mojombo-grit 0.8.1 → 0.9.3

data/test/test_tag.rb

@@ -8,20 +8,16 @@ class TestTag < Test::Unit::TestCase
   # list_from_string
   
   def test_list_from_string
-    Git.any_instance.expects(:for_each_ref).returns(fixture('for_each_ref_tags'))
-    
     tags = @r.tags
     
     assert_equal 1, tags.size
-    assert_equal 'v0.7.1', tags.first.name
-    assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', tags.first.commit.id
+    assert_equal 'v0.7.0', tags.first.name
+    assert_equal 'f0055fda16c18fd8b27986dbf038c735b82198d7', tags.first.commit.id
   end
   
   # inspect
   
   def test_inspect
-    Git.any_instance.expects(:for_each_ref).returns(fixture('for_each_ref'))
-    
     tag = @r.tags.first
     
     assert_equal %Q{#<Grit::Tag "#{tag.name}">}, tag.inspect

data/test/test_tree.rb

@@ -7,6 +7,11 @@ class TestTree < Test::Unit::TestCase
   end
   
   # contents
+  def test_nosuch_tree
+    t = @r.tree('blahblah')
+    assert t.contents.is_a?(Array)
+    assert t.is_a?(Tree)
+  end
   
   def test_contents_should_cache
     Git.any_instance.expects(:ls_tree).returns(

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-grit
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.9.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
+- Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -12,6 +13,15 @@ cert_chain: []
 date: 2008-04-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   version_requirement: 
@@ -21,6 +31,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 description: Grit is a Ruby library for extracting information from a git repository in and object oriented manner.
 email: tom@rubyisawesome.com
 executables: []
@@ -37,57 +56,36 @@ files:
 - README.txt
 - Rakefile
 - grit.gemspec
-- lib/grit.rb
 - lib/grit/actor.rb
 - lib/grit/blob.rb
 - lib/grit/commit.rb
+- lib/grit/commit_stats.rb
 - lib/grit/config.rb
 - lib/grit/diff.rb
 - lib/grit/errors.rb
+- 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
+- lib/grit/git-ruby/internal/raw_object.rb
+- lib/grit/git-ruby/object.rb
+- lib/grit/git-ruby/repository.rb
+- lib/grit/git-ruby.rb
 - lib/grit/git.rb
 - lib/grit/head.rb
+- lib/grit/index.rb
 - lib/grit/lazy.rb
+- lib/grit/ref.rb
 - lib/grit/repo.rb
+- lib/grit/status.rb
 - lib/grit/tag.rb
 - lib/grit/tree.rb
-- test/fixtures/blame
-- test/fixtures/cat_file_blob
-- test/fixtures/cat_file_blob_size
-- test/fixtures/diff_2
-- test/fixtures/diff_2f
-- test/fixtures/diff_f
-- test/fixtures/diff_i
-- test/fixtures/diff_mode_only
-- test/fixtures/diff_new_mode
-- test/fixtures/diff_p
-- test/fixtures/for_each_ref
-- test/fixtures/for_each_ref_tags
-- test/fixtures/ls_tree_a
-- test/fixtures/ls_tree_b
-- test/fixtures/ls_tree_commit
-- test/fixtures/rev_list
-- test/fixtures/rev_list_count
-- test/fixtures/rev_list_single
-- test/fixtures/rev_parse
-- test/fixtures/show_empty_commit
-- test/fixtures/simple_config
-- test/helper.rb
-- test/profile.rb
-- test/suite.rb
-- test/test_actor.rb
-- test/test_blob.rb
-- test/test_commit.rb
-- test/test_config.rb
-- test/test_diff.rb
-- test/test_git.rb
-- test/test_head.rb
-- test/test_reality.rb
-- test/test_repo.rb
-- test/test_tag.rb
-- test/test_tree.rb
-- test/test_real.rb
+- lib/grit.rb
 has_rdoc: true
-homepage: http://github.com/mojombo/grit
+homepage: http://github.com/schacon/grit
 post_install_message: 
 rdoc_options: 
 - --main
@@ -109,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Object model interface to a git repo
@@ -120,9 +118,11 @@ test_files:
 - test/test_config.rb
 - test/test_diff.rb
 - test/test_git.rb
+- test/test_grit.rb
 - test/test_head.rb
 - test/test_real.rb
 - test/test_reality.rb
+- test/test_remote.rb
 - test/test_repo.rb
 - test/test_tag.rb
 - test/test_tree.rb

data/test/fixtures/blame

@@ -1,131 +0,0 @@
-634396b2f541a9f2d58b00be1a07f0c358b999b3 1 1 7
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1191997100
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1191997100
-committer-tz -0700
-filename lib/grit.rb
-summary initial grit setup
-boundary
-	$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
-634396b2f541a9f2d58b00be1a07f0c358b999b3 2 2
-	
-634396b2f541a9f2d58b00be1a07f0c358b999b3 3 3
-	# core
-634396b2f541a9f2d58b00be1a07f0c358b999b3 4 4
-	
-634396b2f541a9f2d58b00be1a07f0c358b999b3 5 5
-	# stdlib
-634396b2f541a9f2d58b00be1a07f0c358b999b3 6 6
-	
-634396b2f541a9f2d58b00be1a07f0c358b999b3 7 7
-	# internal requires
-3b1930208a82457747d76729ae088e90edca4673 8 8 1
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1192267241
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1192267241
-committer-tz -0700
-filename lib/grit.rb
-summary big refactor to do lazy loading
-	require 'grit/lazy'
-4c8124ffcf4039d292442eeccabdeca5af5c5017 8 9 1
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1191999972
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1191999972
-committer-tz -0700
-filename lib/grit.rb
-summary implement Grit#heads
-	require 'grit/errors'
-d01a4cfad6ea50285c4710243e3cbe019d381eba 9 10 1
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1192032303
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1192032303
-committer-tz -0700
-filename lib/grit.rb
-summary convert to Grit module, refactor to be more OO
-	require 'grit/git'
-4c8124ffcf4039d292442eeccabdeca5af5c5017 9 11 1
-	require 'grit/head'
-a47fd41f3aa4610ea527dcc1669dfdb9c15c5425 10 12 1
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1192002639
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1192002639
-committer-tz -0700
-filename lib/grit.rb
-summary add more comments throughout
-	require 'grit/commit'
-b17b974691f0a26f26908495d24d9c4c718920f8 13 13 1
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1192271832
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1192271832
-committer-tz -0700
-filename lib/grit.rb
-summary started implementing Tree
-	require 'grit/tree'
-74fd66519e983a0f29e16a342a6059dbffe36020 14 14 1
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1192317005
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1192317005
-committer-tz -0700
-filename lib/grit.rb
-summary add Blob
-	require 'grit/blob'
-d01a4cfad6ea50285c4710243e3cbe019d381eba 12 15 1
-	require 'grit/repo'
-634396b2f541a9f2d58b00be1a07f0c358b999b3 9 16 1
-	
-d01a4cfad6ea50285c4710243e3cbe019d381eba 14 17 1
-	module Grit
-b6e1b765e0c15586a2c5b9832854f95defd71e1f 18 18 6
-author Tom Preston-Werner
-author-mail <tom@mojombo.com>
-author-time 1192860483
-author-tz -0700
-committer Tom Preston-Werner
-committer-mail <tom@mojombo.com>
-committer-time 1192860483
-committer-tz -0700
-filename lib/grit.rb
-summary implement Repo.init_bare
-	  class << self
-b6e1b765e0c15586a2c5b9832854f95defd71e1f 19 19
-	    attr_accessor :debug
-b6e1b765e0c15586a2c5b9832854f95defd71e1f 20 20
-	  end
-b6e1b765e0c15586a2c5b9832854f95defd71e1f 21 21
-	  
-b6e1b765e0c15586a2c5b9832854f95defd71e1f 22 22
-	  self.debug = false
-b6e1b765e0c15586a2c5b9832854f95defd71e1f 23 23
-	  
-634396b2f541a9f2d58b00be1a07f0c358b999b3 11 24 2
-	  VERSION = '1.0.0'
-634396b2f541a9f2d58b00be1a07f0c358b999b3 12 25
-	end

data/test/fixtures/cat_file_blob

@@ -1 +0,0 @@
-Hello world

data/test/fixtures/cat_file_blob_size

@@ -1 +0,0 @@
-11

data/test/fixtures/diff_2

@@ -1,54 +0,0 @@
-diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
-index a093bb1db8e884cccf396b297259181d1caebed4..80fd3d527f269ecbd570b65b8e21fd85baedb6e9 100644
---- a/lib/grit/commit.rb
-+++ b/lib/grit/commit.rb
-@@ -156,12 +156,8 @@ module Grit
- 
-     def diffs
-       if parents.empty?
--        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
--        if diff =~ /diff --git a/
--          diff = diff.sub(/.+?(diff --git a)/m, '\1')
--        else
--          diff = ''
--        end
-+        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id) 
-+        diff = diff.sub(/.+?(diff --git a)/m, '\1')
-         Diff.list_from_string(@repo, diff)
-       else
-         self.class.diff(@repo, parents.first.id, @id) 
-diff --git a/test/fixtures/show_empty_commit b/test/fixtures/show_empty_commit
-deleted file mode 100644
-index ea25e32a409fdf74c1b9268820108d1c16dcc553..0000000000000000000000000000000000000000
---- a/test/fixtures/show_empty_commit
-+++ /dev/null
-@@ -1,6 +0,0 @@
--commit 1e3824339762bd48316fe87bfafc853732d43264
--tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
--author Tom Preston-Werner <tom@mojombo.com> 1157392833 +0000
--committer Tom Preston-Werner <tom@mojombo.com> 1157392833 +0000
--
--    initial directory structure
-diff --git a/test/test_commit.rb b/test/test_commit.rb
-index fdeb9000089b052f0b31a845e0173e9b089e06a0..bdbc450e08084d7d611e985cfa12fb424cab29b2 100644
---- a/test/test_commit.rb
-+++ b/test/test_commit.rb
-@@ -98,18 +98,6 @@ class TestCommit < Test::Unit::TestCase
-     assert_equal true, diffs[5].new_file
-   end
-   
--  def test_diffs_on_initial_import_with_empty_commit
--    Git.any_instance.expects(:show).with(
--      {:full_index => true, :pretty => 'raw'}, 
--      '634396b2f541a9f2d58b00be1a07f0c358b999b3'
--    ).returns(fixture('show_empty_commit'))
--    
--    @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
--    diffs = @c.diffs
--    
--    assert_equal [], diffs
--  end
--  
-   # to_s
-   
-   def test_to_s

data/test/fixtures/diff_2f

@@ -1,19 +0,0 @@
-diff --git a/lib/grit/commit.rb b/lib/grit/commit.rb
-index a093bb1db8e884cccf396b297259181d1caebed4..80fd3d527f269ecbd570b65b8e21fd85baedb6e9 100644
---- a/lib/grit/commit.rb
-+++ b/lib/grit/commit.rb
-@@ -156,12 +156,8 @@ module Grit
- 
-     def diffs
-       if parents.empty?
--        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id)
--        if diff =~ /diff --git a/
--          diff = diff.sub(/.+?(diff --git a)/m, '\1')
--        else
--          diff = ''
--        end
-+        diff = @repo.git.show({:full_index => true, :pretty => 'raw'}, @id) 
-+        diff = diff.sub(/.+?(diff --git a)/m, '\1')
-         Diff.list_from_string(@repo, diff)
-       else
-         self.class.diff(@repo, parents.first.id, @id) 

data/test/fixtures/diff_f

@@ -1,15 +0,0 @@
-diff --git a/lib/grit/diff.rb b/lib/grit/diff.rb
-index 537955bb86a8ceaa19aea89e75ccbea5ce6f2698..00b0b4a67eca9242db5f8991e99625acd55f040c 100644
---- a/lib/grit/diff.rb
-+++ b/lib/grit/diff.rb
-@@ -27,6 +27,10 @@ module Grit
-       while !lines.empty?
-         m, a_path, b_path = *lines.shift.match(%r{^diff --git a/(\S+) b/(\S+)$})
-         
-+        if lines.first =~ /^old mode/
-+          2.times { lines.shift }
-+        end
-+        
-         new_file = false
-         deleted_file = false
-         

data/test/fixtures/diff_i

@@ -1,201 +0,0 @@
-commit 634396b2f541a9f2d58b00be1a07f0c358b999b3
-Author: Tom Preston-Werner <tom@mojombo.com>
-Date:   Tue Oct 9 23:18:20 2007 -0700
-
-    initial grit setup
-
-diff --git a/History.txt b/History.txt
-new file mode 100644
-index 0000000000000000000000000000000000000000..81d2c27608b352814cbe979a6acd678d30219678
---- /dev/null
-+++ b/History.txt
-@@ -0,0 +1,5 @@
-+== 1.0.0 / 2007-10-09
-+
-+* 1 major enhancement
-+  * Birthday!
-+
-diff --git a/Manifest.txt b/Manifest.txt
-new file mode 100644
-index 0000000000000000000000000000000000000000..641972d82c6d1b51122274ae8f6a0ecdfb56ee22
---- /dev/null
-+++ b/Manifest.txt
-@@ -0,0 +1,7 @@
-+History.txt
-+Manifest.txt
-+README.txt
-+Rakefile
-+bin/grit
-+lib/grit.rb
-+test/test_grit.rb
-
-diff --git a/README.txt b/README.txt
-new file mode 100644
-index 0000000000000000000000000000000000000000..8b1e02c0fb554eed2ce2ef737a68bb369d7527df
---- /dev/null
-+++ b/README.txt
-@@ -0,0 +1,48 @@
-+grit
-+    by FIX (your name)
-+    FIX (url)
-+
-+== DESCRIPTION:
-+  
-+FIX (describe your package)
-+
-+== FEATURES/PROBLEMS:
-+  
-+* FIX (list of features or problems)
-+
-+== SYNOPSIS:
-+
-+  FIX (code sample of usage)
-+
-+== REQUIREMENTS:
-+
-+* FIX (list of requirements)
-+
-+== INSTALL:
-+
-+* FIX (sudo gem install, anything else)
-+
-+== LICENSE:
-+
-+(The MIT License)
-+
-+Copyright (c) 2007 FIX
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+'Software'), to deal in the Software without restriction, including
-+without limitation the rights to use, copy, modify, merge, publish,
-+distribute, sublicense, and/or sell copies of the Software, and to
-+permit persons to whom the Software is furnished to do so, subject to
-+the following conditions:
-+
-+The above copyright notice and this permission notice shall be
-+included in all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-diff --git a/Rakefile b/Rakefile
-new file mode 100644
-index 0000000000000000000000000000000000000000..ff69c3684a18592c741332b290492aa39d980e02
---- /dev/null
-+++ b/Rakefile
-@@ -0,0 +1,17 @@
-+# -*- ruby -*-
-+
-+require 'rubygems'
-+require 'hoe'
-+require './lib/grit.rb'
-+
-+Hoe.new('grit', Grit::VERSION) do |p|
-+  p.rubyforge_name = 'grit'
-+  # p.author = 'FIX'
-+  # p.email = 'FIX'
-+  # p.summary = 'FIX'
-+  # p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-+  # p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
-+  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-+end
-+
-+# vim: syntax=Ruby
-diff --git a/bin/grit b/bin/grit
-new file mode 100644
-index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-diff --git a/lib/grit.rb b/lib/grit.rb
-new file mode 100644
-index 0000000000000000000000000000000000000000..32cec87d1e78946a827ddf6a8776be4d81dcf1d1
---- /dev/null
-+++ b/lib/grit.rb
-@@ -0,0 +1,12 @@
-+$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
-+
-+# core
-+
-+# stdlib
-+
-+# internal requires
-+require 'grit/grit'
-+
-+class Grit
-+  VERSION = '1.0.0'
-+end
-
-diff --git a/lib/grit/errors.rb b/lib/grit/errors.rb
-new file mode 100644
-index 0000000000000000000000000000000000000000..b3be31553741937607a89be8b6a2ab1df208852e
---- /dev/null
-+++ b/lib/grit/errors.rb
-@@ -0,0 +1,4 @@
-+class Grit
-+  class InvalidGitRepositoryError < StandardError
-+  end
-+end
-
-diff --git a/lib/grit/grit.rb b/lib/grit/grit.rb
-new file mode 100644
-index 0000000000000000000000000000000000000000..48fd36e16081ec09903f7a0e2253b3d16f9efb01
---- /dev/null
-+++ b/lib/grit/grit.rb
-@@ -0,0 +1,24 @@
-+class Grit
-+  attr_accessor :path
-+  
-+  # Create a new Grit instance
-+  #   +path+ is the path to either the root git directory or the bare git repo
-+  #
-+  # Examples
-+  #   g = Grit.new("/Users/tom/dev/grit")
-+  #   g = Grit.new("/Users/tom/public/grit.git")
-+  def initialize(path)
-+    if File.exist?(File.join(path, '.git'))
-+      self.path = File.join(path, '.git')
-+    elsif File.exist?(path) && path =~ /\.git$/
-+      self.path = path
-+    else
-+      raise InvalidGitRepositoryError.new(path) unless File.exist?(path)
-+    end
-+  end
-+  
-+  # Return the project's description. Taken verbatim from REPO/description
-+  def description
-+    File.open(File.join(self.path, 'description')).read.chomp
-+  end
-+end
-
-diff --git a/test/helper.rb b/test/helper.rb
-new file mode 100644
-index 0000000000000000000000000000000000000000..56e21da6b4ce3021d2754775dfa589947a4e37e5
---- /dev/null
-+++ b/test/helper.rb
-@@ -0,0 +1,5 @@
-+require File.join(File.dirname(__FILE__), *%w[.. lib grit])
-+
-+require 'test/unit'
-+
-+GRIT_REPO = File.join(File.dirname(__FILE__), *%w[..])
-diff --git a/test/test_grit.rb b/test/test_grit.rb
-new file mode 100644
-index 0000000000000000000000000000000000000000..93aa481b37629797df739380306ae689e13f2855
---- /dev/null
-+++ b/test/test_grit.rb
-@@ -0,0 +1,11 @@
-+require File.dirname(__FILE__) + '/helper'
-+
-+class TestGrit < Test::Unit::TestCase
-+  def setup
-+    @g = Grit.new(GRIT_REPO)
-+  end
-+  
-+  def test_description
-+    assert_equal "Grit is a ruby library for interfacing with git repositories.", @g.description
-+  end
-+end
-