gitrb 0.2.1 → 0.2.2

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.2.1'
+  s.version = '0.2.2'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'
@@ -33,6 +33,7 @@ test/commit_test.rb
 test/helper.rb
 test/profile.rb
 test/repository_test.rb
+test/repository_init_test.rb
 test/trie_test.rb
 test/tree_test.rb
 }

data/lib/gitrb/gitobject.rb

@@ -7,7 +7,7 @@ module Gitrb
       @id = options[:id]
     end
 
-    def object
+    def git_object
       self
     end
 

data/lib/gitrb/reference.rb

@@ -9,9 +9,7 @@ module Gitrb
 
     def method_missing(name, *args, &block)
       if @object
-        unless name == :to_ary || name == :to_str
-          # Ruby 1.9 uses the presence of the to_ary and to_str methods to determine if an object is coercable.
-          # If we create these methods, Ruby will incorrectly think that the object can be converted to an array.
+        if @object.respond_to? name
           instance_eval %{def self.#{name}(*args, &block); @object.send("#{name}", *args, &block); end}
         end
         @object.send(name, *args, &block)
@@ -21,17 +19,12 @@ module Gitrb
         @properties[name]
       elsif @properties.include?(name.to_s)
         @properties[name.to_s]
-      elsif object
-        method_missing(name, *args, &block)
       else
-        super
+        @object = repository.get(id)
+        method_missing(name, *args, &block)
       end
     end
 
-    def object
-      @object ||= repository.get(id)
-    end
-
     def resolved?
       @object != nil
     end

data/lib/gitrb/repository.rb

@@ -17,6 +17,14 @@ module Gitrb
   class Repository
     attr_reader :path, :root, :branch, :head, :encoding
 
+    def self.git_path
+      @git_path ||= begin
+        path = `which git`.chomp
+        raise 'git not found' if $?.exitstatus != 0
+        path
+      end
+    end
+
     SHA_PATTERN = /^[A-Fa-f0-9]{5,40}$/
     REVISION_PATTERN = /^[\w\-\.]+([\^~](\d+)?)*$/
     DEFAULT_ENCODING = 'utf-8'
@@ -176,8 +184,8 @@ module Gitrb
                               :message => message.strip)
       end
       commits
-    rescue => ex
-      return [] if ex.message =~ /bad default revision 'HEAD'/i
+    rescue CommandError => ex
+      return [] if ex.output =~ /bad default revision 'HEAD'/i
       raise
     end
 
@@ -233,7 +241,7 @@ module Gitrb
         content, type = pack.get_object(offset)
       end
 
-      @logger.debug "gitrb: Loaded #{id}"
+      @logger.debug "gitrb: Loaded #{type} #{id}"
 
       set_encoding(id)
       object = GitObject.factory(type, :repository => self, :id => id, :data => content)
@@ -249,6 +257,8 @@ module Gitrb
     #
     # Returns the object.
     def put(object)
+      raise ArgumentError unless object && GitObject === object
+
       content = object.dump
       data = "#{object.type} #{content.bytesize rescue content.length}\0#{content}"
       id = sha(data)
@@ -273,22 +283,25 @@ module Gitrb
       object
     end
 
-    def method_missing(name, *args, &block)
+    def method_missing(name, *args)
       cmd = name.to_s
       if cmd[0..3] == 'git_'
-        ENV['GIT_DIR'] = path
         cmd = cmd[4..-1].tr('_', '-')
-        args = args.flatten.compact.map {|s| "'" + s.to_s.gsub("'", "'\\\\''") + "'" }.join(' ')
-        cmdline = "git #{cmd} #{args} 2>&1"
-
-        @logger.debug "gitrb: #{cmdline}"
-
-	# Read in binary mode (ascii-8bit) and convert afterwards
-        out = if block_given?
-		IO.popen(cmdline, 'rb', &block)
-	      else
-                set_encoding IO.popen(cmdline, 'rb') {|io| io.read }
-              end
+        args = args.flatten.compact.map {|a| a.to_s }
+
+        @logger.debug "gitrb: #{self.class.git_path} #{cmd} #{args.inspect}"
+
+        out = IO.popen('-', 'rb') do |io|
+          if io
+            # Read in binary mode (ascii-8bit) and convert afterwards
+            block_given? ? yield(io) : set_encoding(io.read)
+          else
+            # child's stderr goes to stdout
+            STDERR.reopen(STDOUT)
+            ENV['GIT_DIR'] = path
+            exec(self.class.git_path, cmd, *args)
+          end
+        end
 
         if $?.exitstatus > 0
           return '' if $?.exitstatus == 1 && out == ''
@@ -302,18 +315,13 @@ module Gitrb
     end
 
     def default_user
-      name = git_config('user.name').chomp
-      email = git_config('user.email').chomp
-      if name.empty?
-        require 'etc'
-        user = Etc.getpwnam(Etc.getlogin)
-        name = user.gecos
+      @default_user ||= begin
+        name = git_config('user.name').chomp
+        email = git_config('user.email').chomp
+        name = ENV['USER'] if name.empty?
+        email = ENV['USER'] + '@' + `hostname -f`.chomp if email.empty?
+        User.new(name, email)
       end
-      if email.empty?
-        require 'etc'
-        email = Etc.getlogin + '@' + `hostname -f`.chomp
-      end
-      User.new(name, email)
     end
 
     private
@@ -334,11 +342,7 @@ module Gitrb
       if create && !File.exists?("#{@path}/objects")
         FileUtils.mkpath(@path) if !File.exists?(@path)
         raise ArgumentError, "Not a valid Git repository: '#{@path}'" if !File.directory?(@path)
-        if @bare
-          Dir.chdir(@path) { git_init '--bare' }
-        else
-          Dir.chdir(@path[0..-6]) { git_init }
-        end
+        git_init(@bare ? '--bare' : nil)
       else
         raise ArgumentError, "Not a valid Git repository: '#{@path}'" if !File.directory?("#{@path}/objects")
       end

data/lib/gitrb/tree.rb

@@ -73,7 +73,7 @@ module Gitrb
 
     # Write an entry on specified path.
     def []=(path, entry)
-      raise ArgumentError if !entry
+      raise ArgumentError unless entry && GitObject === entry
       path = normalize_path(path)
       if path.empty?
         raise 'Empty path'

data/lib/gitrb/util.rb

@@ -40,4 +40,3 @@ if !1.respond_to?(:ord)
     end
   end
 end
-

data/test/bare_repository_test.rb

@@ -1,20 +1,11 @@
 require 'helper'
 
 describe Gitrb do
-
-  REPO = '/tmp/gitrb_test.git'
-
   before do
-    FileUtils.rm_rf REPO
-    Dir.mkdir REPO
-
-    @repo = Gitrb::Repository.new(:path => REPO, :create => true)
-  end
+    FileUtils.rm_rf REPO_PATH
+    Dir.mkdir REPO_PATH
 
-  it 'should fail to initialize without a valid git repository' do
-    lambda {
-      Gitrb::Repository.new('/foo', 'master', true)
-    }.should.raise(ArgumentError)
+    @repo = Gitrb::Repository.new(:path => REPO_PATH, :create => true, :bare => true)
   end
 
   it 'should save and load entries' do

data/test/benchmark.rb

@@ -3,13 +3,13 @@ require 'grit'
 require 'benchmark'
 require 'fileutils'
 
-REPO = '/tmp/gitrb'
+REPO_PATH = '/tmp/gitrb_test'
 
-FileUtils.rm_rf REPO
-FileUtils.mkpath REPO
-Dir.chdir REPO
+FileUtils.rm_rf REPO_PATH
+FileUtils.mkpath REPO_PATH
+Dir.chdir REPO_PATH
 
-repo = Gitrb::Repository.new(:path => REPO, :create => true)
+repo = Gitrb::Repository.new(:path => REPO_PATH, :create => true)
 
 grit = nil
 gitrb = nil

data/test/commit_test.rb

@@ -1,14 +1,11 @@
 require 'helper'
 
 describe Gitrb::Commit do
-
-  REPO = '/tmp/gitrb_test'
-
   before do
-    FileUtils.rm_rf REPO
-    Dir.mkdir REPO
+    FileUtils.rm_rf REPO_PATH
+    Dir.mkdir REPO_PATH
 
-    @repo = Gitrb::Repository.new(:path => REPO, :create => true)
+    @repo = Gitrb::Repository.new(:path => REPO_PATH, :create => true)
   end
 
   it "should dump in right format" do
@@ -36,12 +33,14 @@ This is a message"
     repo.root['a'] = Gitrb::Blob.new(:data => "Yay")
     commit = repo.commit("Commit Message", author, author)
 
