gitrb 0.0.5 → 0.0.6

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'

data/lib/gitrb/commit.rb

@@ -47,20 +47,20 @@ module Gitrb
 
     def parse(data)
       headers, @message = data.split("\n\n", 2)
-      repository.encode(@message)
+      repository.set_encoding(@message)
 
       headers.split("\n").each do |header|
         key, value = header.split(' ', 2)
 
         case key
         when 'parent'
-          @parent << Reference.new(:repository => repository, :id => repository.encode(value))
+          @parent << Reference.new(:repository => repository, :id => repository.set_encoding(value))
         when 'author'
-          @author = User.parse(repository.encode(value))
+          @author = User.parse(repository.set_encoding(value))
         when 'committer'
-          @committer = User.parse(repository.encode(value))
+          @committer = User.parse(repository.set_encoding(value))
         when 'tree'
-          @tree = Reference.new(:repository => repository, :id => repository.encode(value))
+          @tree = Reference.new(:repository => repository, :id => repository.set_encoding(value))
         end
       end
 

data/lib/gitrb/pack.rb

@@ -159,7 +159,7 @@ module Gitrb
 
     def find_object(sha1)
       with_idx do |idx|
-        slot = Util.ord(sha1, 0)
+        slot = sha1[0].ord
         return nil if !slot
         first, last = @offsets[slot,2]
         while first < last
@@ -200,13 +200,13 @@ module Gitrb
       obj_offset = offset
       packfile.seek(offset)
 
-      c = Util.ord(packfile.read(1), 0)
+      c = packfile.read(1)[0].ord
       size = c & 0xf
       type = (c >> 4) & 7
       shift = 4
       offset += 1
       while c & 0x80 != 0
-        c = Util.ord(packfile.read(1), 0)
+        c = packfile.read(1)[0].ord
         size |= ((c & 0x7f) << shift)
         shift += 7
         offset += 1
@@ -229,10 +229,10 @@ module Gitrb
 
       if type == OBJ_OFS_DELTA
         i = 0
-        c = Util.ord(data, i)
+        c = data[i].ord
         base_offset = c & 0x7f
         while c & 0x80 != 0
-          c = Util.ord(data, i += 1)
+          c = data[i += 1].ord
           base_offset += 1
           base_offset <<= 7
           base_offset |= c & 0x7f
@@ -279,18 +279,18 @@ module Gitrb
       dest_size, pos = patch_delta_header_size(delta, pos)
       dest = ""
       while pos < delta.size
-        c = Util.ord(delta, pos)
+        c = delta[pos].ord
         pos += 1
         if c & 0x80 != 0
           pos -= 1
           cp_off = cp_size = 0
-          cp_off = Util.ord(delta, pos += 1) if c & 0x01 != 0
-          cp_off |= Util.ord(delta, pos += 1) << 8 if c & 0x02 != 0
-          cp_off |= Util.ord(delta, pos += 1) << 16 if c & 0x04 != 0
-          cp_off |= Util.ord(delta, pos += 1) << 24 if c & 0x08 != 0
-          cp_size = Util.ord(delta, pos += 1) if c & 0x10 != 0
-          cp_size |= Util.ord(delta, pos += 1) << 8 if c & 0x20 != 0
-          cp_size |= Util.ord(delta, pos += 1) << 16 if c & 0x40 != 0
+          cp_off = delta[pos += 1].ord if c & 0x01 != 0
+          cp_off |= delta[pos += 1].ord << 8 if c & 0x02 != 0
+          cp_off |= delta[pos += 1].ord << 16 if c & 0x04 != 0
+          cp_off |= delta[pos += 1].ord << 24 if c & 0x08 != 0
+          cp_size = delta[pos += 1].ord if c & 0x10 != 0
+          cp_size |= delta[pos += 1].ord << 8 if c & 0x20 != 0
+          cp_size |= delta[pos += 1].ord << 16 if c & 0x40 != 0
           cp_size = 0x10000 if cp_size == 0
           pos += 1
           dest << base[cp_off,cp_size]
@@ -308,7 +308,7 @@ module Gitrb
       size = 0
       shift = 0
       begin
-        c = Util.ord(delta, pos)
+        c = delta[pos].ord
         if c == nil
           raise PackFormatError, 'invalid delta header'
         end

data/lib/gitrb/repository.rb

@@ -22,12 +22,24 @@ module Gitrb
   class Repository
     attr_reader :path, :index, :root, :branch, :lock_file, :head, :encoding
 
+    SHA_PATTERN = /[A-Fa-f0-9]{5,40}/
+    REVISION_PATTERN = /[\w\-\.]+([\^~](\d+)?)*/
+
+    # Encoding stuff
+    DEFAULT_ENCODING = 'utf-8'
+
+    if RUBY_VERSION > '1.9'
+      def set_encoding(s); s.force_encoding(@encoding); end
+    else
+      def set_encoding(s); s; end
+    end
+
     # Initialize a repository.
     def initialize(options = {})
       @bare    = options[:bare] || false
       @branch  = options[:branch] || 'master'
       @logger  = options[:logger] || Logger.new(nil)
-      @encoding = options[:encoding] || 'utf-8'
+      @encoding = options[:encoding] || DEFAULT_ENCODING
 
       @path = options[:path]
       @path.chomp!('/')
@@ -49,18 +61,6 @@ module Gitrb
       load
     end
 
-    # Encode string
-    if RUBY_VERSION > '1.9'
-      def encode(s)
-        # We have binary data which has to be encoded
-        s.force_encoding(@encoding)
-      end
-    else
-      def encode(s)
-        s
-      end
-    end
-
     # Bare repository?
     def bare?
       @bare
@@ -89,9 +89,15 @@ module Gitrb
 
     # Diff
     def diff(from, to, path = nil)
-      from = from.id if Commit === from
-      to = to.id if Commit === to
-      Diff.new(from, to, git_diff('--full-index', from, to, '--', path))
+      if from && !(Commit === from)
+        raise ArgumentError if !(String === from)
+        from = Reference.new(:repository => self, :id => from)
+      end
+      if !(Commit === to)
+        raise ArgumentError if !(String === to)
+        to = Reference.new(:repository => self, :id => to)
+      end
+      Diff.new(from, to, git_diff_tree('--root', '-u', '--full-index', from && from.id, to.id, '--', path))
     end
 
     # All changes made inside a transaction are atomic. If some
@@ -155,7 +161,7 @@ module Gitrb
       end
       commits
     rescue => ex
-      return [] if ex.message =~ /bad default revision 'HEAD'/
+      return [] if ex.message =~ /bad default revision 'HEAD'/i
       raise
     end
 
@@ -163,20 +169,29 @@ module Gitrb
     #
     # Returns a tree, blob, commit or tag object.
     def get(id)
-      return nil if id.nil? || id.length < 5
-      list = @objects.find(id).to_a
-      return list.first if list.size == 1
+      raise NotFound, "No id given" if id.nil?
+      if id =~ SHA_PATTERN
+        raise NotFound, "Sha too short" if id.length < 5
+        list = @objects.find(id).to_a
+        return list.first if list.size == 1
+      elsif id =~ REVISION_PATTERN
+        list = git_rev_parse(id).split("\n") rescue nil
+        raise NotFound, "Revision not found" if !list || list.empty?
+        raise NotFound, "Revision is ambiguous" if list.size > 1
+        id = list.first
+      end
 
       @logger.debug "gitrb: Loading #{id}"
 
       path = object_path(id)
       if File.exists?(path) || (glob = Dir.glob(path + '*')).size >= 1
         if glob
-          raise NotFound, "Sha not unique" if glob.size > 1
-          path = glob[0]
+          raise NotFound, "Sha is ambiguous" if glob.size > 1
+          path = glob.first
+          id = path[-41..-40] + path[-38..-1]
         end
 
-        buf = File.open(path, "rb") { |f| f.read }
+        buf = File.open(path, 'rb') { |f| f.read }
 
         raise NotFound, "Not a loose object: #{id}" if !legacy_loose_object?(buf)
 
@@ -185,18 +200,22 @@ module Gitrb
 
         raise NotFound, "Bad object: #{id}" if content.length != size.to_i
       else
-        list = @packs.find(id).to_a
-        raise NotFound, "Object not found" if list.size != 1
+        trie = @packs.find(id)
+	raise NotFound, "Object not found" if !trie
+
+        id += trie.key[-(41 - id.length)...-1]
+
+        list = trie.to_a
+	raise NotFound, "Sha is ambiguous" if list.size > 1
 
         pack, offset = list.first
         content, type = pack.get_object(offset)
       end
 
-      raise NotFound, "Object not found" if !type
-
       @logger.debug "gitrb: Loaded #{id}"
 
-      object = Gitrb::Object.factory(type, :repository => self, :id => encode(id), :data => content)
+      set_encoding(id)
+      object = Gitrb::Object.factory(type, :repository => self, :id => id, :data => content)
       @objects.insert(id, object)
       object
     end
@@ -225,6 +244,7 @@ module Gitrb
 
       @logger.debug "gitrb: Stored #{id}"
 
+      set_encoding(id)
       object.repository = self
       object.id = id
       @objects.insert(id, object)
@@ -242,10 +262,11 @@ module Gitrb
 
         @logger.debug "gitrb: #{cmd}"
 
+	# Read in binary mode (ascii-8bit) and convert afterwards
         out = if block_given?
