thegarage-gitx 2.4.2 → 2.5.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b47697535d0f7b3870b35f25567e35dc9d5482
-  data.tar.gz: d9a3e772a5e8a83d62d70e5ca4903d86bc94a096
+  metadata.gz: 52a815b1f180eb401a49be082d797c8048500eba
+  data.tar.gz: 0fffe93eea6027c24774d152b3a7ce02f36c3021
 SHA512:
-  metadata.gz: 4a6337e2103ad9072deb477849f675038b0b4e38bb0b79b9ac4eb5078f0b7b4d033eba9a73359d0860af65dcbb9ec4c81da7a3cdbbef893071bcc20a9db6530f
-  data.tar.gz: 39a72589d0870324530b0a7179c9740aa2f73eb825c046b18c71ed26de0e5486c176f37c5f07842a9d7ba1af74ef60d92ad39de5a6ac478c1baef76b1f3c3add
+  metadata.gz: 44d73575489db418bf94747b9318061d9f5939d9fff7ee7ebd1efe9242814b487cd857ef7bcfa9c8181d315a1f1241ba1c911dfade1f8016f3949c1c0ec35d2e
+  data.tar.gz: 3e9f8275982afa713d5f553e5ffb3653ee6b7e2a6a40c26cb23fcba9bee95aaa300e21f8115b52aca8194e5a6cf49192a4d1a281b5a050f51edf4404d1d0ef4a

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

@@ -3,49 +3,74 @@ require 'thegarage/gitx'
 require 'thegarage/gitx/cli/base_command'
 require 'thegarage/gitx/cli/update_command'
 
+
 module Thegarage
   module Gitx
     module Cli
       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
-          assert_aggregate_branch!(target_branch)
+          if options[:resume]
+            resume
+          else
+            assert_integratable_branch!(branch, target_branch)
 
-          UpdateCommand.new.update
+            UpdateCommand.new.update
 
-          say "Integrating "
-          say "#{branch} ", :green
-          say "into "
-          say target_branch, :green
+            say "Integrating "
+            say "#{branch} ", :green
+            say "into "
+            say target_branch, :green
 
-          create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)
-          refresh_branch_from_remote(target_branch)
-          run_cmd "git merge #{branch}"
-          run_cmd "git push origin HEAD"
-          checkout_branch branch
+            refresh_branch_from_remote target_branch
+            merge_feature_branch branch
+            run_cmd "git push origin HEAD"
+            checkout_branch branch
+          end
         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 assert_integratable_branch!(branch, target_branch)
+          assert_not_protected_branch!(branch, 'integrate') unless aggregate_branch?(target_branch)
+          raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(target_branch) || target_branch == Thegarage::Gitx::BASE_BRANCH
         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
+          run_cmd "git fetch origin"
           checkout_branch target_branch
         end
 
-        def remote_branch_exists?(target_branch)
-          repo.branches.each_name(:remote).include?("origin/#{target_branch}")
+        def merge_feature_branch(branch)
+          begin
+            run_cmd "git merge #{branch}"
+          rescue
+            raise "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
+          end
+        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
+            raise "#{feature_branch} does not exist please make sure you typed the correct branch and run command again"
+          end
+          checkout_branch feature_branch
+        end
+
+        def check_if_branch_exists?(branch)
+          return true if local_branches.include?(branch)
         end
 
-        def create_remote_branch(target_branch)
-          repo.create_branch(target_branch, Thegarage::Gitx::BASE_BRANCH)
-          run_cmd "git push origin #{target_branch}:#{target_branch}"
+        def local_branches
+          @local_branches ||= repo.branches.each_name(:local).to_a.map { |branch| branch }
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Thegarage
 
           checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd 'git pull'
-          repo.create_branch branch_name, Thegarage::Gitx::BASE_BRANCH
+          repo.create_branch branch_name, 'master'
           checkout_branch branch_name
         end
 

data/lib/thegarage/gitx/version.rb

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

data/lib/thegarage/gitx.rb