-    IO.popen("git log") do |io|
-      io.gets.should.equal "commit #{commit.id}\n"
-      io.gets.should.equal "Author: hans <hans@email.de>\n"
-      io.gets.should.equal "Date:   Mon Apr 20 00:00:00 2009 #{Time.now.strftime('%z')}\n"
-      io.gets.should.equal "\n"
-      io.gets.should.equal "    Commit Message\n"
+    with_git_dir do
+      IO.popen("git log") do |io|
+        io.gets.should.equal "commit #{commit.id}\n"
+        io.gets.should.equal "Author: hans <hans@email.de>\n"
+        io.gets.should.equal "Date:   Mon Apr 20 00:00:00 2009 #{Time.now.strftime('%z')}\n"
+        io.gets.should.equal "\n"
+        io.gets.should.equal "    Commit Message\n"
+      end
     end
   end
 

data/test/helper.rb

@@ -11,13 +11,23 @@ module TestHelper
       open(file, 'w') { |io| io << data }
 
       repo.git_add(file)
-      repo.git_commit('-m', 'added #{file}')
+      repo.git_commit('-m', "added #{file}")
       File.unlink(file)
     end
   end
+
+  def with_git_dir
+    old_path = ENV['GIT_DIR']
+    ENV['GIT_DIR'] = repo.path
+    yield
+  ensure
+    ENV['GIT_DIR'] = old_path
+  end
 end
 
 class Bacon::Context
   include TestHelper
   attr_reader :repo
 end
+
+REPO_PATH = '/tmp/gitrb_test'

data/test/profile.rb

@@ -3,12 +3,12 @@ require 'fileutils'
 require 'grit'
 require 'ruby-prof'
 
-REPO = '/tmp/gitrb'
+REPO_PATH = '/tmp/gitrb_test'
 
-FileUtils.rm_rf REPO
-FileUtils.mkpath REPO
+FileUtils.rm_rf REPO_PATH
+FileUtils.mkpath REPO_PATH
 
-repo = Gitrb::Repository.new(:path => REPO, :create => true)
+repo = Gitrb::Repository.new(:path => REPO_PATH, :create => true)
 repo.transaction { 'aaa'.upto('jjj') { |key| repo.root[key] = Gitrb::Blob.new(:data => rand.to_s) } }
 
 result = RubyProf.profile do

data/test/repository_init_test.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+describe Gitrb do
+  it 'should fail to initialize without a valid git repository' do
+    File.exists?('/foo').should.be.false
+    lambda do
+      Gitrb::Repository.new(:path => '/foo', :branch => 'master', :bare => true)
+    end.should.raise(ArgumentError)
+    File.exists?('/foo').should.be.false
+    lambda do
+      Gitrb::Repository.new(:path => '/foo', :branch => 'master')
+    end.should.raise(ArgumentError)
+    File.exists?('/foo').should.be.false
+  end
+
+  it 'should create repository on relative path' do
+    FileUtils.rm_rf('/tmp/gitrb_test')
+    Dir.chdir('/tmp') do
+      Gitrb::Repository.new(:path => "gitrb_test/repo",
+                            :bare => true, :create => true)
+    end
+    File.directory?('/tmp/gitrb_test/repo').should.be.true
+    File.directory?('/tmp/gitrb_test/repo/objects').should.be.true
+    File.exists?('/tmp/gitrb_test/repo/.git').should.be.false
+
+    FileUtils.rm_rf('/tmp/gitrb_test')
+    Dir.chdir('/tmp') do
+      Gitrb::Repository.new(:path => "gitrb_test/repo", :create => true)
+    end
+    File.directory?('/tmp/gitrb_test/repo').should.be.true
+    File.directory?('/tmp/gitrb_test/repo/.git').should.be.true
+    File.directory?('/tmp/gitrb_test/repo/.git/objects').should.be.true
+  end
+end

data/test/repository_test.rb

@@ -1,19 +1,10 @@
 require 'helper'
 
 describe Gitrb do
-
-  REPO = '/tmp/gitrb_test'
-
   before do
-    FileUtils.rm_rf REPO
-    Dir.mkdir REPO
-    @repo = Gitrb::Repository.new(:path => REPO, :create => true)
-  end
-
-  it 'should fail to initialize without a valid git repository' do
-    lambda do
-      Gitrb::Repository.new(:path => '/')
-    end.should.raise(ArgumentError)
+    FileUtils.rm_rf REPO_PATH
+    Dir.mkdir REPO_PATH
+    @repo = Gitrb::Repository.new(:path => REPO_PATH, :create => true)
   end
 
   it 'should put and get objects by sha' do
