socialcast-git-extensions 3.1.17 → 3.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b008a4a9b2357de82f9e62a7fa5ef31fd9e705b3
-  data.tar.gz: b30af5a791a45d3283cc79c54ff34ca2dc5fdd88
+  metadata.gz: 142609028c21b207ad08dba1ea5deb4c4e6fa7a5
+  data.tar.gz: 5695fa13f1c2f90ba56232412f83ed94ccb1ea8a
 SHA512:
-  metadata.gz: 9eac64d626bf695194df42d14631f7d192d1b8524571916edecdb45b7a0c245097664e65d055c9f4b39779ec885731472b63b1479c181c57fb8af03777d9bf89
-  data.tar.gz: 80a3e05443dc8a8264754411d32b604b37338f0294674b4e69d3096313cd628cc36889c07bcecea5aa5106f1d9f32a1bf1f43236687fadfe30721b08df061c6f
+  metadata.gz: 94e20e9c1c07a4177e149603df027c1c2f597e95fdd088875f697a37b4123f9ef02d658177cd29582acf340134970764a8168a7246d723fa19b4c46d45e0f811
+  data.tar.gz: 36d9ee894930c6cd47a7bff87ee065ba6f760bf8581287b51c6f903cb76d375db620a7ddf706d97a16cf56a682f23e8b015a9a36e0281d7b498bf2b5776d65db

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

@@ -10,7 +10,7 @@ module Socialcast
       end
 
       def assert_in_last_known_good_staging(branch)
-        branches_in_last_known_staging = branches(:remote => true, :merged => last_known_good_staging_branch)
+        branches_in_last_known_staging = branches(:remote => true, :merged => "origin/#{last_known_good_staging_branch}")
         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

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.17"
+    VERSION = "3.1.18"
   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 => '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 => 'origin/last_known_good_staging').and_return(branches_in_last_known_good_staging)
     end
 
     context 'when user rejects release' do

metadata

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