git_tools 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d30825406fc8a411689aa5cda1e57ef7ffed29b
-  data.tar.gz: 1b557251ae763367f7fe60aeab01c8d842afbd03
+  metadata.gz: ae48bc933ba646e1b9d815536045cf7d5177d5af
+  data.tar.gz: 9e81516a89a6934dfb865ac9d51a7a2a9db0f2ac
 SHA512:
-  metadata.gz: 311ab97eae9528e7ec46782950bbe1c7c00ba608aa2884d5ac3c6cb2d2295013af7c79c038fdf4516cf6e54091bcd9bce5ceee65df223877bed65eca6fa67903
-  data.tar.gz: bfd8214bc882ead2b2ea1f2b6ddf7efeedd01b365a6a7a730a42bf50032e29153b3e9c537d62c3709baa269757cd14beaf950c02eb6eca5e4746612fcd7d6a2d
+  metadata.gz: 371645b4777f194bf98d9162ea4c5dffb9849d4ae2c9d23f8f9ecb808b9afe1b1d36fc17bfc641ba345c6377f7bf9fdc640b66b094d747c085dc8c40e2a5c6a1
+  data.tar.gz: edc78dff61ea7122671136aa79cee33cea9aca13dffc4b3287aded998c502676596a46777546972fe4db65259fc97b702a5cf90a90b43ccb78383677a82742ca

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/git_tools/branches/cleaner.rb

@@ -56,6 +56,9 @@ module GitTools
         @remote = remote
         @protected_branches = protected_branches || Branches.default_keep_list
         @master_branch = master_branch || get_remote_head || MASTER_BRANCH
+
+        git_remote_prune # Prune before collecting branch names.
+
         @branches = branches
 
         if @master_branch.empty?
@@ -66,7 +69,6 @@ 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
-
       end
 
       def local?
@@ -78,8 +80,6 @@ module GitTools
       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)
@@ -185,9 +185,10 @@ module GitTools
       DATE_REGEXP = /^Date:\s+(.*)$/
 
       def self.age(branch)
-        time = DATE_REGEXP.match(`git log --shortstat --date=iso -n 1 #{branch}`)
+        cmd = "git log --shortstat --date=iso -n 1 #{branch}"
+        time = DATE_REGEXP.match(`#{cmd}`)
         if time.nil?
-          raise "Error due to unexpected git output."
+          raise "Error due to unexpected git output on command: #{cmd}."
         else
           Time.parse(time[1])
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_tools
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Birkir A. Barkarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt