thegarage-gitx 2.5.0.beta1 → 2.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b22f64be18547e7394ae28d350dd6d43fe30a499
-  data.tar.gz: 8dfeb4c9fc0d4dd65171543a00f2654c2c3a4bbb
+  metadata.gz: 6a11b17f13c6a98af5bbd1415580d1796c13c542
+  data.tar.gz: 20029e4cac935a0c8779c62e7614b4be3c247549
 SHA512:
-  metadata.gz: 0af365e03299c621ac0b6029689d7f0131feb6d783a9f4c42bf53842b49e5b46ea42178240b551d9ac673d794f6cb020bcb1d0823028afe3e4e7bab0a69f333f
-  data.tar.gz: b17b3084db551cfd97e2c71704fe82d18295243683ac209aa477bec72b007e8e5055d31ff1188d0c996c863937923bfc53fedbf5692a093ca62ae4f8b3d4f1a5
+  metadata.gz: 3b86cc43dc22460ff06dcd817472b345448876ef403dc7ea715f566f5ed134e190470171d51a468aace18f7e9465d15aea22c5498f76673f9085bc857d7bab36
+  data.tar.gz: 87ee27377d2f9fe9069561aafe61bbe0cf2502c9f6c9376b39548b163ba85b410b7dc4fced66326ac2ca341da298de61ccf9b5f22086bb9c735abf1876a07e19

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

@@ -61,7 +61,7 @@ module Thegarage
 
           run_cmd "git push origin HEAD"
           until check_if_branch_exists? feature_branch
-            raise "#{feature_branch} does not exist please make sure you typed the correct branch and run command again"
+            feature_branch = ask("#{feature_branch} does not exist please enter the correct branch from this list #{local_branches}")
           end
           checkout_branch feature_branch
         end

data/lib/thegarage/gitx/version.rb

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

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

@@ -105,13 +105,19 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
           resume: 'feature-branch'
         }
       end
+      let(:repo) { cli.send(:repo) }
+      let(:branches) { double(each_name: ['my-feature-branch'])}
       before do
+        expect(repo).to receive(:branches).and_return(branches)
+
+        expect(cli).to receive(:ask).and_return('my-feature-branch')
+
         expect(cli).not_to receive(:run_cmd).with("git branch -D staging")
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
-        expect(options[:resume]).to match("feature-branch")
-        expect(cli).not_to receive(:run_cmd).with("git checkout feature-branch").and_raise('some error').ordered
+        expect(cli).to receive(:run_cmd).with("git checkout my-feature-branch").ordered
 
-        expect { cli.integrate }.to raise_error("#{options[:resume]} does not exist please make sure you typed the correct branch and run command again")
+        cli.integrate
+        # expect { cli.integrate }
       end
       it 'raises 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.beta1
+  version: 2.5.0.beta2
 platform: ruby
 authors:
 - Ryan Sonnek