Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge d34d53 and fix whitespace conflicts

  • Loading branch information...
commit bc9fb8b75e8c0f2e227ea6f963a0695e714261d1 2 parents 007473c + d34d530
@mojombo mojombo authored
Showing with 25 additions and 4 deletions.
  1. +2 −1  Rakefile
  2. +7 −2 lib/grit/blob.rb
  3. +16 −1 lib/grit/tree.rb
View
3  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
View
9 lib/grit/blob.rb
@@ -104,7 +104,7 @@ def self.blame(repo, commit, file)
info = nil
end
end
-
+
blames
end
@@ -116,6 +116,11 @@ def basename
def inspect
%Q{#<Grit::Blob "#{@id}">}
end
+
+ # Compares blobs by name
+ def <=>(other)
+ name <=> other.name
+ end
end # Blob
-
+
end # Grit
View
17 lib/grit/tree.rb
@@ -103,6 +103,21 @@ def basename
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
Please sign in to comment.
Something went wrong with that request. Please try again.