diff options
| -rw-r--r-- | lib/gitlab_projects.rb | 28 | ||||
| -rw-r--r-- | spec/gitlab_projects_spec.rb | 4 |
2 files changed, 16 insertions, 16 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb index 5bcf623..0354b87 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -48,34 +48,34 @@ class GitlabProjects def create_branch branch_name = ARGV.shift ref = ARGV.shift || "HEAD" - cmd = "cd #{full_path} && git branch #{branch_name} #{ref}" - system(cmd) + cmd = %W(git --git-dir=#{full_path} branch #{branch_name} #{ref}) + system(*cmd) end def rm_branch branch_name = ARGV.shift - cmd = "cd #{full_path} && git branch -D #{branch_name}" - system(cmd) + cmd = %W(git --git-dir=#{full_path} branch -D #{branch_name}) + system(*cmd) end def create_tag tag_name = ARGV.shift ref = ARGV.shift || "HEAD" - cmd = "cd #{full_path} && git tag #{tag_name} #{ref}" - system(cmd) + cmd = %W(git --git-dir=#{full_path} tag #{tag_name} #{ref}) + system(*cmd) end def rm_tag tag_name = ARGV.shift - cmd = "cd #{full_path} && git tag -d #{tag_name}" - system(cmd) + cmd = %W(git --git-dir=#{full_path} tag -d #{tag_name}) + system(*cmd) end def add_project $logger.info "Adding project #{@project_name} at <#{full_path}>." FileUtils.mkdir_p(full_path, mode: 0770) - cmd = "cd #{full_path} && git init --bare" - system(cmd) && create_hooks(full_path) + cmd = %W(git --git-dir=#{full_path} init --bare) + system(*cmd) && create_hooks(full_path) end def create_hooks(path) @@ -94,8 +94,8 @@ class GitlabProjects def import_project @source = ARGV.shift $logger.info "Importing project #{@project_name} from <#{@source}> to <#{full_path}>." - cmd = "cd #{repos_path} && git clone --bare #{@source} #{project_name}" - system(cmd) && create_hooks(full_path) + cmd = %W(git clone --bare #{@source} #{project_name}) + system(*cmd, chdir: repos_path) && create_hooks(full_path) end # Move repository from one directory to another @@ -156,8 +156,8 @@ class GitlabProjects end $logger.info "Forking project from <#{full_path}> to <#{full_destination_path}>." - cmd = "cd #{namespaced_path} && git clone --bare #{full_path}" - system(cmd) && create_hooks(full_destination_path) + cmd = %W(git clone --bare #{full_path}) + system(*cmd, chdir: namespaced_path) && create_hooks(full_destination_path) end def update_head diff --git a/spec/gitlab_projects_spec.rb b/spec/gitlab_projects_spec.rb index 5c0b5b7..bbe27e2 100644 --- a/spec/gitlab_projects_spec.rb +++ b/spec/gitlab_projects_spec.rb @@ -101,8 +101,8 @@ describe GitlabProjects do end it "should receive valid cmd" do - valid_cmd = "cd #{tmp_repo_path} && git init --bare" - gl_projects.should_receive(:system).with(valid_cmd).and_return(true) + valid_cmd = ['git', "--git-dir=#{tmp_repo_path}", 'init', '--bare'] + gl_projects.should_receive(:system).with(*valid_cmd).and_return(true) gl_projects.should_receive(:create_hooks).with(tmp_repo_path) gl_projects.exec end |