gitx 2.21.3 → 2.21.4.ci.145.1

data/spec/gitx/cli/integrate_command_spec.rb

@@ -9,7 +9,8 @@ describe Gitx::Cli::IntegrateCommand do
       pretend: true
     }
   end
-  let(:cli) { Gitx::Cli::IntegrateCommand.new(args, options, config) }
+  let(:cli) { described_class.new(args, options, config) }
+  let(:executor) { cli.send(:executor) }
   let(:current_branch) { double('fake branch', name: 'feature-branch', head?: true) }
   let(:repo) { cli.send(:repo) }
   let(:remote_branch_names) { ['origin/staging', 'origin/prototype'] }
@@ -29,14 +30,13 @@ describe Gitx::Cli::IntegrateCommand do
     context 'when integration branch is ommitted and remote branch exists' do
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrating feature-branch into staging (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -51,14 +51,13 @@ describe Gitx::Cli::IntegrateCommand do
       let(:local_branch_names) { ['master'] }
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating master into staging" master').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrating master into staging', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 
         cli.integrate
       end
@@ -78,18 +77,20 @@ describe Gitx::Cli::IntegrateCommand do
           }
         }
       end
+      let(:changelog) { '2013-01-01 did some stuff' }
       before do
         allow(cli).to receive(:ask_editor).and_return('description')
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
 
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'master...feature-branch', '--reverse', '--no-merges', "--pretty=format:'* %B'").and_return(changelog).ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrating feature-branch into staging (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
 
         stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
 
@@ -107,18 +108,16 @@ describe Gitx::Cli::IntegrateCommand do
     context 'when staging branch does not exist remotely' do
       let(:remote_branch_names) { [] }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
         expect(repo).to receive(:create_branch).with('staging', 'master')
 
-        expect(cli).to receive(:run_cmd).with('git push origin staging:staging').ordered
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'staging:staging').ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').and_raise(Gitx::Executor::ExecutionError).ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrating feature-branch into staging (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -131,14 +130,13 @@ describe Gitx::Cli::IntegrateCommand do
     context 'when integration branch == prototype and remote branch exists' do
       let(:remote_branch_names) { ['origin/prototype'] }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into prototype (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrating feature-branch into prototype (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate 'prototype'
@@ -153,26 +151,14 @@ describe Gitx::Cli::IntegrateCommand do
         expect { cli.integrate('some-other-branch') }.to raise_error(/Invalid aggregate branch: some-other-branch must be one of supported aggregate branches/)
       end
     end
-    context 'when merge conflicts occur during the Gitx::Cli::UpdateCommand execution' do
-      let(:remote_branch_names) { ['origin/staging'] }
-      before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).and_raise(Gitx::Cli::BaseCommand::MergeError)
-
-        expect { cli.integrate }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred.  Please fix merge conflict and rerun the integrate command')
-      end
-      it 'raises a helpful error' do
-        should meet_expectations
-      end
-    end
     context 'when merge conflicts occur with the integrate command' do
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').and_raise('git merge feature-branch failed').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrating feature-branch into staging (Pull request #10)', 'feature-branch').and_raise('git merge feature-branch failed').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           expect { cli.integrate }.to raise_error(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
@@ -190,11 +176,10 @@ describe Gitx::Cli::IntegrateCommand do
       end
       let(:repo) { cli.send(:repo) }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
-        expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
-        expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch')
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).not_to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging')
+        expect(executor).not_to receive(:execute).with('git', 'push', 'origin', 'HEAD')
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch')
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -212,12 +197,12 @@ describe Gitx::Cli::IntegrateCommand do
       end
       let(:local_branch_names) { ['feature-branch'] }
       before do
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+        expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(cli).to receive(:ask).and_return('feature-branch')
 
-        expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
-        expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(executor).not_to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging')
+        expect(executor).not_to receive(:execute).with('git', 'push', 'origin', 'HEAD')
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate

data/spec/gitx/cli/nuke_command_spec.rb

@@ -9,7 +9,8 @@ describe Gitx::Cli::NukeCommand do
       pretend: true
     }
   end
-  let(:cli) { Gitx::Cli::NukeCommand.new(args, options, config) }
+  let(:cli) { described_class.new(args, options, config) }
+  let(:executor) { cli.send(:executor) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
 
   before do
@@ -31,13 +32,12 @@ describe Gitx::Cli::NukeCommand do
 
         expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
 
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git push origin --delete prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout -b prototype build-master-2013-10-01-01').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git branch --set-upstream-to origin/prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'build-master-2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'share').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 
         cli.nuke bad_branch
       end
@@ -55,13 +55,12 @@ describe Gitx::Cli::NukeCommand do
 
         expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
 
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git push origin --delete prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout -b prototype build-master-2013-10-01-01').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git branch --set-upstream-to origin/prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'build-master-2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'share').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 
         cli.nuke 'prototype'
       end
@@ -77,7 +76,7 @@ describe Gitx::Cli::NukeCommand do
 
         expect(cli).to receive(:current_build_tag).with('master').and_return(buildtag)
 
-        expect(cli).to_not receive(:run_cmd)
+        expect(executor).to_not receive(:execute)
 
         cli.nuke 'prototype'
       end
