grit 1.1.1 → 2.0.0

data/lib/grit/git-ruby/git_object.rb

@@ -1,7 +1,7 @@
 #
 # converted from the gitrb project
 #
-# authors: 
+# authors:
 #    Matthias Lederhofer <matled@gmx.net>
 #    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
 #    Scott Chacon <schacon@gmail.com>
@@ -24,7 +24,7 @@ module Grit
       @email = ''
       @date = Time.now
       @offset = 0
-      
+
       m = /^(.*?) <(.*)> (\d+) ([+-])0*(\d+?)$/.match(str)
       if !m
         case str
@@ -50,7 +50,7 @@ module Grit
   class GitObject
     attr_accessor :repository
 
-    def GitObject.from_raw(rawobject, repository = nil)      
+    def GitObject.from_raw(rawobject, repository = nil)
       case rawobject.type
       when :blob
         return Blob.from_raw(rawobject, repository)
@@ -110,7 +110,7 @@ module Grit
     S_IFLNK =  0120000
     S_IFREG =  0100000
     S_IFDIR =  0040000
-    S_IFGITLINK = 0160000 
+    S_IFGITLINK = 0160000
     attr_accessor :mode, :name, :sha1
     def initialize(mode, filename, sha1o)
       @mode = 0
@@ -170,7 +170,7 @@ module Grit
     def format_mode
       "%06o" % @mode
     end
-    
+
     def raw
       "%o %s\0%s" % [@mode, @name, [@sha1].pack("H*")]
     end
@@ -191,20 +191,20 @@ module Grit
     string
   end
 
-  
+
   class Tree < GitObject
     attr_accessor :entry
 
     def self.from_raw(rawobject, repository=nil)
       raw = StringIO.new(rawobject.content)
-  
+
       entries = []
       while !raw.eof?
         mode      = Grit::GitRuby.read_bytes_until(raw, ' ')
         file_name = Grit::GitRuby.read_bytes_until(raw, "\0")
         raw_sha   = raw.read(20)
         sha = raw_sha.unpack("H*").first
-        
+
         entries << DirectoryEntry.new(mode, file_name, sha)
       end
       new(entries, repository)
@@ -224,7 +224,7 @@ module Grit
       #@entry.sort { |a,b| a.name <=> b.name }.
       @entry.collect { |e| [[e.format_mode, e.format_type, e.sha1].join(' '), e.name].join("\t") }.join("\n")
     end
-    
+
     def actual_raw
       #@entry.collect { |e| e.raw.join(' '), e.name].join("\t") }.join("\n")
     end
@@ -280,28 +280,28 @@ module Grit
         @parent.collect { |i| "parent %s\n" % i }.join,
         @author, @committer] + @message
     end
-    
+
     def raw_log(sha)
       output = "commit #{sha}\n"
       output += @headers + "\n\n"
       output += @message.split("\n").map { |l| '    ' + l }.join("\n") + "\n\n"
     end
-    
+
   end
 
   class Tag < GitObject
     attr_accessor :object, :type, :tag, :tagger, :message
 
     def self.from_raw(rawobject, repository=nil)
-      
+
       headers, message = rawobject.content.split(/\n\n/, 2)
       headers = headers.split(/\n/).map { |header| header.split(' ', 2) }
-      
+
       object = ''
       type = ''
       tag = ''
       tagger = ''
-      
+
       headers.each do |key, value|
         case key
         when "object"

data/lib/grit/git-ruby/internal/file_window.rb

@@ -1,7 +1,7 @@
 #
 # converted from the gitrb project
 #
-# authors: 
+# authors:
 #    Matthias Lederhofer <matled@gmx.net>
 #    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
 #    Scott Chacon <schacon@gmail.com>
@@ -9,8 +9,8 @@
 # provides native ruby access to git objects and pack files
 #
 
-module Grit 
-  module GitRuby 
+module Grit
+  module GitRuby
     module Internal
       class FileWindow
         def initialize(file, version = 1)
@@ -53,6 +53,6 @@ module Grit
         end
       end
     end
-  end 
+  end
 end
 

data/lib/grit/git-ruby/internal/loose.rb

@@ -1,7 +1,7 @@
 #
 # converted from the gitrb project
 #
-# authors: 
+# authors:
 #    Matthias Lederhofer <matled@gmx.net>
 #    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
 #    Scott Chacon <schacon@gmail.com>
