git-blame-game 0.0.1 → 0.1.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,5 +1,7 @@
 # git-blame-game
 
+[![Build Status](https://secure.travis-ci.org/charleseff/git-blame-game.png)]
+
 <img src="https://github.com/charleseff/git-blame-game/raw/master/public/pensive-kanye.png" />
 
 git-blame-game is an interactive command-line tool for chaining 'git blame' calls to drill-down to the real culprit for the line of code you care about.  When one `git blame` does not tell the whole story.
@@ -44,11 +46,11 @@ git-blame-game is an interactive command-line tool for chaining 'git blame' call
      end
     
 
-    Do you need to git blame chain further (y/n) > y
+    Do you need to git blame chain further? (y/n) > y
 
       1) add.rb
 
-    Enter the number (from 1 to 1) of the file to git blame chain into > 1
+    Enter the number from the above list (from 1 to 1) of the file to git blame chain into > 1
 
     de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
     de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 2)   def add_4(x)
@@ -91,12 +93,12 @@ git-blame-game is an interactive command-line tool for chaining 'git blame' call
      puts add_4(9) # should be 13
     
 
-    Do you need to git blame chain further (y/n) > y
+    Do you need to git blame chain further? (y/n) > y
 
       1) add.rb
       2) blah.rb
 
-    Enter the number (from 1 to 2) of the file to git blame chain into > 2
+    Enter the number from the above list (from 1 to 2) of the file to git blame chain into > 2
 
     ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 1) def add_4(x)
     63b41ee4 (Bob Barker 2012-01-14 14:46:53 -0800 2)   x + 5
@@ -125,7 +127,7 @@ git-blame-game is an interactive command-line tool for chaining 'git blame' call
      puts add_4(9) # should be 13
     
 
-    Do you need to git blame chain further (y/n) > n
+    Do you need to git blame chain further? (y/n) > n
 
     The responsible commit is:
 

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+
+require 'rubygems'
+require 'cucumber'
+require 'cucumber/rake/task'
+require 'rspec/core/rake_task'
+
+Cucumber::Rake::Task.new(:features)
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec, :features]

data/TODO

@@ -0,0 +1,5 @@
+- add special highlighting for in the 'git show' for the line of code (or also the file) that has been chosen to git blame chain into
+- add ability to go back a step if you made a mistake
+- (maybe) add support for one-file mode (maybe make it default too?)
+- add pull request for aruba?
+- add pull request for colorize (decolorize)

data/bin/git-ann-game

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'git-blame-game'
+
+aliases = %w(blame praise annotate ann)
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = <<-END.gsub(/^[ \t]+/m, '')
+    Usage: git-blame-game [options] path/to/filename
+  END
+
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-s", "--sha", "--SHA [SHA]", String, "Set initial SHA (defaults to HEAD)") do |sha|
+    options[:sha] = sha
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    puts "\nAliases: " + aliases.map{|a| ["git-#{a}-game", "git #{a}-game"]}.flatten.join(", ")
+    exit
+  end
+
+end.parse!
+
+path_to_file = ARGV[0]
+raise OptionParser::MissingArgument.new("You must specify a path to a file ") if not path_to_file
+
+GitBlameGame.new(path_to_file, options).run

data/bin/git-annotate-game

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'git-blame-game'
+
+aliases = %w(blame praise annotate ann)
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = <<-END.gsub(/^[ \t]+/m, '')
+    Usage: git-blame-game [options] path/to/filename
+  END
+
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-s", "--sha", "--SHA [SHA]", String, "Set initial SHA (defaults to HEAD)") do |sha|
+    options[:sha] = sha
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    puts "\nAliases: " + aliases.map{|a| ["git-#{a}-game", "git #{a}-game"]}.flatten.join(", ")
+    exit
+  end
+
+end.parse!
+
+path_to_file = ARGV[0]
+raise OptionParser::MissingArgument.new("You must specify a path to a file ") if not path_to_file
+
+GitBlameGame.new(path_to_file, options).run

data/bin/git-blame-game

@@ -1,10 +1,8 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'git-blame-game'
 
-require "rubygems"
-require 'colorize'
-require 'optparse'
-require 'git-blame-game/git_blame_game'
+aliases = %w(blame praise annotate ann)
 
 options = {}
 OptionParser.new do |opts|
@@ -21,6 +19,7 @@ OptionParser.new do |opts|
 
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
+    puts "\nAliases: " + aliases.map{|a| ["git-#{a}-game", "git #{a}-game"]}.flatten.join(", ")
     exit
   end
 

data/bin/git-praise-game

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'git-blame-game'
+
+aliases = %w(blame praise annotate ann)
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = <<-END.gsub(/^[ \t]+/m, '')
+    Usage: git-blame-game [options] path/to/filename
+  END
+
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-s", "--sha", "--SHA [SHA]", String, "Set initial SHA (defaults to HEAD)") do |sha|
+    options[:sha] = sha
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    puts "\nAliases: " + aliases.map{|a| ["git-#{a}-game", "git #{a}-game"]}.flatten.join(", ")
+    exit
+  end
+
+end.parse!
+
+path_to_file = ARGV[0]
+raise OptionParser::MissingArgument.new("You must specify a path to a file ") if not path_to_file
+
+GitBlameGame.new(path_to_file, options).run

data/features/happy_path.feature

@@ -0,0 +1,143 @@
+Feature: The happy path
+
+  Scenario: Happy path
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    Then I should see:
+    """
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+      5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 2)   def add_4(y)
+      5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 3)     y + 5
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+
+      (h for help) >
+    """
+    When I type "3"
+    Then I should see:
+    """
+      commit 5087eab56af9b0901a1b190de14f29867307c140
+      Author: Danny Dover <developers+danny@foo.com>
+      Date:   Sat Jan 14 14:50:06 2012 -0800
+
+          I like y's better
+
+      diff --git a/add.rb b/add.rb
+      index 44be98f..898a812 100644
+      --- a/add.rb
+      +++ b/add.rb
+      @@ -1,5 +1,5 @@
+       module Add
+      -  def add_4(x)
+      -    x + 5
+      +  def add_4(y)
+      +    y + 5
+         end
+       end
+      
+
+        1) add.rb (or 's' for same)
+
+      (h for help) >
+    """
+    When I type "1"
+    Then I should see:
+    """
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 2)   def add_4(x)
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 3)     x + 5
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+
+      (h for help) >
+    """
+    When I type "3"
+    Then I should see:
+    """
+      commit de2a1d78f80e02a515cdd3aa0420dd6ee35b510b
+      Author: Carmen Cummings <developers+carmen@foo.com>
+      Date:   Sat Jan 14 14:49:00 2012 -0800
+
+          moving add_4 to module
+
+      diff --git a/add.rb b/add.rb
+      new file mode 100644
+      index 0000000..44be98f
+      --- /dev/null
+      +++ b/add.rb
+      @@ -0,0 +1,5 @@
+      +module Add
+      +  def add_4(x)
+      +    x + 5
+      +  end
+      +end
+      
+      diff --git a/blah.rb b/blah.rb
+      index 0424947..38b7511 100644
+      --- a/blah.rb
+      +++ b/blah.rb
+      @@ -1,5 +1,5 @@
+      -def add_4(x)
+      -  x + 5
+      -end
+      +$:.unshift(File.dirname(__FILE__))
+      +require 'add'
+      +include Add
+
+       puts add_4(9) # should be 13
+      
+
+        1) add.rb (or 's' for same)
+        2) blah.rb
+
+      (h for help) >
+    """
+    When I type "2"
+    Then I should see:
+    """
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 1) def add_4(x)
+      63b41ee4 (Bob Barker 2012-01-14 14:46:53 -0800 2)   x + 5
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 3) end
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 4)
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 5) puts add_4(9) # should be 13
+
+      (h for help) >
+    """
+    When I type "2"
+    Then I should see:
+    """
+      commit 63b41ee41653991aa00ce9687e3f403efd4c29d4
+      Author: Bob Barker <developers+bob@foo.com>
+      Date:   Sat Jan 14 14:46:53 2012 -0800
+
+          being bad
+
+      diff --git a/blah.rb b/blah.rb
+      index 626a42b..0424947 100644
+      --- a/blah.rb
+      +++ b/blah.rb
+      @@ -1,5 +1,5 @@
+       def add_4(x)
+      -  x + 4
+      +  x + 5
+       end
+
+       puts add_4(9) # should be 13
+      
+
+        1) blah.rb (or 's' for same)
+
+      (h for help) >
+    """
+    When I type "q"
+    Then I should see:
+    """
+    The responsible commit is:
+
+    commit 63b41ee41653991aa00ce9687e3f403efd4c29d4
+    Author: Bob Barker <developers+bob@foo.com>
+    Date:   Sat Jan 14 14:46:53 2012 -0800
+
+        being bad
+    """
+

data/features/other_scenarios.feature

@@ -0,0 +1,244 @@
+Feature: Other scenarios
+
+  Scenario: Getting help
+    When I run `bin/git-blame-game --help`
+    Then it should pass with:
+    """
+    Usage: git-blame-game [options] path/to/filename
+    """
+
+  Scenario: Without a filepath:
+    When I run `bin/git-blame-game`
+    Then it should fail with:
+    """
+    missing argument: You must specify a path to a file
+    """
+
+  Scenario: Specifying a file that doesn't exist:
+    When I run `bin/git-blame-game file/that/doesnt/exist.rb`
+    Then it should fail with:
+    """
+    fatal: no such path file/that/doesnt/exist.rb in HEAD
+    """
+
+  Scenario: Invalid input on git blame view:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    And I type "foobar"
+    Then I should see:
+    """
+      Invalid input.  Enter:
+        - the line number from the above list (from 1 to 5) you are git blaming.
+        - the sha to git blame chain into.
+        - 'r' to re-view the git blame
+
+      (h for help) >
+    """
+
+  Scenario: Invalid input on git show view:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    And I type "3"
+    And I type "blah"
+    Then I should see:
+    """
+      Invalid input.  Enter:
+        - 'q' to quit, if you have found the offending commit
+        - the number from the above list (from 1 to 1) of the file to git blame chain into.
+        - the filepath to git blame chain into.
+        - 's' to git blame chain into the 'same' file as before
+        - 'r' to re-view the git show
+
+      (h for help) >
+    """
+
+  Scenario: With a SHA:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game blah.rb --sha=63b41ee41653991aa00ce9687e3f403efd4c29d4` interactively
+    Then I should see:
+    """
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 1) def add_4(x)
+      63b41ee4 (Bob Barker 2012-01-14 14:46:53 -0800 2)   x + 5
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 3) end
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 4)
+      ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 5) puts add_4(9) # should be 13
+    """
+
+  Scenario: Entering the SHA instead of the number
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    When I type "5087eab5"
+    Then I should see:
+    """
+      commit 5087eab56af9b0901a1b190de14f29867307c140
+      Author: Danny Dover <developers+danny@foo.com>
+      Date:   Sat Jan 14 14:50:06 2012 -0800
+
+          I like y's better
+
+      diff --git a/add.rb b/add.rb
+      index 44be98f..898a812 100644
+      --- a/add.rb
+      +++ b/add.rb
+      @@ -1,5 +1,5 @@
+       module Add
+      -  def add_4(x)
+      -    x + 5
+      +  def add_4(y)
+      +    y + 5
+         end
+       end
+      
+    """
+
+  Scenario: Entering 's' for the same file to git blame into
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    When I type "3"
+    Then I should see:
+    """
+        1) add.rb
+    """
+    When I type "s"
+    Then I should see:
+    """
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 2)   def add_4(x)
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 3)     x + 5
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+    """
+
+  Scenario: Entering the filename for the file to git blame into:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    When I type "3"
+    Then I should see:
+    """
+        1) add.rb (or 's' for same)
+    """
+    When I type "add.rb"
+    Then I should see:
+    """
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 2)   def add_4(x)
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 3)     x + 5
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+    """
+
+  Scenario: Re-viewing a git blame:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    Then I should see:
+    """
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+      5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 2)   def add_4(y)
+      5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 3)     y + 5
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+    """
+    When I type "r"
+    Then I should see:
+    """
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+      5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 2)   def add_4(y)
+      5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 3)     y + 5
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+      de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+    """
+
+  Scenario: Re-viewing a git show:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    And I type "3"
+    Then I should see:
+    """
+      commit 5087eab56af9b0901a1b190de14f29867307c140
+      Author: Danny Dover <developers+danny@foo.com>
+      Date:   Sat Jan 14 14:50:06 2012 -0800
+
+          I like y's better
+
+      diff --git a/add.rb b/add.rb
+      index 44be98f..898a812 100644
+      --- a/add.rb
+      +++ b/add.rb
+      @@ -1,5 +1,5 @@
+       module Add
+      -  def add_4(x)
+      -    x + 5
+      +  def add_4(y)
+      +    y + 5
+         end
+       end
+      
+
+        1) add.rb (or 's' for same)
+    """
+    When I type "r"
+    Then I should see:
+    """
+      commit 5087eab56af9b0901a1b190de14f29867307c140
+      Author: Danny Dover <developers+danny@foo.com>
+      Date:   Sat Jan 14 14:50:06 2012 -0800
+
+          I like y's better
+
+      diff --git a/add.rb b/add.rb
+      index 44be98f..898a812 100644
+      --- a/add.rb
+      +++ b/add.rb
+      @@ -1,5 +1,5 @@
+       module Add
+      -  def add_4(x)
+      -    x + 5
+      +  def add_4(y)
+      +    y + 5
+         end
+       end
+      
+
+        1) add.rb (or 's' for same)
+    """
+
+  Scenario: Getting help interactively for git blame:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    Then I should see:
+    """
+      (h for help) >
+    """
+    When I type "h"
+    Then I should see:
+    """
+      Enter:
+        - the line number from the above list (from 1 to 5) you are git blaming.
+        - the sha to git blame chain into.
+        - 'r' to re-view the git blame
+
+      (h for help) >
+    """
+
+  Scenario: Getting help interactively for git show:
+    Given I cd to "test/fixtures/sample_git_repo"
+    When I run `../../../bin/git-blame-game add.rb` interactively
+    And I type "3"
+    Then I should see:
+    """
+      (h for help) >
+    """
+    When I type "h"
+    Then I should see:
+    """
+      Enter:
+        - 'q' to quit, if you have found the offending commit
+        - the number from the above list (from 1 to 1) of the file to git blame chain into.
+        - the filepath to git blame chain into.
+        - 's' to git blame chain into the 'same' file as before
+        - 'r' to re-view the git show
+
+      (h for help) >
+    """
+
+

data/features/step_definitions/gbc_steps.rb

@@ -1,3 +1,26 @@
+World(ArubaExt)
+
 Then /^the output should contain, ignoring spaces:$/ do |expected|
-  assert_partial_output(expected.gsub("\s",''), all_output.gsub("\s",''))
+  assert_partial_output(expected.gsub("\s", ''), all_output.gsub("\s", ''))
+end
+
+Then /^I should see:$/ do |expected|
+  assert_seen(expected)
+end
+
+Then /^the next bit of output should contain, ignoring spaces:$/ do |expected|
+  assert_seen(expected)
+end
+
+def assert_seen(expected)
+  @seen_output ||= ''
+  expected = unescape(expected.gsub("\s", ''))
+  wait_until_expectation do
+    @all_output = only_processes[0].output(@aruba_keep_ansi)
+
+    actual = unescape(@all_output[@seen_output.size..-1].gsub("\s", ''))
+
+    actual.should include(expected)
+  end
+  @seen_output = @all_output
 end

data/features/support/aruba_ext.rb

@@ -0,0 +1,41 @@
+# extension methods for Aruba
+module ArubaExt
+
+  def wait_until(seconds = 5)
+    timeout(seconds) { yield }
+  end
+
+  def timeout(seconds = 50, &block)
+    start_time = Time.now
+
+    result = nil
+
+    until result
+      return result if result = yield
+
+      delay = seconds - (Time.now - start_time)
+      if delay <= 0
+        raise TimeoutError, "timed out"
+      end
+
+      sleep(0.05)
+    end
+  end
+
+  def wait_until_expectation
+    begin
+      exception = nil
+      wait_until do
+        begin
+          yield
+          true
+        rescue RSpec::Expectations::ExpectationNotMetError => e
+          exception = e
+          false
+        end
+      end
+    rescue TimeoutError
+      raise exception
+    end
+  end
+end

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# NOTE: these features assumes a standard install of git with no .gitconfig options, which may alter git output
+
 require 'aruba/cucumber'
 
 def unzip_git_repo_if_needed!
@@ -15,6 +17,5 @@ end
 
 Before do
   unzip_git_repo_if_needed!
-
   set_relative_dir_for_aruba!
-end
+end

data/lib/git-blame-game.rb

@@ -1,2 +1,4 @@
-# Load nothing - just keep the file here to keep bundler happy.
-
+require 'rubygems'
+require 'colorize'
+require 'optparse'
+require 'git-blame-game/git_blame_game'

data/lib/git-blame-game/git_blame_game.rb

@@ -5,76 +5,135 @@ class GitBlameGame
   end
 
   def run
-    while loop;
-    end
-  end
+    loop do
+      p_flush("\n")
 
-  GIT_BLAME_REGEX = /(.+?) /
+      sha_to_show = show_git_blame_and_prompt_for_sha
 
-  def loop
-    puts
-    out = run_idempotent_git_command("git blame #{@sha} -- #{@path_to_file}")
-    exit $?.exitstatus unless $?.success?
+      p_flush("\n")
+      files_changed = `git show --pretty="format:" --name-only #{sha_to_show}`.split("\n")[1..-1]
 
-    lines = out.split("\n")
-    count = lines.count
+      @path_to_file = prompt_for_file(files_changed, sha_to_show)
+      @sha = "#{sha_to_show}^"
+    end
+  end
 
-    line = prompt_for_line(count)
-    sha_to_show = lines[line-1][GIT_BLAME_REGEX, 1]
+  private
+  def show_git_blame_and_prompt_for_sha
+    git_blame_out = `#{git_blame_cmd}`
+    exit $?.exitstatus unless $?.success?
+    sha_list = get_sha_list(git_blame_out)
+    print_git_blame_and_prompt
+    prompt_for_sha(sha_list)
+  end
 
-    puts
-    system "git show #{sha_to_show}"
-    files_changed = `git show --pretty="format:" --name-only #{sha_to_show}`.split("\n")[1..-1]
+  def prompt_for_sha(shas)
+    loop do
+      input = $stdin.gets.strip
+      # sha was entered, return it:
+      return input if shas.include? input
+
+      if input =~ /\A\d+\Z/
+        input = input.to_i
+        return shas[input - 1] if input <= shas.count && input >= 1
+      end
+
+      if input == 'r'
+        print_git_blame_and_prompt
+      elsif input == 'h'
+        p_flush prompt_for_sha_message(shas.count)
+      else
+        p_flush "\nInvalid input.  " + prompt_for_sha_message(shas.count)
+      end
+    end
+  end
 
-    @path_to_file = prompt_for_file(files_changed,sha_to_show)
-    @sha = "#{sha_to_show}^"
+  def print_git_blame_and_prompt
+    system git_blame_cmd
+    p_flush "\n" + simple_prompt
+  end
 
-    true
+  def git_blame_cmd
+    "git blame #{@sha} -- #{@path_to_file}"
   end
 
-  def prompt_for_file(files_changed,sha)
-    print "\n" + gbc_color("Do you need to git blame chain further (y/n) >") + ' '
-    input = $stdin.gets.strip.downcase
-    until %w{y n}.include?(input)
-      print "\n" + gbc_color("Invalid input.  Enter y or n >") + ' '
-      input = $stdin.gets.strip.downcase
-    end
+  GIT_BLAME_REGEX = /(.+?) /
 
-    if input == 'n'
-      print "\n" + gbc_color("The responsible commit is:") + "\n\n"
-      system "git log #{sha} -n 1"
-      exit 0
-    end
+  def get_sha_list(git_blame_out)
+    git_blame_out.strip.split("\n").map { |line| line[GIT_BLAME_REGEX, 1] }
+  end
 
-    puts
-    files_changed.each_with_index do |file,index|
-      "%-10s  %-12s  %-15s  %-48s  %-s\n"
-      printf("%3d) #{file}\n", index+1)
+  def prompt_for_file(files_changed, sha)
+    print_file_prompt(files_changed, sha)
+
+    loop do
+      input = $stdin.gets.strip
+      if input == 'q'
+        p_flush "\n" + color("The responsible commit is:") + "\n\n"
+        system "git log #{sha} -n 1"
+        exit 0
+      end
+      return @path_to_file if input == 's'
+      return input if files_changed.include? input
+
+      if input =~ /\A\d+\Z/
+        input = input.to_i
+        return files_changed[input-1] if input >= 1 && input <= files_changed.count
+      end
+
+      if input == 'r'
+        print_file_prompt(files_changed, sha)
+      elsif input == 'h'
+        p_flush prompt_for_file_message(files_changed.count)
+      else
+        p_flush "\nInvalid input.  " + prompt_for_file_message(files_changed.count)
+      end
     end
+  end
 
-    print "\n" + gbc_color("Enter the number (from 1 to #{files_changed.size}) of the file to git blame chain into >") + ' '
-    until (input = $stdin.gets.strip.to_i) >= 1 && input <= files_changed.size
-      print "\n" + gbc_color("Invalid input.  Enter a number from 1 to #{files_changed.size} >") + ' '
+  def print_file_prompt(files, sha)
+    system "git show #{sha}"
+    print("\n")
+    files.each_with_index do |file, index|
+      line = sprintf("%3d) #{file}", index+1)
+      line += '   ' + orange_color("(or 's' for same)") if file == @path_to_file
+      print line + "\n"
     end
+    p_flush "\n" + simple_prompt
+  end
 
-    return files_changed[input-1]
+  def prompt_for_file_message(count)
+    "Enter:\n" +
+      "  - 'q' to quit, if you have found the offending commit\n" +
+      "  - the number from the above list (from 1 to #{count}) of the file to git blame chain into.\n" +
+      "  - the filepath to git blame chain into.\n" +
+      "  - 's' to git blame chain into the 'same' file as before\n" +
+      "  - 'r' to re-view the git show\n\n" +
+      simple_prompt
+  end
 
+  def simple_prompt
+    color("(h for help) >") + ' '
   end
 
-  def prompt_for_line(count)
-    print "\n" + gbc_color("Which line are you concerned with? (1 to #{count}) >") + ' '
-    until (input = $stdin.gets.strip.to_i) >= 1 && input <= count
-      print "\n" + gbc_color("Invalid input.  Enter a number from 1 to #{count} >") + ' '
-    end
-    input
+  def prompt_for_sha_message(count)
+    "Enter:\n" +
+      "  - the line number from the above list (from 1 to #{count}) you are git blaming.\n" +
+      "  - the sha to git blame chain into.\n" +
+      "  - 'r' to re-view the git blame\n\n" + simple_prompt
   end
 
-  def run_idempotent_git_command(cmd)
-    system cmd
-    `#{cmd}`
+  def p_flush(str)
+    $stdout.print str
+    $stdout.flush
   end
 
-  def gbc_color(s)
+  def color(s)
     s.colorize(:color => :light_white, :background => :magenta)
   end
+
+  def orange_color(s)
+    s.colorize(:color => :yellow, :background => :black)
+  end
+
 end

data/lib/git-blame-game/version.rb

@@ -1,7 +1,7 @@
 module Git
   module Blame
     module Game
-      VERSION = "0.0.1"
+      VERSION = "0.1.0"
     end
   end
 end

data/spec/git-blame-game/git_blame_game_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe GitBlameGame do
+
+  let(:git_blame_game) { GitBlameGame.new('some_file') }
+  let(:sha_list) { %w(de2a1d78 5087eab5 5087eab5 de2a1d78 de2a1d78) }
+
+  before do
+    $stdout.stub(:print)
+  end
+
+  describe "#get_sha_list" do
+    let(:git_blame_out) {
+      <<-END.gsub(/^[ \t]+/m, '')
+        de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
+        5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 2)   def add_4(y)
+        5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 3)     y + 5
+        de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
+        de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
+      END
+    }
+
+    it "should return a list of shas" do
+      git_blame_game.send(:get_sha_list,git_blame_out).should == sha_list
+    end
+  end
+
+  describe "prompt_for_sha" do
+    before do
+      $stdin.should_receive(:gets).and_return(input)
+    end
+    context "when user enters a correct sha" do
+      let(:input) { '5087eab5' }
+      it "should return the correct sha" do
+        git_blame_game.send(:prompt_for_sha, sha_list).should == '5087eab5'
+      end
+    end
+    context "when user enters a correct number" do
+      let(:input) { '1' }
+      it "should return the correct sha" do
+        git_blame_game.send(:prompt_for_sha, sha_list).should == 'de2a1d78'
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'git-blame-game'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-blame-game
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-15 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &18572720 !ruby/object:Gem::Requirement
+  requirement: &18258680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18572720
+  version_requirements: *18258680
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &18572180 !ruby/object:Gem::Requirement
+  requirement: &18257780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +32,41 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18572180
+  version_requirements: *18257780
 description: When one `git blame` is not enough
 email:
 - charles.finkel@gmail.com
 executables:
+- git-ann-game
+- git-annotate-game
 - git-blame-game
+- git-praise-game
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
+- TODO
+- bin/git-ann-game
+- bin/git-annotate-game
 - bin/git-blame-game
-- features/blaming.feature
+- bin/git-praise-game
+- features/happy_path.feature
+- features/other_scenarios.feature
 - features/step_definitions/gbc_steps.rb
+- features/support/aruba_ext.rb
 - features/support/env.rb
 - git-blame-game.gemspec
 - lib/git-blame-game.rb
 - lib/git-blame-game/git_blame_game.rb
 - lib/git-blame-game/version.rb
 - public/pensive-kanye.png
+- spec/git-blame-game/git_blame_game_spec.rb
+- spec/spec_helper.rb
 - test/fixtures/sample_git_repo.zip
 homepage: https://github.com/charleseff/git-blame-game
 licenses: []

data/features/blaming.feature

