thegarage-gitx 2.5.0.beta4 → 2.5.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74b78c4a2d1e85a08f1d15620de3acb87196296
-  data.tar.gz: f619da8af4ffb618d9cf747dde0367262f33bb9d
+  metadata.gz: 6d5196e1b3d1162c4351b5c71e3ca2226e144a93
+  data.tar.gz: d6583c146149d2aa3413b0822ef3df6ab344aca8
 SHA512:
-  metadata.gz: c08275e45d02e36d56b03083246056c5aff9dd04acfcd955d7f820a7c343204e26670d8c55d81ff7d750f3a465bc433ee21945e35340bade1bca64fab172f159
-  data.tar.gz: 3a159e8687a9e582541348f1269e80974986468cb34ceec4404e61ddd455890ef7c221cc762ec73ab1a7e728ee41d80631fd56b7f7d30a91797a17c10758e740
+  metadata.gz: 61bad6585e96efa1a0b541260b06f8a1bdcb545eb1cdecfda58c8f01310d45a3d0cce465c19585029e865e6b24df79aa01bbb24a36b59fd51e169a63b38f8c55
+  data.tar.gz: 4b79dc87ec890790a663aef886ab4043d521ccd01721682b903d146a248b7c8fae18636c6c8ada5c76a0afa179201a5ac6897a5f2c5c1cf0c09127e9d9f2c0d3

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

@@ -9,63 +9,62 @@ module Thegarage
       class IntegrateCommand < BaseCommand
         desc 'integrate', 'integrate the current branch into one of the aggregate development branches (default = staging)'
         method_option :resume, :type => :string, :aliases => '-r', :desc => 'resume merging of feature-branch'
-        def integrate(target_branch = 'staging')
-          branch = current_branch.name
-          if options[:resume]
-            resume
-          else
-            assert_aggregate_branch!(target_branch)
+        def integrate(integration_branch = 'staging')
+          assert_aggregate_branch!(integration_branch)
 
-            UpdateCommand.new.update
+          branch = feature_branch_name
+          print_message(branch, integration_branch)
 
-            say "Integrating "
-            say "#{branch} ", :green
-            say "into "
-            say target_branch, :green
+          UpdateCommand.new.update
 
-            create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)
-            refresh_branch_from_remote(target_branch)
-            merge_feature_branch branch
-            run_cmd "git push origin HEAD"
-            checkout_branch branch
-          end
+          integrate_branch(branch, integration_branch) unless options[:resume]
+          checkout_branch branch
         end
 
         private
 
-        def assert_aggregate_branch!(target_branch)
-          fail "Invalid aggregate branch: #{target_branch} must be one of supported aggregate branches #{AGGREGATE_BRANCHES}" unless aggregate_branch?(target_branch)
+        def print_message(branch, integration_branch)
+          message = options[:resume] ? 'Resuming integration of' : 'Integrating'
+          say "#{message} "
+          say "#{branch} ", :green
+          say "into "
+          say integration_branch, :green
         end
 
-        # nuke local branch and pull fresh version from remote repo
-        def refresh_branch_from_remote(target_branch)
-          run_cmd "git fetch origin"
-          run_cmd "git branch -D #{target_branch}", :allow_failure => true
-          checkout_branch target_branch
-        end
-
-        def merge_feature_branch(branch)
+        def integrate_branch(branch, integration_branch)
+          fetch_remote_branch(integration_branch)
           begin
             run_cmd "git merge #{branch}"
           rescue
             say "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag", :red
             exit
           end
+          run_cmd "git push origin HEAD"
         end
 
-        def resume
-          feature_branch = options[:resume]
-          say "Resuming Integration of "
-          say "#{feature_branch}", :green
-
-          run_cmd "git push origin HEAD"
-          until check_if_branch_exists? feature_branch
-            feature_branch = ask("#{feature_branch} does not exist please enter the correct branch from this list #{local_branches}")
+        def feature_branch_name
+          @feature_branch ||= begin
+            feature_branch = options[:resume] || current_branch.name
+            until local_branch_exists?(feature_branch)
+              feature_branch = ask("#{feature_branch} does not exist. Please select one of the available local branches: #{local_branches}")
+            end
+            feature_branch
           end
