georgi-git_store 0.2.1 → 0.2.3

data/git_store.gemspec

@@ -1,7 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'git_store'
-  s.version = '0.2.1'
-  s.date = '2008-12-17'
+  s.version = '0.2.3'
   s.summary = 'a simple data store based on git'
   s.author = 'Matthias Georgi'
   s.email = 'matti.georgi@gmail.com'

data/lib/git_store/pack.rb

@@ -13,7 +13,15 @@ require 'zlib'
 
 class GitStore
   PACK_SIGNATURE = "PACK" 
-  PACK_IDX_SIGNATURE = "\377tOc" 
+  PACK_IDX_SIGNATURE = "\377tOc"
+  85
+  OBJ_NONE = 0
+  OBJ_COMMIT = 1
+  OBJ_TREE = 2
+  OBJ_BLOB = 3
+  OBJ_TAG = 4
+
+  OBJ_TYPES = [nil, 'commit', 'tree', 'blob', 'tag'].freeze
 
   class Mmap
     def initialize(file, version = 1)
@@ -111,8 +119,10 @@ class GitStore
     
     def with_packfile
       packfile = File.open(@name)
-      yield packfile
+      result = yield packfile
       packfile.close
+
+      result
     end
     
     def cache_objects
@@ -272,14 +282,12 @@ class GitStore
     private :find_object
     
     def parse_object(offset)
-      obj = nil
-      with_packfile do |packfile|
-        data, type = unpack_object(packfile, offset)
-        obj = RawObject.new(OBJ_TYPES[type], data)
+      data, type = with_packfile do |packfile|
+        unpack_object(packfile, offset)
       end
-      obj
+
+      return data, OBJ_TYPES[type]
     end
-    protected :parse_object
 
     def unpack_object(packfile, offset, options = {})
       obj_offset = offset

data/lib/git_store/tree.rb

@@ -1,5 +1,3 @@
-require 'strscan'
-
 class GitStore
 
   class Tree
@@ -50,6 +48,7 @@ class GitStore
     def load_from_disk
       dir = File.join(store.path, self.path)
       entries = Dir.entries(dir) - ['.', '..']
+
       @table = entries.inject({}) do |hash, name|
         if name[-1, 1] != '~' && name[0, 1] != '.'
           path = "#{dir}/#{name}"
@@ -71,11 +70,13 @@ class GitStore
     #
     # Return an array of [mode, name, id] entries.
     def read_contents(data)
-      scanner = StringScanner.new(data)
       contents = []
-      
-      while scanner.scan(/(.*?) (.*?)\0(.{20})/m)
-        contents << [scanner[1], scanner[2], scanner[3].unpack("H*").first]
+
+      while data.size > 0
+        mode, data = data.split(" ", 2)
+        name, data = data.split("\0", 2)
+        id = data.slice!(0, 20).unpack("H*").first
+        contents << [ mode, name, id ]
       end
 
       contents

data/lib/git_store.rb

@@ -43,6 +43,7 @@ class GitStore
     @path   = path.chomp('/')
     @branch = branch
     @root   = Tree.new(self)
+    @packs  = {}
     
     load_packs("#{path}/.git/objects/pack")
     load
@@ -210,26 +211,18 @@ class GitStore
     
     if File.exists?(path)
       buf = open(path, "rb") { |f| f.read }
+
+      raise if not legacy_loose_object?(buf)
+      
+      header, content = Zlib::Inflate.inflate(buf).split(/\0/, 2)
+      type, size = header.split(/ /, 2)
     else
-      get_object_from_pack(id)
+      content, type = get_object_from_pack(id)
     end
     
-    raise if not legacy_loose_object?(buf)
-    
-    header, content = Zlib::Inflate.inflate(buf).split(/\0/, 2)
-    type, size = header.split(/ /, 2)
-    
-    raise if size.to_i != content.size
-    
     return content, type
   end
 
-  def get_object_from_pack(id)
-    packs.each do |pack|
-      data = pack[id] and return data
-    end
-  end      
-
   # Returns the hash value of an object string.
   def sha(str)
     Digest::SHA1.hexdigest(str)[0, 40]
@@ -244,7 +237,7 @@ class GitStore
     data = header + content
     
     id = sha(data)
-    path = object_path(id)
+    path = object_path(id)    
     
     unless File.exists?(path)
       FileUtils.mkpath(File.dirname(path))
@@ -258,14 +251,27 @@ class GitStore
 
   def legacy_loose_object?(buf)
     word = (buf[0] << 8) + buf[1]
+    
     buf[0] == 0x78 && word % 31 == 0
   end  
 
+  def get_object_from_pack(id)
+    pack, offset = @packs[id]
+        
+    pack.parse_object(offset) if pack
+  end      
+
   def load_packs(path)
     if File.directory?(path)
-      Dir.open(path) do |dir|
+      Dir.open(path) do |dir|        
         entries = dir.select { |entry| entry =~ /\.pack$/i }
-        @packs = entries.map { |entry| PackStorage.new(File.join(path, entry)) }
+        entries.each do |entry|
+          pack = PackStorage.new(File.join(path, entry))
+          pack.each_entry do |id, offset|
+            id = id.unpack("H*").first
+            @packs[id] = [pack, offset]
+          end
+        end
       end
     end
   end

data/test/git_store_spec.rb

@@ -1,6 +1,4 @@
 require 'git_store'
-require 'yaml'
-require 'pp'
 
 describe GitStore do
 
@@ -74,7 +72,7 @@ describe GitStore do
   it 'should load a repo' do
     file 'a', 'Hello'
     file 'b', 'World'
-
+   
     store.load
 
     store['a'].should == 'Hello'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: georgi-git_store
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Matthias Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2009-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: []