git_tools 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d0bb4e3f40cc05a6d2f684e06f69e3e4160af7
-  data.tar.gz: 249cc375da442f650c784832357a3d0465460d24
+  metadata.gz: c1657841a12c0ef189a6d3fca4cdd48e479c0758
+  data.tar.gz: 30448143febad9adb062895611a55647196d2ac6
 SHA512:
-  metadata.gz: f39a3b7b1b6f0e3bb8324719ceedc7185f38cb1837fcaf4b4eef09bfc9c240f4874e57f16655eba80be7c0b2945e4bd9b8d0ea08172804f57244f4e620d07275
-  data.tar.gz: a4324f73f44c2757e185752c337e50a58eddc44ee6d11c94ef378c520af10dc17866ef175cd738180f919c531e72e0e43478dfa0f8e2da212131ee8faed2cfbb
+  metadata.gz: d7f1daa352df56ca237e4c4727caaf69ba88d0b7a5ffc398dd42c5ea1725fc5d857688f3a4e7e93007116c6f8e8b619f8282c2267d6f9afaa9dad5a704872750
+  data.tar.gz: 39ec25606c2267005997e836aba4e07008440e9779507409e521e2643e0d4debd2e830b1b5537a6ac308df2e933d348ec90aedb17ad96a35621bdab9dfb7ae99

data/VERSION

@@ -0,0 +1 @@
+0.3.0

data/bin/git-branch-cleaner

@@ -5,28 +5,37 @@ require 'git_tools'
 require 'git_tools/branches/cleaner'
 
 doc = <<DOCOPT
-Git branch cleaner. Will clean up local and remote branches based on master (HEAD) branch.
+Git branch cleaner. Will delete local and remote branches that have been merged into the master HEAD branch.
+Only branches older than merged threshold will be deleted unless otherwise specified.
+Unmerged branches older than the unmerged threshold will deleted only if so specified.
 
 Usage:
-  #{__FILE__} [options]
+  #{File.basename(__FILE__)} [options]
 
 Options:
-  -h --help                    Show this screen.
-  -v --version                 Show version.
-  -w --verbose                 Show verbose messages.
-  -d --debug                   Show debug messages.
-  -t --test                    Test run (no actualy deleting of branches).
-  -l --local                   Delete local branches.
-  -r --remote                  Delete remote branches.
-  -m --master <branch_name>    Use branch as master.
-  -p --prompt                  Deletion confirmation prompts.
-                               Without this all prompts are assumed to be negative.
+  -h --help                       Show this screen.
+  -v --version                    Show version and exit.
+  -w --verbose                    Show verbose messages.
+  -d --debug                      Show debug messages.
+  -n --no-execute                 Test run (no actualy deleting of branches).
+  -l --local                      Delete local branches.
+  -r --remote                     Delete remote branches.
+  -t --merged-threshold <days>    Delete merged branches older than this
+                                  (default ≈15 days).
+  -u --unmerged-threshold <days>  Prompt for deletion of unmerged branches older
+                                  than this (default ≈180 days, forces -p flag).
+  -m --master <branch_name>       Use branch as master.
+  -p --prompt                     Deletion confirmation prompts. Without this
+                                  all prompts are assumed to be negative.
 DOCOPT
 
 begin
   args = Docopt::docopt(doc)
-  GitTools::Branches::ActionExecutor.test_mode = args['--test']
-  GitTools::Branches::ActionExecutor.skip_prompted = !args['--prompt']
+
+  if args['--version']
+    puts File.read(File.expand_path(File.join(File.dirname(__FILE__), '..', 'VERSION')))
+    exit
+  end
 
   if args['--verbose']
     $VERBOSE = true
@@ -38,6 +47,18 @@ begin
 
   puts args.inspect if $DEBUG
 
+  if time = args['--merged-threshold']
+    GitTools::Branches::Cleaner.merged_threshold_in_days = time.to_i
+  end
+
+  if time = args['--unmerged-threshold']
+    GitTools::Branches::Cleaner.unmerged_threshold_in_days = time.to_i
+    args['--prompt'] = true # Force this option.
+  end
+
+  GitTools::Branches::ActionExecutor.test_mode = args['--no-execute']
+  GitTools::Branches::ActionExecutor.skip_prompted = !args['--prompt']
+
   if args['--local']
     if master = args['--master']
       GitTools::Branches::Cleaner.with_local(master).run!

data/git_tools.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "git_tools"
-  s.version     = '0.2.2'
+  s.version     = File.read('VERSION')
   s.authors     = ["Birkir A. Barkarson"]
   s.email       = ["birkirb@stoicviking.net"]
   s.licenses    = ['MIT']

data/lib/git_tools/branches/cleaner.rb

@@ -21,8 +21,8 @@ module GitTools
     class Cleaner
       MASTER_BRANCH = 'master'
       DEFAULT_REMOTE = 'origin'
-      AGE_THRESHOLD_IN_MONTHS_FOR_DELETING_REMOTE_BRANCHES_IN_MASTER = 1 * Time::SECONDS_IN_MONTH
-      AGE_THRESHOLD_IN_MONTHS_FOR_DELETING_ANY_UNMERGED_BRANCHES = 6 * Time::SECONDS_IN_MONTH
+      @@age_threshold_for_deleting_remote_branches_in_master = 15 * Time::SECONDS_IN_DAY
+      @@age_threshold_for_deleting_any_unmerged_branches = 180 * Time::SECONDS_IN_DAY
 
       attr_reader :master_branch, :remote, :protected_branches
 
@@ -34,6 +34,22 @@ module GitTools
         self.new(DEFAULT_REMOTE, nil, protected_branches)
       end
 
+      def self.merged_threshold
+        @@age_threshold_for_deleting_remote_branches_in_master
+      end
+
+      def self.merged_threshold_in_days=(days)
+        @@age_threshold_for_deleting_remote_branches_in_master = days * Time::SECONDS_IN_DAY
+      end
+
+      def self.unmerged_threshold
+        @@age_threshold_for_deleting_any_unmerged_branches
+      end
+
+      def self.unmerged_threshold_in_days=(days)
+        @@age_threshold_for_deleting_any_unmerged_branches = days * Time::SECONDS_IN_DAY
+      end
+
       public
 
       def initialize(remote = nil, master_branch = nil, protected_branches = nil)
@@ -47,6 +63,11 @@ module GitTools
         else
           puts "Master branch is #{@master_branch}" if $VERBOSE
         end
+
+        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?
@@ -141,12 +162,12 @@ module GitTools
         if local?
           true
         else
-          (Time.now - time) > AGE_THRESHOLD_IN_MONTHS_FOR_DELETING_REMOTE_BRANCHES_IN_MASTER
+          (Time.now - time) > self.class.merged_threshold
         end
       end
 
       def delete_unmerged_branch?(time)
-        (Time.now - time) > AGE_THRESHOLD_IN_MONTHS_FOR_DELETING_ANY_UNMERGED_BRANCHES
+        (Time.now - time) > self.class.unmerged_threshold
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Birkir A. Barkarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -36,6 +36,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- VERSION
 - bin/git-branch-cleaner
 - git_tools.gemspec
 - lib/git_tools.rb