schacon-grit 0.9.1

data/lib/grit/status.rb

@@ -0,0 +1,149 @@
+module Grit
+  
+  class Status
+    include Enumerable
+    
+    @base = nil
+    @files = nil
+    
+    def initialize(base)
+      @base = base
+      construct_status
+    end
+    
+    def changed
+      @files.select { |k, f| f.type == 'M' }
+    end
+    
+    def added
+      @files.select { |k, f| f.type == 'A' }
+    end
+
+    def deleted
+      @files.select { |k, f| f.type == 'D' }
+    end
+    
+    def untracked
+      @files.select { |k, f| f.untracked }
+    end
+    
+    def pretty
+      out = ''
+      self.each do |file|
+        out << file.path
+        out << "\n\tsha(r) " + file.sha_repo.to_s + ' ' + file.mode_repo.to_s
+        out << "\n\tsha(i) " + file.sha_index.to_s + ' ' + file.mode_index.to_s
+        out << "\n\ttype   " + file.type.to_s
+        out << "\n\tstage  " + file.stage.to_s
+        out << "\n\tuntrac " + file.untracked.to_s
+        out << "\n"
+      end
+      out << "\n"
+      out
+    end
+    
+    # enumerable method
+    
+    def [](file)
+      @files[file]
+    end
+    
+    def each
+      @files.each do |k, file|
+        yield file
+      end
+    end
+    
+    class StatusFile
+      attr_accessor :path, :type, :stage, :untracked
+      attr_accessor :mode_index, :mode_repo
+      attr_accessor :sha_index, :sha_repo
+      
+      @base = nil
+      
+      def initialize(base, hash)
+        @base = base
+        @path = hash[:path]
+        @type = hash[:type]
+        @stage = hash[:stage]
+        @mode_index = hash[:mode_index]
+        @mode_repo = hash[:mode_repo]
+        @sha_index = hash[:sha_index]
+        @sha_repo = hash[:sha_repo]
+        @untracked = hash[:untracked]
+      end
+      
+      def blob(type = :index)
+        if type == :repo
+          @base.object(@sha_repo)
+        else
+          @base.object(@sha_index) rescue @base.object(@sha_repo)
+        end
+      end
+      
+    end
+    
+    private
+    
+      def construct_status
+        @files = ls_files
+        
+        # find untracked in working dir
+        Dir.glob('**/*') do |file|
+          if !@files[file]
+            @files[file] = {:path => file, :untracked => true} if !File.directory?(file)
+          end
+        end
+
+        # find modified in tree
+       diff_files.each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
+        
+        # find added but not committed - new files
+        diff_index('HEAD').each do |path, data|
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
+        
+        @files.each do |k, file_hash|
+          @files[k] = StatusFile.new(@base, file_hash)
+        end
+      end
+
+      # compares the index and the working directory
+      def diff_files
+        hsh = {}
+        @base.git.diff_files.split("\n").each do |line|
+          (info, file) = line.split("\t")
+          (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
+          hsh[file] = {:path => file, :mode_file => mode_src.to_s[1, 7], :mode_index => mode_dest, 
+                        :sha_file => sha_src, :sha_index => sha_dest, :type => type}
+        end
+        hsh
+      end
+
+      # compares the index and the repository
+      def diff_index(treeish)
+        hsh = {}
+        @base.git.diff_index({}, treeish).split("\n").each do |line|
+          (info, file) = line.split("\t")
+          (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
+          hsh[file] = {:path => file, :mode_repo => mode_src.to_s[1, 7], :mode_index => mode_dest, 
+                        :sha_repo => sha_src, :sha_index => sha_dest, :type => type}
+        end
+        hsh
+      end
+
+      def ls_files
+        hsh = {}
+        lines = @base.git.ls_files({:stage => true})
+        lines.split("\n").each do |line|
+          (info, file) = line.split("\t")
+          (mode, sha, stage) = info.split
+          hsh[file] = {:path => file, :mode_index => mode, :sha_index => sha, :stage => stage}
+        end
+        hsh
+      end
+  end
+  
+end

data/lib/grit/tag.rb

@@ -0,0 +1,71 @@
+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)
+    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)
+      end
+      
+      tags
+    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}">}
+    end
+  end # Tag
+  
+end # Grit

data/lib/grit/tree.rb

@@ -0,0 +1,100 @@
+module Grit
+  
+  class Tree
+    lazy_reader :contents
+    attr_reader :id
+    attr_reader :mode
+    attr_reader :name
+    
+    # Construct the contents of the tree
+    #   +repo+ is the Repo
+    #   +treeish+ is the reference
+    #   +paths+ is an optional Array of directory paths to restrict the tree
+    #
+    # Returns Grit::Tree (baked)
+    def self.construct(repo, treeish, paths = [])
+      output = repo.git.ls_tree({}, treeish, *paths)
+      self.allocate.construct_initialize(repo, treeish, output)
+    end
+    
+    def construct_initialize(repo, id, text)
+      @repo = repo
+      @id = id
+      @contents = []
+      
+      text.split("\n").each do |line|
+        @contents << content_from_string(repo, line)
+      end
+      @contents.compact!
+
+      self
+    end
+    
+    def lazy_source
+      Tree.construct(@repo, @id, [])
+    end
+    
+    # Create an unbaked Tree containing just the specified attributes
+    #   +repo+ is the Repo
+    #   +atts+ is a Hash of instance variable data
+    #
+    # Returns Grit::Tree (unbaked)
+    def self.create(repo, atts)
+      self.allocate.create_initialize(repo, atts)
+    end
+    
+    # Initializer for Tree.create
+    #   +repo+ is the Repo
+    #   +atts+ is a Hash of instance variable data
+    #
+    # Returns Grit::Tree (unbaked)
+    def create_initialize(repo, atts)
+      @repo = repo
+      
+      atts.each do |k, v|
+        instance_variable_set("@#{k}", v)
+      end
+      self
+    end
+    
+    # Parse a content item and create the appropriate object
+    #   +repo+ is the Repo
+    #   +text+ is the single line containing the items data in `git ls-tree` format
+    #
+    # Returns Grit::Blob or Grit::Tree
+    def content_from_string(repo, text)
+      mode, type, id, name = text.split(" ", 4)
+      case type
+        when "tree"
+          Tree.create(repo, :id => id, :mode => mode, :name => name)
+        when "blob"
+          Blob.create(repo, :id => id, :mode => mode, :name => name)
+        when "link"
+          Blob.create(repo, :id => id, :mode => mode, :name => name)
+        when "commit"
+          nil
+        else
+          raise "Invalid type: #{type}"
+      end
+    end
+    
+    # Find the named object in this tree's contents
+    #
+    # Examples
+    #   Repo.new('/path/to/grit').tree/'lib'
+    #   # => #<Grit::Tree "6cc23ee138be09ff8c28b07162720018b244e95e">
+    #   Repo.new('/path/to/grit').tree/'README.txt'
+    #   # => #<Grit::Blob "8b1e02c0fb554eed2ce2ef737a68bb369d7527df">
+    #
+    # Returns Grit::Blob or Grit::Tree or nil if not found
+    def /(file)
+      self.contents.find { |c| c.name == file }
+    end
+    
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Tree "#{@id}">}
+    end
+  end # Tree
+  
+end # Grit

