mojombo-grit 0.9.4 → 1.1.1

data/lib/grit/ruby1.9.rb

@@ -0,0 +1,7 @@
+class String 
+  if ((defined? RUBY_VERSION) && (RUBY_VERSION[0..2] == "1.9"))
+    def getord(offset); self[offset].ord; end
+  else
+    alias :getord :[]
+  end
+end

data/lib/grit/submodule.rb

@@ -54,7 +54,7 @@ module Grit
       blob = commit.tree/'.gitmodules'
       return {} unless blob
       
-      lines = blob.data.split("\n")
+      lines = blob.data.gsub(/\r\n?/, "\n" ).split("\n")
       
       config = {}
       current = nil
@@ -75,6 +75,10 @@ module Grit
       config
     end
     
+    def basename
+      File.basename(name)
+    end    
+    
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Submodule "#{@id}">}

data/lib/grit/tag.rb

@@ -1,71 +1,66 @@
 module Grit
-  
-  class Tag
-    attr_reader :name
-    attr_reader :commit
-    
-    # Instantiate a new Tag
-    #   +name+ is the name of the head
-    #   +commit+ is the Commit that the head points to
-    #
-    # Returns Grit::Tag (baked)
-    def initialize(name, commit)
-      @name = name
-      @commit = commit
-    end
-    
-    # Find all Tags
-    #   +repo+ is the Repo
-    #   +options+ is a Hash of options
-    #
-    # Returns Grit::Tag[] (baked)
+
+  class Tag < Ref
     def self.find_all(repo, options = {})
-      default_options = {:sort => "committerdate",
-                         :format => "%(refname)%00%(objectname)"}
-                         
-      actual_options = default_options.merge(options)
-      
-      output = repo.git.for_each_ref(actual_options, "refs/tags")
-                 
-      self.list_from_string(repo, output)
-    end
-    
-    # Parse out tag information into an array of baked Tag objects
-    #   +repo+ is the Repo
-    #   +text+ is the text output from the git command
-    #
-    # Returns Grit::Tag[] (baked)
-    def self.list_from_string(repo, text)
-      tags = []
-      
-      text.split("\n").each do |line|
-        tags << self.from_string(repo, line)
+      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}/", '')
+          commit = commit_from_sha(repo, id)
+
+          if !already[name]
+            refs << self.new(name, commit)
+            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]
+              if next_line && next_line[0] == ?^
+                commit = Commit.create(repo, :id => next_line[1..-1].chomp)
+              else
+                commit = commit_from_sha(repo, m[1])
+              end
+
+              if !already[name]
+                refs << self.new(name, commit)
+                already[name] = true
+              end
+            end
+          end
+        end
       end
-      
-      tags
+
+      refs
     end
-    
-    # Create a new Tag instance from the given string.
-    #   +repo+ is the Repo
-    #   +line+ is the formatted tag information
-    #
-    # Format
-    #   name: [a-zA-Z_/]+
-    #   <null byte>
-    #   id: [0-9A-Fa-f]{40}
-    #
-    # Returns Grit::Tag (baked)
-    def self.from_string(repo, line)
-      full_name, id = line.split("\0")
-      name = full_name.split("/").last
-      commit = Commit.create(repo, :id => id)
-      self.new(name, commit)
-    end
-    
-    # Pretty object inspection
-    def inspect
-      %Q{#<Grit::Tag "#{@name}">}
+
+    def self.commit_from_sha(repo, id)
+      git_ruby_repo = GitRuby::Repository.new(repo.path)
+      object = git_ruby_repo.get_object_by_sha1(id)
+
+      if object.type == :commit
+        Commit.create(repo, :id => id)
+      elsif object.type == :tag
+        Commit.create(repo, :id => object.object)
+      else
+        raise "Unknown object type."
+      end
     end
-  end # Tag
-  
-end # Grit
+  end
+
+end

data/lib/grit/tree.rb

@@ -95,10 +95,29 @@ module Grit
       end
     end
     
+    def basename
+      File.basename(name)
+    end
+    
     # Pretty object inspection
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojombo-grit
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 1.1.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -10,87 +10,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 -08:00
+date: 2009-03-31 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
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "1.15"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: diff-lcs
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.1.2
     version: 
-description: Grit is a Ruby library for extracting information from a git repository in and object oriented manner.
-email: tom@rubyisawesome.com
+description: Grit is a Ruby library for extracting information from a git repository in an object oriented manner.
+email: tom@mojombo.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
+- API.txt
 - History.txt
-- README.txt
-- Rakefile
-- grit.gemspec
+- README.md
+- VERSION.yml
+- lib/grit
 - lib/grit/actor.rb
+- lib/grit/blame.rb
 - lib/grit/blob.rb
 - lib/grit/commit.rb
 - lib/grit/commit_stats.rb
 - lib/grit/config.rb
 - lib/grit/diff.rb
 - lib/grit/errors.rb
+- lib/grit/git-ruby
 - 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
+- lib/grit/git-ruby/internal/file_window.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/merge.rb
 - lib/grit/ref.rb
 - lib/grit/repo.rb
+- lib/grit/ruby1.9.rb
 - lib/grit/status.rb
 - lib/grit/submodule.rb
 - lib/grit/tag.rb
 - lib/grit/tree.rb
 - lib/grit.rb
 - lib/open3_detach.rb
-- Manifest.txt
 has_rdoc: true
 homepage: http://github.com/mojombo/grit
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --inline-source
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -107,23 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: grit
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Object model interface to a git repo
-test_files: 
-- test/test_actor.rb
-- test/test_blob.rb
-- test/test_commit.rb
-- test/test_config.rb
-- test/test_diff.rb
-- test/test_git.rb
-- test/test_grit.rb
-- test/test_head.rb
-- test/test_real.rb
-- test/test_reality.rb
-- test/test_remote.rb
-- test/test_repo.rb
-- test/test_tag.rb
-- test/test_tree.rb
+summary: Grit is a Ruby library for extracting information from a git repository in an object oriented manner.
+test_files: []
+

data/Manifest.txt

@@ -1,71 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-grit.gemspec
-lib/grit/actor.rb
-lib/grit/blob.rb
-lib/grit/commit.rb
-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/submodule.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
-test/fixtures/diff_2
-test/fixtures/diff_2f
-test/fixtures/diff_f
-test/fixtures/diff_i
-test/fixtures/diff_mode_only
-test/fixtures/diff_new_mode
-test/fixtures/diff_p
-test/fixtures/for_each_ref
-test/fixtures/for_each_ref_remotes
-test/fixtures/for_each_ref_tags
-test/fixtures/ls_tree_a
-test/fixtures/ls_tree_b
-test/fixtures/ls_tree_commit
-test/fixtures/rev_list
-test/fixtures/rev_list_count
-test/fixtures/rev_list_single
-test/fixtures/rev_parse
-test/fixtures/show_empty_commit
-test/fixtures/simple_config
-test/helper.rb
-test/profile.rb
-test/suite.rb
-test/test_actor.rb
-test/test_blob.rb
-test/test_commit.rb
-test/test_config.rb
-test/test_diff.rb
-test/test_git.rb
-test/test_grit.rb
-test/test_head.rb
-test/test_reality.rb
-test/test_remote.rb
-test/test_repo.rb
-test/test_tag.rb
-test/test_tree.rb

data/README.txt

@@ -1,213 +0,0 @@
-grit
-    by Tom Preston-Werner, Scott Chacon
-    http://github.com/mojombo/grit
-
-== DESCRIPTION:
-
-Grit is a Ruby library for extracting information from a git repository in and
-object oriented manner.
-
-== REQUIREMENTS:
-
-* git (http://git-scm.com) tested with 1.6.0.2
-
-== INSTALL:
-
-  $ gem sources -a http://gems.github.com/ (you only need to do this once)
-  $ gem install mojombo-grit
-
-== SOURCE:
-
-Grit's git repo is available on GitHub, which can be browsed at:
-
-  http://github.com/mojombo/grit
-
-and cloned from:
-
-  git://github.com/mojombo/grit.git
-
-== USAGE:
-
-Grit gives you object model access to your git repository. Once you have
-created a repository object, you can traverse it to find parent commit(s),
-trees, blobs, etc.
-
-= Initialize a Repo object
-
-The first step is to create a Grit::Repo object to represent your repo. I
-include the Grit module so reduce typing.
-
-  require 'mojombo-grit'
-  include Grit
-  repo = Repo.new("/Users/tom/dev/grit")
-  
-In the above example, the directory /Users/tom/dev/grit is my working
-repo and contains the .git directory. You can also initialize Grit with a 
-bare repo.
-
-  repo = Repo.new("/var/git/grit.git")
-  
-= Getting a list of commits
-
-From the Repo object, you can get a list of commits as an array of Commit
-objects.
-
-  repo.commits
-  # => [#<Grit::Commit "e80bbd2ce67651aa18e57fb0b43618ad4baf7750">,
-        #<Grit::Commit "91169e1f5fa4de2eaea3f176461f5dc784796769">,
-        #<Grit::Commit "038af8c329ef7c1bae4568b98bd5c58510465493">,
-        #<Grit::Commit "40d3057d09a7a4d61059bca9dca5ae698de58cbe">,
-        #<Grit::Commit "4ea50f4754937bf19461af58ce3b3d24c77311d9">]
-        
-Called without arguments, Repo#commits returns a list of up to ten commits
-reachable by the master branch (starting at the latest commit). You can ask
-for commits beginning at a different branch, commit, tag, etc.
-
-  repo.commits('mybranch')
-  repo.commits('40d3057d09a7a4d61059bca9dca5ae698de58cbe')
-  repo.commits('v0.1')
-  
-You can specify the maximum number of commits to return.
-
-  repo.commits('master', 100)
-  
-If you need paging, you can specify a number of commits to skip.
-
-  repo.commits('master', 10, 20)
-  
-The above will return commits 21-30 from the commit list.
-        
-= The Commit object
-
-Commit objects contain information about that commit.
-
-  head = repo.commits.first
-  
-  head.id
-  # => "e80bbd2ce67651aa18e57fb0b43618ad4baf7750"
-  
-  head.parents
-  # => [#<Grit::Commit "91169e1f5fa4de2eaea3f176461f5dc784796769">]
-  
-  head.tree
-  # => #<Grit::Tree "3536eb9abac69c3e4db583ad38f3d30f8db4771f">
-  
-  head.author
-  # => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
-  
-  head.authored_date
-  # => Wed Oct 24 22:02:31 -0700 2007
-  
-  head.committer
-  # => #<Grit::Actor "Tom Preston-Werner <tom@mojombo.com>">
-  
-  head.committed_date
-  # => Wed Oct 24 22:02:31 -0700 2007
-  
-  head.message
-  # => "add Actor inspect"
-  
-You can traverse a commit's ancestry by chaining calls to #parents.
-
-  repo.commits.first.parents[0].parents[0].parents[0]
-  
-The above corresponds to master^^^ or master~3 in git parlance.
-
-= The Tree object
-
-A tree records pointers to the contents of a directory. Let's say you want
-the root tree of the latest commit on the master branch.
-
-  tree = repo.commits.first.tree
-  # => #<Grit::Tree "3536eb9abac69c3e4db583ad38f3d30f8db4771f">
-  
-  tree.id
-  # => "3536eb9abac69c3e4db583ad38f3d30f8db4771f"
-  
-Once you have a tree, you can get the contents.
-
-  contents = tree.contents
-  # => [#<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">,
-        #<Grit::Blob "81d2c27608b352814cbe979a6acd678d30219678">,
-        #<Grit::Tree "c3d07b0083f01a6e1ac969a0f32b8d06f20c62e5">,
-        #<Grit::Tree "4d00fe177a8407dbbc64a24dbfc564762c0922d8">]
-
-This tree contains two Blob objects and two Tree objects. The trees are
-subdirectories and the blobs are files. Trees below the root have additional
-attributes.
-
-  contents.last.name
-  # => "lib"
-  
-  contents.last.mode
-  # => "040000"
-  
-There is a convenience method that allows you to get a named sub-object
-from a tree.
-
-  tree/"lib"
-  # => #<Grit::Tree "e74893a3d8a25cbb1367cf241cc741bfd503c4b2">
-  
-You can also get a tree directly from the repo if you know its name.
-
-  repo.tree
-  # => #<Grit::Tree "master">
-  
-  repo.tree("91169e1f5fa4de2eaea3f176461f5dc784796769")
-  # => #<Grit::Tree "91169e1f5fa4de2eaea3f176461f5dc784796769">
-  
-= The Blob object
-
-A blob represents a file. Trees often contain blobs.
-
-  blob = tree.contents.first
-  # => #<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">
-  
-A blob has certain attributes.
-
-  blob.id
-  # => "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666"
-  
-  blob.name
-  # => "README.txt"
-  
-  blob.mode
-  # => "100644"
-  
-  blob.size
-  # => 7726
-  
-You can get the data of a blob as a string.
-
-  blob.data
-  # => "Grit is a library to ..."
-  
-You can also get a blob directly from the repo if you know its name.
-
-  repo.blob("4ebc8aea50e0a67e000ba29a30809d0a7b9b2666")
-  # => #<Grit::Blob "4ebc8aea50e0a67e000ba29a30809d0a7b9b2666">
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2007 Tom Preston-Werner
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.