@@ -14,7 +14,7 @@ require 'digest/sha1'
 require 'grit/git-ruby/internal/raw_object'
 
 module Grit
-  module GitRuby 
+  module GitRuby
     module Internal
       class LooseObjectError < StandardError
       end
@@ -65,16 +65,16 @@ module Grit
         def put_raw_object(content, type)
           size = content.length.to_s
           LooseStorage.verify_header(type, size)
-          
+
           header = "#{type} #{size}\0"
           store = header + content
-                    
+
           sha1 = Digest::SHA1.hexdigest(store)
           path = @directory+'/'+sha1[0...2]+'/'+sha1[2..40]
-          
+
           if !File.exists?(path)
             content = Zlib::Deflate.deflate(store)
-          
+
             FileUtils.mkdir_p(@directory+'/'+sha1[0...2])
             File.open(path, 'wb') do |f|
               f.write content
@@ -82,17 +82,17 @@ module Grit
           end
           return sha1
         end
-        
+
         # simply figure out the sha
         def self.calculate_sha(content, type)
           size = content.length.to_s
           verify_header(type, size)
           header = "#{type} #{size}\0"
           store = header + content
-                    
+
           Digest::SHA1.hexdigest(store)
         end
-        
+
         def self.verify_header(type, size)
           if !%w(blob tree commit tag).include?(type) || size !~ /^\d+$/
             raise LooseObjectError, "invalid object header"
@@ -132,6 +132,6 @@ module Grit
         end
         private :legacy_loose_object?
       end
-    end 
+    end
   end
 end

data/lib/grit/git-ruby/internal/pack.rb

@@ -1,7 +1,7 @@
 #
 # converted from the gitrb project
 #
-# authors: 
+# authors:
 #    Matthias Lederhofer <matled@gmx.net>
 #    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
 #    Scott Chacon <schacon@gmail.com>
@@ -13,11 +13,11 @@ require 'zlib'
 require 'grit/git-ruby/internal/raw_object'
 require 'grit/git-ruby/internal/file_window'
 
-PACK_SIGNATURE = "PACK" 
-PACK_IDX_SIGNATURE = "\377tOc" 
+PACK_SIGNATURE = "PACK"
+PACK_IDX_SIGNATURE = "\377tOc"
 
-module Grit 
-  module GitRuby 
+module Grit
+  module GitRuby
     module Internal
       class PackFormatError < StandardError
       end
@@ -44,7 +44,7 @@ module Grit
           @cache = {}
           init_pack
         end
-        
+
         def with_idx(index_file = nil)
           if !index_file
             index_file = @name
@@ -52,35 +52,35 @@ module Grit
           else
             idxfile = File.open(index_file, 'rb')
           end
-          
+
           # read header
           sig = idxfile.read(4)
           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            
+            end
             @version = 2
           else
             @version = 1
           end
-                    
+
           idx = FileWindow.new(idxfile, @version)
           yield idx
           idx.unmap
           idxfile.close
         end
-        
+
         def with_packfile
           packfile = File.open(@name, 'rb')
           yield packfile
           packfile.close
         end
-        
+
         def cache_objects
           @cache = {}
-          with_packfile do |packfile|          
+          with_packfile do |packfile|
             each_entry do |sha, offset|
               data, type = unpack_object(packfile, offset, {:caching => true})
               if data
@@ -93,7 +93,7 @@ module Grit
         def name
           @name
         end
-        
+
         def close
           # shouldnt be anything open now
         end
@@ -104,12 +104,12 @@ module Grit
           each_sha1 { |sha| shas << sha.unpack("H*")[0] }
           shas
         end
-        
+
         def [](sha1)
           if obj = @cache[sha1]
-            return obj 
+            return obj
           end
-          
+
           offset = find_object(sha1)
           return nil if !offset
           @cache[sha1] = obj = parse_object(offset)
@@ -129,7 +129,7 @@ module Grit
             @size = @offsets[-1]
           end
         end
-        
+
         def each_entry
           with_idx do |idx|
             if @version == 2
@@ -148,7 +148,7 @@ module Grit
             end
           end
         end
-        
+
         def read_data_v2(idx)
           data = []
           pos = OffsetStart
@@ -169,7 +169,7 @@ module Grit
           data
         end
         private :read_data_v2
-        
+
         def each_sha1
           with_idx do |idx|
             if @version == 2
@@ -191,7 +191,7 @@ module Grit
         def find_object_in_index(idx, sha1)
           slot = sha1.getord(0)
           return nil if !slot
-          first, last = @offsets[slot,2] 
+          first, last = @offsets[slot,2]
           while first < last
             mid = (first + last) / 2
             if @version == 2
@@ -224,16 +224,16 @@ module Grit
           end
           nil
         end
-        
+
         def find_object(sha1)
           obj = nil
           with_idx do |idx|
             obj = find_object_in_index(idx, sha1)
           end
           obj
-        end    
+        end
         private :find_object
-        
+
         def parse_object(offset)
           obj = nil
           with_packfile do |packfile|
@@ -259,9 +259,9 @@ module Grit
             shift += 7
             offset += 1
           end
-        
+
           return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
-          
+
           case type
           when OBJ_OFS_DELTA, OBJ_REF_DELTA
             data, type = unpack_deltified(packfile, type, offset, obj_offset, size, options)
@@ -297,9 +297,9 @@ module Grit
           end
 
           base, type = unpack_object(packfile, base_offset)
-          
+
           return [false, false] if !(type == OBJ_COMMIT || type == OBJ_TREE) && options[:caching]
-          
+
           delta = unpack_compressed(offset, size)
           [patch_delta(base, delta), type]
         end
@@ -378,5 +378,5 @@ module Grit
         private :patch_delta_header_size
       end
     end
-  end 
+  end
 end

data/lib/grit/git-ruby/internal/raw_object.rb

@@ -1,7 +1,7 @@
 #
 # converted from the gitrb project
 #
-# authors: 
+# authors:
 #    Matthias Lederhofer <matled@gmx.net>
 #    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
 #
@@ -10,8 +10,8 @@
 
 require 'digest/sha1'
 
-module Grit 
-  module GitRuby 
+module Grit
+  module GitRuby
     module Internal
       OBJ_NONE = 0
       OBJ_COMMIT = 1
@@ -32,6 +32,6 @@ module Grit
           Digest::SHA1.digest("%s %d\0" % [@type, @content.length] + @content)
         end
       end
-    end 
+    end
   end
 end

data/lib/grit/git-ruby/object.rb

@@ -1,7 +1,7 @@
 #
 # converted from the gitrb project
 #
-# authors: 
+# authors:
 #    Matthias Lederhofer <matled@gmx.net>
 #    Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
 #    Scott Chacon <schacon@gmail.com>
@@ -40,7 +40,7 @@ module Grit
   class Object
     attr_accessor :repository
 
-    def Object.from_raw(rawobject, repository = nil)      
+    def Object.from_raw(rawobject, repository = nil)
       case rawobject.type
       when :blob
         return Blob.from_raw(rawobject, repository)
@@ -154,7 +154,7 @@ module Grit
     def format_mode
       "%06o" % @mode
     end
-    
+
     def raw
       "%o %s\0%s" % [@mode, @name, [@sha1].pack("H*")]
     end
@@ -175,20 +175,20 @@ module Grit
     string
   end
 
-  
+
   class Tree < Object
     attr_accessor :entry
 
     def self.from_raw(rawobject, repository=nil)
       raw = StringIO.new(rawobject.content)
-  
+
       entries = []
       while !raw.eof?
         mode      = Grit::GitRuby.read_bytes_until(raw, ' ')
         file_name = Grit::GitRuby.read_bytes_until(raw, "\0")
         raw_sha   = raw.read(20)
         sha = raw_sha.unpack("H*").first
-        
+
         entries << DirectoryEntry.new(mode, file_name, sha)
       end
       new(entries, repository)
@@ -208,7 +208,7 @@ module Grit
       #@entry.sort { |a,b| a.name <=> b.name }.
       @entry.collect { |e| [[e.format_mode, e.format_type, e.sha1].join(' '), e.name].join("\t") }.join("\n")
     end
-    
+
     def actual_raw
       #@entry.collect { |e| e.raw.join(' '), e.name].join("\t") }.join("\n")
     end
@@ -264,13 +264,13 @@ module Grit
         @parent.collect { |i| "parent %s\n" % i }.join,
         @author, @committer] + @message
     end
-    
+
     def raw_log(sha)
       output = "commit #{sha}\n"
       output += @headers + "\n\n"
       output += @message.split("\n").map { |l| '    ' + l }.join("\n") + "\n\n"
     end
-    
+
   end
 
   class Tag < Object