git_tools 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99bd8d872a939d6ef245e120c08dd8f735f3965
-  data.tar.gz: 1e04ce6953a4f27c3a165d715d0ddfbd36111191
+  metadata.gz: 559e0661bd71f674ea66ed8e42f586b498e70cc9
+  data.tar.gz: 16aace169bb88aa04d24039738e8763b9bb35563
 SHA512:
-  metadata.gz: 9762a509b0448aa5ed7205a564602451f628d353dc280dd3358fb70879daa4345d36214b6c12d58b6e0a48232feac9cfa7f7a4b3534cbd8822b2a27b51846f51
-  data.tar.gz: ca015ee59daad5f78697844558aa1e6cd4654e8cd4e4a179dc7a46d75894a77ff2de7f60ab7f67b8703ffbd3433ec0bbe19340fc042f90517deccd8afd9b48ce
+  metadata.gz: a73fbf197ccfe8fd873fc8569eca0ae4c5fc9e7510096d65e14297858f4f6271e37165674b669a20175c38fe1b01223679c7539d5a1978822ed461bd008ec700
+  data.tar.gz: 611e03f9f3a58dc5fd6d9897b0b32617c6f36a01349d8652c0544d59f5ad7f13dd36ebd42621c97a5648d5c7273f1dd919c5190df12a376ee6dcc4c441ef7189

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/git_tools/branches/cleaner.rb

@@ -67,14 +67,19 @@ module GitTools
         puts "Merged branch threshold is #{@@age_threshold_for_deleting_remote_branches_in_master/Time::SECONDS_IN_DAY} days." if $VERBOSE
         puts "Unmerged branch threshold is #{@@age_threshold_for_deleting_any_unmerged_branches/Time::SECONDS_IN_DAY} days." if $VERBOSE
 
-        git_remote_prune
       end
 
       def local?
         @remote.nil?
       end
 
+      def remote?
+        !local?
+      end
+
       def run!
+        git_remote_prune
+
         puts "Skipping prompts" if $VERBOSE && ActionExecutor.skip_prompted
         (@branches - protected_branches - [master_branch] ).each do |branch|
           branch = Branch.new(branch, remote)
@@ -106,12 +111,15 @@ module GitTools
         git_remote_prune
       rescue StandardError => e
         puts e.message
+        puts e.backtrace if $DEBUG
       end
 
       private
 
       def git_remote_prune
-        `git remote prune #{remote}` unless local?
+        if remote?
+          `git remote prune #{remote}`
+        end
       end
 
       def label_for_remote

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_tools
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Birkir A. Barkarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt