grog 0.0.3 → 0.0.4

data/README.rdoc

@@ -21,6 +21,8 @@ A wrapper script for git-log - shows subject, time and author of each commit plu
 * Accept a commit range as a command line parameter
 * Fix tag/branch ambiguity issues
 * Show 'shadows' or remote branches (commit that is the latest in common with a remote branch)
+* Distinguish commits by user with different color
+* Read user default options from a .grog file
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/grog

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'grog'
-
-# puts `git log --pretty=format:"%x1b[33m%h%Creset %s %Cgreen(%an)%Creset"`
-options = Grog::Options.parse(ARGV)
-Grog::GitLog.print(:number_of_commits_to_show => options.number_of_commits_to_show,
-                   :show_datetimes => options.show_datetimes)
+puts Grog::GitLog.generate_parsing_arguments

data/features/grog.feature

@@ -4,16 +4,11 @@ Feature: default output of grog
   I want to see an overview of my recent commits
 
   Scenario: running grog with no options
-    Given a test git repo
-    And the test git repo has a file called "file_a" containing "I am A"
-    And a commit of all changes to the test git repo with message "Commit A"
-    And a checkout in the git repo with new branch called "branch_a"
-    And the test git repo has a file called "file_b" containing "I am B"
-    And a commit of all changes to the test git repo with message "Commit B"
+    Given a test git repo extracted from the "test_git_repo" tarball
     When I run grog on the test git repo
-    Then the output should be
+    Then the output ignoring colour codes should be
       """
-Commit B
-Commit A
+6165a67 Commit B (Tom ten Thij) B(branch_b master) T(foo v2)
+bf5b520 Commit A (Tom ten Thij) B(branch_a foo) T(v1)
 
       """

data/features/step_definitions/git_steps.rb

@@ -1,14 +1,43 @@
-Given /^a test git repo$/ do
-  features_dir = File.expand_path(File.dirname(__FILE__) + '/..')
-  @root_dir = File.expand_path(File.dirname(__FILE__) + '/../..')
-  @tmp_git_repo_dir = File.join(features_dir, 'tmp', 'git_repo')
-  if File.exists?(@tmp_git_repo_dir)
-    `rm -rf #{@tmp_git_repo_dir}`
+module GitHelpers
+  def set_root_path_variable
+    @root_dir ||= File.expand_path(File.dirname(__FILE__) + '/../..')
+  end
+
+  def set_repo_path_variable(name)
+    set_root_path_variable
+    unless @tmp_git_repo_dir
+      @features_dir = File.expand_path(File.dirname(__FILE__) + '/..')
+      @tmp_git_repo_dir = File.join(@features_dir, 'tmp', name)
+    end
+  end
+
+  def delete_temporary_test_repo
+    if File.exists?(@tmp_git_repo_dir)
+      `rm -rf #{@tmp_git_repo_dir}`
+    end
+  end
+
+  def untar_tarball_to_test_repo_location(tarball_name)
+    tarball_path = File.join(@root_dir, 'spec', tarball_name + '.tgz')
+    Dir.chdir(File.join(@features_dir, 'tmp'))
+    `tar zxf #{tarball_path}`
   end
+end
+
+Given /^a test git repo$/ do
+  name = 'git_repo'
+  set_repo_path_variable(name)
+  delete_temporary_test_repo(name)
   `mkdir #{@tmp_git_repo_dir}`
   `git init #{@tmp_git_repo_dir}`
 end
 
+Given /^a test git repo extracted from the "([^\"]*)" tarball$/ do |tarball_name|
+  set_repo_path_variable(tarball_name)
+  delete_temporary_test_repo
+  untar_tarball_to_test_repo_location(tarball_name)
+end
+
 Given /^the test git repo has a file called "([^\"]*)" containing "([^\"]*)"$/ do |filename, content|
   File.open(File.join(@tmp_git_repo_dir, filename), 'w') do |file|
     file.puts content
@@ -25,3 +54,5 @@ Given /^a checkout in the git repo with new branch called "([^\"]*)"$/ do |branc
   Dir.chdir(@tmp_git_repo_dir)
   `git checkout -b #{branch_name} 2> /dev/null`
 end
+
+World(GitHelpers)

data/features/step_definitions/grog_steps.rb

@@ -1,9 +1,15 @@
 When /^I run grog on the test git repo$/ do
   Dir.chdir(@tmp_git_repo_dir)
   grog_bin = File.join(@root_dir, 'bin', 'grog')
-  @grog_output = `#{grog_bin}`
+  @grog_output = Grog::GitLog.generate_parsing_arguments
 end
 
 Then /^the output should be$/ do |expected_output|
   @grog_output.should == expected_output
 end
+
+Then /^the output ignoring colour codes should be$/ do |expected_output|
+  colourless_output = @grog_output.gsub(/\e\[\d+m/, '')
+  colourless_output.should == expected_output
+end
+

data/lib/grog/git_log.rb

@@ -8,8 +8,14 @@ module Grog
       fetch_log
     end
 
-    def self.print(options)
-      puts self.new(options).to_s
+    def self.generate_parsing_arguments
+      options = Grog::Options.parse(ARGV)
+      generate(:number_of_commits_to_show => options.number_of_commits_to_show,
+               :show_datetimes => options.show_datetimes)
+    end
+
+    def self.generate(options)
+      self.new(options).to_s
     end
 
     def to_s
@@ -43,8 +49,8 @@ module Grog
           line += " T(" + Term::ANSIColor.cyan + tags.join(' ') + Term::ANSIColor.reset + ")"
         end
 
-        line
-      end
+        line + "\n"
+      end.join
     end
 
     protected
@@ -78,24 +84,42 @@ module Grog
       'git log --pretty=format:"%s" -n %d' % [format, @options[:number_of_commits_to_show]]
     end
 
-    def self.hash_from_rev_names(rev_names)
+    def self.hash_from_rev_names(rev_names, ref_root)
       hash = Hash.new { |hash, key| hash[key] = [] }
+      # Instead of running the command for each rev, it should run the
+      # command with all of them
       rev_names.each do |rev_name|
-        sha1 = GitLog.first_line_of_command("git rev-parse #{rev_name}")
+        sha1 = GitLog.first_line_of_command("git rev-parse #{ref_root}/#{rev_name}")
         hash[sha1] << rev_name
       end
       hash
     end
 
-    def get_all_branches
-      branch_names = GitLog.lines_of_command("git branch -a --no-color --no-track").
+    def branch_names_from_branch_command(type = :local)
+      case type
+      when :local
+        option = ''
+        ref = 'refs/heads'
+      when :remote
+        option = '-r '
+        ref = 'refs/remotes'
+      else
+        raise "Unknown type of branch: %s" % type
+      end
+      branch_names = GitLog.lines_of_command("git branch #{option}--no-color").
         map { |line| line[2..-1].split(' -> ').first }
-      @branches = GitLog.hash_from_rev_names(branch_names)
+      GitLog.hash_from_rev_names(branch_names, ref)
+    end
+
+    def get_all_branches
+      local_branches = branch_names_from_branch_command(:local)
+      remote_branches = branch_names_from_branch_command(:remote)
+      @branches = local_branches.merge(remote_branches)
     end
 
     def get_all_tags
       tag_names = GitLog.lines_of_command("git tag")
-      @tags = GitLog.hash_from_rev_names(tag_names)
+      @tags = GitLog.hash_from_rev_names(tag_names, 'refs/tags')
     end
 
     def fetch_log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grog
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tom ten Thij
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2009-11-16 00:00:00 +00:00
 default_executable: grog
 dependencies: 
 - !ruby/object:Gem::Dependency