thegarage-gitx 2.5.0.beta5 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d5196e1b3d1162c4351b5c71e3ca2226e144a93
-  data.tar.gz: d6583c146149d2aa3413b0822ef3df6ab344aca8
+  metadata.gz: 4467ae416b3bf6136ccfc3158301c00c961574b6
+  data.tar.gz: cc0365b89a0d11315998d3a0d42aa44f30ba4301
 SHA512:
-  metadata.gz: 61bad6585e96efa1a0b541260b06f8a1bdcb545eb1cdecfda58c8f01310d45a3d0cce465c19585029e865e6b24df79aa01bbb24a36b59fd51e169a63b38f8c55
-  data.tar.gz: 4b79dc87ec890790a663aef886ab4043d521ccd01721682b903d146a248b7c8fae18636c6c8ada5c76a0afa179201a5ac6897a5f2c5c1cf0c09127e9d9f2c0d3
+  metadata.gz: 866b0b4cbd14c4e6991a6301c9d2bf7630dc51cdaa96291e9ca708fa39170737a45db6139aecda4bfd7d4303e4cc403745b7731dd96d7b93e2a9238fce3464ed
+  data.tar.gz: 74c7b693a591709e00c1068d7cf073848a276b9fd4223fc32acd7d55df0d5086e2c76618787a788e34c48889ab205b0cef1f780b3995ad85c1db62c46955bb6f

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

@@ -9,6 +9,8 @@ module Thegarage
       class BaseCommand < Thor
         include Thor::Actions
 
+        class MergeError < Thor::Error; end
+
         AGGREGATE_BRANCHES = %w( staging prototype )
         RESERVED_BRANCHES = %w( HEAD master next_release ) + AGGREGATE_BRANCHES
         add_runtime_options!

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

@@ -36,8 +36,7 @@ module Thegarage
           begin
             run_cmd "git merge #{branch}"
           rescue
-            say "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag", :red
-            exit
+            fail MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
           end
           run_cmd "git push origin HEAD"
         end

data/lib/thegarage/gitx/version.rb

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

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

@@ -100,9 +100,8 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         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 feature-branch").and_raise('git merge feature-branch failed').ordered
-        expect(cli).to receive(:exit).and_raise(SystemExit)
 
-        expect { cli.integrate }.to raise_error(SystemExit)
+        expect { cli.integrate }.to raise_error(/Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume feature-branch flag/)
       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.beta5
+  version: 2.5.0
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -309,9 +309,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2