socialcast-git-extensions 3.1.18 → 3.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142609028c21b207ad08dba1ea5deb4c4e6fa7a5
-  data.tar.gz: 5695fa13f1c2f90ba56232412f83ed94ccb1ea8a
+  metadata.gz: bda1a5738f6ce97b652da189f0d18544614f02d4
+  data.tar.gz: 4bbf5f6a51edd0e949ec46875c3d83ba8e1a56da
 SHA512:
-  metadata.gz: 94e20e9c1c07a4177e149603df027c1c2f597e95fdd088875f697a37b4123f9ef02d658177cd29582acf340134970764a8168a7246d723fa19b4c46d45e0f811
-  data.tar.gz: 36d9ee894930c6cd47a7bff87ee065ba6f760bf8581287b51c6f903cb76d375db620a7ddf706d97a16cf56a682f23e8b015a9a36e0281d7b498bf2b5776d65db
+  metadata.gz: 4603769a42aa207cc13b9b54aa80cc2e1d76697bb89b304659766a138e872661a3baab242b39d81e91a5066f693086d75cd44ebccdb6e51381f80fc9cf6c6f39
+  data.tar.gz: 473dcdb7188d4c9f02075a2baffee8e4d6852c3f4f87954c589452e02ad3522392f53c98dd312830cd590beb09f040a7ac1b97e93d8d00551b654356c9ca876c

data/lib/socialcast-git-extensions/git.rb

@@ -10,10 +10,13 @@ module Socialcast
       end
 
       def assert_in_last_known_good_staging(branch)
-        branches_in_last_known_staging = branches(:remote => true, :merged => "origin/#{last_known_good_staging_branch}")
+        refresh_branch_from_remote last_known_good_staging_branch
+        branches_in_last_known_staging = branches(:remote => true, :merged => true)
         unless branches_in_last_known_staging.include? branch
           raise "Cannot release #{branch} unless it has already been promoted separately to #{staging_branch} and the build has passed."
         end
+      ensure
+        run_cmd "git checkout #{branch}"
       end
 
       # lookup the current branch of the PWD

data/lib/socialcast-git-extensions/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.18"
+    VERSION = "3.1.19"
   end
 end

data/spec/cli_spec.rb

@@ -156,7 +156,7 @@ describe Socialcast::Gitx::CLI do
   describe '#release' do
     let(:branches_in_last_known_good_staging) { ['FOO'] }
     before do
-      expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).with(:remote => true, :merged => 'origin/last_known_good_staging').and_return(branches_in_last_known_good_staging)
+      expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:branches).with(:remote => true, :merged => true).and_return(branches_in_last_known_good_staging)
     end
 
     context 'when user rejects release' do
@@ -164,8 +164,8 @@ describe Socialcast::Gitx::CLI do
         expect_any_instance_of(Socialcast::Gitx::CLI).to receive(:yes?).and_return(false)
         Socialcast::Gitx::CLI.start ['release']
       end
-      it 'should run no commands' do
-        expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([])
+      it 'does not try and release the branch' do
+        expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq(["git branch -D last_known_good_staging", "git fetch origin", "git checkout last_known_good_staging", "git checkout FOO"])
       end
     end
     context 'when user confirms release' do
@@ -179,6 +179,10 @@ describe Socialcast::Gitx::CLI do
       it 'should post message to socialcast' do end # see expectations
       it 'should run expected commands' do
         expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
+          "git branch -D last_known_good_staging",
+          "git fetch origin",
+          "git checkout last_known_good_staging",
+          "git checkout FOO",
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
@@ -235,6 +239,10 @@ describe Socialcast::Gitx::CLI do
       end
       it 'should run expected commands' do
         expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
+          "git branch -D last_known_good_staging",
+          "git fetch origin",
+          "git checkout last_known_good_staging",
+          "git checkout FOO",
           "git pull origin FOO",
           "git pull origin special-master",
           "git push origin HEAD",
@@ -271,6 +279,10 @@ describe Socialcast::Gitx::CLI do
       it 'should post message to socialcast' do end # see expectations
       it 'should run expected commands' do
         expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
+          "git branch -D last_known_good_staging",
+          "git fetch origin",
+          "git checkout last_known_good_staging",
+          "git checkout FOO",
           "git pull origin FOO",
           "git pull origin special-master",
           "git push origin HEAD",
@@ -308,6 +320,10 @@ describe Socialcast::Gitx::CLI do
       it 'should post message to socialcast' do end # see expectations
       it 'should run expected commands' do
         expect(Socialcast::Gitx::CLI.stubbed_executed_commands).to eq([
+          "git branch -D last_known_good_staging",
+          "git fetch origin",
+          "git checkout last_known_good_staging",
+          "git checkout FOO",
           "git pull origin FOO",
           "git pull origin special-master",
           "git push origin HEAD",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.18
+  version: 3.1.19
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit