kablame 0.1.3 → 0.2.0

data/bin/git-kablame

@@ -1,20 +1,9 @@
 #!/usr/bin/env ruby
 #
 
-usage = <<USAGE
-Run git-kablame
-Usage: git-kablame <directory>
-USAGE
-
 require 'fileutils'
-
-target = ARGV.first
-
-if target.nil? || target.empty?
-	puts usage
-	exit(0)
-end
 require 'rubygems'
 gem 'kablame'
 require 'kablame'
-GitKablame.new(target).kablame
+
+GitKablame.kablame(ARGV)

data/bin/svn-kablame

@@ -1,20 +1,9 @@
 #!/usr/bin/env ruby
 #
 
-usage = <<USAGE
-Run git-kablame
-Usage: git-kablame <directory>
-USAGE
-
 require 'fileutils'
-
-target = ARGV.first
-
-if target.nil? || target.empty?
-	puts usage
-	exit(0)
-end
 require 'rubygems'
 gem 'kablame'
 require 'kablame'
-SvnKablame.new(target).kablame
+
+SvnKablame.kablame(ARGV)

data/lib/kablame.rb

@@ -1,9 +1,10 @@
+require 'kablame_options'
 class Kablame
 
   def initialize(dirs = nil, formats = nil)
     @users = {}    
-    @folders = dirs.split.map {|dir| dir.sub(/\/+\Z/, '') }
-    @formats = formats ? formats.split : %w{rb}
+    @folders = dirs.map {|dir| dir.sub(/\/+\Z/, '') }
+    @formats = formats || %w{rb}
   end
   
   def kablame
@@ -40,7 +41,7 @@ class Kablame
     @users.values.sort.each do |user|
       puts user.to_s
     end 
-    puts "**LOSER** #{@users.values.sort.last.name} **LOSER**"
+    puts "**LOSER** #{@users.values.sort.last.name} **LOSER**" unless @users.length == 1
   end
     
   
@@ -51,6 +52,17 @@ class Kablame
   def file_format_regex
     %r{\.(#{@formats.join('|')})}
   end
+  
+  def self.kablame(args)
+    formats = KablameOptions.new(type).format_parse(args)
+    targets = args
+
+    if targets.nil? || targets.empty?
+    	KablameOptions.print_usage(type)
+    	exit(0)
+    end
+    new(targets, formats).kablame
+  end
 end
 
 class SvnKablame < Kablame
@@ -62,19 +74,19 @@ class SvnKablame < Kablame
     `svn blame #{filename}`.split("\n")
   end
 
-  def version_control; 'svn'; end
+  def self.type; 'svn'; end
 end
 
 class GitKablame < Kablame     
   def blank_line_regex; /\(.+[\+-]\d{4}\s+\d+\)(\s*)$/; end
   
-  def name_match_regex; /\((.+)\s+\d{4}\-\d{2}/; end   
+  def name_match_regex; /\(([^\)]+)\s+\d{4}\-\d{2}/; end   
   
   def get_blame_lines(filename)
     `git blame #{filename}`.split("\n")
   end
   
-  def version_control; 'git'; end
+  def self.type; 'git'; end
 end
 
 class KablameUser

data/lib/kablame_options.rb

@@ -0,0 +1,31 @@
+require 'optparse'
+
+class KablameOptions
+  
+  def opts
+    OptionParser.new do |opts|
+      opts.banner = "Usage: #{@type}-kablame [options] <directories>"
+      opts.on("-f", "--formats xml,html", Array, "List of file formats to #{@type}-kablame") do |list|
+        @formats = list
+      end
+      
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+    end
+  end
+  
+  def initialize(type)
+    @type = type
+  end
+  
+  def format_parse(args)
+    opts.parse!(args)
+    @formats
+  end
+  
+  def self.print_usage(type)
+    puts self.new(type).opts
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kablame
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jacob Dunphy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-10 00:00:00 -07:00
+date: 2008-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,6 +24,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/kablame.rb
+- lib/kablame_options.rb
 - bin/git-kablame
 - bin/svn-kablame
 has_rdoc: true