mojombo-grit 0.8.1 → 0.9.3

data/lib/grit/status.rb

@@ -0,0 +1,151 @@
+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
+        
+        Dir.chdir(@base.working_dir) do 
+          # 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
+      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/tree.rb

@@ -14,7 +14,6 @@ module Grit
     # 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
     
@@ -70,6 +69,8 @@ module Grit
           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
@@ -87,7 +88,7 @@ module Grit
     #
     # Returns Grit::Blob or Grit::Tree or nil if not found
     def /(file)
-      self.contents.select { |c| c.name == file }.first
+      self.contents.find { |c| c.name == file }
     end
     
     # Pretty object inspection

data/test/test_blob.rb

@@ -7,6 +7,11 @@ class TestBlob < Test::Unit::TestCase
   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'))

data/test/test_commit.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestCommit < Test::Unit::TestCase
   def setup
-    @r = Repo.new(GRIT_REPO)
+    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
   end
   
   # __bake__
@@ -19,7 +19,6 @@ class TestCommit < Test::Unit::TestCase
   # short_name
   
   def test_id_abbrev
-    Git.any_instance.expects(:rev_parse).returns(fixture('rev_parse'))
     assert_equal '80f136f', @r.commit('80f136f500dfdb8c3e8abf4ae716f875f0a1b57f').id_abbrev
   end
   
@@ -164,13 +163,14 @@ class TestCommit < Test::Unit::TestCase
   # 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' => "2007-10-10T00:06:12-07:00",
+      'committed_date' => date.xmlschema,
       'tree' => "672eca9b7f9e09c22dcb128c283e8c3c8d7697a4",
-      'authored_date' => "2007-10-10T00:06:12-07:00",
+      '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"},
@@ -178,5 +178,7 @@ class TestCommit < Test::Unit::TestCase
     }
 
     assert_equal expected, @c.to_hash
+  ensure
+    ENV["TZ"] = old_tz
   end
 end

data/test/test_diff.rb

@@ -10,7 +10,7 @@ class TestDiff < Test::Unit::TestCase
   def test_list_from_string_new_mode
     output = fixture('diff_new_mode')
     
-    diffs = Diff.list_from_string(@r, output)
+    diffs = Grit::Diff.list_from_string(@r, output)
     assert_equal 2, diffs.size
     assert_equal 10, diffs.first.diff.split("\n").size
     assert_equal nil, diffs.last.diff

data/test/test_git.rb

@@ -5,10 +5,28 @@ class TestGit < Test::Unit::TestCase
     @git = Git.new(File.join(File.dirname(__FILE__), *%w[..]))
   end
   
+  def teardown
+    Grit.debug = false
+  end
+  
   def test_method_missing
     assert_match(/^git version [\w\.]*$/, @git.version)
   end
   
+  def test_logs_stderr
+    Grit.debug = true
+    Grit.stubs(:log)
+    Grit.expects(:log).with(includes("git: 'bad' is not a git-command"))
+    @git.bad
+  end
+  
+  def testl_logs_stderr_when_skipping_timeout 
+    Grit.debug = true
+    Grit.stubs(:log)
+    Grit.expects(:log).with(includes("git: 'bad' is not a git-command"))
+    @git.bad :timeout => false
+  end
+  
   def test_transform_options
     assert_equal ["-s"], @git.transform_options({:s => true})
     assert_equal ["-s '5'"], @git.transform_options({:s => 5})
@@ -38,7 +56,7 @@ class TestGit < Test::Unit::TestCase
 
   def test_raises_on_slow_shell
     Grit::Git.git_timeout = 0.5
-    Open4.expects(:popen4).returns([ nil, nil, mock(:read => proc { sleep 1 }), nil ])
+    Open4.expects(:popen4).yields( nil, nil, mock(:read => proc { sleep 1 }), nil )
     assert_raises Grit::Git::GitTimeout do
       @git.something
     end
@@ -46,7 +64,7 @@ class TestGit < Test::Unit::TestCase
 
   def test_works_fine_if_quick
     output = 'output'
-    Open4.expects(:popen4).returns([ nil, nil, mock(:read => output), nil ])
+    Open4.expects(:popen4).yields( nil, nil, mock(:read => output), stub(:read => nil) )
     assert_equal output, @git.something
   end
 end

data/test/test_grit.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestGrit < Test::Unit::TestCase
+  def setup
+    @old_debug  = Grit.debug
+    @old_logger = Grit.logger
+    Grit.debug  = true
+  end
+  
+  def teardown
+    Grit.debug  = @old_debug
+    Grit.logger = @old_logger
+  end 
+  
+  def test_uses_stdout_logger_by_default
+    assert_equal STDOUT, Grit.logger.instance_variable_get(:@logdev).dev
+  end
+  
+  def test_can_override_logger
+    my_logger = Logger.new(io = StringIO.new)
+    Grit.logger = my_logger
+    assert_equal my_logger, Grit.logger
+  end
+
+  def test_logs_to_specified_logger
+    Grit.logger = Logger.new(io = StringIO.new)
+    Grit.log 'hi mom'
+    io.rewind
+    assert io.read.include?('hi mom')
+  end
+  
+end

data/test/test_head.rb

@@ -2,21 +2,46 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestHead < Test::Unit::TestCase
   def setup
-    @r = Repo.new(GRIT_REPO)
-    Git.any_instance.expects(:for_each_ref).returns(fixture('for_each_ref'))
+    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
   end
   
   # inspect
   
   def test_inspect
     head = @r.heads.first
-    assert_equal %Q{#<Grit::Head "#{head.name}">}, head.inspect
+    assert_equal %Q{#<Grit::Head "test/master">}, head.inspect
   end
 
+  def test_master
+    head = @r.commit('master')
+    assert_equal 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a', head.id
+  end
+
+  def test_submaster
+    head = @r.commit('test/master')
+    assert_equal '2d3acf90f35989df8f262dc50beadc4ee3ae1560', head.id
+  end
+  
   # heads with slashes
 
   def test_heads_with_slashes
-    head = @r.heads.last
-    assert_equal %Q{#<Grit::Head "mojombo/master">}, head.inspect
+    head = @r.heads[2]
+    assert_equal %Q{#<Grit::Head "test/chacon">}, head.inspect
+  end
+  
+  def test_is_head
+    assert @r.is_head?('master')
+    assert @r.is_head?('test/chacon')
+    assert !@r.is_head?('masterblah')
   end
+
+  def test_head_count
+    assert_equal 5, @r.heads.size
+  end
+
+
+  def test_nonpack
+    assert @r.heads.map { |h| h.name }.include?('nonpack')
+  end
+
 end

data/test/test_real.rb

@@ -2,16 +2,18 @@
 # 
 # class TestReal < Test::Unit::TestCase
 #   def setup
-#     @repo = Repo.new('/Users/tom/dev/sandbox/ruby-on-rails-tmbundle')
+#     `rm -fr /Users/tom/dev/sandbox/grittest.git`
+#     `git --git-dir=/Users/tom/dev/sandbox/grittest.git init`
+#     @repo = Repo.new('/Users/tom/dev/sandbox/grittest.git')
 #   end
 #   
 #   def test_real
-#     # Grit.debug = true
+#     Grit.debug = true
 #     
-#     p @repo.commits
+#     index = @repo.index
+#     index.add('foo/bar/baz.txt', 'hello!')
+#     index.add('foo/qux/bam.txt', 'world!')
 #     
-#     # p (@repo.tree/'Syntaxes/Ruby on Rails.plist').data
-#     # p @repo.tree('master', ['Snippets/rea.plist']).contents.first
-#     p @repo.tree('master', ['Syntaxes/Ruby on Rails.plist']).contents.first
+#     puts index.commit('first commit')
 #   end
 # end

data/test/test_remote.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRemote < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+  end
+
+  # inspect
+
+  def test_inspect
+    remote = @r.remotes.first
+    assert_equal %Q{#<Grit::Remote "#{remote.name}">}, remote.inspect
+  end
+end

data/test/test_repo.rb

@@ -4,57 +4,64 @@ class TestRepo < Test::Unit::TestCase
   def setup
     @r = Repo.new(GRIT_REPO)
   end
-  
+
   # new
-  
+
   def test_new_should_raise_on_invalid_repo_location
     assert_raise(InvalidGitRepositoryError) do
       Repo.new("/tmp")
     end
   end
-  
+
   def test_new_should_raise_on_non_existant_path
     assert_raise(NoSuchPathError) do
       Repo.new("/foobar")
     end
   end
-  
+
   # descriptions
-  
+
   def test_description
     assert_equal "Unnamed repository; edit this file to name it for gitweb.", @r.description
   end
-  
+
+  # refs
+
+  def test_refs_should_return_array_of_ref_objects
+    @r.refs.each do |ref|
+      assert ref.is_a? Grit::Ref
+    end
+  end
+
   # heads
-  
+
   def test_heads_should_return_array_of_head_objects
     @r.heads.each do |head|
       assert_equal Grit::Head, head.class
     end
   end
-  
+
   def test_heads_should_populate_head_data
-    Git.any_instance.expects(:for_each_ref).returns(fixture('for_each_ref'))
-    
+    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
     head = @r.heads.first
     
-    assert_equal 'master', head.name
-    assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', head.commit.id
+    assert_equal 'test/master', head.name
+    assert_equal '2d3acf90f35989df8f262dc50beadc4ee3ae1560', head.commit.id
   end
-  
+
   # branches
-  
+
   def test_branches
     # same as heads
   end
-  
+
   # commits
-  
+
   def test_commits
     Git.any_instance.expects(:rev_list).returns(fixture('rev_list'))
-    
+
     commits = @r.commits('master', 10)
-    
+
     c = commits[0]
     assert_equal '4c8124ffcf4039d292442eeccabdeca5af5c5017', c.id
     assert_equal ["634396b2f541a9f2d58b00be1a07f0c358b999b3"], c.parents.map { |p| p.id }
@@ -66,190 +73,190 @@ class TestRepo < Test::Unit::TestCase
     assert_equal "tom@mojombo.com", c.committer.email
     assert_equal Time.at(1191999972), c.committed_date
     assert_equal "implement Grit#heads", c.message
-    
+
     c = commits[1]
     assert_equal [], c.parents
-    
+
     c = commits[2]
     assert_equal ["6e64c55896aabb9a7d8e9f8f296f426d21a78c2c", "7f874954efb9ba35210445be456c74e037ba6af2"], c.parents.map { |p| p.id }
     assert_equal "Merge branch 'site'\n\n  * Some other stuff\n  * just one more", c.message
     assert_equal "Merge branch 'site'", c.short_message
   end
-  
+
   # commit_count
-  
+
   def test_commit_count
     Git.any_instance.expects(:rev_list).with({}, 'master').returns(fixture('rev_list_count'))
-    
+
     assert_equal 655, @r.commit_count('master')
   end
-  
+
   # commit
-  
+
   def test_commit
     commit = @r.commit('634396b2f541a9f2d58b00be1a07f0c358b999b3')
-    
+
     assert_equal "634396b2f541a9f2d58b00be1a07f0c358b999b3", commit.id
   end
-  
+
   # tree
-  
+
   def test_tree
     Git.any_instance.expects(:ls_tree).returns(fixture('ls_tree_a'))
     tree = @r.tree('master')
-    
+
     assert_equal 4, tree.contents.select { |c| c.instance_of?(Blob) }.size
     assert_equal 3, tree.contents.select { |c| c.instance_of?(Tree) }.size
   end
-  
+
   # blob
-  
+
   def test_blob
     Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob'))
     blob = @r.blob("abc")
     assert_equal "Hello world", blob.data
   end
-  
+
   # init_bare
-  
+
   def test_init_bare
     Git.any_instance.expects(:init).returns(true)
-    Repo.expects(:new).with("/foo/bar.git")
+    Repo.expects(:new).with("/foo/bar.git", {})
     Repo.init_bare("/foo/bar.git")
   end
-  
+
   def test_init_bare_with_options
     Git.any_instance.expects(:init).with(
       :template => "/baz/sweet").returns(true)
-    Repo.expects(:new).with("/foo/bar.git")
+    Repo.expects(:new).with("/foo/bar.git", {})
     Repo.init_bare("/foo/bar.git", :template => "/baz/sweet")
   end
-  
+
   # fork_bare
-  
+
   def test_fork_bare
     Git.any_instance.expects(:clone).with(
-      {:bare => true, :shared => true}, 
+      {:bare => true, :shared => true},
       "#{absolute_project_path}/.git",
       "/foo/bar.git").returns(nil)
     Repo.expects(:new)
-      
+
     @r.fork_bare("/foo/bar.git")
   end
-  
+
   def test_fork_bare_with_options
     Git.any_instance.expects(:clone).with(
-      {:bare => true, :shared => true, :template => '/awesome'}, 
+      {:bare => true, :shared => true, :template => '/awesome'},
       "#{absolute_project_path}/.git",
       "/foo/bar.git").returns(nil)
     Repo.expects(:new)
-      
+
     @r.fork_bare("/foo/bar.git", :template => '/awesome')
   end
-  
+
   # diff
-  
+
   def test_diff
     Git.any_instance.expects(:diff).with({}, 'master^', 'master', '--')
     @r.diff('master^', 'master')
-    
+
     Git.any_instance.expects(:diff).with({}, 'master^', 'master', '--', 'foo/bar')
     @r.diff('master^', 'master', 'foo/bar')
-    
+
     Git.any_instance.expects(:diff).with({}, 'master^', 'master', '--', 'foo/bar', 'foo/baz')
     @r.diff('master^', 'master', 'foo/bar', 'foo/baz')
   end
-  
+
   # commit_diff
-  
+
   def test_diff
     Git.any_instance.expects(:diff).returns(fixture('diff_p'))
     diffs = @r.commit_diff('master')
-    
+
     assert_equal 15, diffs.size
   end
-  
+
   # init bare
-  
+
   # archive
-  
+
   def test_archive_tar
-    @r.archive_tar
+    #@r.archive_tar  -- no assertion being done here
   end
-  
+
   # archive_tar_gz
-  
+
   def test_archive_tar_gz
-    @r.archive_tar_gz
+    #@r.archive_tar_gz -- again, no assertion
   end
-  
+
   # enable_daemon_serve
-  
+
   def test_enable_daemon_serve
     FileUtils.expects(:touch).with(File.join(@r.path, 'git-daemon-export-ok'))
     @r.enable_daemon_serve
   end
-  
+
   # disable_daemon_serve
-  
+
   def test_disable_daemon_serve
     FileUtils.expects(:rm_f).with(File.join(@r.path, 'git-daemon-export-ok'))
     @r.disable_daemon_serve
   end
-  
+
   # alternates
-  
+
   def test_alternates_with_two_alternates
     File.expects(:exist?).with("#{absolute_project_path}/.git/objects/info/alternates").returns(true)
     File.expects(:read).returns("/path/to/repo1/.git/objects\n/path/to/repo2.git/objects\n")
-    
+
     assert_equal ["/path/to/repo1/.git/objects", "/path/to/repo2.git/objects"], @r.alternates
   end
-  
+
   def test_alternates_no_file
     File.expects(:exist?).returns(false)
-    
+
     assert_equal [], @r.alternates
   end
-  
+
   # alternates=
-  
+
   def test_alternates_setter_ok
     alts = %w{/path/to/repo.git/objects /path/to/repo2.git/objects}
-    
+
     alts.each do |alt|
       File.expects(:exist?).with(alt).returns(true)
     end
-    
+
     File.any_instance.expects(:write).with(alts.join("\n"))
-    
+
     assert_nothing_raised do
       @r.alternates = alts
     end
   end
-  
+
   def test_alternates_setter_bad
     alts = %w{/path/to/repo.git/objects}
-    
+
     alts.each do |alt|
       File.expects(:exist?).with(alt).returns(false)
     end
-    
+
     File.any_instance.expects(:write).never
-    
+
     assert_raise RuntimeError do
       @r.alternates = alts
     end
   end
-  
+
   def test_alternates_setter_empty
     File.expects(:delete)
-    
+
     @r.alternates = []
   end
-  
+
   # inspect
-  
+
   def test_inspect
     assert_equal %Q{#<Grit::Repo "#{File.expand_path(GRIT_REPO)}/.git">}, @r.inspect
   end