grit 1.0.1 → 1.1.0

data/lib/grit/commit_stats.rb

@@ -62,12 +62,12 @@ module Grit
         lines.shift
         
         message_lines = []
-        message_lines << lines.shift[4..-1] while lines.first =~ /^ {4}/
+        message_lines << lines.shift[4..-1] while lines.first =~ /^ {4}/ || lines.first == ''
         
         lines.shift while lines.first && lines.first.empty?
 
         files = []
-        while lines.first =~ /^(\d+)\s+(\d+)\s+(.+)/
+        while lines.first =~ /^([-\d]+)\s+([-\d]+)\s+(.+)/
           (additions, deletions, filename) = lines.shift.split
           additions = additions.to_i
           deletions = deletions.to_i
@@ -88,6 +88,13 @@ module Grit
       %Q{#<Grit::CommitStats "#{@id}">}
     end
     
+    # Convert to an easy-to-traverse structure
+    def to_diffstat
+      files.map do |metadata|
+        DiffStat.new(*metadata)
+      end
+    end
+    
     # private
     
     def to_hash
@@ -99,6 +106,23 @@ module Grit
         'total'     => total
       }
     end
+    
   end # CommitStats
   
+  class DiffStat
+    attr_reader :filename, :additions, :deletions
+
+    def initialize(filename, additions, deletions, total=nil)
+      @filename, @additions, @deletions = filename, additions, deletions
+    end
+    
+    def net
+      additions - deletions
+    end
+
+    def inspect
+      "#{filename}: +#{additions} -#{deletions}"
+    end
+  end
+  
 end # Grit

data/lib/grit/diff.rb

@@ -2,17 +2,17 @@ module Grit
   
   class Diff
     attr_reader :a_path, :b_path
-    attr_reader :a_commit, :b_commit
+    attr_reader :a_blob, :b_blob
     attr_reader :a_mode, :b_mode
     attr_reader :new_file, :deleted_file
     attr_reader :diff
     
-    def initialize(repo, a_path, b_path, a_commit, b_commit, a_mode, b_mode, new_file, deleted_file, diff)
+    def initialize(repo, a_path, b_path, a_blob, b_blob, a_mode, b_mode, new_file, deleted_file, diff)
       @repo = repo
       @a_path = a_path
       @b_path = b_path
-      @a_commit = a_commit =~ /^0{40}$/ ? nil : Commit.create(repo, :id => a_commit)
-      @b_commit = b_commit =~ /^0{40}$/ ? nil : Commit.create(repo, :id => b_commit)
+      @a_blob = a_blob =~ /^0{40}$/ ? nil : Blob.create(repo, :id => a_blob)
+      @b_blob = b_blob =~ /^0{40}$/ ? nil : Blob.create(repo, :id => b_blob)
       @a_mode = a_mode
       @b_mode = b_mode
       @new_file = new_file
@@ -51,7 +51,7 @@ module Grit
           deleted_file = true
         end
         
-        m, a_commit, b_commit, b_mode = *lines.shift.match(%r{^index ([0-9A-Fa-f]+)\.\.([0-9A-Fa-f]+) ?(.+)?$})
+        m, a_blob, b_blob, b_mode = *lines.shift.match(%r{^index ([0-9A-Fa-f]+)\.\.([0-9A-Fa-f]+) ?(.+)?$})
         b_mode.strip! if b_mode
         
         diff_lines = []
@@ -60,7 +60,7 @@ module Grit
         end
         diff = diff_lines.join("\n")
         
-        diffs << Diff.new(repo, a_path, b_path, a_commit, b_commit, a_mode, b_mode, new_file, deleted_file, diff)
+        diffs << Diff.new(repo, a_path, b_path, a_blob, b_blob, a_mode, b_mode, new_file, deleted_file, diff)
       end
       
       diffs

data/lib/grit/git-ruby.rb

@@ -113,7 +113,7 @@ module Grit
     
     def blame_tree(commit, path = nil)
       begin
-        path = path.to_a.join('/').to_s + '/' if (path && path != '')
+        path = [path].join('/').to_s + '/' if (path && path != '')
         path = '' if !path.is_a? String
         commits = file_index.last_commits(rev_parse({}, commit), looking_for(commit, path))
         clean_paths(commits)

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

@@ -115,7 +115,7 @@ module Grit
     def initialize(mode, filename, sha1o)
       @mode = 0
       mode.each_byte do |i|
-        @mode = (@mode << 3) | (i-'0'[0])
+        @mode = (@mode << 3) | (i-'0'.getord(0))
       end
       @name = filename
       @sha1 = sha1o
@@ -179,8 +179,14 @@ module Grit
 
   def self.read_bytes_until(io, char)
     string = ''
-    while ((next_char = io.getc.chr) != char) && !io.eof
-      string += next_char
+    if RUBY_VERSION > '1.9'
+      while ((next_char = io.getc) != char) && !io.eof
+        string += next_char
+      end
+    else
+      while ((next_char = io.getc.chr) != char) && !io.eof
+        string += next_char
+      end
     end
     string
   end

data/lib/grit/git-ruby/internal/{mmap.rb → file_window.rb}

@@ -12,7 +12,7 @@
 module Grit 
   module GitRuby 
     module Internal
-      class Mmap
+      class FileWindow
         def initialize(file, version = 1)
           @file = file
           @offset = nil
@@ -46,7 +46,7 @@ module Grit
           end
           @offset = offset + len ? len : 1
           if not len
-            @file.read(1)[0]
+            @file.read(1).getord(0)
           else
             @file.read(len)
           end

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

@@ -29,7 +29,7 @@ module Grit
           begin
             return nil unless sha1[0...2] && sha1[2..39]
             path = @directory + '/' + sha1[0...2] + '/' + sha1[2..39]
-            get_raw_object(File.read(path))
+            get_raw_object(File.open(path, 'rb').read)
           rescue Errno::ENOENT
             nil
           end
@@ -76,7 +76,7 @@ module Grit
             content = Zlib::Deflate.deflate(store)
           
             FileUtils.mkdir_p(@directory+'/'+sha1[0...2])
-            File.open(path, 'w') do |f|
+            File.open(path, 'wb') do |f|
               f.write content
             end
           end
@@ -102,7 +102,7 @@ module Grit
         # private
         def unpack_object_header_gently(buf)
           used = 0
-          c = buf[used]
+          c = buf.getord(used)
           used += 1
 
           type = (c >> 4) & 7;
@@ -112,7 +112,7 @@ module Grit
             if buf.length <= used
               raise LooseObjectError, "object file too short"
             end
-            c = buf[used]
+            c = buf.getord(used)
             used += 1
 
             size += (c & 0x7f) << shift
@@ -127,8 +127,8 @@ module Grit
         private :unpack_object_header_gently
 
         def legacy_loose_object?(buf)
-          word = (buf[0] << 8) + buf[1]
-          buf[0] == 0x78 && word % 31 == 0
+          word = (buf.getord(0) << 8) + buf.getord(1)
+          buf.getord(0) == 0x78 && word % 31 == 0
         end
         private :legacy_loose_object?
       end

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

@@ -11,7 +11,7 @@
 
 require 'zlib'
 require 'grit/git-ruby/internal/raw_object'
-require 'grit/git-ruby/internal/mmap'
+require 'grit/git-ruby/internal/file_window'
 
 PACK_SIGNATURE = "PACK" 
 PACK_IDX_SIGNATURE = "\377tOc" 
@@ -48,9 +48,9 @@ module Grit
         def with_idx(index_file = nil)
           if !index_file
             index_file = @name
-            idxfile = File.open(@name[0...-4]+'idx')
+            idxfile = File.open(@name[0...-4]+'idx', 'rb')
           else
-            idxfile = File.open(index_file)
+            idxfile = File.open(index_file, 'rb')
           end
           
           # read header
@@ -66,14 +66,14 @@ module Grit
             @version = 1
           end
                     
-          idx = Mmap.new(idxfile, @version)
+          idx = FileWindow.new(idxfile, @version)
           yield idx
           idx.unmap
           idxfile.close
         end
         
         def with_packfile
-          packfile = File.open(@name)
+          packfile = File.open(@name, 'rb')
           yield packfile
           packfile.close
         end
@@ -189,7 +189,7 @@ module Grit
         end
 
         def find_object_in_index(idx, sha1)
-          slot = sha1[0]
+          slot = sha1.getord(0)
           return nil if !slot
           first, last = @offsets[slot,2] 
           while first < last
@@ -248,13 +248,13 @@ module Grit
           obj_offset = offset
           packfile.seek(offset)
 
-          c = packfile.read(1)[0]
+          c = packfile.read(1).getord(0)
           size = c & 0xf
           type = (c >> 4) & 7
           shift = 4
           offset += 1
           while c & 0x80 != 0
-            c = packfile.read(1)[0]
+            c = packfile.read(1).getord(0)
             size |= ((c & 0x7f) << shift)
             shift += 7
             offset += 1
@@ -281,10 +281,10 @@ module Grit
 
           if type == OBJ_OFS_DELTA
             i = 0
-            c = data[i]
+            c = data.getord(i)
             base_offset = c & 0x7f
             while c & 0x80 != 0
-              c = data[i += 1]
+              c = data.getord(i += 1)
               base_offset += 1
               base_offset <<= 7
               base_offset |= c & 0x7f
@@ -335,18 +335,18 @@ module Grit
           dest_size, pos = patch_delta_header_size(delta, pos)
           dest = ""
           while pos < delta.size
-            c = delta[pos]
+            c = delta.getord(pos)
             pos += 1
             if c & 0x80 != 0
               pos -= 1
               cp_off = cp_size = 0
-              cp_off = delta[pos += 1] if c & 0x01 != 0
-              cp_off |= delta[pos += 1] << 8 if c & 0x02 != 0
-              cp_off |= delta[pos += 1] << 16 if c & 0x04 != 0
-              cp_off |= delta[pos += 1] << 24 if c & 0x08 != 0
-              cp_size = delta[pos += 1] if c & 0x10 != 0
-              cp_size |= delta[pos += 1] << 8 if c & 0x20 != 0
-              cp_size |= delta[pos += 1] << 16 if c & 0x40 != 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_size = 0x10000 if cp_size == 0
               pos += 1
               dest += base[cp_off,cp_size]
@@ -365,7 +365,7 @@ module Grit
           size = 0
           shift = 0
           begin
-            c = delta[pos]
+            c = delta.getord(pos)
             if c == nil
               raise PackFormatError, 'invalid delta header'
             end

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

@@ -163,8 +163,14 @@ module Grit
 
   def self.read_bytes_until(io, char)
     string = ''
-    while ((next_char = io.getc.chr) != char) && !io.eof
-      string += next_char
+    if RUBY_VERSION > '1.9'
+      while ((next_char = io.getc) != char) && !io.eof
+        string += next_char
+      end
+    else
+      while ((next_char = io.getc.chr) != char) && !io.eof
+        string += next_char
+      end
     end
     string
   end

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

@@ -185,16 +185,15 @@ module Grit
       def get_raw_tree(sha)
         o = get_raw_object_by_sha1(sha)
         if o.type == :commit
-          tree = cat_file(get_object_by_sha1(sha).tree)
+          cat_file(get_object_by_sha1(sha).tree)
         elsif o.type == :tag
           commit_sha = get_object_by_sha1(sha).object
-          tree = cat_file(get_object_by_sha1(commit_sha).tree)
-        else
-          tree = cat_file(sha)
+          cat_file(get_object_by_sha1(commit_sha).tree)
+        elsif o.type == :tree
+          cat_file(sha)
         end
-        return tree
       end
-      
+
       # return array of tree entries
       ## TODO : refactor this to remove the fugly
       def ls_tree_path(sha, path, append = nil)

data/lib/grit/git.rb

@@ -15,11 +15,12 @@ module Grit
     include GitRuby
     
     class << self
-      attr_accessor :git_binary, :git_timeout
+      attr_accessor :git_binary, :git_timeout, :git_max_size
     end
   
-    self.git_binary  = "/usr/bin/env git"
-    self.git_timeout = 10
+    self.git_binary   = "/usr/bin/env git"
+    self.git_timeout  = 10
+    self.git_max_size = 5242880 # 5.megabytes
     
     def self.with_timeout(timeout = 10.seconds)
       old_timeout = Grit::Git.git_timeout
@@ -35,6 +36,11 @@ module Grit
       self.bytes_read = 0
     end
     
+    def shell_escape(str)
+      str.to_s.gsub("'", "\\\\'").gsub(";", '\\;')
+    end
+    alias_method :e, :shell_escape
+    
     # Run the given git command with the specified arguments and return
     # the result as a String
     #   +cmd+ is the command
@@ -54,9 +60,9 @@ module Grit
       timeout  = true if timeout.nil?
 
       opt_args = transform_options(options)
-      ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : "'#{a}'" }
+      ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : "'#{e(a)}'" }
 
-      call = "#{prefix}#{Git.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{postfix}"
+      call = "#{prefix}#{Git.git_binary} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{e(postfix)}"
       Grit.log(call) if Grit.debug
       response, err = timeout ? sh(call) : wild_sh(call)
       Grit.log(response) if Grit.debug
@@ -70,7 +76,7 @@ module Grit
         Timeout.timeout(self.class.git_timeout) do
           while tmp = stdout.read(1024)
             ret += tmp
-            if (@bytes_read += tmp.size) > 5242880 # 5.megabytes
+            if (@bytes_read += tmp.size) > self.class.git_max_size
               bytes = @bytes_read
               @bytes_read = 0
               raise GitTimeout.new(command, bytes)
@@ -116,14 +122,14 @@ module Grit
             args << "-#{opt}"
           else
             val = options.delete(opt)
-            args << "-#{opt.to_s} '#{val}'"
+            args << "-#{opt.to_s} '#{e(val)}'"
           end
         else
           if options[opt] == true
             args << "--#{opt.to_s.gsub(/_/, '-')}"
           else
             val = options.delete(opt)
-            args << "--#{opt.to_s.gsub(/_/, '-')}='#{val}'"
+            args << "--#{opt.to_s.gsub(/_/, '-')}='#{e(val)}'"
           end
         end
       end

data/lib/grit/index.rb

@@ -93,12 +93,12 @@ module Grit
       # overwrite with new tree contents
       tree.each do |k, v|
         case v
-          when String:
+          when String
             sha = write_blob(v)
             sha = [sha].pack("H*")
             str = "%s %s\0%s" % ['100644', k, sha]
             tree_contents[k] = str
-          when Hash:
+          when Hash
             ctree = now_tree/k if now_tree
             sha = write_tree(v, ctree)
             sha = [sha].pack("H*")

data/lib/grit/ref.rb

@@ -9,7 +9,7 @@ module Grit
       #   +options+ is a Hash of options
       #
       # Returns Grit::Ref[] (baked)
-      def find_all(repo, options = {})      
+      def find_all(repo, options = {})
         refs = []
         already = {}
         Dir.chdir(repo.path) do
@@ -37,9 +37,9 @@ module Grit
                 end
               end
             end
-          end          
+          end
         end
-                
+
         refs
       end
 
@@ -94,8 +94,6 @@ module Grit
 
   end # Head
 
-  class Tag < Ref ; end
-
   class Remote < Ref; end
-  
+
 end # Grit