socialcast-git-extensions 2.2.13 → 2.3.0

data/bin/git-reset-prototype

@@ -4,7 +4,5 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extension
 include Socialcast::Git
 
 head_branch = ARGV.first || 'master'
-reset_branch('prototype', head_branch)
+reset_branch('prototype', head_branch, :share => true)
 reset_branch('last_known_good_prototype', head_branch)
-
-share "#worklog resetting prototype branch #scgitx"

data/bin/git-reset-staging

@@ -4,7 +4,5 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'socialcast-git-extension
 include Socialcast::Git
 
 head_branch = ARGV.first || 'last_known_good_staging'
-reset_branch('staging', head_branch)
+reset_branch('staging', head_branch, :share => (head_branch != 'last_known_good_staging')
 reset_branch('last_known_good_staging', head_branch)
-
-share "#worklog resetting staging branch #scgitx"

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

@@ -20,17 +20,23 @@ module Socialcast
         branch = branch.split('/').last if options[:remote]
         branches << branch unless RESERVED_BRANCHES.include?(branch)
       end
-      branches
+      branches.uniq
     end
-    def reset_branch(branch, head_branch = 'master')
+    def reset_branch(branch, head_branch = 'master', options = {})
       return if branch == head_branch
+
+      HighLine.say "resetting <%= color('#{branch}', :green) %> branch to <%= color('#{head_branch}', :green) %>"
+
       run_cmd "git checkout #{head_branch}"
       run_cmd "git pull"
+      removed_branches = branches :remote => true, :merged => "origin/#{branch}"
       run_cmd "git branch -D #{branch}" rescue nil
       run_cmd "git push origin :#{branch}" rescue nil
       run_cmd "git checkout -b #{branch}"
       run_cmd "grb publish #{branch}"
       run_cmd "git checkout #{head_branch}"
+
+      share "#worklog resetting #{branch} branch to #{head_branch} #scgitx\n\nthe following branches were affected:\n#{removed_branches.collect {|b| '* ' + b + "\n" } }" if options[:share]
     end
 
     def integrate(branch, destination_branch = 'staging')

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "2.2.13"
+    VERSION = "2.3.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
-  - 13
-  version: 2.2.13
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Ryan Sonnek