gitrb 0.0.3 → 0.0.4

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'
@@ -28,6 +28,7 @@ lib/gitrb/tag.rb
 lib/gitrb/tree.rb
 lib/gitrb/trie.rb
 lib/gitrb/user.rb
+lib/gitrb/util.rb
 test/bare_repository_spec.rb
 test/benchmark.rb
 test/commit_spec.rb

data/lib/gitrb/commit.rb

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

data/lib/gitrb/object.rb

@@ -27,6 +27,10 @@ module Gitrb
   class Reference
     undef_method :id, :type rescue nil
 
+    def sha
+      id
+    end
+
     def initialize(properties = {})
       @properties = properties
       @object = nil

data/lib/gitrb/pack.rb

@@ -1,5 +1,3 @@
-# -*- coding: us-ascii -*-
-
 #
 # converted from the gitrb project
 #
@@ -13,10 +11,6 @@
 
 require 'zlib'
 
-class String
-  def getord(i); self[i].ord; end
-end
-
 module Gitrb
   PACK_SIGNATURE = "PACK"
   PACK_IDX_SIGNATURE = "\377tOc"
@@ -165,7 +159,7 @@ module Gitrb
 
     def find_object(sha1)
       with_idx do |idx|
-        slot = sha1.getord(0)
+        slot = Util.ord(sha1, 0)
         return nil if !slot
         first, last = @offsets[slot,2]
         while first < last
@@ -206,13 +200,13 @@ module Gitrb
       obj_offset = offset
       packfile.seek(offset)
 
-      c = packfile.read(1).getord(0)
+      c = Util.ord(packfile.read(1), 0)
       size = c & 0xf
       type = (c >> 4) & 7
       shift = 4
       offset += 1
       while c & 0x80 != 0
-        c = packfile.read(1).getord(0)
+        c = Util.ord(packfile.read(1), 0)
         size |= ((c & 0x7f) << shift)
         shift += 7
         offset += 1
@@ -235,10 +229,10 @@ module Gitrb
 
       if type == OBJ_OFS_DELTA
         i = 0
-        c = data.getord(i)
+        c = Util.ord(data, i)
         base_offset = c & 0x7f
         while c & 0x80 != 0
-          c = data.getord(i += 1)
+          c = Util.ord(data, i += 1)
           base_offset += 1
           base_offset <<= 7
           base_offset |= c & 0x7f
@@ -285,18 +279,18 @@ module Gitrb
       dest_size, pos = patch_delta_header_size(delta, pos)
       dest = ""
       while pos < delta.size
-        c = delta.getord(pos)
+        c = Util.ord(delta, pos)
         pos += 1
         if c & 0x80 != 0
           pos -= 1
           cp_off = cp_size = 0
-          cp_off = delta.getord(pos += 1) if c & 0x01 != 0
-          cp_off |= delta.getord(pos += 1) << 8 if c & 0x02 != 0
-          cp_off |= delta.getord(pos += 1) << 16 if c & 0x04 != 0
-          cp_off |= delta.getord(pos += 1) << 24 if c & 0x08 != 0
-          cp_size = delta.getord(pos += 1) if c & 0x10 != 0
-          cp_size |= delta.getord(pos += 1) << 8 if c & 0x20 != 0
-          cp_size |= delta.getord(pos += 1) << 16 if c & 0x40 != 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_size = 0x10000 if cp_size == 0
           pos += 1
           dest << base[cp_off,cp_size]
@@ -314,7 +308,7 @@ module Gitrb
       size = 0
       shift = 0
       begin
-        c = delta.getord(pos)
+        c = Util.ord(delta, pos)
         if c == nil
           raise PackFormatError, 'invalid delta header'
         end

data/lib/gitrb/repository.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'fileutils'
 require 'logger'
 
+require 'gitrb/util'
 require 'gitrb/repository'
 require 'gitrb/object'
 require 'gitrb/blob'
