socialcast-git-extensions 3.0.5 → 3.0.6

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

@@ -149,8 +149,10 @@ module Socialcast
         return unless yes?("Release #{branch} to production? (y/n)", :green)
 
         update
-        integrate_branch branch, Socialcast::Gitx::BASE_BRANCH
-        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd 'git checkout master'
+        run_cmd 'git pull origin master'
+        run_cmd "git pull . #{branch}"
+        run_cmd "git push origin HEAD"
         integrate_branch('master', 'staging')
         cleanup
 

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

@@ -62,6 +62,7 @@ module Socialcast
       end
 
       # integrate a branch into a destination aggregate branch
+      # blow away the local aggregate branch to ensure pulling into most recent "clean" branch
       def integrate_branch(branch, destination_branch)
         assert_not_protected_branch!(branch, 'integrate') unless aggregate_branch?(destination_branch)
         raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(destination_branch) || destination_branch == Socialcast::Gitx::BASE_BRANCH
@@ -70,8 +71,8 @@ module Socialcast
         say "into "
         say destination_branch, :green
 
+        run_cmd "git branch -D #{destination_branch}"
         run_cmd "git checkout #{destination_branch}"
-        run_cmd "git pull origin #{destination_branch}"
         run_cmd "git pull . #{branch}"
         run_cmd "git push origin HEAD"
         run_cmd "git checkout #{branch}"

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

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

data/spec/cli_spec.rb

@@ -46,8 +46,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
+          "git branch -D prototype",
           "git checkout prototype",
-          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -66,8 +66,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
+          "git branch -D prototype",
           "git checkout prototype",
-          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -86,13 +86,13 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
+          "git branch -D staging",
           "git checkout staging",
-          "git pull origin staging",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
+          "git branch -D prototype",
           "git checkout prototype",
-          "git pull origin prototype",
           "git pull . staging",
           "git push origin HEAD",
           "git checkout staging",
@@ -135,10 +135,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin master",
           "git pull . FOO",
           "git push origin HEAD",
-          "git checkout FOO",
-          "git checkout master",
+          "git branch -D staging",
           "git checkout staging",
-          "git pull origin staging",
           "git pull . master",
           "git push origin HEAD",
           "git checkout master",
@@ -271,13 +269,13 @@ describe Socialcast::Gitx::CLI do
         "git pull origin FOO",
         "git pull origin master",
         "git push origin HEAD",
+        "git branch -D staging",
         "git checkout staging",
-        "git pull origin staging",
         "git pull . FOO",
         "git push origin HEAD",
         "git checkout FOO",
+        "git branch -D prototype",
         "git checkout prototype",
-        "git pull origin prototype",
         "git pull . staging",
         "git push origin HEAD",
         "git checkout staging",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-06 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: 1096009066134982419
+      hash: 2832499571703574372
 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: 1096009066134982419
+      hash: 2832499571703574372
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24