-          checkout_branch feature_branch
         end
 
-        def check_if_branch_exists?(branch)
+        def assert_aggregate_branch!(target_branch)
+          fail "Invalid aggregate branch: #{target_branch} must be one of supported aggregate branches #{AGGREGATE_BRANCHES}" unless aggregate_branch?(target_branch)
+        end
+
+        # nuke local branch and pull fresh version from remote repo
+        def fetch_remote_branch(target_branch)
+          create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)
+          run_cmd "git fetch origin"
+          run_cmd "git branch -D #{target_branch}", :allow_failure => true
+          checkout_branch target_branch
+        end
+
+        def local_branch_exists?(branch)
           local_branches.include?(branch)
         end
 

data/lib/thegarage/gitx/version.rb

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

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

@@ -12,11 +12,15 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
   let(:cli) { Thegarage::Gitx::Cli::IntegrateCommand.new(args, options, config) }
   let(:current_branch) { double('fake branch', name: 'feature-branch', head?: true) }
   let(:repo) { cli.send(:repo) }
-  let(:remote_branch_names) { [] }
+  let(:remote_branch_names) { ['origin/staging', 'origin/prototype'] }
+  let(:local_branch_names) { ['feature-branch'] }
 
   before do
     allow(cli).to receive(:current_branch).and_return(current_branch)
-    allow(repo).to receive(:branches).and_return(double(each_name: remote_branch_names))
+    branches = double('fake branches')
+    allow(branches).to receive(:each_name).with(:local).and_return(local_branch_names)
+    allow(branches).to receive(:each_name).with(:remote).and_return(remote_branch_names)
+    allow(repo).to receive(:branches).and_return(branches)
   end
 
   describe '#integrate' do
@@ -24,7 +28,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
     before do
       allow(Thegarage::Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
     end
-    context 'when target branch is ommitted and remote branch exists' do
+    context 'when integration branch is ommitted and remote branch exists' do
       let(:remote_branch_names) { ['origin/staging'] }
       before do
         expect(fake_update_command).to receive(:update)
@@ -64,7 +68,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'when target branch == prototype and remote branch exists' do
+    context 'when integration branch == prototype and remote branch exists' do
       let(:remote_branch_names) { ['origin/prototype'] }
       before do
         expect(fake_update_command).to receive(:update)
@@ -82,7 +86,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'when target branch is not an aggregate branch' do
+    context 'when integration branch is not an aggregate branch' do
       it 'raises an error' do
         expect { cli.integrate('some-other-branch') }.to raise_error(/Invalid aggregate branch: some-other-branch must be one of supported aggregate branches/)
       end
@@ -111,13 +115,11 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         }
       end
       let(:repo) { cli.send(:repo) }
-      let(:branches) { double(each_name: ['feature-branch']) }
       before do
-        expect(repo).to receive(:branches).and_return(branches)
+        expect(fake_update_command).to receive(:update)
 
         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 push origin HEAD")
         expect(cli).to receive(:run_cmd).with("git checkout feature-branch")
 
         cli.integrate
@@ -134,14 +136,14 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       end
       let(:repo) { cli.send(:repo) }
       let(:branches) { double(each_name: ['my-feature-branch'])}
+      let(:local_branch_names) { ['another-feature-branch'] }
       before do
-        expect(repo).to receive(:branches).and_return(branches)
-
-        expect(cli).to receive(:ask).and_return('my-feature-branch')
+        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:ask).and_return('another-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(cli).to receive(:run_cmd).with("git checkout my-feature-branch").ordered
+        expect(cli).not_to receive(:run_cmd).with("git push origin HEAD")
+        expect(cli).to receive(:run_cmd).with("git checkout another-feature-branch").ordered
 
         cli.integrate
       end

metadata

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