socialcast-git-extensions 2.2.5 → 2.2.6

data/bin/git-integrate

@@ -9,6 +9,8 @@ include Socialcast::Gitx
 include Socialcast::Git
 
 branch = current_branch
+protect_reserved_branches!(branch, 'integrate')
+exit 1
 
 run_cmd 'git update'
 integrate(branch, 'prototype')

data/bin/git-promote

@@ -5,6 +5,9 @@ include Socialcast::Gitx
 include Socialcast::Git
 
 branch = current_branch
+protect_reserved_branches!(branch, 'promote')
+
+exit 1
 
 run_cmd 'git update'
 integrate(branch, 'staging')

data/bin/git-release

@@ -5,7 +5,7 @@ include Socialcast::Gitx
 include Socialcast::Git
 
 branch = current_branch
-abort("Cannot release reserved branch") if %w{master staging prototype}.include?(branch)
+protect_reserved_branches!(branch, 'release')
 
 exit unless HighLine.agree("<%= color('Release #{branch} to production? (y/n)', :green) %>")
 

data/bin/git-reset-prototype

@@ -8,6 +8,4 @@ head_branch = ARGV.first || 'master'
 reset_branch('prototype', head_branch)
 reset_branch('last_known_good_prototype', head_branch)
 
-HighLine.say "\n<%= color('Updating the following tickets to no longer be in prototype:', :red) %>"
-
 share "#worklog resetting prototype branch #scgitx"

data/lib/socialcast-git-extensions.rb

@@ -4,6 +4,9 @@ require 'socialcast-git-extensions/github'
 
 module Socialcast
   module Gitx
+    def protect_reserved_branches!(branch, mode)
+      abort("Cannot #{mode} reserved branch") if Socialcast::Git::RESERVED_BRANCHES.include?(branch)
+    end
     def run_cmd(cmd)
       HighLine.say "\n> <%= color('#{cmd.gsub("'", '')}', :red) %>"
       raise "#{cmd} failed" unless system cmd

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

@@ -4,6 +4,7 @@ require 'grit'
 module Socialcast
   module Git
     include Socialcast::Gitx
+    RESERVED_BRANCHES = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
 
     def current_branch
       repo = Grit::Repo.new(Dir.pwd)
@@ -11,7 +12,6 @@ module Socialcast
     end
     def branches(options = {})
       branches = []
-      reserved_branches = %w{ HEAD master last_known_good_master staging last_known_good_staging next_release last_known_good_next_release }
       args = []
       args << '-r' if options[:remote]
       args << '--merged' if options[:merged]
@@ -19,7 +19,7 @@ module Socialcast
       output.each do |branch|
         branch = branch.gsub(/\*/, '').strip.split(' ').first
         branch = branch.split('/').last if options[:remote]
-        branches << branch unless reserved_branches.include?(branch)
+        branches << branch unless RESERVED_BRANCHES.include?(branch)
       end
       branches
     end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "2.2.5"
+    VERSION = "2.2.6"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 2
-  - 5
-  version: 2.2.5
+  - 6
+  version: 2.2.6
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: grit