schacon-grit 0.9.1 → 0.9.3

data/Manifest.txt

@@ -3,7 +3,6 @@ Manifest.txt
 README.txt
 Rakefile
 grit.gemspec
-lib/grit.rb
 lib/grit/actor.rb
 lib/grit/blob.rb
 lib/grit/commit.rb
@@ -11,12 +10,26 @@ lib/grit/commit_stats.rb
 lib/grit/config.rb
 lib/grit/diff.rb
 lib/grit/errors.rb
+lib/grit/git-ruby/commit_db.rb
+lib/grit/git-ruby/file_index.rb
+lib/grit/git-ruby/git_object.rb
+lib/grit/git-ruby/internal/loose.rb
+lib/grit/git-ruby/internal/mmap.rb
+lib/grit/git-ruby/internal/pack.rb
+lib/grit/git-ruby/internal/raw_object.rb
+lib/grit/git-ruby/object.rb
+lib/grit/git-ruby/repository.rb
+lib/grit/git-ruby.rb
 lib/grit/git.rb
+lib/grit/head.rb
 lib/grit/index.rb
 lib/grit/lazy.rb
 lib/grit/ref.rb
 lib/grit/repo.rb
+lib/grit/status.rb
+lib/grit/tag.rb
 lib/grit/tree.rb
+lib/grit.rb
 test/fixtures/blame
 test/fixtures/cat_file_blob
 test/fixtures/cat_file_blob_size

data/grit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "grit"
-  s.version  = "0.9.1"
+  s.version  = "0.9.3"
   s.date     = "2008-04-24"
   s.summary  = "Object model interface to a git repo"
   s.email    = "tom@rubyisawesome.com"
@@ -56,5 +56,7 @@ Gem::Specification.new do |s|
       "test/test_tree.rb"]
   s.rdoc_options = ["--main", "README.txt"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+  s.add_dependency("diff-lcs", ["> 0.0.0"])
   s.add_dependency("mime-types", ["> 0.0.0"])
+  s.add_dependency("open4", ["> 0.0.0"])
 end

data/lib/grit/commit.rb

@@ -182,6 +182,14 @@ module Grit
     def to_s
       @id
     end
+
+    def sha
+      @id
+    end
+    
+    def date
+      @committed_date
+    end
     
     # Pretty object inspection
     def inspect

data/lib/grit/git-ruby.rb

@@ -1,6 +1,5 @@
 require 'grit/git-ruby/repository'
 require 'grit/git-ruby/file_index'
-require 'grit/git-ruby/commit_db'
 
 module Grit
   
@@ -11,6 +10,14 @@ module Grit
     
     attr_accessor :ruby_git_repo, :git_file_index
     
+    def init(options)
+      if options.size == 0
+        Grit::GitRuby::Repository.init(@git_dir)
+      else
+        method_missing('init', options) 
+      end
+    end
+    
     def cat_file(options, ref)
       if options[:t]
         file_type(ref)
@@ -172,4 +179,4 @@ module Grit
     # git log --pretty='raw' --max-count='1' 'master' -- 'test'
     
   end
-end
+end

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

@@ -9,17 +9,18 @@
 # provides native ruby access to git objects and pack files
 #
 
-begin
-  require 'mmap'
-rescue LoadError
-
 module Grit 
   module GitRuby 
     module Internal
       class Mmap
-        def initialize(file)
+        def initialize(file, version = 1)
           @file = file
           @offset = nil
+          if version == 2
+            @global_offset = 8
+          else
+            @global_offset = 0
+          end
         end
 
         def unmap
@@ -41,7 +42,7 @@ module Grit
             raise RuntimeError, "invalid index param: #{idx.class}"
           end
           if @offset != offset
-            @file.seek(offset)
+            @file.seek(offset + @global_offset)
           end
           @offset = offset + len ? len : 1
           if not len
@@ -55,5 +56,3 @@ module Grit
   end 
 end
 
-end     # rescue LoadError
-

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

@@ -13,6 +13,9 @@ require 'zlib'
 require 'grit/git-ruby/internal/raw_object'
 require 'grit/git-ruby/internal/mmap'
 
+PACK_SIGNATURE = "PACK" 
+PACK_IDX_SIGNATURE = "\377tOc" 
+
 module Grit 
   module GitRuby 
     module Internal
@@ -27,30 +30,19 @@ module Grit
         SHA1Size = 20
         IdxOffsetSize = 4
         OffsetSize = 4
+        CrcSize = 4
         OffsetStart = FanOutCount * IdxOffsetSize
         SHA1Start = OffsetStart + OffsetSize
         EntrySize = OffsetSize + SHA1Size
+        EntrySizeV2 = SHA1Size + CrcSize + OffsetSize
 
         def initialize(file)
           if file =~ /\.idx$/
             file = file[0...-3] + 'pack'
           end
-          
-          @cache = {}
           @name = file
-          
-          with_idx do |idx|
-            @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
-              @offsets << pos
-            end
-
-            @size = @offsets[-1]
-          end
+          @cache = {}
+          init_pack
         end
         
         def with_idx(index_file = nil)
@@ -60,7 +52,21 @@ module Grit
           else
             idxfile = File.open(index_file)
           end
-          idx = Mmap.new(idxfile)
+          
+          # 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            
+            @version = 2
+          else
+            @version = 1
+          end
+                    
+          idx = Mmap.new(idxfile, @version)
           yield idx
           idx.unmap
           idxfile.close
@@ -72,31 +78,6 @@ module Grit
           packfile.close
         end
         
-        # given an index file, list out the shas that it's packfile contains
-        def self.get_shas(index_file)
-          with_idx(index_file) do |idx|
-            @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
-              @offsets << pos
-            end
-        
-            @size = @offsets[-1]
-            shas = []
-          
-            pos = SHA1Start
-            @size.times do
-              sha1 = idx[pos,SHA1Size]
-              pos += EntrySize
-              shas << sha1.unpack("H*").first
-            end
-            shas
-          end
-        end
-        
         def cache_objects
           @cache = {}
           with_packfile do |packfile|          
@@ -117,6 +98,13 @@ module Grit
           # shouldnt be anything open now
         end
 
+        # given an index file, list out the shas that it's packfile contains
+        def get_shas
+          shas = []
+          each_sha1 { |sha| shas << sha.unpack("H*")[0] }
+          shas
+        end
+        
         def [](sha1)
           if obj = @cache[sha1]
             return obj 
@@ -128,39 +116,77 @@ module Grit
           return obj
         end
 
-        def each_entry
+        def init_pack
           with_idx do |idx|
-            pos = OffsetStart
-            @size.times do
-              offset = idx[pos,OffsetSize].unpack('N')[0]
-              sha1 = idx[pos+OffsetSize,SHA1Size]
-              pos += EntrySize
-              yield sha1, offset
+            @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
+              @offsets << pos
             end
+            @size = @offsets[-1]
           end
         end
-
-        def each_sha1
+        
+        def each_entry
           with_idx do |idx|
-            # unpacking the offset is quite expensive, so
-            # we avoid using #each
-            pos = SHA1Start
-            @size.times do
-              sha1 = idx[pos,SHA1Size]
-              pos += EntrySize
-              yield sha1
+            if @version == 2
+              data = read_data_v2(idx)
+              data.each do |sha1, crc, offset|
+                yield sha1, offset
+              end
+            else
+              pos = OffsetStart
+              @size.times do
+                offset = idx[pos,OffsetSize].unpack('N')[0]
+                sha1 = idx[pos+OffsetSize,SHA1Size]
+                pos += EntrySize
+                yield sha1, offset
+              end
             end
           end
         end
-
-        def find_object(sha1)
-          obj = nil
+        
+        def read_data_v2(idx)
+          data = []
+          pos = OffsetStart
+          @size.times do |i|
+            data[i] = [idx[pos,SHA1Size], 0, 0]
+            pos += SHA1Size
+          end
+          @size.times do |i|
+            crc = idx[pos,CrcSize]
+            data[i][1] = crc
+            pos += CrcSize
+          end
+          @size.times do |i|
+            offset = idx[pos,OffsetSize].unpack('N')[0]
+            data[i][2] = offset
+            pos += OffsetSize
+          end
+          data
+        end
+        private :read_data_v2
+        
+        def each_sha1
           with_idx do |idx|
-            obj = find_object_in_index(idx, sha1)
+            if @version == 2
+              data = read_data_v2(idx)
+              data.each do |sha1, crc, offset|
+                yield sha1
+              end
+            else
+              pos = SHA1Start
+              @size.times do
+                sha1 = idx[pos,SHA1Size]
+                pos += EntrySize
+                yield sha1
+              end
+            end
           end
-          obj
-        end    
-        private :find_object
+        end
 
         def find_object_in_index(idx, sha1)
           slot = sha1[0]
@@ -168,22 +194,46 @@ module Grit
           first, last = @offsets[slot,2] 
           while first < last
             mid = (first + last) / 2
-            midsha1 = idx[SHA1Start + mid * EntrySize,SHA1Size]
-            cmp = midsha1 <=> sha1
+            if @version == 2
+              midsha1 = idx[OffsetStart + (mid * SHA1Size), SHA1Size]
+              cmp = midsha1 <=> sha1
 
-            if cmp < 0
-              first = mid + 1
-            elsif cmp > 0
-              last = mid
+              if cmp < 0
+                first = mid + 1
+              elsif cmp > 0
+                last = mid
+              else
+                pos = OffsetStart + (@size * (SHA1Size + CrcSize)) + (mid * OffsetSize)
+                offset = idx[pos, OffsetSize].unpack('N')[0]
+                return offset
+              end
             else
-              pos = OffsetStart + mid * EntrySize
-              offset = idx[pos,OffsetSize].unpack('N')[0]
-              return offset
+              midsha1 = idx[SHA1Start + mid * EntrySize,SHA1Size]
+              cmp = midsha1 <=> sha1
+
+              if cmp < 0
+                first = mid + 1
+              elsif cmp > 0
+                last = mid
+              else
+                pos = OffsetStart + mid * EntrySize
+                offset = idx[pos,OffsetSize].unpack('N')[0]
+                return offset
+              end
             end
           end
           nil
         end
-
+        
+        def find_object(sha1)
+          obj = nil
+          with_idx do |idx|
+            obj = find_object_in_index(idx, sha1)
+          end
+          obj
+        end    
+        private :find_object
+        
         def parse_object(offset)
           obj = nil
           with_packfile do |packfile|

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

@@ -37,6 +37,7 @@ module Grit
       def initialize(git_dir, options = {})
         @git_dir = git_dir
         @options = options
+        @packs = []
       end
       
       # returns the loose objects object lazily
@@ -599,6 +600,53 @@ module Grit
         found_data
       end
       
+      # initialize a git repository
+      def self.init(dir, bare = false)
+
+        FileUtils.mkdir_p(dir) if !File.exists?(dir)
+
+        FileUtils.cd(dir) do
+          if(File.exists?('objects'))
+            return false # already initialized
+          else
+            # initialize directory
+            create_initial_config(bare)
+            FileUtils.mkdir_p('refs/heads')
+            FileUtils.mkdir_p('refs/tags')
+            FileUtils.mkdir_p('objects/info')
+            FileUtils.mkdir_p('objects/pack')
+            FileUtils.mkdir_p('branches')
+            add_file('description', 'Unnamed repository; edit this file to name it for gitweb.')
+            add_file('HEAD', "ref: refs/heads/master\n")
+            FileUtils.mkdir_p('hooks')
+            FileUtils.cd('hooks') do
+              add_file('applypatch-msg', '# add shell script and make executable to enable')
+              add_file('post-commit', '# add shell script and make executable to enable')
+              add_file('post-receive', '# add shell script and make executable to enable')
+              add_file('post-update', '# add shell script and make executable to enable')
+              add_file('pre-applypatch', '# add shell script and make executable to enable')
+              add_file('pre-commit', '# add shell script and make executable to enable')
+              add_file('pre-rebase', '# add shell script and make executable to enable')
+              add_file('update', '# add shell script and make executable to enable')
+            end
+            FileUtils.mkdir_p('info')
+            add_file('info/exclude', "# *.[oa]\n# *~")
+          end
+        end
+      end
+
+      def self.create_initial_config(bare = false)
+        bare ? bare_status = 'true' : bare_status = 'false'
+        config = "[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = #{bare_status}\n\tlogallrefupdates = true"
+        add_file('config', config)
+      end
+
+      def self.add_file(name, contents)
+        File.open(name, 'w') do |f|
+          f.write contents
+        end
+      end      
+      
       def close
         @packs.each do |pack|
           pack.close
@@ -625,6 +673,9 @@ module Grit
           alt = File.join(path, 'info/alternates')
           if File.exists?(alt)
             File.readlines(alt).each do |line|
+              if line[0, 2] == '..'
+                line = File.expand_path(File.join(@git_dir, line))
+              end
               load_loose(line.chomp)
               load_alternate_loose(line.chomp)
             end
@@ -648,6 +699,9 @@ module Grit
           alt = File.join(path, 'info/alternates')
           if File.exists?(alt)
             File.readlines(alt).each do |line|
+              if line[0, 2] == '..'
+                line = File.expand_path(File.join(@git_dir, line))
+              end
               full_pack = File.join(line.chomp, 'pack')
               load_packs(full_pack)
               load_alternate_packs(File.join(line.chomp))

data/lib/grit/index.rb

@@ -1,11 +1,12 @@
 module Grit
   
   class Index
-    attr_accessor :repo, :tree
+    attr_accessor :repo, :tree, :current_tree
     
     def initialize(repo)
       self.repo = repo
       self.tree = {}
+      self.current_tree = nil
     end
     
     # Add a file to the index
@@ -28,12 +29,16 @@ module Grit
       current[filename] = data
     end
         
+    def read_tree(tree)
+      self.current_tree = self.repo.tree(tree)
+    end
+    
     # Commit the contents of the index
     #   +message+ is the commit message
     #
     # Returns a String of the SHA1 of the commit
-    def commit(message, parents = nil, actor = nil, last_tree = nil)
-      tree_sha1 = write_tree(self.tree)
+    def commit(message, parents = nil, actor = nil, last_tree = nil, head = 'master')
+      tree_sha1 = write_tree(self.tree, self.current_tree)
       return false if tree_sha1 == last_tree # don't write identical commits
       
       contents = []
@@ -60,7 +65,7 @@ module Grit
       commit_sha1 = self.repo.git.ruby_git.put_raw_object(contents.join("\n"), 'commit')      
       
       # self.repo.git.update_ref({}, 'HEAD', commit_sha1)
-      File.open(File.join(self.repo.path, 'refs', 'heads', 'master'), 'w') do |f|
+      File.open(File.join(self.repo.path, 'refs', 'heads', head), 'w') do |f|
         f.write(commit_sha1)
       end if commit_sha1
       
@@ -71,23 +76,35 @@ module Grit
     #   +tree+ is the tree
     #
     # Returns the SHA1 String of the tree
-    def write_tree(tree)
-      tree_contents = ''
+    def write_tree(tree, now_tree = nil)
+      tree_contents = {}
+            
+      # fill in original tree
+      now_tree.contents.each do |obj|
+        sha = [obj.id].pack("H*")
+        k = obj.name
+        k += '/' if (obj.class == Grit::Tree)
+        tree_contents[k] = "%s %s\0%s" % [obj.mode.to_s, obj.name, sha]
+      end if now_tree
+      
+      # overwrite with new tree contents
       tree.each do |k, v|
         case v
           when String:
             sha = write_blob(v)
             sha = [sha].pack("H*")
             str = "%s %s\0%s" % ['100644', k, sha]
-            tree_contents += str
+            tree_contents[k] = str
           when Hash:
-            sha = write_tree(v)
+            ctree = now_tree/k if now_tree
+            sha = write_tree(v, ctree)
             sha = [sha].pack("H*")
             str = "%s %s\0%s" % ['040000', k, sha]
-            tree_contents += str
+            tree_contents[k + '/'] = str
         end
       end
-      self.repo.git.ruby_git.put_raw_object(tree_contents, 'tree')
+      tr = tree_contents.sort.map { |k, v| v }.join('')
+      self.repo.git.ruby_git.put_raw_object(tr, 'tree')
     end
     
     # Write the blob to the index

data/lib/grit/repo.rb

@@ -5,6 +5,7 @@ module Grit
     
     # The path of the git repo as a String
     attr_accessor :path
+    attr_accessor :working_dir
     attr_reader :bare
     
     # The git command line interface object
@@ -22,6 +23,7 @@ module Grit
       epath = File.expand_path(path)
       
       if File.exist?(File.join(epath, '.git'))
+        self.working_dir = epath
         self.path = File.join(epath, '.git')
         @bare = false
       elsif File.exist?(epath) && (epath =~ /\.git$/ || options[:is_bare])
@@ -60,6 +62,10 @@ module Grit
     
     alias_method :branches, :heads
 
+    def is_head?(head_name)
+      heads.find { |h| h.name == head_name }
+    end
+    
     # Object reprsenting the current repo head.
     #
     # Returns Grit::Head (baked)

data/lib/grit/status.rb

@@ -88,25 +88,27 @@ module Grit
       def construct_status
         @files = ls_files
         
-        # find untracked in working dir
-        Dir.glob('**/*') do |file|
-          if !@files[file]
-            @files[file] = {:path => file, :untracked => true} if !File.directory?(file)
+        Dir.chdir(@base.working_dir) do 
+          # find untracked in working dir
+          Dir.glob('**/*') do |file|
+            if !@files[file]
+              @files[file] = {:path => file, :untracked => true} if !File.directory?(file)
+            end
           end
-        end
 
-        # find modified in tree
-       diff_files.each do |path, data|
-          @files[path] ? @files[path].merge!(data) : @files[path] = data
-        end
+          # find modified in tree
+         diff_files.each do |path, data|
+            @files[path] ? @files[path].merge!(data) : @files[path] = data
+          end
         
-        # find added but not committed - new files
-        diff_index('HEAD').each do |path, data|
-          @files[path] ? @files[path].merge!(data) : @files[path] = data
-        end
+          # find added but not committed - new files
+          diff_index('HEAD').each do |path, data|
+            @files[path] ? @files[path].merge!(data) : @files[path] = data
+          end
         
-        @files.each do |k, file_hash|
-          @files[k] = StatusFile.new(@base, file_hash)
+          @files.each do |k, file_hash|
+            @files[k] = StatusFile.new(@base, file_hash)
+          end
         end
       end
 

data/test/test_head.rb

@@ -28,6 +28,12 @@ class TestHead < Test::Unit::TestCase
     head = @r.heads[2]
     assert_equal %Q{#<Grit::Head "test/chacon">}, head.inspect
   end
+  
+  def test_is_head
+    assert @r.is_head?('master')
+    assert @r.is_head?('test/chacon')
+    assert !@r.is_head?('masterblah')
+  end
 
   def test_head_count
     assert_equal 5, @r.heads.size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schacon-grit
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -13,6 +13,15 @@ cert_chain: []
 date: 2008-04-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   version_requirement: 
@@ -22,6 +31,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
 description: Grit is a Ruby library for extracting information from a git repository in and object oriented manner.
 email: tom@rubyisawesome.com
 executables: []