thegarage-gitx 2.5.0.beta5 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/thegarage/gitx/cli/base_command.rb +2 -0
  3. data/lib/thegarage/gitx/cli/integrate_command.rb +1 -2
  4. data/lib/thegarage/gitx/version.rb +1 -1
  5. data/spec/thegarage/gitx/cli/integrate_command_spec.rb +1 -2
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6d5196e1b3d1162c4351b5c71e3ca2226e144a93
4
- data.tar.gz: d6583c146149d2aa3413b0822ef3df6ab344aca8
3
+ metadata.gz: 4467ae416b3bf6136ccfc3158301c00c961574b6
4
+ data.tar.gz: cc0365b89a0d11315998d3a0d42aa44f30ba4301
5
5
  SHA512:
6
- metadata.gz: 61bad6585e96efa1a0b541260b06f8a1bdcb545eb1cdecfda58c8f01310d45a3d0cce465c19585029e865e6b24df79aa01bbb24a36b59fd51e169a63b38f8c55
7
- data.tar.gz: 4b79dc87ec890790a663aef886ab4043d521ccd01721682b903d146a248b7c8fae18636c6c8ada5c76a0afa179201a5ac6897a5f2c5c1cf0c09127e9d9f2c0d3
6
+ metadata.gz: 866b0b4cbd14c4e6991a6301c9d2bf7630dc51cdaa96291e9ca708fa39170737a45db6139aecda4bfd7d4303e4cc403745b7731dd96d7b93e2a9238fce3464ed
7
+ data.tar.gz: 74c7b693a591709e00c1068d7cf073848a276b9fd4223fc32acd7d55df0d5086e2c76618787a788e34c48889ab205b0cef1f780b3995ad85c1db62c46955bb6f
data/lib/thegarage/gitx/cli/base_command.rb CHANGED
@@ -9,6 +9,8 @@ module Thegarage
9
9
  class BaseCommand < Thor
10
10
  include Thor::Actions
11
11
 
12
+ class MergeError < Thor::Error; end
13
+
12
14
  AGGREGATE_BRANCHES = %w( staging prototype )
13
15
  RESERVED_BRANCHES = %w( HEAD master next_release ) + AGGREGATE_BRANCHES
14
16
  add_runtime_options!
data/lib/thegarage/gitx/cli/integrate_command.rb CHANGED
@@ -36,8 +36,7 @@ module Thegarage
36
36
  begin
37
37
  run_cmd "git merge #{branch}"
38
38
  rescue
39
- say "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag", :red
40
- exit
39
+ fail MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
41
40
  end
42
41
  run_cmd "git push origin HEAD"
43
42
  end
data/lib/thegarage/gitx/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Thegarage
2
2
  module Gitx
3
- VERSION = '2.5.0.beta5'
3
+ VERSION = '2.5.0'
4
4
  end
5
5
  end
data/spec/thegarage/gitx/cli/integrate_command_spec.rb CHANGED
@@ -100,9 +100,8 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
100
100
  expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
101
101
  expect(cli).to receive(:run_cmd).with("git checkout staging").ordered
102
102
  expect(cli).to receive(:run_cmd).with("git merge feature-branch").and_raise('git merge feature-branch failed').ordered
103
- expect(cli).to receive(:exit).and_raise(SystemExit)
104
103
 
105
- expect { cli.integrate }.to raise_error(SystemExit)
104
+ expect { cli.integrate }.to raise_error(/Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume feature-branch flag/)
106
105
  end
107
106
  it 'raises a helpful error' do
108
107
  should meet_expectations
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thegarage-gitx
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0.beta5
4
+ version: 2.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryan Sonnek
@@ -309,9 +309,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
309
309
  version: '0'
310
310
  required_rubygems_version: !ruby/object:Gem::Requirement
311
311
  requirements:
312
- - - ">"
312
+ - - ">="
313
313
  - !ruby/object:Gem::Version
314
- version: 1.3.1
314
+ version: '0'
315
315
  requirements: []
316
316
  rubyforge_project:
317
317
  rubygems_version: 2.2.2