square-circle-triangle-grit 1.1.2 → 1.1.3

data/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2007-2009 Tom Preston-Werner
+
+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.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 1

data/examples/ex_add_commit.rb

@@ -0,0 +1,13 @@
+require '../lib/grit'
+
+count = 1
+Dir.chdir("/Users/schacon/projects/atest") do
+  r = Grit::Repo.new('.')
+  while(count < 10) do
+    fname = Time.now.to_i.to_s + count.to_s
+    File.open(fname, 'w') { |f| f.write('hellor ' + fname) }
+    r.add(fname)
+    count += 1
+  end
+  r.commit_index('my commit')
+end

data/examples/ex_index.rb

@@ -0,0 +1,14 @@
+require '../lib/grit'
+
+count = 1
+Dir.chdir("/Users/schacon/projects/atest") do
+  r = Grit::Repo.new('.')
+  i = r.index
+  while(count < 10) do
+    fname = Time.now.to_i.to_s + count.to_s
+    i.add(fname, 'hello ' + fname)
+    count += 1
+  end
+  puts i.commit('my commit')
+  puts i.inspect
+end

data/lib/grit/repo.rb

@@ -1,19 +1,11 @@
 module Grit
 
-  class RemoteError < StandardError
-  end
-
-  class RemoteNonexistentError < StandardError
-  end
-
-  class BranchNonexistentError < StandardError
-  end
-
-  class RemoteBranchExistsError < StandardError
-  end
-
-  class RemoteUninitializedError < StandardError
-  end
+  class RemoteError < StandardError; end
+  class RemoteNonexistentError < RemoteError; end
+  class BranchNonexistentError < RemoteError; end
+  class RemoteBranchExistsError < RemoteError; end
+  class RemoteUninitializedError < RemoteError; end
+  class ConflictError < RemoteError; end
 
   class Repo
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
@@ -541,12 +533,18 @@ module Grit
           raise RemoteNonexistentError, last_error
         elsif last_error =~ /ssh: Could not resolve hostname .*: nodename nor servname provided, or not known/
           raise RemoteNonexistentError, last_error
+        elsif last_error =~ /does not appear to be a git repository/
+          raise RemoteNonexistentError, last_error
         elsif last_error =~ /fatal: Couldn't find remote ref .*/
           raise BranchNonexistentError, last_error
         elsif last_error =~ /error: src refspec .* does not match any./
           raise BranchNonexistentError, last_error
         elsif last_error =~ /unknown revision or path not in the working tree/
           raise RemoteUninitializedError, last_error
+        elsif last_error =~ /error: Entry '.*' would be overwritten by merge. Cannot merge./
+          raise ConflictError, last_error
+        elsif last_error =~ /Entry '.*' not uptodate. Cannot merge./
+          raise ConflictError, last_error
         elsif last_error =~ /(error|fatal)/
           raise RemoteError, last_error
         end

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

data/test/test_blame.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/helper'
+require 'pp'
+
+class TestBlame < Test::Unit::TestCase
+
+  def setup
+    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
+  end
+
+  def test_simple_blame
+    commit = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    blame = @r.blame('History.txt', commit)
+    assert_equal 5, blame.lines.size
+    line = blame.lines[2]
+    assert_equal '* 1 major enhancement', line.line
+    assert_equal 3, line.lineno
+    assert_equal 3, line.oldlineno
+    assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', line.commit.id
+  end
+
+  def test_depth_blame
+    commit = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    blame = @r.blame('lib/grit.rb', commit)
+    assert_equal 37, blame.lines.size
+    line = blame.lines[24]
+    assert_equal "require 'grit/diff'", line.line
+    assert_equal 25, line.lineno
+    assert_equal 16, line.oldlineno
+    assert_equal '46291865ba0f6e0c9818b11be799fe2db6964d56', line.commit.id
+  end
+
+end

data/test/test_blame_tree.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/helper'
+require 'pp'
+
+class TestBlameTree < Test::Unit::TestCase
+  
+  def setup
+    @git = Git.new(File.join(File.dirname(__FILE__), *%w[dot_git]))
+  end
+
+  def test_blame_tree    
+    commit = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    tree = @git.blame_tree(commit)
+    last_commit_sha = tree['History.txt']
+    assert_equal last_commit_sha, '7bcc0ee821cdd133d8a53e8e7173a334fef448aa'
+  end
+
+  def test_blame_tree_path   
+    commit = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    tree = @git.blame_tree(commit, 'lib')
+    last_commit_sha = tree['lib/grit.rb']
+    assert_equal last_commit_sha, '5a0943123f6872e75a9b1dd0b6519dd42a186fda'
+    last_commit_sha = tree['lib/grit']
+    assert_equal last_commit_sha, '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+  end
+
+  def test_blame_tree_multi_path
+    commit = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    tree = @git.blame_tree(commit, 'lib/grit')
+    last_commit_sha = tree['lib/grit/diff.rb']
+    assert_equal last_commit_sha, '22825175e37f22c9418d756ca69b574d75602994'
+  end
+  
+end

data/test/test_blob.rb

@@ -0,0 +1,83 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestBlob < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+    @b = Blob.allocate
+  end
+
+  # blob
+  def test_nosuch_blob
+    t = @r.blob('blahblah')
+    assert t.is_a?(Blob)
+  end
+
+  def test_data_should_return_blob_contents
+    Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob'))
+    blob = Blob.create(@r, :id => 'abc')
+    assert_equal "Hello world", blob.data
+  end
+
+  def test_data_should_cache
+    Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob')).times(1)
+    blob = Blob.create(@r, :id => 'abc')
+    blob.data
+    blob.data
+  end
+
+  # size
+
+  def test_size_should_return_file_size
+    Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob_size'))
+    blob = Blob.create(@r, :id => 'abc')
+    assert_equal 11, blob.size
+  end
+
+  # data
+
+  # mime_type
+
+  def test_mime_type_should_return_mime_type_for_known_types
+    blob = Blob.create(@r, :id => 'abc', :name => 'foo.png')
+    assert_equal "image/png", blob.mime_type
+  end
+
+  def test_mime_type_should_return_text_plain_for_unknown_types
+    blob = Blob.create(@r, :id => 'abc')
+    assert_equal "text/plain", blob.mime_type
+  end
+
+  # blame
+
+  def test_blame
+    Git.any_instance.expects(:blame).returns(fixture('blame'))
+    b = Blob.blame(@r, 'master', 'lib/grit.rb')
+    assert_equal 13, b.size
+    assert_equal 25, b.inject(0) { |acc, x| acc + x.last.size }
+    assert_equal b[0].first.object_id, b[9].first.object_id
+    c = b.first.first
+    c.expects(:__bake__).times(0)
+    assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', c.id
+    assert_equal 'Tom Preston-Werner', c.author.name
+    assert_equal 'tom@mojombo.com', c.author.email
+    assert_equal Time.at(1191997100), c.authored_date
+    assert_equal 'Tom Preston-Werner', c.committer.name
+    assert_equal 'tom@mojombo.com', c.committer.email
+    assert_equal Time.at(1191997100), c.committed_date
+    assert_equal 'initial grit setup', c.message
+    # c.expects(:__bake__).times(1)
+    # assert_equal Tree, c.tree.class
+  end
+
+  # inspect
+
+  def test_inspect
+    @b = Blob.create(@r, :id => 'abc')
+    assert_equal %Q{#<Grit::Blob "abc">}, @b.inspect
+  end
+  
+  def test_basename
+    @b = Blob.create(@r, :name => 'foo/bar.rb')
+    assert_equal "bar.rb", @b.basename
+  end
+end