socialcast-git-extensions 3.0.7 → 3.0.8

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

@@ -128,15 +128,16 @@ module Socialcast
         good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{default_good_branch})")
         good_branch = default_good_branch if good_branch.length == 0
         good_branch = "last_known_good_#{good_branch}" unless good_branch.starts_with?('last_known_good_')
+
         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
+        reset_branch("last_known_good_#{bad_branch}", good_branch)
 
         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}
+          message_parts += removed_branches.map{|b| ['*', b].join(' ')}
         end
         post message_parts.join("\n")
       end
@@ -149,8 +150,8 @@ module Socialcast
         return unless yes?("Release #{branch} to production? (y/n)", :green)
 
         update
-        run_cmd 'git checkout master'
-        run_cmd 'git pull origin master'
+        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        run_cmd "git pull origin #{Socialcast::Gitx::BASE_BRANCH}"
         run_cmd "git pull . #{branch}"
         run_cmd "git push origin HEAD"
         integrate_branch('master', 'staging')

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

@@ -40,23 +40,24 @@ module Socialcast
       end
 
       # reset the specified branch to the same set of commits as the destination branch
-      # used to revert commits on aggregate branches back to a known good state
+      # reverts commits on aggregate branches back to a known good state
+      # returns list of branches that were removed
       def reset_branch(branch, head_branch)
-        raise "Can not reset #{branch} to #{head_branch}" if branch == head_branch
+        return [] if branch == head_branch
         raise "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(branch)
         say "Resetting "
         say "#{branch} ", :green
         say "branch to "
         say head_branch, :green
 
-        run_cmd "git checkout #{head_branch}"
-        run_cmd "git pull"
+        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
+        refresh_branch_from_remote head_branch
         removed_branches = branches(:remote => true, :merged => "origin/#{branch}") - branches(:remote => true, :merged => "origin/#{head_branch}")
         run_cmd "git branch -D #{branch}" rescue nil
         run_cmd "git push origin --delete #{branch}" rescue nil
         run_cmd "git checkout -b #{branch}"
         run_cmd "grb publish #{branch}"
-        run_cmd "git checkout #{head_branch}"
+        run_cmd "git checkout #{Socialcast::Gitx::BASE_BRANCH}"
 
         removed_branches
       end
@@ -71,14 +72,19 @@ 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}"
+        refresh_branch_from_remote destination_branch
         run_cmd "git pull . #{branch}"
         run_cmd "git push origin HEAD"
         run_cmd "git checkout #{branch}"
       end
 
+      # nuke local branch and pull fresh version from remote repo
+      def refresh_branch_from_remote(destination_branch)
+        run_cmd "git branch -D #{destination_branch}" rescue nil
+        run_cmd "git checkout #{destination_branch}"
+        run_cmd "git pull origin #{destination_branch}"
+      end
+
       def aggregate_branch?(branch)
         AGGREGATE_BRANCHES.include?(branch) || branch.starts_with?('last_known_good')
       end

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

@@ -6,6 +6,6 @@ class String
   alias :dedent :undent
 
   def starts_with?(characters)
-    self.match(/^#{characters}/) ? true : false
+    !!self.match(/^#{characters}/)
   end
 end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.0.7"
+    VERSION = "3.0.8"
   end
 end

data/spec/cli_spec.rb

@@ -156,26 +156,33 @@ 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")
+        prototype_branches = %w( dev-foo dev-bar )
+        master_branches = %w( dev-foo )
+        Socialcast::Gitx::CLI.any_instance.should_receive(:branches).and_return(prototype_branches, master_branches, prototype_branches, master_branches)
+        Socialcast::Gitx::CLI.any_instance.should_receive(:post).with("#worklog resetting prototype branch to last_known_good_master #scgitx\n\nthe following branches were affected:\n* dev-bar")
         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 master",
+          "git branch -D last_known_good_master",
           "git checkout last_known_good_master",
-          "git pull",
+          "git pull origin last_known_good_master",
           "git branch -D prototype",
           "git push origin --delete prototype",
           "git checkout -b prototype",
           "grb publish prototype",
+          "git checkout master",
+          "git checkout master",
+          "git branch -D last_known_good_master",
           "git checkout last_known_good_master",
-          "git checkout last_known_good_master",
-          "git pull",
+          "git pull origin last_known_good_master",
           "git branch -D last_known_good_prototype",
           "git push origin --delete last_known_good_prototype",
           "git checkout -b last_known_good_prototype",
           "grb publish last_known_good_prototype",
-          "git checkout last_known_good_master"
+          "git checkout master"
         ]
       end
     end
@@ -185,13 +192,15 @@ describe Socialcast::Gitx::CLI do
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout master",
+          "git branch -D last_known_good_staging",
           "git checkout last_known_good_staging",
-          "git pull",
+          "git pull origin last_known_good_staging",
           "git branch -D staging",
           "git push origin --delete staging",
           "git checkout -b staging",
           "grb publish staging",
-          "git checkout last_known_good_staging"
+          "git checkout master"
         ]
       end
     end
@@ -202,13 +211,15 @@ describe Socialcast::Gitx::CLI do
       end
       it 'defaults to last_known_good_prototype and should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout master",
+          "git branch -D last_known_good_prototype",
           "git checkout last_known_good_prototype",
-          "git pull",
+          "git pull origin last_known_good_prototype",
           "git branch -D prototype",
           "git push origin --delete prototype",
           "git checkout -b prototype",
           "grb publish prototype",
-          "git checkout last_known_good_prototype"
+          "git checkout master"
         ]
       end
     end
@@ -219,20 +230,24 @@ describe Socialcast::Gitx::CLI do
       end
       it 'should run expected commands' do
         Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+          "git checkout master",
+          "git branch -D last_known_good_master",
           "git checkout last_known_good_master",
-          "git pull",
+          "git pull origin last_known_good_master",
           "git branch -D prototype",
           "git push origin --delete prototype",
           "git checkout -b prototype",
           "grb publish prototype",
+          "git checkout master",
+          "git checkout master",
+          "git branch -D last_known_good_master",
           "git checkout last_known_good_master",
-          "git checkout last_known_good_master",
-          "git pull",
+          "git pull origin last_known_good_master",
           "git branch -D last_known_good_prototype",
           "git push origin --delete last_known_good_prototype",
           "git checkout -b last_known_good_prototype",
           "grb publish last_known_good_prototype",
-          "git checkout last_known_good_master"
+          "git checkout master"
         ]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1512186750897379892
+      hash: 874256379826639527
 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: -1512186750897379892
+      hash: 874256379826639527
 requirements: []
 rubyforge_project: socialcast-git-extensions
 rubygems_version: 1.8.24