thegarage-gitx 2.5.0.beta2 → 2.5.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a11b17f13c6a98af5bbd1415580d1796c13c542
-  data.tar.gz: 20029e4cac935a0c8779c62e7614b4be3c247549
+  metadata.gz: b23514b77454d12bf5c3f10fb8631e81c6549be7
+  data.tar.gz: 2d6ccdbb734236b9408376baf3a2c4d72c3aac48
 SHA512:
-  metadata.gz: 3b86cc43dc22460ff06dcd817472b345448876ef403dc7ea715f566f5ed134e190470171d51a468aace18f7e9465d15aea22c5498f76673f9085bc857d7bab36
-  data.tar.gz: 87ee27377d2f9fe9069561aafe61bbe0cf2502c9f6c9376b39548b163ba85b410b7dc4fced66326ac2ca341da298de61ccf9b5f22086bb9c735abf1876a07e19
+  metadata.gz: 7373518508bcba2cbbb5f4714230180f7788a13f6c137a6ef6d64aa423dd1330339ad7d28e6fdb60240f2cfd4f378615990e43289e5becec34748592d8c97881
+  data.tar.gz: 981c8c8264d3111b89298003e26dbbc0c4ba245dc33113d8df395b2cf759113bb446bcb45a9239dedaf00316e63da58cd7323852c92a95c61d295bc0e435c0c0

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

@@ -15,7 +15,7 @@ module Thegarage
           if options[:resume]
             resume
           else
-            assert_integratable_branch!(branch, target_branch)
+            assert_aggregate_branch!(target_branch)
 
             UpdateCommand.new.update
 
@@ -24,7 +24,8 @@ module Thegarage
             say "into "
             say target_branch, :green
 
-            refresh_branch_from_remote target_branch
+            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
@@ -33,15 +34,14 @@ module Thegarage
 
         private
 
-        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
+        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 refresh_branch_from_remote(target_branch)
-          run_cmd "git branch -D #{target_branch}", :allow_failure => true
           run_cmd "git fetch origin"
+          run_cmd "git branch -D #{target_branch}", :allow_failure => true
           checkout_branch target_branch
         end
 
@@ -49,7 +49,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"
+            say "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag", :red
             exit
           end
         end
@@ -67,11 +67,20 @@ module Thegarage
         end
 
         def check_if_branch_exists?(branch)
-          return true if local_branches.include?(branch)
+          local_branches.include?(branch)
         end
 
         def local_branches
-          @local_branches ||= repo.branches.each_name(:local).to_a.map { |branch| branch }
+          @local_branches ||= repo.branches.each_name(:local).map { |branch| branch }
+        end
+
+        def remote_branch_exists?(target_branch)
+          repo.branches.each_name(:remote).include?("origin/#{target_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}"
         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, 'master'
+          repo.create_branch branch_name, Thegarage::Gitx::BASE_BRANCH
           checkout_branch branch_name
         end
 

data/lib/thegarage/gitx/version.rb

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

data/lib/thegarage/gitx.rb

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

data/spec/spec_helper.rb

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

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

@@ -10,10 +10,13 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
     }
   end
   let(:cli) { Thegarage::Gitx::Cli::IntegrateCommand.new(args, options, config) }
-  let(:branch) { double('fake branch', name: 'feature-branch') }
+  let(:current_branch) { double('fake branch', name: 'feature-branch', head?: true) }
+  let(:repo) { cli.send(:repo) }
+  let(:remote_branch_names) { [] }
 
   before do
-    allow(cli).to receive(:current_branch).and_return(branch)
+    allow(cli).to receive(:current_branch).and_return(current_branch)
+    allow(repo).to receive(:branches).and_return(double(each_name: remote_branch_names))
   end
 
   describe '#integrate' do
@@ -21,12 +24,13 @@ 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' do
+    context 'when target branch is ommitted and remote branch exists' do
+      let(:remote_branch_names) { ['origin/staging'] }
       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 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").ordered
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
@@ -38,12 +42,35 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'when target branch == prototype' do
+    context 'when staging branch does not exist remotely' do
+      let(:remote_branch_names) { [] }
+      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 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 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
+      end
+      it 'creates remote aggregate branch' do
+        should meet_expectations
+      end
+    end
+    context 'when target branch == prototype and remote branch exists' do
+      let(:remote_branch_names) { ['origin/prototype'] }
       before do
         expect(fake_update_command).to receive(:update)
 
-        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 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 push origin HEAD").ordered
@@ -55,18 +82,18 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'when target branch != staging || prototype' do
+    context 'when target branch is not an aggregate branch' do
       it 'raises an error' do
-
-        expect { cli.integrate('some-other-branch') }.to raise_error(/Only aggregate branches are allowed for integration/)
+        expect { cli.integrate('some-other-branch') }.to raise_error(/Invalid aggregate branch: some-other-branch must be one of supported aggregate branches/)
       end
     end
     context 'when merge conflicts occur' do
+      let(:remote_branch_names) { ['origin/staging'] }
       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 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)
@@ -117,7 +144,6 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with("git checkout my-feature-branch").ordered
 
         cli.integrate
-        # expect { cli.integrate }
       end
       it 'raises error' do
         should meet_expectations

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

@@ -101,5 +101,65 @@ 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.5.0.beta2
+  version: 2.5.0.beta3
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -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/string_extensions.rb
-- lib/thegarage/gitx/thor_extensions.rb
+- lib/thegarage/gitx/extensions/string.rb
+- lib/thegarage/gitx/extensions/thor.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