git_tools 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0e458481a11751c30773053821dc103dcb20066
-  data.tar.gz: ad109373d0c651babb912fa2a97ff8f247ad9ad8
+  metadata.gz: 2bc3f7f01ad32646404bc725653462fdba76ecfc
+  data.tar.gz: 4e133c8c0c56c335f0e0f2756f06b84d218f5b65
 SHA512:
-  metadata.gz: b2c2ef68608acf414c38b9acf868c87afa209743c34fc98b87aec3c35a948a398233948132f7957ac2bd272c3362e98f872a85a7b6cab8e2841062c101a89a7b
-  data.tar.gz: 0e4c13416a9498544dcd3e10f8711cc00b8953743ed8da487df4c4a05ffba1bb797d0d8730b6882c86d8263a091a8df03b6821cead0bce96dcfdaed99cbc31db
+  metadata.gz: 9fba53a172ba660ef0b6aed34b6d90162e094b7a7667c78bdfc7b3a146c4d4e741421566d4bdfab8855afd744e3864a5241bb1e2b122a0418afa4ff39358f421
+  data.tar.gz: 9bbdcaf7b15c26efa2d344ea8a21fdd02a2b93b0a5e8a9d8358b50cdb3026ec4890e92452439cc39adaf6c7e2ef0c99d2a9825871be1f314bc2820899733ee74

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Rakefile

@@ -15,9 +15,9 @@ namespace :gem do
   end 
 
   desc 'Install the gem locally'
-  task :install do
+  task :install => :build do
     gem = `ls pkg`.split.sort
-    `gem install pkg/#{gem.last}`
+    puts `gem install pkg/#{gem.last}`
   end 
 end
 

data/bin/git-branch-cleaner

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+
+require 'docopt'
+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.
+
+Usage:
+  #{__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.
+DOCOPT
+
+begin
+  args = Docopt::docopt(doc)
+  GitTools::Branches::ActionExecutor.test_mode = args[:test]
+  GitTools::Branches::ActionExecutor.skip_prompted = !args[:prompt]
+
+  if args['--verbose']
+    $VERBOSE = true
+  end
+
+  if args['--debug']
+    $DEBUG = true
+  end
+
+  puts args.inspect if $DEBUG
+
+  if args['--local']
+    if master = args['--master']
+      GitTools::Branches::Cleaner.with_local(master).run!
+    else
+      GitTools::Branches::Cleaner.with_local.run!
+    end
+  end
+
+  if args['--remote']
+    GitTools::Branches::Cleaner.with_origin.run!
+  end
+rescue Docopt::Exit => e
+  puts e.message
+end

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.1.0'
+  s.version     = '0.2.0'
   s.authors     = ["Birkir A. Barkarson"]
   s.email       = ["birkirb@stoicviking.net"]
   s.licenses    = ['MIT']
@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "git_tools"
 
+  s.add_runtime_dependency("docopt")
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/git_tools/branches/cleaner.rb

@@ -26,7 +26,7 @@ module GitTools
 
       attr_reader :master_branch, :remote, :protected_branches
 
-      def self.with_local(master_branch, protected_branches = nil)
+      def self.with_local(master_branch = nil, protected_branches = nil)
         self.new(nil, master_branch, protected_branches)
       end
 
@@ -42,7 +42,7 @@ module GitTools
         @master_branch = master_branch || get_remote_head || MASTER_BRANCH
         @branches = branches
 
-        if @master_branch.nil?
+        if @master_branch.empty?
           raise "Master branch was not set or determined."
         else
           puts "Master branch is #{@master_branch}" if $VERBOSE
@@ -82,6 +82,8 @@ module GitTools
         end
 
         git_remote_prune
+      rescue StandardError => e
+        puts e.message
       end
 
       private
@@ -103,7 +105,8 @@ module GitTools
       end
 
       def get_remote_head
-        (`git branch -r | grep #{remote}/HEAD`).sub(/#{remote}\/HEAD -> #{remote}\//, '').strip
+        head = (`git branch -r | grep #{remote}/HEAD`).sub(/#{remote}\/HEAD -> #{remote}\//, '').strip
+        head.empty? ? nil : head
       end
 
       def clean_branches_result(branches)
@@ -153,7 +156,11 @@ module GitTools
 
       def self.age(branch)
         time = DATE_REGEXP.match(`git log --shortstat --date=iso -n 1 #{branch}`)
-        Time.parse(time[1])
+        if time.nil?
+          raise "Error due to unexpected git output."
+        else
+          Time.parse(time[1])
+        end
       end
 
       def self.executor

data/lib/tasks/git_tools/branches.rake

@@ -16,12 +16,11 @@ namespace :git do
     namespace :clean do
       desc 'Clean up local branches'
       task :local do
-        GitTools::Branches::Cleaner.with_local('stable').run!
+        GitTools::Branches::Cleaner.with_local.run!
       end
 
       desc 'Clean up remote branches'
       task :remote do
-        # TODO: Handle non origin
         GitTools::Branches::Cleaner.with_origin.run!
       end
 

metadata

@@ -1,25 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: git_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Birkir A. Barkarson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
-dependencies: []
+date: 2014-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: docopt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Git tools for installing hooks, cleaning up branches and more.
 email:
 - birkirb@stoicviking.net
-executables: []
+executables:
+- git-branch-cleaner
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - README.md
 - Rakefile
+- bin/git-branch-cleaner
 - git_tools.gemspec
 - lib/git_tools.rb
 - lib/git_tools/branches/cleaner.rb