data/test/test_actor.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestActor < Test::Unit::TestCase
+  def setup
+    
+  end
+  
+  # from_string
+  
+  def test_from_string_should_separate_name_and_email
+    a = Actor.from_string("Tom Werner <tom@example.com>")
+    assert_equal "Tom Werner", a.name
+    assert_equal "tom@example.com", a.email
+  end
+  
+  def test_from_string_should_handle_just_name
+    a = Actor.from_string("Tom Werner")
+    assert_equal "Tom Werner", a.name
+    assert_equal nil, a.email
+  end
+  
+  # inspect
+  
+  def test_inspect
+    a = Actor.from_string("Tom Werner <tom@example.com>")
+    assert_equal %Q{#<Grit::Actor "Tom Werner <tom@example.com>">}, a.inspect
+  end
+
+  # to_s
+
+  def test_to_s_should_alias_name
+    a = Actor.from_string("Tom Werner <tom@example.com>")
+    assert_equal a.name, a.to_s
+  end
+end

data/test/test_blob.rb

@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestBlob < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+    @b = Blob.allocate
+  end
+  
+  # blob
+  def test_nosuch_blob
+    t = @r.blob('blahblah')
+    puts t.data
+    assert t.is_a?(Blob)
+  end
+  
+  def test_data_should_return_blob_contents
+    Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob'))
+    blob = Blob.create(@r, :id => 'abc')
+    assert_equal "Hello world", blob.data
+  end
+  
+  def test_data_should_cache
+    Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob')).times(1)
+    blob = Blob.create(@r, :id => 'abc')
+    blob.data
+    blob.data
+  end
+  
+  # size
+  
+  def test_size_should_return_file_size
+    Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob_size'))
+    blob = Blob.create(@r, :id => 'abc')
+    assert_equal 11, blob.size
+  end
+  
+  # data
+  
+  # mime_type
+  
+  def test_mime_type_should_return_mime_type_for_known_types
+    blob = Blob.create(@r, :id => 'abc', :name => 'foo.png')
+    assert_equal "image/png", blob.mime_type
+  end
+  
+  def test_mime_type_should_return_text_plain_for_unknown_types
+    blob = Blob.create(@r, :id => 'abc')
+    assert_equal "text/plain", blob.mime_type
+  end
+  
+  # blame
+  
+  def test_blame
+    Git.any_instance.expects(:blame).returns(fixture('blame'))
+    b = Blob.blame(@r, 'master', 'lib/grit.rb')
+    assert_equal 13, b.size
+    assert_equal 25, b.inject(0) { |acc, x| acc + x.last.size }
+    assert_equal b[0].first.object_id, b[9].first.object_id
+    c = b.first.first
+    c.expects(:__bake__).times(0)
+    assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', c.id
+    assert_equal 'Tom Preston-Werner', c.author.name
+    assert_equal 'tom@mojombo.com', c.author.email
+    assert_equal Time.at(1191997100), c.authored_date
+    assert_equal 'Tom Preston-Werner', c.committer.name
+    assert_equal 'tom@mojombo.com', c.committer.email
+    assert_equal Time.at(1191997100), c.committed_date
+    assert_equal 'initial grit setup', c.message
+    # c.expects(:__bake__).times(1)
+    # assert_equal Tree, c.tree.class
+  end
+  
+  # inspect
+  
+  def test_inspect
+    @b = Blob.create(@r, :id => 'abc')
+    assert_equal %Q{#<Grit::Blob "abc">}, @b.inspect
+  end
+end

data/test/test_commit.rb

@@ -0,0 +1,184 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestCommit < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
+  end
+  
+  # __bake__
+  
+  def test_bake
+    Git.any_instance.expects(:rev_list).returns(fixture('rev_list_single'))
+    @c = Commit.create(@r, :id => '4c8124ffcf4039d292442eeccabdeca5af5c5017')
+    @c.author # bake
+    
+    assert_equal "Tom Preston-Werner", @c.author.name
+    assert_equal "tom@mojombo.com", @c.author.email
+  end
+  
+  # short_name
+  
+  def test_id_abbrev
+    assert_equal '80f136f', @r.commit('80f136f500dfdb8c3e8abf4ae716f875f0a1b57f').id_abbrev
+  end
+  
+  # diff
+  
+  def test_diff
+    # git diff --full-index 91169e1f5fa4de2eaea3f176461f5dc784796769 > test/fixtures/diff_p
+    
+    Git.any_instance.expects(:diff).with({:full_index => true}, 'master').returns(fixture('diff_p'))
+    diffs = Commit.diff(@r, 'master')
+    
+    assert_equal 15, diffs.size
+    
+    assert_equal '.gitignore', diffs.first.a_path
+    assert_equal '.gitignore', diffs.first.b_path
+    assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_commit.id
+    assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_commit.id
+    assert_equal '100644', diffs.first.b_mode
+    assert_equal false, diffs.first.new_file
+    assert_equal false, diffs.first.deleted_file
+    assert_equal "--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs.first.diff
+    
+    assert_equal 'lib/grit/actor.rb', diffs[5].a_path
+    assert_equal nil, diffs[5].a_commit
+    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_commit.id
+    assert_equal true, diffs[5].new_file
+  end
+  
+  def test_diff_with_two_commits
+    # git diff --full-index 59ddc32 13d27d5 > test/fixtures/diff_2
+    Git.any_instance.expects(:diff).with({:full_index => true}, '59ddc32', '13d27d5').returns(fixture('diff_2'))
+    diffs = Commit.diff(@r, '59ddc32', '13d27d5')
+    
+    assert_equal 3, diffs.size
+    assert_equal %w(lib/grit/commit.rb test/fixtures/show_empty_commit test/test_commit.rb), diffs.collect { |d| d.a_path }
+  end
+  
+  def test_diff_with_files
+    # git diff --full-index 59ddc32 -- lib > test/fixtures/diff_f
+    Git.any_instance.expects(:diff).with({:full_index => true}, '59ddc32', '--', 'lib').returns(fixture('diff_f'))
+    diffs = Commit.diff(@r, '59ddc32', %w(lib))
+    
+    assert_equal 1, diffs.size
+    assert_equal 'lib/grit/diff.rb', diffs.first.a_path
+  end
+  
+  def test_diff_with_two_commits_and_files
+    # git diff --full-index 59ddc32 13d27d5 -- lib > test/fixtures/diff_2f
+    Git.any_instance.expects(:diff).with({:full_index => true}, '59ddc32', '13d27d5', '--', 'lib').returns(fixture('diff_2f'))
+    diffs = Commit.diff(@r, '59ddc32', '13d27d5', %w(lib))
+    
+    assert_equal 1, diffs.size
+    assert_equal 'lib/grit/commit.rb', diffs.first.a_path
+  end
+
+  # diffs
+  def test_diffs
+    # git diff --full-index 91169e1f5fa4de2eaea3f176461f5dc784796769 > test/fixtures/diff_p
+    
+    Git.any_instance.expects(:diff).returns(fixture('diff_p'))
+    @c = Commit.create(@r, :id => '91169e1f5fa4de2eaea3f176461f5dc784796769')
+    diffs = @c.diffs
+    
+    assert_equal 15, diffs.size
+    
+    assert_equal '.gitignore', diffs.first.a_path
+    assert_equal '.gitignore', diffs.first.b_path
+    assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_commit.id
+    assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_commit.id
+    assert_equal '100644', diffs.first.b_mode
+    assert_equal false, diffs.first.new_file
+    assert_equal false, diffs.first.deleted_file
+    assert_equal "--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs.first.diff
+    
+    assert_equal 'lib/grit/actor.rb', diffs[5].a_path
+    assert_equal nil, diffs[5].a_commit
+    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_commit.id
+    assert_equal true, diffs[5].new_file
+  end
+
+  def test_diffs_on_initial_import
+    # git show --full-index 634396b2f541a9f2d58b00be1a07f0c358b999b3 > test/fixtures/diff_i
+
+    Git.any_instance.expects(:show).with({:full_index => true, :pretty => 'raw'}, '634396b2f541a9f2d58b00be1a07f0c358b999b3').returns(fixture('diff_i'))
+    @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
+    diffs = @c.diffs
+    
+    assert_equal 10, diffs.size
+    
+    assert_equal 'History.txt', diffs.first.a_path
+    assert_equal 'History.txt', diffs.first.b_path
+    assert_equal nil, diffs.first.a_commit
+    assert_equal nil, diffs.first.b_mode
+    assert_equal '81d2c27608b352814cbe979a6acd678d30219678', diffs.first.b_commit.id
+    assert_equal true, diffs.first.new_file
+    assert_equal false, diffs.first.deleted_file
+    assert_equal "--- /dev/null\n+++ b/History.txt\n@@ -0,0 +1,5 @@\n+== 1.0.0 / 2007-10-09\n+\n+* 1 major enhancement\n+  * Birthday!\n+", diffs.first.diff
+
+    
+    assert_equal 'lib/grit.rb', diffs[5].a_path
+    assert_equal nil, diffs[5].a_commit
+    assert_equal '32cec87d1e78946a827ddf6a8776be4d81dcf1d1', diffs[5].b_commit.id
+    assert_equal true, diffs[5].new_file
+  end
+  
+  def test_diffs_on_initial_import_with_empty_commit
+    Git.any_instance.expects(:show).with(
+      {:full_index => true, :pretty => 'raw'}, 
+      '634396b2f541a9f2d58b00be1a07f0c358b999b3'
+    ).returns(fixture('show_empty_commit'))
+    
+    @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
+    diffs = @c.diffs
+    
+    assert_equal [], diffs
+  end
+  
+  def test_diffs_with_mode_only_change
+    Git.any_instance.expects(:diff).returns(fixture('diff_mode_only'))
+    @c = Commit.create(@r, :id => '91169e1f5fa4de2eaea3f176461f5dc784796769')
+    diffs = @c.diffs
+    
+    assert_equal 23, diffs.size
+    assert_equal '100644', diffs[0].a_mode
+    assert_equal '100755', diffs[0].b_mode
+  end
+  
+  # to_s
+  
+  def test_to_s
+    @c = Commit.create(@r, :id => 'abc')
+    assert_equal "abc", @c.to_s
+  end
+  
+  # inspect
+  
+  def test_inspect
+    @c = Commit.create(@r, :id => 'abc')
+    assert_equal %Q{#<Grit::Commit "abc">}, @c.inspect
+  end
+
+  # to_hash
+
+  def test_to_hash
+    old_tz, ENV["TZ"] = ENV["TZ"], "US/Pacific"
+    @c = Commit.create(@r, :id => '4c8124ffcf4039d292442eeccabdeca5af5c5017')
+    date = Time.parse('Wed Oct 10 03:06:12 -0400 2007')
+    expected = {
+      'parents' => ['id' => "634396b2f541a9f2d58b00be1a07f0c358b999b3"],
+      'committed_date' => date.xmlschema,
+      'tree' => "672eca9b7f9e09c22dcb128c283e8c3c8d7697a4",
+      'authored_date' => date.xmlschema,
+      'committer' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
+      'message' => "implement Grit#heads",
+      'author' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
+      'id' => "4c8124ffcf4039d292442eeccabdeca5af5c5017"
+    }
+
+    assert_equal expected, @c.to_hash
+  ensure
+    ENV["TZ"] = old_tz
+  end
+end