thegarage-gitx 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4467ae416b3bf6136ccfc3158301c00c961574b6
-  data.tar.gz: cc0365b89a0d11315998d3a0d42aa44f30ba4301
+  metadata.gz: d0b811de52af14874eb51c9c61fd1394fc6ce510
+  data.tar.gz: a497c02d33bbe70cdc915bbab537f019d20e82d8
 SHA512:
-  metadata.gz: 866b0b4cbd14c4e6991a6301c9d2bf7630dc51cdaa96291e9ca708fa39170737a45db6139aecda4bfd7d4303e4cc403745b7731dd96d7b93e2a9238fce3464ed
-  data.tar.gz: 74c7b693a591709e00c1068d7cf073848a276b9fd4223fc32acd7d55df0d5086e2c76618787a788e34c48889ab205b0cef1f780b3995ad85c1db62c46955bb6f
+  metadata.gz: a7cf35490ed34c5b821d659bf89f7e67450a1718c00f2d1fd63dc4843a837d13565bb3f36ca12e80e7e3c8eb9cdf61e4807c0ef62714bcdc067b7cc2c27e5cd2
+  data.tar.gz: 1d2d0f3cfd6f47ded0614469664a948a73ed5f1237bb8a4f46a97e5100e56616eb6f664673ba50127b11ac3b52e83cc32ead1d32d8234b9a5ca0ea523d9ee8d6

data/lib/thegarage/gitx/cli/integrate_command.rb

@@ -15,7 +15,11 @@ module Thegarage
           branch = feature_branch_name
           print_message(branch, integration_branch)
 
-          UpdateCommand.new.update
+          begin
+            UpdateCommand.new.update
+          rescue
+            fail MergeError, "Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command"
+          end
 
           integrate_branch(branch, integration_branch) unless options[:resume]
           checkout_branch branch

data/lib/thegarage/gitx/cli/update_command.rb

@@ -8,15 +8,29 @@ module Thegarage
       class UpdateCommand < BaseCommand
         desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
         def update
-          say 'Updating '
+          say "Updating "
           say "#{current_branch.name} ", :green
           say "with latest changes from "
           say Thegarage::Gitx::BASE_BRANCH, :green
 
-          run_cmd "git pull origin #{current_branch.name}", :allow_failure => true
-          run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
+          update_branch(current_branch.name) if remote_branch_exists?(current_branch.name)
+          update_branch(Thegarage::Gitx::BASE_BRANCH)
           run_cmd 'git push origin HEAD'
         end
+
+        private
+
+        def update_branch(branch)
+          begin
+            run_cmd "git pull origin #{branch}"
+          rescue
+            fail MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun the update command"
+          end
+        end
+
+        def remote_branch_exists?(branch)
+          repo.branches.each_name(:remote).include?("origin/#{branch}")
+        end
       end
     end
   end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.5.0'
+    VERSION = '2.5.1'
   end
 end

data/spec/thegarage/gitx/cli/integrate_command_spec.rb

@@ -91,7 +91,18 @@ describe Thegarage::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' do
+    context 'when merge conflicts occur during the updatecommand execution' do
+      let(:remote_branch_names) { ['origin/staging'] }
+      before do
+        expect(fake_update_command).to receive(:update).and_raise(Thegarage::Gitx::Cli::BaseCommand::MergeError)
+
+        expect { cli.integrate }.to raise_error(Thegarage::Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please 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(fake_update_command).to receive(:update)

data/spec/thegarage/gitx/cli/update_command_spec.rb

@@ -11,23 +11,69 @@ describe Thegarage::Gitx::Cli::UpdateCommand do
   end
   let(:cli) { Thegarage::Gitx::Cli::UpdateCommand.new(args, options, config) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
+  let(:repo) { cli.send(:repo) }
+  let(:remote_branch_names) { ['origin/feature-branch'] }
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
+    branches = double('fake branches')
+    allow(branches).to receive(:each_name).with(:remote).and_return(remote_branch_names)
+    allow(repo).to receive(:branches).and_return(branches)
   end
 
   describe '#update' do
-    before do
-      allow(cli).to receive(:say)
+    context 'when no merge conflicts occur' do
+      before do
+        allow(cli).to receive(:say)
 
-      expect(cli).to receive(:run_cmd).with('git pull origin feature-branch', allow_failure: true).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(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
 
-      cli.update
+        cli.update
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
     end
-    it 'runs expected commands' do
-      should meet_expectations
+    context 'when merge conflicts occur when pulling remote feature-branch' 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 { cli.update }.to raise_error(Thegarage::Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command')
+      end
+      it 'raises error' do
+        should meet_expectations
+      end
+    end
+    context 'when merge conflicts occur when pulling remote master branch' 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 { cli.update }.to raise_error(Thegarage::Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command')
+      end
+      it 'raises error' do
+        should meet_expectations
+      end
+    end
+    context 'when feature-branch does not exist remotely' do
+      let(:remote_branch_names) { [] }
+      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
+
+        cli.update
+      end
+      it 'skips pulling from feature branch' do
+        should meet_expectations
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged