socialcast-git-extensions 3.0.4 → 3.0.5

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

@@ -131,7 +131,14 @@ module Socialcast
         removed_branches = reset_branch(bad_branch, good_branch)
         reset_branch("last_known_good_#{bad_branch}", good_branch) unless "last_known_good_#{bad_branch}" == good_branch
 
-        post "#worklog resetting #{bad_branch} branch to #{good_branch} #scgitx\n\nthe following branches were affected:\n#{removed_branches.map{|b| '* ' + b}.join("\n") }"
+        message_parts = []
+        message_parts << "#worklog resetting #{bad_branch} branch to #{good_branch} #scgitx"
+        if removed_branches.any?
+          message_parts << ""
+          message_parts << "the following branches were affected:"
+          messgae_parts += removed_branches.map{|b| '* ' + b}
+        end
+        post message_parts.join("\n")
       end
 
       desc 'release', 'release the current branch to production'
@@ -144,7 +151,7 @@ module Socialcast
         update
         integrate_branch branch, Socialcast::Gitx::BASE_BRANCH
         run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
-        invoke :integrate, ['staging', '--quiet']
+        integrate_branch('master', 'staging')
         cleanup
 
         post "#worklog releasing #{branch} to production #scgitx"

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.0.4"
+    VERSION = "3.0.5"
   end
 end

data/spec/cli_spec.rb

@@ -21,8 +21,10 @@ describe Socialcast::Gitx::CLI do
 
   describe '#update' do
     before do
+      Socialcast::Gitx::CLI.any_instance.should_not_receive(:post)
       Socialcast::Gitx::CLI.start ['update']
     end
+    it 'should not 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',
@@ -35,8 +37,10 @@ describe Socialcast::Gitx::CLI do
   describe '#integrate' do
     context 'when target branch is ommitted' do
       before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog integrating FOO into prototype #scgitx")
         Socialcast::Gitx::CLI.start ['integrate']
       end
+      it 'should post message to socialcast' do end # see expectations
       it 'should default to prototype' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git pull origin FOO",
@@ -53,8 +57,10 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == prototype' do
       before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog integrating FOO into prototype #scgitx")
         Socialcast::Gitx::CLI.start ['integrate', 'prototype']
       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",
@@ -71,8 +77,10 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when target branch == staging' do
       before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog integrating FOO into staging #scgitx")
         Socialcast::Gitx::CLI.start ['integrate', 'staging']
       end
+      it 'should post message to socialcast' do end # see expectations
       it 'should also integrate into prototype and run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git pull origin FOO",
@@ -113,9 +121,11 @@ describe Socialcast::Gitx::CLI do
     end
     context 'when user confirms release' do
       before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog releasing FOO to production #scgitx")
         Socialcast::Gitx::CLI.any_instance.should_receive(:yes?).and_return(true)
         Socialcast::Gitx::CLI.start ['release']
       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",
@@ -127,20 +137,11 @@ describe Socialcast::Gitx::CLI do
           "git push origin HEAD",
           "git checkout FOO",
           "git checkout master",
-          "git pull origin FOO",
-          "git pull origin master",
-          "git push origin HEAD",
           "git checkout staging",
           "git pull origin staging",
-          "git pull . FOO",
-          "git push origin HEAD",
-          "git checkout FOO",
-          "git checkout prototype",
-          "git pull origin prototype",
-          "git pull . staging",
+          "git pull . master",
           "git push origin HEAD",
-          "git checkout staging",
-          "git checkout FOO",
+          "git checkout master",
           "git checkout master",
           "git pull",
           "git remote prune origin"
@@ -152,8 +153,10 @@ describe Socialcast::Gitx::CLI do
   describe '#nuke' do
     context 'when target branch == prototype and --destination == master' do
       before do
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog resetting prototype branch to last_known_good_master #scgitx")
         Socialcast::Gitx::CLI.start ['nuke', 'prototype', '--destination', 'master']
       end
+      it 'should publish message into socialcast' do end # see expectations
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout last_known_good_master",
@@ -248,9 +251,7 @@ describe Socialcast::Gitx::CLI do
 
         Socialcast::Gitx::CLI.start ['reviewrequest', '--description', 'testing']
       end
-      it 'should create github pull request' do
-
-      end
+      it 'should create github pull request' do end # see expectations
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git pull origin FOO",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2981719831077906514
+      hash: 1096009066134982419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2981719831077906514
+      hash: 1096009066134982419
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24