@@ -1,195 +0,0 @@
-Feature: Blaming
-
-  Scenario: Getting help
-    When I run `bin/git-blame-game --help`
-    Then it should pass with:
-    """
-    Usage: git-blame-game [options] path/to/filename
-    """
-
-  Scenario: Without a filepath:
-    When I run `bin/git-blame-game`
-    Then it should fail with:
-    """
-    missing argument: You must specify a path to a file
-    """
-
-  Scenario: Specifying a file that doesn't exist:
-    When I run `bin/git-blame-game file/that/doesnt/exist.rb`
-    Then it should fail with:
-    """
-    fatal: no such path file/that/doesnt/exist.rb in HEAD
-    """
-
-  Scenario: Without a SHA:
-    Given I cd to "test/fixtures/sample_git_repo"
-    When I run `../../../bin/git-blame-game add.rb` interactively
-    When I type "foobar"
-    When I type "3"
-    When I type "blah"
-    When I type "y"
-    When I type "1"
-    When I type "3"
-    When I type "y"
-    When I type "2"
-    When I type "2"
-    When I type "n"
-    Then the output should contain, ignoring spaces:
-    """
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
-    5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 2)   def add_4(y)
-    5087eab5 (Danny Dover     2012-01-14 14:50:06 -0800 3)     y + 5
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
-
-    Which line are you concerned with? (1 to 5) >
-    Invalid input.  Enter a number from 1 to 5 >
-    commit 5087eab56af9b0901a1b190de14f29867307c140 (HEAD, master)
-    Author: Danny Dover <developers+danny@foo.com>
-    Date:   Sat Jan 14 14:50:06 2012 -0800
-
-        I like y's better
-
-    diff --git a/add.rb b/add.rb
-    index 44be98f..898a812 100644
-    --- a/add.rb
-    +++ b/add.rb
-    @@ -1,5 +1,5 @@
-     module Add
-    -  def add_4(x)
-    -    x + 5
-    +  def add_4(y)
-    +    y + 5
-       end
-     end
-    
-
-    Do you need to git blame chain further (y/n) >
-    Invalid input.  Enter y or n >
-      1) add.rb
-
-    Enter the number (from 1 to 1) of the file to git blame chain into >
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 1) module Add
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 2)   def add_4(x)
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 3)     x + 5
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 4)   end
-    de2a1d78 (Carmen Cummings 2012-01-14 14:49:00 -0800 5) end
-
-    Which line are you concerned with? (1 to 5) >
-    commit de2a1d78f80e02a515cdd3aa0420dd6ee35b510b
-    Author: Carmen Cummings <developers+carmen@foo.com>
-    Date:   Sat Jan 14 14:49:00 2012 -0800
-
-        moving add_4 to module
-
-    diff --git a/add.rb b/add.rb
-    new file mode 100644
-    index 0000000..44be98f
-    --- /dev/null
-    +++ b/add.rb
-    @@ -0,0 +1,5 @@
-    +module Add
-    +  def add_4(x)
-    +    x + 5
-    +  end
-    +end
-    
-    diff --git a/blah.rb b/blah.rb
-    index 0424947..38b7511 100644
-    --- a/blah.rb
-    +++ b/blah.rb
-    @@ -1,5 +1,5 @@
-    -def add_4(x)
-    -  x + 5
-    -end
-    +$:.unshift(File.dirname(__FILE__))
-    +require 'add'
-    +include Add
-
-     puts add_4(9) # should be 13
-    
-
-    Do you need to git blame chain further (y/n) >
-      1) add.rb
-      2) blah.rb
-
-    Enter the number (from 1 to 2) of the file to git blame chain into >
-    ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 1) def add_4(x)
-    63b41ee4 (Bob Barker 2012-01-14 14:46:53 -0800 2)   x + 5
-    ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 3) end
-    ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 4)
-    ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 5) puts add_4(9) # should be 13
-
-    Which line are you concerned with? (1 to 5) >
-    commit 63b41ee41653991aa00ce9687e3f403efd4c29d4
-    Author: Bob Barker <developers+bob@foo.com>
-    Date:   Sat Jan 14 14:46:53 2012 -0800
-
-        being bad
-
-    diff --git a/blah.rb b/blah.rb
-    index 626a42b..0424947 100644
-    --- a/blah.rb
-    +++ b/blah.rb
-    @@ -1,5 +1,5 @@
-     def add_4(x)
-    -  x + 4
-    +  x + 5
-     end
-
-     puts add_4(9) # should be 13
-    
-
-    Do you need to git blame chain further (y/n) >
-    The responsible commit is:
-
-    commit 63b41ee41653991aa00ce9687e3f403efd4c29d4
-    Author: Bob Barker <developers+bob@foo.com>
-    Date:   Sat Jan 14 14:46:53 2012 -0800
-
-        being bad
-
-    """
-
-  Scenario: With a SHA:
-    Given I cd to "test/fixtures/sample_git_repo"
-    When I run `../../../bin/git-blame-game blah.rb --sha=63b41ee41653991aa00ce9687e3f403efd4c29d4` interactively
-    When I type "2"
-    When I type "n"
-    Then the output should contain, ignoring spaces:
-    """
-  ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 1) def add_4(x)
-  63b41ee4 (Bob Barker 2012-01-14 14:46:53 -0800 2)   x + 5
-  ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 3) end
-  ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 4)
-  ^f603a9a (Alice Amos 2012-01-14 14:46:18 -0800 5) puts add_4(9) # should be 13
-
-  Which line are you concerned with? (1 to 5) >
-  commit 63b41ee41653991aa00ce9687e3f403efd4c29d4
-  Author: Bob Barker <developers+bob@foo.com>
-  Date:   Sat Jan 14 14:46:53 2012 -0800
-
-      being bad
-
-  diff --git a/blah.rb b/blah.rb
-  index 626a42b..0424947 100644
-  --- a/blah.rb
-  +++ b/blah.rb
-  @@ -1,5 +1,5 @@
-   def add_4(x)
-  -  x + 4
-  +  x + 5
-   end
-
-   puts add_4(9) # should be 13
-  
-
-  Do you need to git blame chain further (y/n) >
-  The responsible commit is:
-
-  commit 63b41ee41653991aa00ce9687e3f403efd4c29d4
-  Author: Bob Barker <developers+bob@foo.com>
-  Date:   Sat Jan 14 14:46:53 2012 -0800
-
-      being bad
-   """