socialcast-git-extensions 3.1.8 → 3.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMxY2JlODhkMDhlYTE4YzkzMDg5MTExYzRiMGI2MzRmOWJjMzM3MA==
+    MzZjNmVjNmM0YTQ5ZGVkYTAxY2U2ZTdiZDkyMWM0ZGEyYTRlZTI5YQ==
   data.tar.gz: !binary |-
-    YTk4YTgyNDc4ZGRlMzU2NWJhMWEzNzYxYmNhN2Y3ZDcyMDgxNGQzMQ==
+    MjNiYjI4NmViN2NlM2Y1Y2M1NjQzZDBlMjhiM2FlZGUwODUxMDM0OQ==
 SHA512:
   metadata.gz: !binary |-
-    YzVkOTkxMmRjOTY1Yzg3ZjlhMTAzMWMwZTBmMzUxYzY3MmFmN2ExZmVmZTk2
-    MGQ1MGMzZTFhMzFhMDdlYTNhYTNlMDVmYTJlOTM3NzcxOTMwZjljNDgwODA0
-    ZDAwM2ZiOGEyNmFiMGQyNWQ2NjNhYzE1OGM4Y2ViYjYwMmJlNzc=
+    MWQwODRiOTQxOGMwZTkwYmU3NGI2NGQ5YjgzZGM5NDAzZTRhODc2YzZhYmU4
+    OWI3Nzc1MmEyNmRiMWViMTUwYzliNjVmYzU0ODUzMzc2MTQ0OWFhMDJlMGM3
+    ZjA5OTBkZGI2NjkxNzE1MTc0NTMwMzdlMTI3NDJkZjA5M2M1NWE=
   data.tar.gz: !binary |-
-    YjQxZTRmMTE5MTEzMzk1ZDBmY2I1OGI1ZjJiM2YwMjdkMWQ2YzA0NjE5YTQ5
-    MGEzMGZjYjA2MWVlODdmZGY3OTAxMWNkYTRjZDRlOTI1MDlhMDc0NjEwZTJm
-    YmE3MjliMTNjMWE3YTcwN2EyZTYzNjU2ZWUyYmIyNTEyNGQwYzA=
+    YTMzY2E5ZTc0ODk3M2MwMTQxNmJiOTAzZDg5OWIxYTNjMWZmMGFkOTgzNTQ0
+    NDBjMDdhMTU3OWNkYTI4YjgxYTlkODA2YWNlYWEyYjMwNzdjYTRjMTJhNjhk
+    MzhiNDA0ZjhlOGVmYzYzZjc3MmRjYzQ4OTI4ZGI3OGMwOTlkOTk=

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

@@ -174,7 +174,7 @@ module Socialcast
       end
 
       def base_branch
-        config['base_branch'] || Socialcast::Gitx::DEFAULT_BASE_BRANCH
+        ENV['BASE_BRANCH'] || config['base_branch'] || Socialcast::Gitx::DEFAULT_BASE_BRANCH
       end
 
       def staging_branch
@@ -190,7 +190,7 @@ module Socialcast
       end
 
       def reserved_branches
-        @reserved_branches ||= %w{ HEAD master next_release } + [base_branch] + aggregate_branches
+        @reserved_branches ||= %w{ HEAD master next_release } + [base_branch, config['base_branch']].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.8"
+    VERSION = "3.1.9"
   end
 end

data/spec/cli_spec.rb

@@ -175,14 +175,92 @@ describe Socialcast::Gitx::CLI do
       end
     end
 
-    context 'with alternative base branch' do
+    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")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
-        Socialcast::Gitx::CLI.any_instance.stub(:base_branch).and_return('special-master')
+        Socialcast::Gitx::CLI.any_instance.stub(:config).and_return( { 'base_branch' => 'special-master' })
         Socialcast::Gitx::CLI.start ['release']
       end
       it 'should post message to socialcast' do end # see expectations
+      it "treats the alternative base branch as reserved" do
+        Socialcast::Gitx::CLI.new.send(:reserved_branches).should include 'special-master'
+      end
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin special-master",
+          "git push origin HEAD",
+          "git checkout special-master",
+          "git pull origin special-master",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git branch -D staging",
+          "git fetch origin",
+          "git checkout staging",
+          "git pull . special-master",
+          "git push origin HEAD",
+          "git checkout special-master",
+          "git checkout special-master",
+          "git pull",
+          "git remote prune origin"
+        ]
+      end
+    end
+
+    context 'with alternative base branch via environment variable' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")
+        Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
+        Socialcast::Gitx::CLI.any_instance.stub(:config).and_return({})
+        ENV['BASE_BRANCH'] = 'special-master'
+        Socialcast::Gitx::CLI.start ['release']
+      end
+      after do
+        ENV.delete('BASE_BRANCH')
+      end
+      it "treats the alternative base branch as reserved" do
+        Socialcast::Gitx::CLI.new.send(:reserved_branches).should include 'special-master'
+      end
+      it 'should post message to socialcast' do end # see expectations
+      it 'should run expected commands' do
+        Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git pull origin FOO",
+          "git pull origin special-master",
+          "git push origin HEAD",
+          "git checkout special-master",
+          "git pull origin special-master",
+          "git pull . FOO",
+          "git push origin HEAD",
+          "git branch -D staging",
+          "git fetch origin",
+          "git checkout staging",
+          "git pull . special-master",
+          "git push origin HEAD",
+          "git checkout special-master",
+          "git checkout special-master",
+          "git pull",
+          "git remote prune origin"
+        ]
+      end
+    end
+
+    context 'with alternative base branch via environment variable overriding base branch in config' do
+      before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to special-master #scgitx")
+        Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
+        Socialcast::Gitx::CLI.any_instance.stub(:config).and_return({ 'base_branch' => 'extra-special-master' })
+        ENV['BASE_BRANCH'] = 'special-master'
+        Socialcast::Gitx::CLI.start ['release']
+      end
+      after do
+        ENV.delete('BASE_BRANCH')
+      end
+      it "treats the alternative base branch as reserved" do
+        Socialcast::Gitx::CLI.new.send(:reserved_branches).should include 'special-master'
+        Socialcast::Gitx::CLI.new.send(:reserved_branches).should include 'extra-special-master'
+      end
+      it 'should post message to socialcast' do end # see expectations
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git pull origin FOO",

metadata

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