thegarage-gitx 2.5.0.alpha1 → 2.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52a815b1f180eb401a49be082d797c8048500eba
-  data.tar.gz: 0fffe93eea6027c24774d152b3a7ce02f36c3021
+  metadata.gz: b22f64be18547e7394ae28d350dd6d43fe30a499
+  data.tar.gz: 8dfeb4c9fc0d4dd65171543a00f2654c2c3a4bbb
 SHA512:
-  metadata.gz: 44d73575489db418bf94747b9318061d9f5939d9fff7ee7ebd1efe9242814b487cd857ef7bcfa9c8181d315a1f1241ba1c911dfade1f8016f3949c1c0ec35d2e
-  data.tar.gz: 3e9f8275982afa713d5f553e5ffb3653ee6b7e2a6a40c26cb23fcba9bee95aaa300e21f8115b52aca8194e5a6cf49192a4d1a281b5a050f51edf4404d1d0ef4a
+  metadata.gz: 0af365e03299c621ac0b6029689d7f0131feb6d783a9f4c42bf53842b49e5b46ea42178240b551d9ac673d794f6cb020bcb1d0823028afe3e4e7bab0a69f333f
+  data.tar.gz: b17b3084db551cfd97e2c71704fe82d18295243683ac209aa477bec72b007e8e5055d31ff1188d0c996c863937923bfc53fedbf5692a093ca62ae4f8b3d4f1a5

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

@@ -49,7 +49,8 @@ module Thegarage
           begin
             run_cmd "git merge #{branch}"
           rescue
-            raise "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
+            say "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
+            exit
           end
         end
 

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.5.0.alpha1'
+    VERSION = '2.5.0.beta1'
   end
 end

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

@@ -69,8 +69,9 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git checkout staging").ordered
         expect(cli).to receive(:run_cmd).with("git merge feature-branch").and_raise('git merge feature-branch failed').ordered
+        expect(cli).to receive(:exit).and_raise(SystemExit)
 
-        expect { cli.integrate }.to raise_error("Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume feature-branch flag")
+        expect { cli.integrate }.to raise_error(SystemExit)
       end
       it 'raises a helpful error' do
         should meet_expectations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.5.0.alpha1
+  version: 2.5.0.beta1
 platform: ruby
 authors:
 - Ryan Sonnek