gitx 2.21.3 → 2.21.4.ci.145.1

data/spec/gitx/cli/review_command_spec.rb

@@ -10,6 +10,7 @@ describe Gitx::Cli::ReviewCommand do
     }
   end
   let(:cli) { described_class.new(args, options, config) }
+  let(:executor) { cli.send(:executor) }
   let(:repo) { double('fake repo', config: repo_config, workdir: repo_workdir) }
   let(:repo_workdir) { File.expand_path(File.join(__dir__, '../../../')) }
   let(:repo_config) do
@@ -42,11 +43,10 @@ describe Gitx::Cli::ReviewCommand do
       end
       let(:changelog) { "* old commit\n\n* new commit" }
       before do
-        expect(Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
-
         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 log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return(changelog).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(cli).to receive(:ask_editor).with(changelog, hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return('description')
 
         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' })
@@ -79,11 +79,10 @@ describe Gitx::Cli::ReviewCommand do
       let(:changelog) { "* old commit\n\n* new commit" }
       let(:pull_request_description) { 'description' }
       before do
-        expect(Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
-
         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 log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return(changelog).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(cli).to receive(:ask_editor).with(changelog, hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return(pull_request_description)
 
         stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
@@ -151,7 +150,7 @@ describe Gitx::Cli::ReviewCommand do
       let(:authorization_token) { '123123' }
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(cli).to receive(:run_cmd).with('open https://path/to/html/pull/request').ordered
+        expect(executor).to receive(:execute).with('open', 'https://path/to/html/pull/request').ordered
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.review
         end

data/spec/gitx/cli/share_command_spec.rb

@@ -9,7 +9,8 @@ describe Gitx::Cli::ShareCommand do
       pretend: true
     }
   end
-  let(:cli) { Gitx::Cli::ShareCommand.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
@@ -20,8 +21,8 @@ describe Gitx::Cli::ShareCommand do
     before do
       allow(cli).to receive(:say)
 
-      expect(cli).to receive(:run_cmd).with('git push origin feature-branch').ordered
-      expect(cli).to receive(:run_cmd).with('git branch --set-upstream-to origin/feature-branch').ordered
+      expect(executor).to receive(:execute).with('git', 'push', 'origin', 'feature-branch').ordered
+      expect(executor).to receive(:execute).with('git', 'track').ordered
 
       cli.share
     end

data/spec/gitx/cli/start_command_spec.rb

@@ -11,15 +11,13 @@ describe Gitx::Cli::StartCommand do
   end
   let(:cli) { described_class.new(args, options, config) }
   let(:repo) { cli.send(:repo) }
-  let(:exit_value) { double(:exit_value, success?: true) }
-  let(:thread) { double(:thread, value: exit_value) }
-  let(:stdoutput) { StringIO.new('') }
+  let(:executor) { cli.send(:executor) }
 
   describe '#start' do
     context 'when user inputs branch that is valid' do
       before do
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -34,7 +32,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -49,7 +47,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -67,7 +65,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -85,7 +83,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -103,10 +101,10 @@ describe Gitx::Cli::StartCommand do
       end
       before do
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
-        expect(Open3).to receive(:popen2e).with('git', 'commit', '--allow-empty', '--message', 'Starting work on new-branch (Issue #10)').and_yield(nil, stdoutput, thread).ordered
+        expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', 'Starting work on new-branch (Issue #10)').ordered
 
         cli.start 'new-branch'
       end

data/spec/gitx/cli/track_command_spec.rb

@@ -9,7 +9,8 @@ describe Gitx::Cli::TrackCommand do
       pretend: true
     }
   end
-  let(:cli) { Gitx::Cli::TrackCommand.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
@@ -20,7 +21,7 @@ describe Gitx::Cli::TrackCommand do
     before do
       allow(cli).to receive(:say)
 
-      expect(cli).to receive(:run_cmd).with('git branch --set-upstream-to origin/feature-branch').ordered
+      expect(executor).to receive(:execute).with('git', 'branch', '--set-upstream-to', 'origin/feature-branch').ordered
 
       cli.track
     end

data/spec/gitx/cli/update_command_spec.rb

@@ -9,9 +9,10 @@ describe Gitx::Cli::UpdateCommand do
       pretend: true
     }
   end
-  let(:cli) { Gitx::Cli::UpdateCommand.new(args, options, config) }
+  let(:cli) { described_class.new(args, options, config) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
   let(:repo) { cli.send(:repo) }
+  let(:executor) { cli.send(:executor) }
   let(:remote_branch_names) { ['origin/feature-branch'] }
 
   before do
@@ -26,9 +27,9 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(cli).to receive(:run_cmd).with('git pull origin feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'share').ordered
 
         cli.update
       end
@@ -40,9 +41,9 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(cli).to receive(:run_cmd).with('git pull origin feature-branch').and_raise('merge error').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').and_raise('merge error').ordered
 
-        expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command')
+        expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command')
       end
       it 'raises error' do
         should meet_expectations
@@ -52,10 +53,10 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(cli).to receive(:run_cmd).with('git pull origin feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git pull origin master').and_raise('merge error occurred').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').and_raise('merge error occurred').ordered
 
-        expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command')
+        expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command')
       end
       it 'raises error' do
         should meet_expectations
@@ -66,8 +67,8 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(cli).not_to receive(:run_cmd).with('git pull origin feature-branch')
-        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
+        expect(executor).not_to receive(:execute).with('git', 'pull', 'origin', 'feature-branch')
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
 
         cli.update
       end

data/spec/gitx/executor_spec.rb

@@ -0,0 +1,41 @@
+require 'gitx/executor'
+
+RSpec.describe Gitx::Executor do
+  let(:executor) { described_class.new }
+  let(:exit_value) { double(:exit_value, success?: true) }
+  let(:thread) { double(:thread, value: exit_value) }
+  let(:stdoutput) { StringIO.new('Hello World') }
+  before do
+    expect(Open3).to receive(:popen2e).and_yield(nil, stdoutput, thread)
+  end
+
+  describe '#execute' do
+    context 'when execution is successful and block given' do
+      before do
+        @output = []
+        executor.execute('some', 'command', '--with', '--args') do |output|
+          @output << output
+        end
+      end
+      it 'yields the command and output' do
+        expect(@output).to eq ['$ some command --with --args', 'Hello World']
+      end
+    end
+    context 'when execution is successful' do
+      before do
+        @output = executor.execute('some', 'command', '--with', '--args')
+      end
+      it 'returns the output' do
+        expect(@output).to eq 'Hello World'
+      end
+    end
+    context 'when execution is not sucessful' do
+      let(:exit_value) { double(:exit_value, success?: false) }
+      it 'raises ExecutionError' do
+        expect do
+          executor.execute('some', 'bad', 'command')
+        end.to raise_error Gitx::Executor::ExecutionError
+      end
+    end
+  end
+end

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.21.3
+  version: 2.21.4.ci.145.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Git eXtensions for improved development workflows
@@ -251,13 +251,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitx.yml"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .gitx.yml
+- .hound.yml
+- .rspec
+- .rubocop.yml
+- .ruby-version
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -289,6 +289,7 @@ files:
 - lib/gitx/cli/update_command.rb
 - lib/gitx/configuration.rb
 - lib/gitx/defaults.yml
+- lib/gitx/executor.rb
 - lib/gitx/extensions/string.rb
 - lib/gitx/extensions/thor.rb
 - lib/gitx/github.rb
@@ -307,6 +308,7 @@ files:
 - spec/gitx/cli/start_command_spec.rb
 - spec/gitx/cli/track_command_spec.rb
 - spec/gitx/cli/update_command_spec.rb
+- spec/gitx/executor_spec.rb
 - spec/spec_helper.rb
 - spec/support/global_config.rb
 - spec/support/home_env.rb
@@ -326,17 +328,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
@@ -355,6 +357,7 @@ test_files:
 - spec/gitx/cli/start_command_spec.rb
 - spec/gitx/cli/track_command_spec.rb
 - spec/gitx/cli/update_command_spec.rb
+- spec/gitx/executor_spec.rb
 - spec/spec_helper.rb
 - spec/support/global_config.rb
 - spec/support/home_env.rb
@@ -364,4 +367,3 @@ test_files:
 - spec/support/timecop.rb
 - spec/support/vcr.rb
 - spec/support/webmock.rb
-has_rdoc: