schacon-grit 0.9.4 → 1.1.1

data/lib/grit/blame.rb

@@ -0,0 +1,61 @@
+module Grit
+
+  class Blame
+
+    attr_reader :lines
+
+    def initialize(repo, file, commit)
+      @repo = repo
+      @file = file
+      @commit = commit
+      @lines = []
+      load_blame
+    end
+
+    def load_blame
+      output = @repo.git.blame({'p' => true}, @commit, '--', @file)
+      process_raw_blame(output)
+    end
+
+    def process_raw_blame(output)
+      lines, final = [], []
+      info, commits = {}, {}
+
+      # process the output
+      output.split("\n").each do |line|
+        if line[0, 1] == "\t"
+          lines << line[1, line.size]
+        elsif m = /^(\w{40}) (\d+) (\d+)/.match(line)
+          if !commits[m[1]]
+            commits[m[1]] = @repo.commit(m[1])
+          end
+          info[m[3].to_i] = [commits[m[1]], m[2].to_i]
+        end
+      end
+
+      # get it together
+      info.sort.each do |lineno, commit|
+        final << BlameLine.new(lineno, commit[1], commit[0], lines[lineno - 1])
+      end
+
+      @lines = final
+    end
+
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Blame "#{@file} <#{@commit}>">}
+    end
+
+    class BlameLine
+      attr_accessor :lineno, :oldlineno, :commit, :line
+      def initialize(lineno, oldlineno, commit, line)
+        @lineno = lineno
+        @oldlineno = oldlineno
+        @commit = commit
+        @line = line
+      end
+    end
+
+  end # Blame
+
+end # Grit

data/lib/grit/blob.rb

@@ -104,14 +104,23 @@ module Grit
             info = nil
         end
       end
-      
+
       blames
     end
     
+    def basename
+      File.basename(name)
+    end
+    
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Blob "#{@id}">}
     end
+
+    # Compares blobs by name
+    def <=>(other)
+      name <=> other.name
+    end
   end # Blob
-  
+
 end # Grit

data/lib/grit/commit.rb

@@ -1,5 +1,5 @@
 module Grit
-  
+
   class Commit
     attr_reader :id
     lazy_reader :parents
@@ -10,7 +10,8 @@ module Grit
     lazy_reader :committed_date
     lazy_reader :message
     lazy_reader :short_message
-    
+    lazy_reader :author_string
+
     # Instantiate a new Commit
     #   +id+ is the id of the commit
     #   +parents+ is an array of commit ids (will be converted into Commit instances)
@@ -34,11 +35,11 @@ module Grit
       @message = message.join("\n")
       @short_message = message[0] || ''
     end
-    
+
     def id_abbrev
       @id_abbrev ||= @repo.git.rev_parse({}, self.id).chomp[0, 7]
     end
-    
+
     # Create an unbaked Commit containing just the specified attributes
     #   +repo+ is the Repo
     #   +atts+ is a Hash of instance variable data
@@ -47,7 +48,7 @@ module Grit
     def self.create(repo, atts)
       self.allocate.create_initialize(repo, atts)
     end
-    
+
     # Initializer for Commit.create
     #   +repo+ is the Repo
     #   +atts+ is a Hash of instance variable data
@@ -60,11 +61,11 @@ module Grit
       end
       self
     end
-    
+
     def lazy_source
       self.class.find_all(@repo, @id, {:max_count => 1}).first
     end
-    
+
     # Count the number of commits reachable from this ref
     #   +repo+ is the Repo
     #   +ref+ is the ref from which to begin (SHA1 or name)
@@ -73,7 +74,7 @@ module Grit
     def self.count(repo, ref)
       repo.git.rev_list({}, ref).size / 41
     end
-    
+
     # Find all commits matching the given criteria.
     #   +repo+ is the Repo
     #   +ref+ is the ref from which to begin (SHA1 or name) or nil for --all
@@ -84,21 +85,21 @@ module Grit
     # Returns Grit::Commit[] (baked)
     def self.find_all(repo, ref, options = {})
       allowed_options = [:max_count, :skip, :since]
-          
+
       default_options = {:pretty => "raw"}
       actual_options = default_options.merge(options)
-      
+
       if ref
         output = repo.git.rev_list(actual_options, ref)
       else
         output = repo.git.rev_list(actual_options.merge(:all => true))
       end
-            
+
       self.list_from_string(repo, output)
     rescue Grit::GitRuby::Repository::NoSuchShaFound
       []
     end
-    
+
     # Parse out commit information into an array of baked Commit objects
     #   +repo+ is the Repo
     #   +text+ is the text output from the git command (raw format)
@@ -110,40 +111,40 @@ module Grit
     #
     def self.list_from_string(repo, text)
       lines = text.split("\n")
-      
+
       commits = []
-            
+
       while !lines.empty?
         id = lines.shift.split.last
         tree = lines.shift.split.last
-        
+
         parents = []
         parents << lines.shift.split.last while lines.first =~ /^parent/
-        
+
         author, authored_date = self.actor(lines.shift)
         committer, committed_date = self.actor(lines.shift)
-        
+
         # not doing anything with this yet, but it's sometimes there
         encoding = lines.shift.split.last if lines.first =~ /^encoding/
-        
+
         lines.shift
-        
+
         message_lines = []
         message_lines << lines.shift[4..-1] while lines.first =~ /^ {4}/
-        
+
         lines.shift while lines.first && lines.first.empty?
-        
+
         commits << Commit.new(repo, id, parents, tree, author, authored_date, committer, committed_date, message_lines)
       end
-      
+
       commits
     end
-    
+
     # Show diffs between two trees:
     #   +repo+ is the Repo
     #   +a+ is a named commit
-    #   +b+ is an optional named commit.  Passing an array assumes you 
-    #     wish to omit the second named commit and limit the diff to the 
+    #   +b+ is an optional named commit.  Passing an array assumes you
+    #     wish to omit the second named commit and limit the diff to the
     #     given paths.
     #   +paths* is an array of paths to limit the diff.
     #
@@ -174,10 +175,14 @@ module Grit
       if parents.empty?
         show
       else
-        self.class.diff(@repo, parents.first.id, @id) 
+        self.class.diff(@repo, parents.first.id, @id)
       end
     end
     
+    def stats
+      stats = @repo.commit_stats(self.sha, 1)[0][-1]
+    end
+    
     # Convert this Commit to a String which is just the SHA1 id
     def to_s
       @id
@@ -186,18 +191,22 @@ module Grit
     def sha
       @id
     end
-    
+
     def date
       @committed_date
     end
-    
+
+    def to_patch
+      @repo.git.format_patch({'1' => true, :stdout => true}, to_s)
+    end
+
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Commit "#{@id}">}
     end
-    
+
     # private
-    
+
     # Parse out the actor (author or committer) info
     #
     # Returns [String (actor name and email), Time (acted at time)]
@@ -206,6 +215,10 @@ module Grit
       [Actor.from_string(actor), Time.at(epoch.to_i)]
     end
 
+    def author_string
+      "%s <%s> %s %+05d" % [author.name, author.email, authored_date.to_i, 800]
+    end
+
     def to_hash
       {
         'id'       => id,
@@ -225,5 +238,5 @@ module Grit
       }
     end
   end # Commit
-  
+
 end # Grit

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,21 +2,21 @@ 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
-      @deleted_file = deleted_file
+      @new_file = new_file || @a_blob.nil?
+      @deleted_file = deleted_file || @b_blob.nil?
       @diff = diff
     end
     
@@ -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

@@ -39,9 +39,9 @@ module Grit
     end
 
     # git diff --full-index 'ec037431382e83c3e95d4f2b3d145afbac8ea55d' 'f1ec1aea10986159456846b8a05615b87828d6c6'
-    def diff(options, sha1, sha2)
-      try_run { ruby_git.diff(sha1, sha2, options) }
-    end
+    #def diff(options, sha1, sha2)
+    #  try_run { ruby_git.diff(sha1, sha2, options) }
+    #end
     
     def rev_list(options, ref = 'master')
       options.delete(:skip) if options[:skip].to_i == 0
@@ -72,8 +72,8 @@ module Grit
         (sha1, sha2) = string.split('..')
         return [rev_parse({}, sha1), rev_parse({}, sha2)]
       end
-      
-      if /\w{40}/.match(string)  # passing in a sha - just no-op it
+
+      if /^[0-9a-f]{40}$/.match(string)  # passing in a sha - just no-op it
         return string.chomp
       end
 
@@ -103,6 +103,87 @@ module Grit
       return method_missing('rev-parse', {}, string).chomp
     end
     
+    def refs(options, prefix)
+      refs = []
+      already = {}
+      Dir.chdir(@git_dir) do
+        files = Dir.glob(prefix + '/**/*')
+        files.each do |ref|
+          next if !File.file?(ref)
+          id = File.read(ref).chomp
+          name = ref.sub("#{prefix}/", '')
+          if !already[name]
+            refs << "#{name} #{id}"
+            already[name] = true
+          end
+        end
+
+        if File.file?('packed-refs')
+          File.readlines('packed-refs').each do |line|
+            if m = /^(\w{40}) (.*?)$/.match(line)
+              next if !Regexp.new('^' + prefix).match(m[2])
+              name = m[2].sub("#{prefix}/", '')
+              if !already[name]
+                refs << "#{name} #{m[1]}"
+                already[name] = true
+              end
+            end
+          end
+        end
+      end
+
+      refs.join("\n")
+    end
+    
+    def tags(options, prefix)
+      refs = []
+      already = {}
+
+      Dir.chdir(repo.path) do
+        files = Dir.glob(prefix + '/**/*')
+
+        files.each do |ref|
+          next if !File.file?(ref)
+
+          id = File.read(ref).chomp
+          name = ref.sub("#{prefix}/", '')
+
+          if !already[name]
+            refs << "#{name} #{id}"
+            already[name] = true
+          end
+        end
+
+        if File.file?('packed-refs')
+          lines = File.readlines('packed-refs')
+          lines.each_with_index do |line, i|
+            if m = /^(\w{40}) (.*?)$/.match(line)
+              next if !Regexp.new('^' + prefix).match(m[2])
+              name = m[2].sub("#{prefix}/", '')
+
+              # Annotated tags in packed-refs include a reference
+              # to the commit object on the following line.
+              next_line = lines[i + 1]
+              
+              id =
+              if next_line && next_line[0] == ?^
+                next_line[1..-1].chomp
+              else
+                m[1]
+              end
+
+              if !already[name]
+                refs << "#{name} #{id}"
+                already[name] = true
+              end
+            end
+          end
+        end
+      end
+
+      refs.join("\n")
+    end
+    
     def file_size(ref)
       try_run { ruby_git.cat_file_size(ref).to_s }
     end
@@ -113,7 +194,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)