grog 0.0.4 → 0.0.5

data/README.rdoc

@@ -19,7 +19,6 @@ A wrapper script for git-log - shows subject, time and author of each commit plu
 * Create --no-color option
 * Improve performance by slashing some shell calls to git commands
 * 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

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/features/grog.feature

@@ -8,7 +8,7 @@ Feature: default output of grog
     When I run grog on the test git repo
     Then the output ignoring colour codes should be
       """
-6165a67 Commit B (Tom ten Thij) B(branch_b master) T(foo v2)
+6165a67 Commit B (Tom ten Thij) B(branch_b master origin/master) T(foo v2)
 bf5b520 Commit A (Tom ten Thij) B(branch_a foo) T(v1)
 
       """

data/lib/grog/git_log.rb

@@ -1,4 +1,5 @@
 require 'term/ansicolor'
+require 'grog/list_hash'
 
 module Grog
   class GitLog
@@ -114,7 +115,7 @@ module Grog
     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)
+      @branches = Grog::ListHash.merge_lists(local_branches, remote_branches)
     end
 
     def get_all_tags

data/lib/grog/list_hash.rb

@@ -0,0 +1,19 @@
+module Grog
+  class ListHash
+    # Merges hashes that have lists as values: when merging identical
+    # keys the lists are added
+    #
+    # Hash.merge_lists({:a => [1, 2]}, {:a => [3]}) => {:a => [1, 2, 3] }
+    def self.merge_lists(h1, h2)
+      merged_hash = h1.dup
+      h2.keys.each do |key|
+        if merged_hash.has_key?(key)
+          merged_hash[key] += h2[key]
+        else
+          merged_hash[key] = h2[key]
+        end
+      end
+      merged_hash
+    end
+  end
+end

data/spec/grog/list_hash.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'grog/list_hash'
+
+describe Grog::ListHash do
+  it "should add lists that are the values of identical keys" do
+    hash1 = {:a => [1, 2], :b => [4]}
+    hash2 = {:a => [3], :c => [5]}
+    expected_hash = {:a => [1, 2, 3], :b => [4], :c => [5] }
+    Grog::ListHash.merge_lists(hash1, hash2).should == expected_hash
+  end
+
+  it "should be an empty hash if both arguments are empty" do
+    Grog::ListHash.merge_lists({}, {}).should == {}
+  end
+
+  it "should be the first hash if the second one is empty" do
+    hash = { :x => 3 }
+    Grog::ListHash.merge_lists(hash, {}).should == hash
+  end
+
+  it "should be the second hash if the first one is empty" do
+    hash = { :x => 3 }
+    Grog::ListHash.merge_lists({}, hash).should == hash
+  end
+
+  it "should not modify the first hash" do
+    hash1 = {:a => [1]}
+    hash2 = {:a => [2]}
+    Grog::ListHash.merge_lists(hash1, hash2)
+    hash1[:a].should == [1]
+  end
+
+  it "should not modify the second hash" do
+    hash1 = {:a => [1]}
+    hash2 = {:a => [2]}
+    Grog::ListHash.merge_lists(hash1, hash2)
+    hash2[:a].should == [2]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grog
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tom ten Thij
@@ -76,8 +76,10 @@ files:
 - features/support/env.rb
 - lib/grog.rb
 - lib/grog/git_log.rb
+- lib/grog/list_hash.rb
 - lib/grog/options.rb
 - spec/grog/git_log_spec.rb
+- spec/grog/list_hash.rb
 - spec/grog/options_spec.rb
 - spec/grog_spec.rb
 - spec/spec.opts
@@ -113,6 +115,7 @@ specification_version: 3
 summary: A wrapper script for git-log - shows subject, time and author of each commit plus branches and tags
 test_files: 
 - spec/grog/git_log_spec.rb
+- spec/grog/list_hash.rb
 - spec/grog/options_spec.rb
 - spec/grog_spec.rb
 - spec/spec_helper.rb