-                IO.popen(cmd, &block)
-              else
-                `#{cmd}`.chomp
+		IO.popen(cmd, 'rb', &block)
+	      else
+                set_encoding IO.popen(cmd, 'rb') {|io| io.read }
               end
 
         if $?.exitstatus > 0
@@ -385,7 +406,7 @@ module Gitrb
     end
 
     def legacy_loose_object?(buf)
-      Util.ord(buf, 0) == 0x78 && ((Util.ord(buf, 0) << 8) + Util.ord(buf, 1)) % 31 == 0
+      buf[0].ord == 0x78 && ((buf[0].ord << 8) | buf[1].ord) % 31 == 0
     end
 
   end

data/lib/gitrb/tag.rb

@@ -14,6 +14,7 @@ module Gitrb
 
     def parse(data)
       headers, @message = data.split("\n\n", 2)
+      repository.set_encoding(@message)
 
       headers.split("\n").each do |header|
         key, value = header.split(' ', 2)
@@ -21,9 +22,9 @@ module Gitrb
         when 'type'
           @tagtype = value
         when 'object'
-          @object = Reference.new(:repository => repository, :id => repository.encode(value))
+          @object = Reference.new(:repository => repository, :id => repository.set_encoding(value))
         when 'tagger'
-          @tagger = User.parse(repository.encode(value))
+          @tagger = User.parse(repository.set_encoding(value))
         end
       end
 

data/lib/gitrb/tree.rb

@@ -24,8 +24,8 @@ module Gitrb
 
     # Set new repository (modified flag is reset)
     def id=(id)
-      super
       @modified = false
+      super
     end
 
     # Has this tree been modified?
@@ -36,7 +36,7 @@ module Gitrb
     def dump
       @children.to_a.sort {|a,b| a.first <=> b.first }.map do |name, child|
 	child.save if !(Reference === child) || child.resolved?
-        "#{child.mode} #{name}\0#{[child.id].pack("H*")}"
+        "#{child.mode} #{name}\0#{repository.set_encoding [child.id].pack("H*")}"
       end.join
     end
 
@@ -137,9 +137,9 @@ module Gitrb
       @children.clear
       data = StringIO.new(data)
       while !data.eof?
-        mode = repository.encode Util.read_bytes_until(data, ' ')
-        name = repository.encode Util.read_bytes_until(data, "\0")
-        id   = repository.encode data.read(20).unpack("H*").first
+        mode = repository.set_encoding Util.read_bytes_until(data, ' ')
+        name = repository.set_encoding Util.read_bytes_until(data, "\0")
+        id   = repository.set_encoding data.read(20).unpack("H*").first
         @children[name] = Reference.new(:repository => repository, :id => id, :mode => mode)
       end
     end

data/lib/gitrb/util.rb

@@ -17,9 +17,5 @@ module Gitrb
         str
       end
     end
-
-    def self.ord(s, i)
-      s[i].ord
-    end
   end
 end

data/test/repository_spec.rb

@@ -17,9 +17,40 @@ describe Gitrb do
   end
 
   it 'should fail to initialize without a valid git repository' do
-    lambda {
+    lambda do
       Gitrb::Repository.new(:path => '/')
-    }.should raise_error(ArgumentError)
+    end.should raise_error(ArgumentError)
+  end
+
+  it 'should put and get objects by sha' do
+    blob1 = repo.put(Gitrb::Blob.new(:data => 'Hello'))
+    blob2 = repo.put(Gitrb::Blob.new(:data => 'World'))
+
+    repo.get(blob1.id).should === blob1
+    repo.get(blob1.id[0..4]).should === blob1
+    repo.get(blob1.id[0..10]).should === blob1
+
+    repo.get(blob2.id).should === blob2
+    repo.get(blob2.id[0..4]).should === blob2
+    repo.get(blob2.id[0..10]).should === blob2
+  end
+
+  it 'should find commits by revision' do
+    repo.root['a'] = Gitrb::Blob.new(:data => 'Hello')
+    commit1 = repo.commit
+
+    repo.get('HEAD').should === commit1
+    repo.get('master').should === commit1
+    lambda { repo.get('HEAD^') }.should raise_error(Gitrb::NotFound)
+
+    repo.root['a'] = Gitrb::Blob.new(:data => 'World')
+    commit2 = repo.commit
+
+    repo.get('master').should === commit2
+    repo.get('HEAD').should === commit2
+    repo.get('HEAD^').should === commit1
+    repo.get('HEAD~').should === commit1
+    lambda { repo.get('HEAD^^') }.should raise_error(Gitrb::NotFound)
   end
 
   it 'should find modified entries' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitrb
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-20 00:00:00 +01:00
+date: 2009-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: []