option parsin, --help / --version / --sha + file:line support

fixes #7

Author: grosser

Gemfile

@@ -1,7 +1,9 @@
 source "http://rubygems.org"
 
 gemspec
+
 gem 'debugger'
 gem 'bump'
 gem 'rake'
-
+gem 'minitest'
+gem 'minitest-rg'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_spelunk (0.2.2)
+    git_spelunk (0.2.0)
       grit
 
 GEM
@@ -20,7 +20,10 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    mime-types (1.25)
+    mime-types (1.25.1)
+    minitest (5.1.0)
+    minitest-rg (5.0.0)
+      minitest (~> 5.0)
     posix-spawn (0.3.6)
     rake (10.1.0)
 
@@ -31,4 +34,6 @@ DEPENDENCIES
   bump
   debugger
   git_spelunk!
+  minitest
+  minitest-rg
   rake

bin/git-spelunk

@@ -1,6 +1,36 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'git_spelunk'
+require 'optparse'
 
-file_context = GitSpelunk::FileContext.new(ARGV[0], {:sha => ARGV[1], :line_number => ARGV[2]})
+def parse_options(argv)
+  options = {}
+  OptionParser.new do |opts|
+    opts.banner = <<-BANNER.gsub(/^ {6}/, "")
+      An interactive tool for exploring blame history.
+
+      Usage:
+          git-spelunk some_file.rb
+          git-spelunk some_file.rb:123
+
+      Options:
+    BANNER
+    opts.on("-s", "--sha SHA", String, "Start on this sha") { |sha| options[:sha] = sha }
+    opts.on("-h", "--help", "Show this.") { puts opts; exit }
+    opts.on("-v", "--version", "Show Version"){ puts GitSpelunk::VERSION; exit}
+  end.parse!(argv)
+  options
+end
+
+options = parse_options(ARGV)
+
+raise "Too many arguments" if ARGV.size != 1
+
+file = ARGV[0]
+
+file, line = file.split(':',2) if file.include?(':')
+options[:line_number] = line
+
+file_context = GitSpelunk::FileContext.new(file, options)
 ui = GitSpelunk::UI.new(file_context)
 ui.run

git_spelunk.gemspec

@@ -1,6 +1,9 @@
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "git_spelunk/version"
+
 Gem::Specification.new do |s|
   s.name        = "git_spelunk"
-  s.version     = "0.2.2"
+  s.version     = GitSpelunk::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben Osheroff", "Saroj Yadav"]
   s.email       = ["ben@zendesk.com", "saroj@zendesk.com"]

lib/git_spelunk.rb

@@ -1,4 +1,4 @@
-require 'debugger'
+require 'git_spelunk/version'
 require 'git_spelunk/ui'
 require 'git_spelunk/file_context'
 require 'git_spelunk/offset'

lib/git_spelunk/grit_patches.rb

@@ -5,5 +5,10 @@ class String
     def getord(offset); self[offset].ord; end
   end
 
-  PACK_IDX_SIGNATURE = "\377tOc".force_encoding(Encoding::ASCII_8BIT)
+  begin
+    old, $VERBOSE = $VERBOSE, nil
+    PACK_IDX_SIGNATURE = "\377tOc".force_encoding(Encoding::ASCII_8BIT)
+  ensure
+    $VERBOSE = old
+  end
 end

lib/git_spelunk/version.rb

@@ -0,0 +1,3 @@
+module GitSpelunk
+  VERSION = "0.2.2"
+end

test/integration_test.rb

@@ -0,0 +1,24 @@
+require_relative "test_helper"
+
+describe "CLI" do
+  def sh(cmd, options={})
+    result = `#{cmd} 2>&1`
+    raise "FAILED #{cmd} --> #{result}" if $?.success? != !options[:fail]
+    result
+  end
+
+  def spelunk(command, options={})
+    sh "#{File.expand_path("../../bin/git-spelunk", __FILE__)} #{command}", options
+  end
+
+  it "shows version" do
+    version = /\A\d+\.\d+\.\d+\Z/m
+    spelunk("--version").must_match version
+    spelunk("-v").must_match version
+  end
+
+  it "shows help" do
+    spelunk("--help").must_include "Usage"
+    spelunk("-h").must_include "Usage"
+  end
+end

test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'bundler/setup'
+require 'minitest/autorun'
+require 'minitest/rg'