grit 1.1.1 → 2.0.0

data/lib/grit/submodule.rb

@@ -1,10 +1,10 @@
 module Grit
-  
+
   class Submodule
     attr_reader :id
     attr_reader :mode
     attr_reader :name
-    
+
     # Create a Submodule containing just the specified attributes
     #   +repo+ is the Repo
     #   +atts+ is a Hash of instance variable data
@@ -13,7 +13,7 @@ module Grit
     def self.create(repo, atts)
       self.allocate.create_initialize(repo, atts)
     end
-    
+
     # Initializer for Submodule.create
     #   +repo+ is the Repo
     #   +atts+ is a Hash of instance variable data
@@ -26,23 +26,23 @@ module Grit
       end
       self
     end
-    
+
     # The url of this submodule
     #   +ref+ is the committish that should be used to look up the url
     #
     # Returns String
     def url(ref)
       config = self.class.config(@repo, ref)
-      
+
       lookup = config.keys.inject({}) do |acc, key|
         id = config[key]['id']
         acc[id] = config[key]['url']
         acc
       end
-      
+
       lookup[@id]
     end
-    
+
     # The configuration information for the given +repo+
     #   +repo+ is the Repo
     #   +ref+ is the committish (defaults to 'master')
@@ -53,12 +53,12 @@ module Grit
       commit = repo.commit(ref)
       blob = commit.tree/'.gitmodules'
       return {} unless blob
-      
+
       lines = blob.data.gsub(/\r\n?/, "\n" ).split("\n")
-      
+
       config = {}
       current = nil
-      
+
       lines.each do |line|
         if line =~ /^\[submodule "(.+)"\]$/
           current = $1
@@ -71,18 +71,18 @@ module Grit
           # ignore
         end
       end
-      
+
       config
     end
-    
+
     def basename
       File.basename(name)
-    end    
-    
+    end
+
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Submodule "#{@id}">}
     end
   end # Submodule
-  
+
 end # Grit

data/lib/grit/tag.rb

@@ -2,63 +2,13 @@ module Grit
 
   class Tag < Ref
     def self.find_all(repo, options = {})
-      refs = []
-      already = {}
-
-      Dir.chdir(repo.path) do
-        files = Dir.glob(prefix + '/**/*')
-
-        files.each do |ref|
-          next if !File.file?(ref)
-
-          id = File.read(ref).chomp
-          name = ref.sub("#{prefix}/", '')
-          commit = commit_from_sha(repo, id)
-
-          if !already[name]
-            refs << self.new(name, commit)
-            already[name] = true
-          end
-        end
-
-        if File.file?('packed-refs')
-          lines = File.readlines('packed-refs')
-          lines.each_with_index do |line, i|
-            if m = /^(\w{40}) (.*?)$/.match(line)
-              next if !Regexp.new('^' + prefix).match(m[2])
-              name = m[2].sub("#{prefix}/", '')
-
-              # Annotated tags in packed-refs include a reference
-              # to the commit object on the following line.
-              next_line = lines[i+1]
-              if next_line && next_line[0] == ?^
-                commit = Commit.create(repo, :id => next_line[1..-1].chomp)
-              else
-                commit = commit_from_sha(repo, m[1])
-              end
-
-              if !already[name]
-                refs << self.new(name, commit)
-                already[name] = true
-              end
-            end
-          end
-        end
-      end
-
-      refs
-    end
-
-    def self.commit_from_sha(repo, id)
-      git_ruby_repo = GitRuby::Repository.new(repo.path)
-      object = git_ruby_repo.get_object_by_sha1(id)
-
-      if object.type == :commit
-        Commit.create(repo, :id => id)
-      elsif object.type == :tag
-        Commit.create(repo, :id => object.object)
-      else
-        raise "Unknown object type."
+      refs = repo.git.refs(options, prefix)
+      refs.split("\n").map do |ref|
+        name, id = *ref.split(' ')
+        cid = repo.git.commit_from_sha(id)
+        raise "Unknown object type." if cid == ''
+        commit = Commit.create(repo, :id => cid)
+        self.new(name, commit)
       end
     end
   end

data/lib/grit/tree.rb

@@ -1,11 +1,11 @@
 module Grit
-  
+
   class Tree
     lazy_reader :contents
     attr_reader :id
     attr_reader :mode
     attr_reader :name
-    
+
     # Construct the contents of the tree
     #   +repo+ is the Repo
     #   +treeish+ is the reference
@@ -16,12 +16,12 @@ module Grit
       output = repo.git.ls_tree({}, treeish, *paths)
       self.allocate.construct_initialize(repo, treeish, output)
     end
-    
+
     def construct_initialize(repo, id, text)
       @repo = repo
       @id = id
       @contents = []
-      
+
       text.split("\n").each do |line|
         @contents << content_from_string(repo, line)
       end
@@ -29,11 +29,11 @@ module Grit
 
       self
     end
-    
+
     def lazy_source
       Tree.construct(@repo, @id, [])
     end
-    
+
     # Create an unbaked Tree containing just the specified attributes
     #   +repo+ is the Repo
     #   +atts+ is a Hash of instance variable data
@@ -42,7 +42,7 @@ module Grit
     def self.create(repo, atts)
       self.allocate.create_initialize(repo, atts)
     end
-    
+
     # Initializer for Tree.create
     #   +repo+ is the Repo
     #   +atts+ is a Hash of instance variable data
@@ -50,13 +50,13 @@ module Grit
     # Returns Grit::Tree (unbaked)
     def create_initialize(repo, atts)
       @repo = repo
-      
+
       atts.each do |k, v|
         instance_variable_set("@#{k}", v)
       end
       self
     end
-    
+
     # Parse a content item and create the appropriate object
     #   +repo+ is the Repo
     #   +text+ is the single line containing the items data in `git ls-tree` format
@@ -77,7 +77,7 @@ module Grit
           raise "Invalid type: #{type}"
       end
     end
-    
+
     # Find the named object in this tree's contents
     #
     # Examples
@@ -94,11 +94,11 @@ module Grit
         self.contents.find { |c| c.name == file }
       end
     end
-    
+
     def basename
       File.basename(name)
     end
-    
+
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Tree "#{@id}">}

data/test/bench/benchmarks.rb

@@ -0,0 +1,126 @@
+require 'fileutils'
+require 'benchmark'
+require 'rubygems'
+require 'ruby-prof'
+require 'memcache'
+require 'pp'
+
+gem 'grit', '=0.7.0' 
+#require '../../lib/grit'
+
+def main
+  @wbare = File.expand_path(File.join('../../', 'test', 'dot_git'))
+  
+  in_temp_dir do
+    #result = RubyProf.profile do
+
+      git = Grit::Repo.new('.')
+      puts Grit::VERSION
+      #Grit::GitRuby.cache_client = MemCache.new 'localhost:11211', :namespace => 'grit'
+      #Grit.debug = true
+    
+      #pp Grit::GitRuby.cache_client.stats 
+    
+      commit1 = '5e3ee1198672257164ce3fe31dea3e40848e68d5'
+      commit2 = 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a'
+    
+      Benchmark.bm(8) do |x|
+            
+        run_code(x, 'packobj') do
+          @commit = git.commit('5e3ee1198672257164ce3fe31dea3e40848e68d5')
+          @tree = git.tree('cd7422af5a2e0fff3e94d6fb1a8fff03b2841881')
+          @blob = git.blob('4232d073306f01cf0b895864e5a5cfad7dd76fce')
+          @commit.parents[0].parents[0].parents[0]
+        end
+
+        run_code(x, 'commits 1') do
+          git.commits.size
+        end
+              
+        run_code(x, 'commits 2') do
+          log = git.commits('master', 15)
+          log.size
+          log.size
+          log.first
+          git.commits('testing').map { |c| c.message }
+        end
+
+        run_code(x, 'big revlist') do
+          c = git.commits('master', 200)
+        end
+
+        run_code(x, 'log') do
+          log = git.log('master')
+          log.size
+          log.size
+          log.first
+        end
+
+        run_code(x, 'diff') do
+          c = git.diff(commit1, commit2)
+        end
+
+        run_code(x, 'commit-diff') do
+          c = git.commit_diff(commit1)
+        end
+
+        run_code(x, 'heads') do
+          c = git.heads.collect { |b| b.commit.id }
+        end
+
+       # run_code(x, 'config', 100) do
+       #   c = git.config['user.name']
+       #   c = git.config['user.email']
+       # end
+
+        #run_code(x, 'commit count') do
+        #  c = git.commit_count('testing')
+        #end
+
+
+      end
+    #end
+
+    #printer = RubyProf::FlatPrinter.new(result)
+    #printer.print(STDOUT, 0)
+    
+  end
+
+
+end
+
+
+def run_code(x, name, times = 30)
+    x.report(name.ljust(12)) do
+      for i in 1..times do
+        yield i
+      end
+    end
+  
+  #end
+  
+  # Print a graph profile to text
+end
+
+def new_file(name, contents)
+  File.open(name, 'w') do |f|
+    f.puts contents
+  end
+end
+
+
+def in_temp_dir(remove_after = true)
+  filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
+  tmp_path = File.join("/tmp/", filename)
+  FileUtils.mkdir(tmp_path)
+  Dir.chdir tmp_path do
+    FileUtils.cp_r(@wbare, File.join(tmp_path, '.git'))
+    yield tmp_path
+  end
+  puts tmp_path
+  #FileUtils.rm_r(tmp_path) if remove_after
+end
+
+main()
+
+##pp Grit::GitRuby.cache_client.stats 

data/test/helper.rb

@@ -0,0 +1,18 @@
+require File.join(File.dirname(__FILE__), *%w[.. lib grit])
+
+require 'rubygems'
+require 'test/unit'
+gem "mocha", ">=0"
+require 'mocha'
+
+GRIT_REPO = File.join(File.dirname(__FILE__), *%w[..])
+
+include Grit
+
+def fixture(name)
+  File.read(File.join(File.dirname(__FILE__), 'fixtures', name))
+end
+
+def absolute_project_path
+  File.expand_path(File.join(File.dirname(__FILE__), '..'))
+end

data/test/profile.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), *%w[.. lib grit])
+include Grit
+
+def recurse(tree, indent = "")
+  tree.contents.each do |c|
+    case c
+      when Tree
+        # puts "#{indent}#{c.name} (#{c.id})"
+        recurse(c, indent + "  ")
+    end
+  end
+end
+
+10.times do
+  r = Repo.new("/Users/schacon/projects/ambition")
+  t = r.tree
+
+  recurse(t)
+end
+
+#500.times { puts `git --git-dir /Users/schacon/projects/ambition/.git ls-tree master` }

data/test/suite.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+
+tests = Dir["#{File.dirname(__FILE__)}/test_*.rb"]
+tests.each do |file|
+  require file
+end

data/test/test_actor.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestActor < Test::Unit::TestCase
+  def setup
+
+  end
+
+  # from_string
+
+  def test_from_string_should_separate_name_and_email
+    a = Actor.from_string("Tom Werner <tom@example.com>")
+    assert_equal "Tom Werner", a.name
+    assert_equal "tom@example.com", a.email
+  end
+
+  def test_from_string_should_handle_just_name
+    a = Actor.from_string("Tom Werner")
+    assert_equal "Tom Werner", a.name
+    assert_equal nil, a.email
+  end
+
+  # inspect
+
+  def test_inspect
+    a = Actor.from_string("Tom Werner <tom@example.com>")
+    assert_equal %Q{#<Grit::Actor "Tom Werner <tom@example.com>">}, a.inspect
+  end
+
+  # to_s
+
+  def test_to_s_should_alias_name
+    a = Actor.from_string("Tom Werner <tom@example.com>")
+    assert_equal a.name, a.to_s
+  end
+end