merge d34d53 and fix whitespace conflicts

Rakefile

@@ -3,6 +3,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 begin
+  require 'rubygems'
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "grit"
@@ -51,4 +52,4 @@ end
 desc "Upload site to Rubyforge"
 task :site do
   sh "scp -r doc/* mojombo@grit.rubyforge.org:/var/www/gforge-projects/grit"
-end
+end

lib/grit/blob.rb

@@ -104,7 +104,7 @@ module Grit
             info = nil
         end
       end
-      
+
       blames
     end
     
@@ -116,6 +116,11 @@ module Grit
     def inspect
       %Q{#<Grit::Blob "#{@id}">}
     end
+
+    # Compares blobs by name
+    def <=>(other)
+      name <=> other.name
+    end
   end # Blob
-  
+
 end # Grit

lib/grit/tree.rb

@@ -103,6 +103,21 @@ module Grit
     def inspect
       %Q{#<Grit::Tree "#{@id}">}
     end
+
+    # Find only Tree objects from contents
+    def trees
+      contents.select {|v| v.kind_of? Tree}
+    end
+
+    # Find only Blob objects from contents
+    def blobs
+      contents.select {|v| v.kind_of? Blob}
+    end
+
+    # Compares trees by name
+    def <=>(other)
+      name <=> other.name
+    end
   end # Tree
-  
+
 end # Grit