socialcast-git-extensions 3.0.2 → 3.0.4

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

@@ -53,13 +53,13 @@ module Socialcast
         run_cmd "git pull origin #{branch}" rescue nil
         run_cmd "git pull origin #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd 'git push origin HEAD'
-        run_cmd 'git remote prune origin'
       end
 
       desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
       def cleanup
         run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd "git pull"
+        run_cmd 'git remote prune origin'
 
         say "Deleting branches that have been merged into "
         say Socialcast::Gitx::BASE_BRANCH, :green
@@ -143,9 +143,9 @@ module Socialcast
 
         update
         integrate_branch branch, Socialcast::Gitx::BASE_BRANCH
-        invoke :integrate, ['staging']
         run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
-        run_cmd "grb rm #{branch}"
+        invoke :integrate, ['staging', '--quiet']
+        cleanup
 
         post "#worklog releasing #{branch} to production #scgitx"
       end

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

@@ -70,8 +70,8 @@ module Socialcast
         say "into "
         say destination_branch, :green
 
-        run_cmd "git remote prune origin"
         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.2"
+    VERSION = "3.0.4"
   end
 end

data/spec/cli_spec.rb

@@ -27,8 +27,7 @@ describe Socialcast::Gitx::CLI do
       Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
         'git pull origin FOO',
         'git pull origin master',
-        'git push origin HEAD',
-        'git remote prune origin'
+        'git push origin HEAD'
       ]
     end
   end
@@ -43,9 +42,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
-          "git remote prune origin",
-          "git remote prune origin",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -62,9 +60,8 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
-          "git remote prune origin",
-          "git remote prune origin",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
@@ -81,14 +78,13 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
-          "git remote prune origin",
-          "git remote prune origin",
           "git checkout staging",
+          "git pull origin staging",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
-          "git remote prune origin",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . staging",
           "git push origin HEAD",
           "git checkout staging",
@@ -125,29 +121,29 @@ describe Socialcast::Gitx::CLI do
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
-          "git remote prune origin",
-          "git remote prune origin",
           "git checkout master",
+          "git pull origin master",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
+          "git checkout master",
           "git pull origin FOO",
           "git pull origin master",
           "git push origin HEAD",
-          "git remote prune origin",
-          "git remote prune origin",
           "git checkout staging",
+          "git pull origin staging",
           "git pull . FOO",
           "git push origin HEAD",
           "git checkout FOO",
-          "git remote prune origin",
           "git checkout prototype",
+          "git pull origin prototype",
           "git pull . staging",
           "git push origin HEAD",
           "git checkout staging",
           "git checkout FOO",
           "git checkout master",
-          "grb rm FOO"
+          "git pull",
+          "git remote prune origin"
         ]
       end
     end
@@ -259,8 +255,7 @@ describe Socialcast::Gitx::CLI do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
           "git pull origin FOO",
           "git pull origin master",
-          "git push origin HEAD",
-          "git remote prune origin"
+          "git push origin HEAD"
         ]
       end
     end
@@ -275,14 +270,13 @@ describe Socialcast::Gitx::CLI do
         "git pull origin FOO",
         "git pull origin master",
         "git push origin HEAD",
-        "git remote prune origin",
-        "git remote prune origin",
         "git checkout staging",
+        "git pull origin staging",
         "git pull . FOO",
         "git push origin HEAD",
         "git checkout FOO",
-        "git remote prune origin",
         "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.2
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3163682562416443837
+      hash: 2981719831077906514
 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: 3163682562416443837
+      hash: 2981719831077906514
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24