gitrb 0.2.4 → 0.2.5

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.2.4'
+  s.version = '0.2.5'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'
@@ -27,6 +27,7 @@ lib/gitrb/tree.rb
 lib/gitrb/trie.rb
 lib/gitrb/user.rb
 lib/gitrb/util.rb
+lib/gitrb/version.rb
 test/bare_repository_test.rb
 test/benchmark.rb
 test/commit_test.rb

data/lib/gitrb/gitobject.rb

@@ -1,4 +1,6 @@
 module Gitrb
+
+  # Base class for blob, tree, commit and tag
   class GitObject
     attr_accessor :repository, :id
 
@@ -27,4 +29,5 @@ module Gitrb
       klass.new(*args)
     end
   end
+
 end

data/lib/gitrb/pack.rb

@@ -10,16 +10,6 @@
 #
 
 module Gitrb
-  PACK_SIGNATURE = "PACK"
-  PACK_IDX_SIGNATURE = "\377tOc"
-
-  OBJ_NONE = 0
-  OBJ_COMMIT = 1
-  OBJ_TREE = 2
-  OBJ_BLOB = 3
-  OBJ_TAG = 4
-
-  OBJ_TYPES = [nil, 'commit', 'tree', 'blob', 'tag'].freeze
 
   class FileWindow
     def initialize(file, version = 1)
@@ -42,8 +32,15 @@ module Gitrb
   class PackFormatError < StandardError; end
 
   class Pack
+    PACK_IDX_SIGNATURE = "\377tOc"
+
+    OBJ_COMMIT = 1
+    OBJ_TREE = 2
+    OBJ_BLOB = 3
+    OBJ_TAG = 4
     OBJ_OFS_DELTA = 6
     OBJ_REF_DELTA = 7
+    OBJ_TYPES = [nil, 'commit', 'tree', 'blob', 'tag'].freeze
 
     FanOutCount = 256
     SHA1Size = 20
@@ -55,8 +52,6 @@ module Gitrb
     EntrySize = OffsetSize + SHA1Size
     EntrySizeV2 = SHA1Size + CrcSize + OffsetSize
 
-    attr_reader :name
-
     def initialize(file)
       file = file[0...-3] + 'pack' if file =~ /\.idx$/
       @name = file
@@ -100,25 +95,23 @@ module Gitrb
       ver = idxfile.read(4).unpack("N")[0]
 
       if sig == PACK_IDX_SIGNATURE
-        if(ver != 2)
-          raise PackFormatError, "pack #@name has unknown pack file version #{ver}"
-        end
+        raise PackFormatError, "pack #@name has unknown pack file version #{ver}" if ver != 2
         @version = 2
       else
         @version = 1
       end
 
       idx = FileWindow.new(idxfile, @version)
-      result = yield idx
+      yield idx
+    ensure
       idxfile.close
-      result
     end
 
     def with_pack
       packfile = File.open(@name, 'rb')
-      result = yield packfile
+      yield packfile
+    ensure
       packfile.close
-      result
     end
 
     def init_pack
@@ -126,9 +119,7 @@ module Gitrb
         @offsets = [0]
         FanOutCount.times do |i|
           pos = idx[i * IdxOffsetSize,IdxOffsetSize].unpack('N')[0]
-          if pos < @offsets[i]
-            raise PackFormatError, "pack #@name has discontinuous index #{i}"
-          end
+          raise PackFormatError, "pack #@name has discontinuous index #{i}" if pos < @offsets[i]
           @offsets << pos
         end
         @size = @offsets[-1]
@@ -252,27 +243,24 @@ module Gitrb
       outdata = ""
       with_pack do |packfile|
         packfile.seek(offset)
-        zstr = Zlib::Inflate.new
-        while outdata.size < destsize
-          indata = packfile.read(0xFFFF)
-          if indata.size == 0
-            raise PackFormatError, 'error reading pack data'
+        begin
+          zstream = Zlib::Inflate.new
+          while outdata.size < destsize
+            indata = packfile.read(0xFFFF)
+            raise PackFormatError, 'error reading pack data' if indata.size == 0
+            outdata << zstream.inflate(indata)
           end
-          outdata << zstr.inflate(indata)
-        end
-        if outdata.size > destsize
-          raise PackFormatError, 'error reading pack data'
+          raise PackFormatError, 'error reading pack data' if outdata.size > destsize
+        ensure
+          zstream.close
         end
-        zstr.close
       end
       outdata
     end
 
     def patch_delta(base, delta)
       src_size, pos = patch_delta_header_size(delta, 0)
-      if src_size != base.size
-        raise PackFormatError, 'invalid delta data'
-      end
+      raise PackFormatError, 'invalid delta data' if src_size != base.size
 
       dest_size, pos = patch_delta_header_size(delta, pos)
       dest = ""
@@ -307,9 +295,7 @@ module Gitrb
       shift = 0
       begin
         c = delta[pos].ord
-        if c == nil
-          raise PackFormatError, 'invalid delta header'
-        end
+        raise PackFormatError, 'invalid delta header' if c == nil
         pos += 1
         size |= (c & 0x7f) << shift
         shift += 7
@@ -317,4 +303,5 @@ module Gitrb
       [size, pos]
     end
   end
+
 end

data/lib/gitrb/reference.rb

@@ -1,4 +1,6 @@
 module Gitrb
+
+  # Reference to GitObject to support lazy-loading of git-objects
   class Reference
     undef_method :id, :type rescue nil
 
@@ -29,4 +31,5 @@ module Gitrb
       @object != nil
     end
   end
+
 end

data/lib/gitrb/repository.rb

@@ -1,4 +1,5 @@
 module Gitrb
+
   class NotFound < StandardError; end
 
   class CommandError < StandardError
@@ -420,4 +421,5 @@ module Gitrb
       buf[0].ord == 0x78 && ((buf[0].ord << 8) | buf[1].ord) % 31 == 0
     end
   end
+
 end

data/lib/gitrb/trie.rb

@@ -1,4 +1,6 @@
 module Gitrb
+
+  # Trie data structure to store sha1s
   class Trie
     include Enumerable
 
@@ -91,4 +93,5 @@ module Gitrb
       key[@key.length].ord
     end
   end
+
 end

data/lib/gitrb/user.rb

@@ -1,4 +1,5 @@
 module Gitrb
+
   class User
     attr_reader :name, :email, :date
 
@@ -18,6 +19,6 @@ module Gitrb
         new match[1].strip, match[2].strip, Time.at(match[3].to_i)
       end
     end
-
   end
+
 end

data/lib/gitrb/version.rb

@@ -0,0 +1,3 @@
+module Gitrb
+  VERSION = '0.2.5'
+end

data/lib/gitrb.rb

@@ -5,6 +5,7 @@ require 'logger'
 require 'enumerator'
 require 'stringio'
 
+require 'gitrb/version'
 require 'gitrb/util'
 require 'gitrb/gitobject'
 require 'gitrb/reference'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitrb
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +02:00
+date: 2010-09-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,6 +57,7 @@ files:
 - lib/gitrb/trie.rb
 - lib/gitrb/user.rb
 - lib/gitrb/util.rb
+- lib/gitrb/version.rb
 - test/bare_repository_test.rb
 - test/benchmark.rb
 - test/commit_test.rb
@@ -73,23 +77,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: gitrb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Pure ruby git implementation