Making the project setup easier (Gemfile and development_dependencies)

robertodecurnex · robertodecurnex · commit 79b72dd1780e · 2013-04-10T16:52:56.000-03:00
Updating tests (some of them were based on dates, no longer valids)
Updating branch naming policy (Git 1.7.x)
Extending the Branches #[] to return the target repo given the full or any of the shorter names
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,9 +6,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    columnize (0.3.6)
     json (1.7.7)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    rbx-require-relative (0.0.9)
     rdoc (4.0.1)
       json (~> 1.4)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     ruby-prof (0.13.0)
     test-unit (2.5.4)
 
@@ -18,5 +27,6 @@ PLATFORMS
 DEPENDENCIES
   git!
   rdoc
+  ruby-debug
   ruby-prof
   test-unit
diff --git a/git.gemspec b/git.gemspec
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.requirements = ['git 1.6.0.0, or greater']
 
+  s.add_development_dependency 'ruby-debug'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'ruby-prof'
   s.add_development_dependency 'test-unit'
diff --git a/lib/git/branch.rb b/lib/git/branch.rb
@@ -1,22 +1,17 @@
+require 'git/path'
+
 module Git
+
   class Branch < Path
     
     attr_accessor :full, :remote, :name
     
     def initialize(base, name)
-      @remote = nil
       @full = name
       @base = base
       @gcommit = nil
       @stashes = nil
-      
-      parts = name.split('/')
-      if parts[1]
-        @remote = Git::Remote.new(@base, parts[0])
-        @name = parts[1]
-      else
-        @name = parts[0]
-      end
+      @remote, @name = parse_name(name)
     end
     
     def gcommit
@@ -100,5 +95,28 @@ def determine_current
         @base.lib.branch_current == @name
       end
     
+      # Given a full branch name return an Array containing the remote and branch names.
+      #
+      # Removes 'remotes' from the beggining of the name (if present).
+      # Takes the second part (splittign by '/') as the remote name.
+      # Takes the rest as the repo name (can also hold one or more '/').
+      #
+      # Example:
+      #   parse_name('master') #=> [nil, 'master']
+      #   parse_name('origin/master') #=> ['origin', 'master']
+      #   parse_name('remotes/origin/master') #=> ['origin', 'master']
+      #   parse_name('origin/master/v2') #=> ['origin', 'master/v2'] 
+      #
+      # param [String] name branch full name.
+      # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names. 
+      def parse_name(name)
+        if name.match /^(?:remotes)?\/([^\/]+)\/(.+)/
+          return [Git::Remote.new(@base, $1), $2]
+        end
+
+        return [nil, name]
+      end
+    
   end
+  
 end
diff --git a/lib/git/branches.rb b/lib/git/branches.rb
@@ -2,6 +2,7 @@ module Git
   
   # object that holds all the available branches
   class Branches
+
     include Enumerable
     
     def initialize(base)
@@ -32,8 +33,29 @@ def each(&block)
       @branches.values.each(&block)
     end
     
-    def [](symbol)
-      @branches[symbol.to_s]
+    # Returns the target branch
+    #
+    # Example:
+    #   Given (git branch -a):
+    #    master
+    #    remotes/working/master
+    #
+    #   g.branches['master'].full #=> 'master'
+    #   g.branches['working/master'].full => 'remotes/working/master'
+    #   g.branches['remotes/working/master'].full => 'remotes/working/master'
+    #
+    # @param [#to_s] branch_name the target branch name.
+    # @return [Git::Branch] the target branch.
+    def [](branch_name)
+      @branches.values.inject(@branches) do |branches, branch|
+        branches[branch.full] ||= branch
+
+        # This is how Git (version 1.7.9.5) works. 
+        # Lets you ignore the 'remotes' if its at the beginning of the branch full name (even if is not a real remote branch). 
+        branches[branch.full.sub('remotes/', '')] ||= branch if branch.full =~ /^remotes\/.+/
+        
+        branches
+      end[branch_name.to_s]
     end
     
     def to_s
@@ -45,4 +67,5 @@ def to_s
     end
     
   end
+
 end
diff --git a/lib/git/repository.rb b/lib/git/repository.rb
@@ -1,4 +1,6 @@
 module Git
+
   class Repository < Path
   end
+
 end
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
@@ -1,6 +1,7 @@
-require 'test/unit'
 require 'fileutils'
 require 'logger'
+require 'test/unit'
+require 'ruby-debug'
 
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/git"
 
diff --git a/tests/units/test_branch.rb b/tests/units/test_branch.rb
@@ -30,15 +30,18 @@ def test_branches_remote
   end
   
   def test_branches_single
-    b = @git.branches[:test_object]
-    assert_equal('test_object', b.name)
+    branch = @git.branches[:test_object]
+    assert_equal('test_object', branch.name)
 
-    b = @git.branches['working/master']
-    assert_equal('master', b.name)
-    assert_equal('working/master', b.full)
-    assert_equal('working', b.remote.name)
-    assert_equal('+refs/heads/*:refs/remotes/working/*', b.remote.fetch_opts)
-    assert_equal('../working.git', b.remote.url)
+    %w{working/master remotes/working/master}.each do |branch_name|
+      branch = @git.branches[branch_name]
+     
+      assert_equal('master', branch.name)
+      assert_equal('remotes/working/master', branch.full)
+      assert_equal('working', branch.remote.name)
+      assert_equal('+refs/heads/*:refs/remotes/working/*', branch.remote.fetch_opts)
+      assert_equal('../working.git', branch.remote.url)
+    end
   end
   
   def test_branch_commit
@@ -89,4 +92,4 @@ def test_branch_create_and_switch
     end
   end
   
-end
+end
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -32,7 +32,7 @@ def test_log_commits
     assert(a.first.is_a?(String))
     assert_equal(10, a.size)
     
-    a = @lib.log_commits :count => 20, :since => '3 years ago'
+    a = @lib.log_commits :count => 20, :since => "#{Date.today.year - 2007} years ago"
     assert(a.first.is_a?(String))
     assert_equal(20, a.size)
     
@@ -165,4 +165,4 @@ def test_grep
     assert_equal(2, match.size)
   end
   
-end
+end
diff --git a/tests/units/test_log.rb b/tests/units/test_log.rb
@@ -36,7 +36,7 @@ def test_get_log_since
     l = @git.log.since("2 seconds ago")
     assert_equal(0, l.size)
     
-    l = @git.log.since("2 years ago")
+    l = @git.log.since("#{Date.today.year - 2007} years ago")
     assert_equal(30, l.size)
   end
   
diff --git a/tests/units/test_logger.rb b/tests/units/test_logger.rb
@@ -19,7 +19,7 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git branch '-a'/.match(logc))
+    assert(/INFO -- : git branch "-a"/.match(logc))
     assert(/DEBUG -- : \* git_grep/.match(logc))
 
     log = Tempfile.new('logfile')
@@ -31,7 +31,7 @@ def test_logger
     @git.branches.size
     
     logc = File.read(log.path)
-    assert(/INFO -- : git branch '-a'/.match(logc))
+    assert(/INFO -- : git branch "-a"/.match(logc))
     assert(!/DEBUG -- : \* git_grep/.match(logc))
   end
   
diff --git a/tests/units/test_tree_ops.rb b/tests/units/test_tree_ops.rb
@@ -65,8 +65,12 @@ def test_read_tree
         tr = nil
         g.with_temp_working do
           tr = g.with_temp_index do
-            assert_raises Git::GitExecuteError do
-              g.add  # add whats in our working tree - should be nothing
+            begin 
+              g.add
+            rescue Exception => e
+              # Adding nothig is now validd on Git 1.7.x
+              # If an error ocurres (Git 1.6.x) it MUST rise Git::GitExecuteError
+              assert_equal(e.class, Git::GitExecuteError)
             end
             g.read_tree('testbranch1', :prefix => 'b1/')
             g.read_tree('testbranch3', :prefix => 'b1/b3/')

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 module Git
++
   class Repository < Path
   end
++
 end