socialcast-git-extensions 3.1.9 → 3.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzZjNmVjNmM0YTQ5ZGVkYTAxY2U2ZTdiZDkyMWM0ZGEyYTRlZTI5YQ==
+    NTVhZGZmOTIzNzM1Zjg3OTYyN2M4YjQwY2ExNjY2ZjM2MWZlMDEyZQ==
   data.tar.gz: !binary |-
-    MjNiYjI4NmViN2NlM2Y1Y2M1NjQzZDBlMjhiM2FlZGUwODUxMDM0OQ==
+    NzFkYjk0ZDZmNTQxYjRkNTg3NTA1ZmNkMWQ1YWYxOGVhYzgwZDkyNw==
 SHA512:
   metadata.gz: !binary |-
-    MWQwODRiOTQxOGMwZTkwYmU3NGI2NGQ5YjgzZGM5NDAzZTRhODc2YzZhYmU4
-    OWI3Nzc1MmEyNmRiMWViMTUwYzliNjVmYzU0ODUzMzc2MTQ0OWFhMDJlMGM3
-    ZjA5OTBkZGI2NjkxNzE1MTc0NTMwMzdlMTI3NDJkZjA5M2M1NWE=
+    MjY1OTlkOTQwYmZkMDA2NTQ0NTc0MzZlM2U1MzRkZjdhN2JlOTkwYWMyZGVm
+    YTE4ZDFjMDczOTgwNGI3NmE1YzNhMTZjYWUyZGVkZmFmYTU3ZTUwOGFkZTIx
+    ZDdlMWM1NzE2YjBmY2Q1NjNkNmY3ZmRhODU2YmI1MmQ2NTFlNzU=
   data.tar.gz: !binary |-
-    YTMzY2E5ZTc0ODk3M2MwMTQxNmJiOTAzZDg5OWIxYTNjMWZmMGFkOTgzNTQ0
-    NDBjMDdhMTU3OWNkYTI4YjgxYTlkODA2YWNlYWEyYjMwNzdjYTRjMTJhNjhk
-    MzhiNDA0ZjhlOGVmYzYzZjc3MmRjYzQ4OTI4ZGI3OGMwOTlkOTk=
+    NjYwNjM1MGEyZTM2MjI4NjgxMTE4MTlhNGNjYTgyOTg2ODYzMGIzMGEwZDhm
+    NjQ4YTI2ZDljY2Q1NjM1YWQ3NTcxNTZiMTQ0MGVhYWNlNjExYTk1MDRlMjQ1
+    NTM4NDA2NzM0YjM5NmEwZThhODgxMDczZTY1MDU3MDcwZjIwNTg=

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

@@ -190,7 +190,7 @@ module Socialcast
       end
 
       def reserved_branches
-        @reserved_branches ||= %w{ HEAD master next_release } + [base_branch, config['base_branch']].compact.uniq + aggregate_branches
+        @reserved_branches ||= %w{ HEAD master next_release } + [base_branch, config['reserved_branches'], config['base_branch']].flatten.compact.uniq + aggregate_branches
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.9"
+    VERSION = "3.1.10"
   end
 end

data/spec/cli_spec.rb

@@ -175,6 +175,18 @@ describe Socialcast::Gitx::CLI do
       end
     end
 
+    context 'with reserved_branches via config file' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
+        Socialcast::Gitx::CLI.any_instance.stub(:config).and_return( { 'reserved_branches' => ['dont-del-me','dont-del-me-2'] })
+        Socialcast::Gitx::CLI.start ['release']
+      end
+      it "treats the alternative base branch as reserved" do
+        Socialcast::Gitx::CLI.new.send(:reserved_branches).should include 'dont-del-me'
+        Socialcast::Gitx::CLI.new.send(:reserved_branches).should include 'dont-del-me-2'
+      end
+    end
+
     context 'with alternative base branch via config file' do
       before do
         Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit