mojombo-grit 0.9.3 → 0.9.4

data/Manifest.txt

@@ -27,6 +27,7 @@ lib/grit/lazy.rb
 lib/grit/ref.rb
 lib/grit/repo.rb
 lib/grit/status.rb
+lib/grit/submodule.rb
 lib/grit/tag.rb
 lib/grit/tree.rb
 lib/grit.rb

data/README.txt

@@ -1,5 +1,5 @@
 grit
-    by Tom Preston-Werner, Chris Wanstrath
+    by Tom Preston-Werner, Scott Chacon
     http://github.com/mojombo/grit
 
 == DESCRIPTION:
@@ -9,7 +9,7 @@ object oriented manner.
 
 == REQUIREMENTS:
 
-* git (http://git.or.cz) tested with 1.5.3.4
+* git (http://git-scm.com) tested with 1.6.0.2
 
 == INSTALL:
 

data/grit.gemspec

@@ -1,15 +1,14 @@
 Gem::Specification.new do |s|
   s.name     = "grit"
-  s.version  = "0.9.3"
-  s.date     = "2008-04-24"
+  s.version  = "0.9.4"
+  s.date     = "2008-11-07"
   s.summary  = "Object model interface to a git repo"
   s.email    = "tom@rubyisawesome.com"
-  s.homepage = "http://github.com/schacon/grit"
+  s.homepage = "http://github.com/mojombo/grit"
   s.description = "Grit is a Ruby library for extracting information from a git repository in and object oriented manner."
   s.has_rdoc = true
   s.authors  = ["Tom Preston-Werner", "Scott Chacon"]
   s.files    = ["History.txt", 
-		"Manifest.txt", 
 		"README.txt", 
 		"Rakefile", 
 		"grit.gemspec", 
@@ -23,7 +22,6 @@ Gem::Specification.new do |s|
 		"lib/grit/git-ruby/commit_db.rb", 
 		"lib/grit/git-ruby/file_index.rb", 
 		"lib/grit/git-ruby/git_object.rb", 
-		"lib/grit/git-ruby/internal", 
 		"lib/grit/git-ruby/internal/loose.rb", 
 		"lib/grit/git-ruby/internal/mmap.rb", 
 		"lib/grit/git-ruby/internal/pack.rb", 
@@ -38,9 +36,11 @@ Gem::Specification.new do |s|
 		"lib/grit/ref.rb", 
 		"lib/grit/repo.rb", 
 		"lib/grit/status.rb", 
+		"lib/grit/submodule.rb", 
 		"lib/grit/tag.rb", 
 		"lib/grit/tree.rb", 
-		"lib/grit.rb"]
+		"lib/grit.rb",
+		"lib/open3_detach.rb"]
   s.test_files = ["test/test_actor.rb", 
       "test/test_blob.rb", "test/test_commit.rb", 
       "test/test_config.rb", 

data/lib/grit.rb

@@ -7,12 +7,17 @@ require 'time'
 # stdlib
 require 'timeout'
 require 'logger'
+require 'digest/sha1'
+
+if defined? RUBY_ENGINE && RUBY_ENGINE == 'jruby'
+  require 'open3'
+else
+  require 'open3_detach'
+end
 
 # third party
 require 'rubygems'
 require 'mime/types'
-require 'open4'
-require 'digest/sha1'
 
 # internal requires
 require 'grit/lazy'
@@ -30,6 +35,7 @@ require 'grit/config'
 require 'grit/repo'
 require 'grit/index'
 require 'grit/status'
+require 'grit/submodule'
 
 
 module Grit
@@ -49,5 +55,5 @@ module Grit
   
   @logger ||= ::Logger.new(STDOUT)
   
-  VERSION = '0.9.1'
+  VERSION = '0.9.4'
 end

data/lib/grit/commit.rb

@@ -71,7 +71,7 @@ module Grit
     #
     # Returns Integer
     def self.count(repo, ref)
-      repo.git.rev_list({}, ref).strip.split("\n").size
+      repo.git.rev_list({}, ref).size / 41
     end
     
     # Find all commits matching the given criteria.

data/lib/grit/git-ruby.rb

@@ -51,7 +51,7 @@ module Grit
       elsif (options.size == 0)
         # pure rev-list
         begin
-          return file_index.commits_from(rev_parse({}, ref)).join("\n")
+          return file_index.commits_from(rev_parse({}, ref)).join("\n") + "\n"
         rescue
           return method_missing('rev-list', options, ref) 
         end
@@ -65,7 +65,9 @@ module Grit
       end
     end
     
-    def rev_parse(options, string)      
+    def rev_parse(options, string)
+      raise RuntimeError, "invalid string: #{string}" unless string.is_a?(String)
+
       if string =~ /\.\./
         (sha1, sha2) = string.split('..')
         return [rev_parse({}, sha1), rev_parse({}, sha2)]
@@ -89,7 +91,7 @@ module Grit
       if File.file?(packref)
         File.readlines(packref).each do |line|
           if m = /^(\w{40}) refs\/.+?\/(.*?)$/.match(line)
-            next if !Regexp.new(string + '$').match(m[3])
+            next if !Regexp.new(Regexp.escape(string) + '$').match(m[3])
             return m[1].chomp
           end
         end

data/lib/grit/git-ruby/internal/loose.rb

@@ -27,7 +27,8 @@ module Grit
         def [](sha1)
           sha1 = sha1.unpack("H*")[0]
           begin
-            path = @directory+'/'+sha1[0...2]+'/'+sha1[2..39]
+            return nil unless sha1[0...2] && sha1[2..39]
+            path = @directory + '/' + sha1[0...2] + '/' + sha1[2..39]
             get_raw_object(File.read(path))
           rescue Errno::ENOENT
             nil

data/lib/grit/git-ruby/repository.rb

@@ -70,6 +70,8 @@ module Grit
      
       # returns a raw object given a SHA1
       def get_raw_object_by_sha1(sha1o)
+        raise NoSuchShaFound if sha1o.nil? || sha1o.empty? || !sha1o.is_a?(String)
+
         sha1 = [sha1o.chomp].pack("H*")
         # try packs
         packs.each do |pack|

data/lib/grit/git.rb

@@ -1,10 +1,3 @@
-trap("CHLD") do
-  begin
-    Process.wait(-1, Process::WNOHANG)
-  rescue Object
-  end
-end
-
 module Grit
   
   class Git
@@ -26,7 +19,7 @@ module Grit
     end
   
     self.git_binary  = "/usr/bin/env git"
-    self.git_timeout = 5
+    self.git_timeout = 10
     
     attr_accessor :git_dir, :bytes_read
     
@@ -54,7 +47,7 @@ module Grit
       timeout  = true if timeout.nil?
 
       opt_args = transform_options(options)
-      ext_args = args.map { |a| a == '--' ? a : "'#{a}'" }
+      ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : "'#{a}'" }
       
       call = "#{prefix}#{Git.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{postfix}"
       Grit.log(call) if Grit.debug
@@ -65,37 +58,41 @@ module Grit
     end
 
     def sh(command)
-      ret, pid, err = nil, nil, nil
-      Open4.popen4(command) do |id, _, stdout, stderr|
-        pid = id
-        ret = Timeout.timeout(self.class.git_timeout) { stdout.read }
-        err = stderr.read
-        @bytes_read += ret.size
+      ret, err = '', ''
+      Open3.popen3(command) do |_, stdout, stderr|
+        Timeout.timeout(self.class.git_timeout) do
+          while tmp = stdout.read(1024)
+            ret += tmp
+            if (@bytes_read += tmp.size) > 5242880 # 5.megabytes
+              bytes = @bytes_read
+              @bytes_read = 0
+              raise GitTimeout.new(command, bytes)
+            end
+          end
+        end
 
-        if @bytes_read > 5242880 # 5.megabytes
-          bytes = @bytes_read
-          @bytes_read = 0
-          raise GitTimeout.new(command, bytes) 
+        while tmp = stderr.read(1024)
+          err += tmp
         end
       end
       [ret, err]
-    rescue Errno::ECHILD
-      [ret, err]
-    rescue Object => e
-      Process.kill('KILL', pid) rescue nil
+    rescue Timeout::Error, Grit::Git::GitTimeout
       bytes = @bytes_read
       @bytes_read = 0
       raise GitTimeout.new(command, bytes)
     end
 
     def wild_sh(command)
-      ret, err = nil, nil
-      Open4.popen4(command) {|pid, _, stdout, stderr|
-        ret = stdout.read
-        err = stderr.read
-      }
-      [ret, err]
-    rescue Errno::ECHILD
+      ret, err = '', ''
+      Open3.popen3(command) do |_, stdout, stderr|
+        while tmp = stdout.read(1024)
+          ret += tmp
+        end
+
+        while tmp = stderr.read(1024)
+          err += tmp
+        end
+      end
       [ret, err]
     end
 

data/lib/grit/lazy.rb

@@ -20,8 +20,10 @@ module Lazy
     args.each do |arg|
       ivar = "@#{arg}"
       define_method(arg) do
-        val = instance_variable_get(ivar) 
-        return val if val
+        if instance_variable_defined?(ivar)
+          val = instance_variable_get(ivar)
+          return val if val
+        end
         instance_variable_set(ivar, (@lazy_source ||= lazy_source).send(arg))
       end
     end

data/lib/grit/submodule.rb

@@ -0,0 +1,84 @@
+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
+    #
+    # Returns Grit::Submodule (unbaked)
+    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
+    #
+    # Returns Grit::Submodule
+    def create_initialize(repo, atts)
+      @repo = repo
+      atts.each do |k, v|
+        instance_variable_set("@#{k}".to_sym, v)
+      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')
+    #
+    # Returns a Hash of { <path:String> => { 'url' => <url:String>, 'id' => <id:String> } }
+    # Returns {} if no .gitmodules file was found
+    def self.config(repo, ref = "master")
+      commit = repo.commit(ref)
+      blob = commit.tree/'.gitmodules'
+      return {} unless blob
+      
+      lines = blob.data.split("\n")
+      
+      config = {}
+      current = nil
+      
+      lines.each do |line|
+        if line =~ /^\[submodule "(.+)"\]$/
+          current = $1
+          config[current] = {}
+          config[current]['id'] = (commit.tree/current).id
+        elsif line =~ /^\t(\w+) = (.+)$/
+          config[current][$1] = $2
+          config[current]['id'] = (commit.tree/$2).id if $1 == 'path'
+        else
+          # ignore
+        end
+      end
+      
+      config
+    end
+    
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Submodule "#{@id}">}
+    end
+  end # Submodule
+  
+end # Grit

