socialcast-git-extensions 3.1.6 → 3.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmExZmQyNTY0YjJlNWM0ZTg4NTI2OGE5ODZkNTE2NWZiNzAwMzBiYg==
+    MjFhY2RkNmIxMTE0MTNjZDhjMzhhMjdkZjljOTRhYmIzMmE1MjllZA==
   data.tar.gz: !binary |-
-    YTM0ZWUzN2Y2NzFjZWQ3MWEzNmNlZjM2YjIxY2NmY2IzZjM1M2I3OA==
+    MWRiY2IwMTUwMmZmYWJlYjAzOTU5MmY1ZWY0ZTc4ODg1OWEyYWRiOA==
 SHA512:
   metadata.gz: !binary |-
-    YzJkNWRiM2E5YzY4NDNjMGE0MjI5YTUyNTNjNGExMjhkMWM2ZmY3MjliNTQw
-    NTRlZjg2ODY3YTg5ODNiZTAwODBlMTdlY2UxYmY1MWQxN2I4YTU0MTQ1OTRm
-    NDhjMjFiYzIyNWFiYThhNzNmMjg0ZmQxMmY3ZTdkMmUwYWYxMTI=
+    ZTdjZTQxY2U1YjM3MTRmN2VlY2Y4MmQ4NTc1OTg4NzI1ZDZjMjE1MDlmODJk
+    ZTU4ZDdmM2FiODg4NmE2NGVkMzRmYmM4YTc1NTA1ODU1YTE5ZGEwN2VkMTgz
+    ODYxNjg4Mzg1YTkyNTYzNTdjMWMzNTZhYmNhMWIzNDg3NGVhMGQ=
   data.tar.gz: !binary |-
-    MzRkZDAxYzk1YmZhNTAyOGVkNDc0ZTIzNjRlZWJlNTc5Zjk4ZWE1MmE4Zjkx
-    ZTJjN2Y5NjM4MjQwMTk3YWVjN2FmMjYwOTAzYzAzYzFiZTE0MTMxNjM4NzI5
-    N2RiZWEzZDcyMTU2NDFhNjU0ZTJlY2NhY2IyYTg0Njg1MDgxNjU=
+    OWY5ZGEwMGMzYjhhZjFhMWU5YTkzYjdiNDg3OGEzMThkYzUzYzRkYzVhNGZi
+    YzI4MWU5YjFlN2E5NTc0NTFjM2ZmNTZmYzhhMmQwMmVlNTczM2I2M2VkOTFm
+    NTRiNGE3YTc4M2E1NmVjOWZmNDY5ZmZiNGJhMmY4ZTk1NzZmNDY=

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

@@ -72,10 +72,10 @@ module Socialcast
         say "Deleting branches that have been merged into "
         say base_branch, :green
         branches(:merged => true, :remote => true).each do |branch|
-          run_cmd "git push origin --delete #{branch}" unless aggregate_branch?(branch)
+          run_cmd "git push origin --delete #{branch}" unless reserved_branches.include?(branch)
         end
         branches(:merged => true).each do |branch|
-          run_cmd "git branch -d #{branch}" unless aggregate_branch?(branch)
+          run_cmd "git branch -d #{branch}" unless reserved_branches.include?(branch)
         end
       end
 

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

@@ -186,7 +186,7 @@ module Socialcast
       end
 
       def reserved_branches
-        @reserved_branches ||= %w{ HEAD next_release } + [base_branch] + aggregate_branches
+        @reserved_branches ||= %w{ HEAD master next_release } + [base_branch] + aggregate_branches
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module Socialcast
   module Gitx
-    VERSION = "3.1.6"
+    VERSION = "3.1.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit