socialcast-git-extensions 3.1.7 → 3.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFhY2RkNmIxMTE0MTNjZDhjMzhhMjdkZjljOTRhYmIzMmE1MjllZA==
+    MTMxY2JlODhkMDhlYTE4YzkzMDg5MTExYzRiMGI2MzRmOWJjMzM3MA==
   data.tar.gz: !binary |-
-    MWRiY2IwMTUwMmZmYWJlYjAzOTU5MmY1ZWY0ZTc4ODg1OWEyYWRiOA==
+    YTk4YTgyNDc4ZGRlMzU2NWJhMWEzNzYxYmNhN2Y3ZDcyMDgxNGQzMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTdjZTQxY2U1YjM3MTRmN2VlY2Y4MmQ4NTc1OTg4NzI1ZDZjMjE1MDlmODJk
-    ZTU4ZDdmM2FiODg4NmE2NGVkMzRmYmM4YTc1NTA1ODU1YTE5ZGEwN2VkMTgz
-    ODYxNjg4Mzg1YTkyNTYzNTdjMWMzNTZhYmNhMWIzNDg3NGVhMGQ=
+    YzVkOTkxMmRjOTY1Yzg3ZjlhMTAzMWMwZTBmMzUxYzY3MmFmN2ExZmVmZTk2
+    MGQ1MGMzZTFhMzFhMDdlYTNhYTNlMDVmYTJlOTM3NzcxOTMwZjljNDgwODA0
+    ZDAwM2ZiOGEyNmFiMGQyNWQ2NjNhYzE1OGM4Y2ViYjYwMmJlNzc=
   data.tar.gz: !binary |-
-    OWY5ZGEwMGMzYjhhZjFhMWU5YTkzYjdiNDg3OGEzMThkYzUzYzRkYzVhNGZi
-    YzI4MWU5YjFlN2E5NTc0NTFjM2ZmNTZmYzhhMmQwMmVlNTczM2I2M2VkOTFm
-    NTRiNGE3YTc4M2E1NmVjOWZmNDY5ZmZiNGJhMmY4ZTk1NzZmNDY=
+    YjQxZTRmMTE5MTEzMzk1ZDBmY2I1OGI1ZjJiM2YwMjdkMWQ2YzA0NjE5YTQ5
+    MGEzMGZjYjA2MWVlODdmZGY3OTAxMWNkYTRjZDRlOTI1MDlhMDc0NjEwZTJm
+    YmE3MjliMTNjMWE3YTcwN2EyZTYzNjU2ZWUyYmIyNTEyNGQwYzA=

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 reserved_branches.include?(branch)
+          run_cmd "git push origin --delete #{branch}" unless reserved_branch?(branch)
         end
         branches(:merged => true).each do |branch|
-          run_cmd "git branch -d #{branch}" unless reserved_branches.include?(branch)
+          run_cmd "git branch -d #{branch}" unless reserved_branch?(branch)
         end
       end
 

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

@@ -6,7 +6,7 @@ module Socialcast
     module Git
       private
       def assert_not_protected_branch!(branch, action)
-        raise "Cannot #{action} reserved branch" if reserved_branches.include?(branch) || aggregate_branch?(branch)
+        raise "Cannot #{action} reserved branch" if reserved_branch?(branch)
       end
 
       # lookup the current branch of the PWD
@@ -38,7 +38,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_branch?(branch)
         end
         branches.uniq
       end
@@ -105,6 +105,10 @@ module Socialcast
         aggregate_branches.include?(branch) || branch.starts_with?('last_known_good')
       end
 
+      def reserved_branch?(branch)
+        aggregate_branch?(branch) || reserved_branches.include?(branch)
+      end
+
       # build a summary of changes
       def changelog_summary(branch)
         changes = `git diff --stat origin/#{base_branch}...#{branch}`.split("\n")

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

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

data/spec/cli_spec.rb

@@ -391,4 +391,21 @@ describe Socialcast::Gitx::CLI do
       ]
     end
   end
+
+  describe '#cleanup' do
+    before do
+      Socialcast::Gitx::CLI.any_instance.should_receive(:branches).with(:merged => true, :remote => true).and_return(['master', 'foobar', 'last_known_good_master'])
+      Socialcast::Gitx::CLI.any_instance.should_receive(:branches).with(:merged => true).and_return(['staging', 'bazquux', 'last_known_good_prototype'])
+      Socialcast::Gitx::CLI.start ['cleanup']
+    end
+    it 'should only cleanup non-reserved branches' do
+      Socialcast::Gitx::CLI.stubbed_executed_commands.should == [
+        "git checkout master",
+        "git pull",
+        "git remote prune origin",
+        "git push origin --delete foobar",
+        "git branch -d bazquux"
+      ]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast-git-extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - Ryan Sonnek