@@ -1,6 +1,6 @@
 require 'thegarage/gitx/version'
-require 'thegarage/gitx/extensions/string'
-require 'thegarage/gitx/extensions/thor'
+require 'thegarage/gitx/string_extensions'
+require 'thegarage/gitx/thor_extensions'
 
 module Thegarage
   module Gitx

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 require 'coveralls'
-Coveralls.wear! do
-  ::SimpleCov.add_filter 'spec'
-  ::SimpleCov.add_filter 'lib/thegarage/gitx/extensions'
-end
+Coveralls.wear!
 require 'rubygems'
 require 'bundler/setup'
 

data/spec/support/stub_execution.rb

@@ -1,13 +1,6 @@
 # protip to prevent execution of shell commands during testsuite
 # see http://stackoverflow.com/questions/1628586/mock-system-call-in-ruby
-module ShellExecutionStub
-  def included(base)
-    base.class_eval do
-      alias_method :execute_without_stub, :`
-      alias_method :`, :execute_with_stub
-    end
-  end
-
+module Kernel
   def execute_with_stub(cmd)
     if cmd.include?('git')
       puts "WARNING: stubbing command execution within tests of command: #{cmd}", :red
@@ -15,6 +8,7 @@ module ShellExecutionStub
       execute_without_stub(cmd)
     end
   end
-end
 
-Kernel.send(:include, ShellExecutionStub)
+  alias_method :execute_without_stub, :`
+  alias_method :`, :execute_with_stub
+end

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

@@ -10,13 +10,10 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
     }
   end
   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(:branch) { double('fake branch', name: '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))
+    allow(cli).to receive(:current_branch).and_return(branch)
   end
 
   describe '#integrate' do
@@ -24,13 +21,12 @@ 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
-      let(:remote_branch_names) { ['origin/staging'] }
+    context 'when target branch is ommitted' do
       before do
         expect(fake_update_command).to receive(:update)
 
-        expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
+        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").ordered
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
@@ -42,49 +38,82 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'when staging branch does not exist remotely' do
-      let(:remote_branch_names) { [] }
+    context 'when target branch == prototype' do
       before do
         expect(fake_update_command).to receive(:update)
 
-        expect(repo).to receive(:create_branch).with('staging', 'master')
-
-        expect(cli).to receive(:run_cmd).with('git push origin staging:staging').ordered
-
+        expect(cli).to receive(:run_cmd).with("git branch -D prototype", allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
-        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 checkout prototype").ordered
         expect(cli).to receive(:run_cmd).with("git merge feature-branch").ordered
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
         expect(cli).to receive(:run_cmd).with("git checkout feature-branch").ordered
 
-        cli.integrate
+        cli.integrate 'prototype'
       end
-      it 'creates remote aggregate branch' do
+      it 'runs expected commands' do
         should meet_expectations
       end
     end
-    context 'when target branch == prototype and remote branch exists' do
-      let(:remote_branch_names) { ['origin/prototype'] }
+    context 'when target branch != staging || prototype' do
+      it 'raises an error' do
+
+        expect { cli.integrate('some-other-branch') }.to raise_error(/Only aggregate branches are allowed for integration/)
+      end
+    end
+    context 'when merge conflicts occur' do
       before do
         expect(fake_update_command).to receive(:update)
 
+        expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
-        expect(cli).to receive(:run_cmd).with("git branch -D prototype", allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with("git checkout prototype").ordered
-        expect(cli).to receive(:run_cmd).with("git merge feature-branch").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.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
+      end
+    end
+    context 'with --resume "feature-branch" flag when feature-branch exists' do
+      let(:options) do
+        {
+          resume: 'feature-branch'
+        }
+      end
+      let(:repo) { cli.send(:repo) }
+      let(:branches) { double(each_name: ['feature-branch']) }
+      before do
+        expect(repo).to receive(:branches).and_return(branches)
+
+        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 feature-branch").ordered
+        expect(options[:resume]).to match("feature-branch")
+        expect(cli).to receive(:run_cmd).with("git checkout feature-branch")
 
-        cli.integrate 'prototype'
+        cli.integrate
       end
-      it 'runs expected commands' do
+      it 'does not delete local staging branch' do
         should meet_expectations
       end
     end
-    context 'when target 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/)
+    context 'with --resume "feature-branch" flag when feature-branch does not exist' do
+      let(:options) do
+        {
+          resume: 'feature-branch'
+        }
+      end
+      before do
+        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.integrate }.to raise_error("#{options[:resume]} does not exist please make sure you typed the correct branch and run command again")
+      end
+      it 'raises error' do
+        should meet_expectations
       end
     end
   end

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

@@ -101,65 +101,5 @@ describe Thegarage::Gitx::Cli::NukeCommand do
         expect { cli.nuke('prototype') }.to raise_error(/No known good tag found for branch/)
       end
     end
-    context 'when database migrations exist and user cancels operation' do
-      let(:buildtag) { 'build-master-2013-10-01-01' }
-      let(:good_branch) { 'master' }
-      let(:bad_branch) { 'prototype' }
-      let(:migrations) do
-        %w( db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb ).join("\n")
-      end
-      before do
-        FileUtils.mkdir_p('db/migrate')
-
-        expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
-
-        expect(cli).to receive(:ask).and_return(good_branch)
-        expect(cli).to receive(:yes?).with('Reset prototype to build-master-2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(cli).to receive(:run_cmd).with("git diff build-master-2013-10-01-01...prototype --name-only db/migrate").and_return(migrations)
-        expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(false)
-
-        cli.nuke 'prototype'
-      end
-      after do
-        FileUtils.rm_rf('db/migrate')
-      end
-      it 'prompts for nuke confirmation' do
-        should meet_expectations
-      end
-    end
-    context 'when database migrations exist and user approves operation' do
-      let(:buildtag) { 'build-master-2013-10-01-01' }
-      let(:good_branch) { 'master' }
-      let(:bad_branch) { 'prototype' }
-      let(:migrations) do
-        %w( db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb ).join("\n")
-      end
-      before do
-        FileUtils.mkdir_p('db/migrate')
-
-        expect(cli).to receive(:current_build_tag).with(good_branch).and_return(buildtag)
-
-        expect(cli).to receive(:ask).and_return(good_branch)
-        expect(cli).to receive(:yes?).with('Reset prototype to build-master-2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(cli).to receive(:run_cmd).with("git diff build-master-2013-10-01-01...prototype --name-only db/migrate").and_return(migrations)
-        expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(true)
-
-        expect(cli).to receive(:run_cmd).with("git checkout master").ordered
-        expect(cli).to receive(:run_cmd).with("git branch -D prototype", allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with("git push origin --delete prototype", allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with("git checkout -b prototype build-master-2013-10-01-01").ordered
-        expect(cli).to receive(:run_cmd).with("git push origin prototype").ordered
-        expect(cli).to receive(:run_cmd).with("git branch --set-upstream-to origin/prototype").ordered
-        expect(cli).to receive(:run_cmd).with("git checkout master").ordered
-
-        cli.nuke 'prototype'
-      end
-      after do
-        FileUtils.rm_rf('db/migrate')
-      end
-      it 'prompts for nuke confirmation' do
-        should meet_expectations
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0.alpha1
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -271,8 +271,8 @@ files:
 - lib/thegarage/gitx/cli/start_command.rb
 - lib/thegarage/gitx/cli/track_command.rb
 - lib/thegarage/gitx/cli/update_command.rb
-- lib/thegarage/gitx/extensions/string.rb
-- lib/thegarage/gitx/extensions/thor.rb
+- lib/thegarage/gitx/string_extensions.rb
+- lib/thegarage/gitx/thor_extensions.rb
 - lib/thegarage/gitx/version.rb
 - spec/fixtures/vcr_cassettes/pull_request_does_exist.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
@@ -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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2