@@ -95,8 +94,8 @@ describe Gitx::Cli::NukeCommand do
       let(:bad_branch) { 'prototype' }
       let(:buildtags) { '' }
       it 'raises error' do
-        expect(cli).to receive(:run_cmd).with('git fetch --tags').ordered
-        expect(cli).to receive(:run_cmd).with("git tag -l 'build-master-*'").and_return(buildtags).ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
+        expect(executor).to receive(:execute).with('git', 'tag', '--list', 'build-master-*').and_return(buildtags).ordered
 
         expect { cli.nuke('prototype') }.to raise_error(/No known good tag found for branch/)
       end
@@ -115,7 +114,7 @@ describe Gitx::Cli::NukeCommand do
 
         expect(cli).to receive(:ask).and_return(good_branch)
         expect(cli).to receive(:yes?).with('Reset prototype to build-master-2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(cli).to receive(:run_cmd).with('git diff build-master-2013-10-01-01...prototype --name-only db/migrate').and_return(migrations)
+        expect(executor).to receive(:execute).with('git', 'diff', 'build-master-2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
         expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(false)
 
         cli.nuke 'prototype'
@@ -141,16 +140,15 @@ describe Gitx::Cli::NukeCommand do
 
         expect(cli).to receive(:ask).and_return(good_branch)
         expect(cli).to receive(:yes?).with('Reset prototype to build-master-2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(cli).to receive(:run_cmd).with('git diff build-master-2013-10-01-01...prototype --name-only db/migrate').and_return(migrations)
+        expect(executor).to receive(:execute).with('git', 'diff', 'build-master-2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
         expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(true)
 
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git push origin --delete prototype', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout -b prototype build-master-2013-10-01-01').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git branch --set-upstream-to origin/prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'build-master-2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'share').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
 
         cli.nuke 'prototype'
       end

data/spec/gitx/cli/release_command_spec.rb

@@ -13,6 +13,7 @@ describe Gitx::Cli::ReleaseCommand do
   let(:branch) { double('fake branch', name: 'feature-branch') }
   let(:authorization_token) { '123123' }
   let(:repo) { cli.send(:repo) }
+  let(:executor) { cli.send(:executor) }
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
@@ -22,7 +23,7 @@ describe Gitx::Cli::ReleaseCommand do
     context 'when user rejects release' do
       before do
         expect(cli).to receive(:yes?).and_return(false)
-        expect(cli).to_not receive(:run_cmd)
+        expect(executor).to_not receive(:execute)
 
         cli.release
       end
@@ -33,16 +34,16 @@ describe Gitx::Cli::ReleaseCommand do
     context 'when user confirms release and pull request exists with non-success status' do
       before do
         expect(repo).to receive(:workdir).and_return(temp_dir)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:yes?).with('Release feature-branch to master? (y/n)', :green).and_return(true)
         expect(cli).to receive(:yes?).with('Branch status is currently: failure.  Proceed with release? (y/n)', :red).and_return(false)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        expect(cli).to_not receive(:run_cmd).with('git checkout master')
-        expect(cli).to_not receive(:run_cmd).with('git pull origin master')
-        expect(cli).to_not receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch')
-        expect(cli).to_not receive(:run_cmd).with('git push origin HEAD')
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to_not receive(:execute).with('git', 'checkout', 'master')
+        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'master')
+        expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch')
+        expect(executor).to_not receive(:execute).with('git', 'push', 'origin', 'HEAD')
 
         VCR.use_cassette('pull_request_does_exist_with_failure_status') do
           cli.release
@@ -56,17 +57,16 @@ describe Gitx::Cli::ReleaseCommand do
       before do
         expect(repo).to receive(:workdir).and_return(temp_dir)
 
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git integrate').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release
@@ -87,17 +87,16 @@ describe Gitx::Cli::ReleaseCommand do
         File.open(File.join(temp_dir, '.gitx.yml'), 'w') do |f|
           f.puts gitx_config.to_yaml
         end
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('echo hello').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('echo hello').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release
@@ -110,17 +109,17 @@ describe Gitx::Cli::ReleaseCommand do
     context 'when target_branch is not nil and user confirms release and pull request exists with success status' do
       before do
         expect(repo).to receive(:workdir).and_return(temp_dir)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git integrate').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release 'feature-branch'
@@ -146,19 +145,19 @@ describe Gitx::Cli::ReleaseCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         allow(cli).to receive(:ask_editor).and_return('description')
 
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
-
         expect(cli).to receive(:yes?).with('Release feature-branch to master? (y/n)', :green).and_return(true)
         expect(cli).to receive(:yes?).with('Branch status is currently: pending.  Proceed with release? (y/n)', :red).and_return(true)
 
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'master...feature-branch', '--reverse', '--no-merges', "--pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git integrate').ordered
 
         stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
         VCR.use_cassette('pull_request_does_not_exist') do
@@ -180,18 +179,18 @@ describe Gitx::Cli::ReleaseCommand do
       end
       before do
         expect(repo).to receive(:workdir).and_return(temp_dir)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
-        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Releasing feature-branch to master (Pull request #10)" feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git integrate').ordered
-        expect(cli).to receive(:run_cmd).with('git cleanup').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Releasing feature-branch to master (Pull request #10)', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git cleanup').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release