@@ -77,8 +68,8 @@ describe Gitrb do
 
     repo.refresh
 
-    repo.root['x'].object.should.be.kind_of(Gitrb::Tree)
-    repo.root['y'].object.should.be.kind_of(Gitrb::Tree)
+    repo.root['x'].git_object.should.be.kind_of(Gitrb::Tree)
+    repo.root['y'].git_object.should.be.kind_of(Gitrb::Tree)
 
     repo.root['x']['a'].data.should.equal 'Hello'
     repo.root['y']['b'].data.should.equal 'World'
@@ -151,11 +142,12 @@ describe Gitrb do
 
     begin
       repo.transaction do
-        repo.root['a/b'] = 'Changed'
-        repo.root['x/a'] = 'Added'
-        raise
+        repo.root['a/b'] = Gitrb::Blob.new(:data => 'Changed')
+        repo.root['x/a'] = Gitrb::Blob.new(:data => 'Added')
+        raise 'boo'
       end
-    rescue
+    rescue RuntimeError => ex
+      ex.message.should.equal 'boo'
     end
 
     repo.root['a/b'].data.should.equal 'Hello'
@@ -172,8 +164,8 @@ describe Gitrb do
       repo.root['x/a'] = Gitrb::Blob.new(:data => 'Added')
     end
 
-    a = ls_tree(repo.root['a'].object.id)
-    x = ls_tree(repo.root['x'].object.id)
+    a = ls_tree(repo.root['a'].id)
+    x = ls_tree(repo.root['x'].id)
 
     a.should.equal [["100644", "blob", "b653cf27cef08de46da49a11fa5016421e9e3b32", "b"]]
     x.should.equal [["100644", "blob", "87d2b203800386b1cc8735a7d540a33e246357fa", "a"]]
@@ -203,9 +195,12 @@ describe Gitrb do
 
     ready = false
 
+    # This test case produces a deadlock in old ruby versions
+    # (Works in 1.8.7_p302 and 1.9)
     repo.transaction do
       Thread.start do
         repo.transaction do
+          sleep 0.1
           repo.root['a/b'] = Gitrb::Blob.new(:data => 'Changed by second thread')
         end
         ready = true
@@ -213,15 +208,14 @@ describe Gitrb do
       repo.root['a/b'] = Gitrb::Blob.new(:data => 'Changed')
     end
 
-    sleep 0.01 until ready
+    repo.root['a/b'].data.should.equal 'Changed'
 
-    repo.refresh
+    sleep 0.01 until ready
 
     repo.root['a/b'].data.should.equal 'Changed by second thread'
   end
 
   it 'should find all objects' do
-    repo.refresh
     repo.root['c'] = Gitrb::Blob.new(:data => 'Hello')
     repo.root['d'] = Gitrb::Blob.new(:data => 'World')
     repo.commit
@@ -231,6 +225,8 @@ describe Gitrb do
   end
 
   it "should load log" do
+    repo.log.should.be.empty
+
     repo.root['a'] = Gitrb::Blob.new(:data => 'a')
     repo.commit 'added a'
 
@@ -253,7 +249,7 @@ describe Gitrb do
     tag = repo.get(id)
 
     tag.tagtype.should.equal 'commit'
-    tag.object.object.should.equal repo.head
+    tag.object.git_object.should.equal repo.head
     tag.tagger.name.should.equal user.name
     tag.tagger.email.should.equal user.email
     tag.message.should =~ /message/

data/test/tree_test.rb

@@ -1,13 +1,11 @@
 require 'helper'
 
 describe Gitrb::Tree do
-  REPO = '/tmp/gitrb_test'
-
   before do
-    FileUtils.rm_rf REPO
-    Dir.mkdir REPO
+    FileUtils.rm_rf REPO_PATH
+    Dir.mkdir REPO_PATH
 
-    @repo = Gitrb::Repository.new(:path => REPO, :create => true)
+    @repo = Gitrb::Repository.new(:path => REPO_PATH, :create => true)
   end
 
   it "should write a table" do

data/test/trie_test.rb

@@ -1,7 +1,6 @@
 require 'gitrb'
 
 describe Gitrb::Trie do
-
   before do
     @trie = Gitrb::Trie.new
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - test/helper.rb
 - test/profile.rb
 - test/repository_test.rb
+- test/repository_init_test.rb
 - test/trie_test.rb
 - test/tree_test.rb
 has_rdoc: true