@@ -19,13 +20,14 @@ module Gitrb
   class NotFound < StandardError; end
 
   class Repository
-    attr_reader :path, :index, :root, :branch, :lock_file, :head, :bare
+    attr_reader :path, :index, :root, :branch, :lock_file, :head, :encoding
 
     # 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'
 
       @path = options[:path]
       @path.chomp!('/')
@@ -47,6 +49,23 @@ 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
+    end
+
     # Switch branch
     def branch=(branch)
       @branch = branch
@@ -167,7 +186,7 @@ module Gitrb
         raise NotFound, "Bad object: #{id}" if content.length != size.to_i
       else
         list = @packs.find(id).to_a
-        return nil if list.size != 1
+        raise NotFound, "Object not found" if list.size != 1
 
         pack, offset = list.first
         content, type = pack.get_object(offset)
@@ -177,7 +196,7 @@ module Gitrb
 
       @logger.debug "gitrb: Loaded #{id}"
 
-      object = Gitrb::Object.factory(type, :repository => self, :id => id, :data => content)
+      object = Gitrb::Object.factory(type, :repository => self, :id => encode(id), :data => content)
       @objects.insert(id, object)
       object
     end
@@ -366,7 +385,7 @@ module Gitrb
     end
 
     def legacy_loose_object?(buf)
-      buf.getord(0) == 0x78 && ((buf.getord(0) << 8) + buf.getord(1)) % 31 == 0
+      Util.ord(buf, 0) == 0x78 && ((Util.ord(buf, 0) << 8) + Util.ord(buf, 1)) % 31 == 0
     end
 
   end

data/lib/gitrb/tag.rb

@@ -21,9 +21,9 @@ module Gitrb
         when 'type'
           @tagtype = value
         when 'object'
-          @object = Reference.new(:repository => repository, :id => value)
+          @object = Reference.new(:repository => repository, :id => repository.encode(value))
         when 'tagger'
-          @tagger = User.parse(value)
+          @tagger = User.parse(repository.encode(value))
         end
       end
 

data/lib/gitrb/tree.rb

@@ -1,23 +1,3 @@
-class StringIO
-  if RUBY_VERSION > '1.9'
-    def read_bytes_until(char)
-      str = ''
-      while ((ch = getc) != char) && !eof
-        str << ch
-      end
-      str
-    end
-  else
-    def read_bytes_until(char)
-      str = ''
-      while ((ch = getc.chr) != char) && !eof
-        str << ch
-      end
-      str
-    end
-  end
-end
-
 module Gitrb
 
   class Tree < Gitrb::Object
@@ -157,9 +137,9 @@ module Gitrb
       @children.clear
       data = StringIO.new(data)
       while !data.eof?
-        mode = data.read_bytes_until(' ')
-        name = data.read_bytes_until("\0")
-        id   = data.read(20).unpack("H*").first
+        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
         @children[name] = Reference.new(:repository => repository, :id => id, :mode => mode)
       end
     end

data/lib/gitrb/util.rb

@@ -0,0 +1,25 @@
+module Gitrb
+  module Util
+    if RUBY_VERSION > '1.9'
+      def self.read_bytes_until(io, char)
+        str = ''
+        while ((ch = io.getc) != char) && !io.eof
+          str << ch
+        end
+        str
+      end
+    else
+      def self.read_bytes_until(io, char)
+        str = ''
+        while ((ch = io.getc.chr) != char) && !io.eof
+          str << ch
+        end
+        str
+      end
+    end
+
+    def self.ord(s, i)
+      s[i].ord
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitrb
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 +01:00
+date: 2009-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - lib/gitrb/tree.rb
 - lib/gitrb/trie.rb
 - lib/gitrb/user.rb
+- lib/gitrb/util.rb
 - test/bare_repository_spec.rb
 - test/benchmark.rb
 - test/commit_spec.rb