data/lib/grit/tree.rb

@@ -72,7 +72,7 @@ module Grit
         when "link"
           Blob.create(repo, :id => id, :mode => mode, :name => name)
         when "commit"
-          nil
+          Submodule.create(repo, :id => id, :mode => mode, :name => name)
         else
           raise "Invalid type: #{type}"
       end
@@ -88,7 +88,11 @@ module Grit
     #
     # Returns Grit::Blob or Grit::Tree or nil if not found
     def /(file)
-      self.contents.find { |c| c.name == file }
+      if file =~ /\//
+        file.split("/").inject(self) { |acc, x| acc/x } rescue nil
+      else
+        self.contents.find { |c| c.name == file }
+      end
     end
     
     # Pretty object inspection

data/lib/open3_detach.rb

@@ -0,0 +1,46 @@
+module Open3
+  extend self
+
+  def popen3(*cmd)
+    pw = IO::pipe   # pipe[0] for read, pipe[1] for write
+    pr = IO::pipe
+    pe = IO::pipe
+
+    pid = fork{
+      # child
+      fork{
+        # grandchild
+        pw[1].close
+        STDIN.reopen(pw[0])
+        pw[0].close
+
+        pr[0].close
+        STDOUT.reopen(pr[1])
+        pr[1].close
+
+        pe[0].close
+        STDERR.reopen(pe[1])
+        pe[1].close
+
+        exec(*cmd)
+      }
+      exit!(0)
+    }
+
+    pw[0].close
+    pr[1].close
+    pe[1].close
+    Process.waitpid(pid)
+    pi = [pw[1], pr[0], pe[0]]
+    pw[1].sync = true
+    if defined? yield
+      begin
+        return yield(*pi)
+      ensure
+        Process.detach(pid) if pid
+        pi.each { |p| p.close unless p.closed? }
+      end
+    end
+    pi
+  end
+end

data/test/test_commit.rb

@@ -22,6 +22,12 @@ class TestCommit < Test::Unit::TestCase
     assert_equal '80f136f', @r.commit('80f136f500dfdb8c3e8abf4ae716f875f0a1b57f').id_abbrev
   end
   
+  # count
+  
+  def test_count
+    assert_equal 107, Commit.count(@r, 'master')
+  end
+  
   # diff
   
   def test_diff

data/test/test_git.rb

@@ -8,7 +8,7 @@ class TestGit < Test::Unit::TestCase
   def teardown
     Grit.debug = false
   end
-  
+
   def test_method_missing
     assert_match(/^git version [\w\.]*$/, @git.version)
   end
@@ -50,21 +50,15 @@ class TestGit < Test::Unit::TestCase
   def test_raises_if_too_many_bytes
     @git.instance_variable_set(:@bytes_read, 6000000)
     assert_raises Grit::Git::GitTimeout do
-      @git.something
+      @git.version
     end
   end
 
   def test_raises_on_slow_shell
-    Grit::Git.git_timeout = 0.5
-    Open4.expects(:popen4).yields( nil, nil, mock(:read => proc { sleep 1 }), nil )
+    Grit::Git.git_timeout = 0.001
     assert_raises Grit::Git::GitTimeout do
-      @git.something
+      @git.version
     end
-  end
-
-  def test_works_fine_if_quick
-    output = 'output'
-    Open4.expects(:popen4).yields( nil, nil, mock(:read => output), stub(:read => nil) )
-    assert_equal output, @git.something
+    Grit::Git.git_timeout = 5.0
   end
 end

data/test/test_tree.rb

@@ -50,12 +50,12 @@ class TestTree < Test::Unit::TestCase
     assert_equal "grit.rb", tree.name
   end
   
-  def test_content_from_string_tree_should_return_commit
-    text = fixture('ls_tree_commit').split("\n")[1]
+  def test_content_from_string_tree_should_return_submodule
+    text = fixture('ls_tree_submodule').split("\n").first
     
-    tree = @t.content_from_string(nil, text)
+    sm = @t.content_from_string(nil, text)
     
-    assert_nil tree
+    assert_kind_of Submodule, sm
   end
   
   def test_content_from_string_invalid_type_should_raise
@@ -82,7 +82,7 @@ class TestTree < Test::Unit::TestCase
     )
     tree = @r.tree('master')
     
-    assert_nil tree/'bar'
+    assert_equal 'd35b34c6e931b9da8f6941007a92c9c9a9b0141a', (tree/'bar').id
     assert_equal '2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id
     assert_equal 'f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-grit
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-24 00:00:00 -07:00
+date: 2008-11-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,6 @@ extra_rdoc_files:
 - README.txt
 files: 
 - History.txt
-- Manifest.txt
 - README.txt
 - Rakefile
 - grit.gemspec
@@ -66,7 +65,6 @@ files:
 - lib/grit/git-ruby/commit_db.rb
 - lib/grit/git-ruby/file_index.rb
 - lib/grit/git-ruby/git_object.rb
-- lib/grit/git-ruby/internal
 - lib/grit/git-ruby/internal/loose.rb
 - lib/grit/git-ruby/internal/mmap.rb
 - lib/grit/git-ruby/internal/pack.rb
@@ -81,11 +79,14 @@ files:
 - lib/grit/ref.rb
 - lib/grit/repo.rb
 - lib/grit/status.rb
+- lib/grit/submodule.rb
 - lib/grit/tag.rb
 - lib/grit/tree.rb
 - lib/grit.rb
+- lib/open3_detach.rb
+- Manifest.txt
 has_rdoc: true
-homepage: http://github.com/schacon/grit
+homepage: http://github.com/mojombo/grit
 post_install_message: 
 rdoc_options: 
 - --main