rugged 0.18.0.gh.de28323 → 0.19.0

data/lib/rugged.rb

@@ -9,4 +9,5 @@ require 'rugged/walker'
 require 'rugged/tree'
 require 'rugged/tag'
 require 'rugged/branch'
+require 'rugged/diff'
 require 'rugged/remote'

data/lib/rugged/commit.rb

@@ -6,7 +6,22 @@ module Rugged
     end
 
     def inspect
-      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_oids}>"
+      "#<Rugged::Commit:#{object_id} {message: #{message.inspect}, tree: #{tree.inspect}, parents: #{parent_oids}}>"
+    end
+
+    # Return a diff between this commit and its first parent or another commit or tree.
+    #
+    # See Rugged::Tree#diff for more details.
+    def diff(*args)
+      args.unshift(parents.first) if args.size == 1 && args.first.is_a?(Hash)
+      self.tree.diff(*args)
+    end
+
+    # Return a diff between this commit and the workdir.
+    #
+    # See Rugged::Tree#diff_workdir for more details.
+    def diff_workdir(options = {})
+      self.tree.diff_workdir(options)
     end
 
     # The time when this commit was made effective. This is the same value

data/lib/rugged/console.rb

@@ -0,0 +1,9 @@
+# Loaded by script/console. Land helpers here.
+
+def repo
+  Rugged::Repository.new(File.expand_path('../../../', __FILE__))
+end
+
+Pry.config.prompt = lambda do |context, nesting, pry|
+  "[rugged] #{context}> "
+end

data/lib/rugged/diff.rb

@@ -0,0 +1,19 @@
+require 'rugged/diff/patch'
+require 'rugged/diff/hunk'
+require 'rugged/diff/line'
+require 'rugged/diff/delta'
+
+module Rugged
+  class Diff
+    include Enumerable
+    alias each each_patch
+
+    def patches
+      each_patch.to_a
+    end
+
+    def deltas
+      each_delta.to_a
+    end
+  end
+end

data/lib/rugged/diff/delta.rb

@@ -0,0 +1,54 @@
+module Rugged
+  class Diff
+    class Delta
+      include Enumerable
+
+      attr_reader :owner
+      alias diff owner
+
+      attr_reader :old_file
+      attr_reader :new_file
+      attr_reader :similarity
+      attr_reader :status
+      attr_reader :binary
+
+      alias binary? binary
+
+      def added?
+        status == :added
+      end
+
+      def deleted?
+        status == :deleted
+      end
+
+      def modified?
+        status == :modified
+      end
+
+      def renamed?
+        status == :renamed
+      end
+
+      def copied?
+        status == :copied
+      end
+
+      def ignored?
+        status == :ignored
+      end
+
+      def untracked?
+        status == :untracked
+      end
+
+      def typechange?
+        status == :typechange
+      end
+
+      def inspect
+        "#<#{self.class.name}:#{object_id} {old_file: #{old_file.inspect}, new_file: #{new_file.inspect}, similarity: #{similarity.inspect}, status: #{status.inspect}>"
+      end
+    end
+  end
+end

data/lib/rugged/diff/hunk.rb

@@ -0,0 +1,23 @@
+module Rugged
+  class Diff
+    class Hunk
+      include Enumerable
+      alias each each_line
+
+      attr_reader :line_count, :header, :range, :owner
+
+      alias size line_count
+      alias count line_count
+      alias delta owner
+
+      def inspect
+        "#<#{self.class.name}:#{object_id} {header: #{header.inspect}, range: #{range.inspect}>"
+      end
+
+      # Returns an Array containing all lines of the hunk.
+      def lines
+        each_line.to_a
+      end
+    end
+  end
+end

data/lib/rugged/diff/line.rb

@@ -0,0 +1,29 @@
+module Rugged
+  class Diff
+    class Line
+      attr_reader :line_origin, :content, :owner, :old_lineno, :new_lineno
+
+      alias hunk owner
+
+      def context?
+        @line_origin == :context
+      end
+
+      def addition?
+        @line_origin == :addition
+      end
+
+      def deletion?
+        @line_origin == :deletion
+      end
+
+      def eof_newline?
+        @line_origin == :eof_newline
+      end
+
+      def inspect
+        "#<#{self.class.name}:#{object_id} {line_origin: #{line_origin.inspect}, content: #{content.inspect}>"
+      end
+    end
+  end
+end

data/lib/rugged/diff/patch.rb

@@ -0,0 +1,28 @@
+module Rugged
+  class Diff
+    class Patch
+      include Enumerable
+      alias each each_hunk
+
+      alias size hunk_count
+      alias count hunk_count
+
+      attr_accessor :owner
+      alias diff owner
+
+      def inspect
+        "#<#{self.class.name}:#{object_id}>"
+      end
+
+      # Returns the number of changes in the patch.
+      def changes
+        additions + deletions
+      end
+
+      # Returns an Array containing all hunks of the patch.
+      def hunks
+        each_hunk.to_a
+      end
+    end
+  end
+end

data/lib/rugged/repository.rb

@@ -17,6 +17,35 @@ module Rugged
       self.lookup self.head.target
     end
 
+    def diff(left, right, opts = {})
+      left = rev_parse(left) if left.kind_of?(String)
+      right = rev_parse(right) if right.kind_of?(String)
+
+      if !left.is_a?(Rugged::Tree) && !left.is_a?(Rugged::Commit) && !left.nil?
+        raise TypeError, "Expected a Rugged::Tree or Rugged::Commit instance"
+      end
+
+      if !right.is_a?(Rugged::Tree) && !right.is_a?(Rugged::Commit) && !right.nil?
+        raise TypeError, "Expected a Rugged::Tree or Rugged::Commit instance"
+      end
+
+      if left
+        left.diff(right, opts)
+      elsif right
+        right.diff(left, opts.merge(:reverse => !opts[:reverse]))
+      end
+    end
+
+    def diff_workdir(left, opts = {})
+      left = rev_parse(left) if left.kind_of?(String)
+
+      if !left.is_a?(Rugged::Tree) && !left.is_a?(Rugged::Commit)
+        raise TypeError, "Expected a Rugged::Tree or Rugged::Commit instance"
+      end
+
+      left.diff_workdir(opts)
+    end
+
     # Walks over a set of commits using Rugged::Walker.
     #
     # from    - The String SHA1 to push onto Walker to begin our walk.
@@ -32,14 +61,6 @@ module Rugged
       walker.each(&block)
     end
 
-    # Find the HEAD of this repository.
-    #
-    # Returns a Reference.
-    def head
-      ref = Reference.lookup(self, "HEAD")
-      ref.resolve
-    end
-
     # Look up a SHA1.
     #
     # Returns one of the four classes that inherit from Rugged::Object.
@@ -74,37 +95,12 @@ module Rugged
       Rugged::Reference.lookup(self, ref_name)
     end
 
-    # Retuns all the References that match a pattern.
-    #
-    # refs - A Regexp (or String) to search for. Optional.
-    #
-    # Examples:
-    #
-    #   # All refs
-    #   repo.refs
-    #
-    #   # All remote refs
-    #   repo.refs 'refs/remotes'
-    #
-    # Returns an Array of References.
-    def refs(pattern = nil)
-      r = []
-      ref_names.each do |ref_name|
-        if pattern
-          p = Regexp.new(pattern)
-          r << Rugged::Reference.lookup(self, ref_name) if p.match(ref_name)
-        else
-          r << Rugged::Reference.lookup(self, ref_name)
-        end
-      end
-      r
+    def refs(glob = nil)
+      Rugged::Reference.each(self, glob)
     end
 
-    # The names of all the refs.
-    #
-    # Returns an Enumerable::Enumerator containing all the String ref names.
-    def ref_names
-      Rugged::Reference.each(self)
+    def ref_names(glob = nil)
+      Rugged::Reference.each_name(self, glob)
     end
 
     # All the tags in the repository.
@@ -116,7 +112,8 @@ module Rugged
 
     # All the remotes in the repository.
     #
-    # Returns an Enumerable::Enumerator containing all the String remote names.
+    # Returns an Enumerable::Enumerator containing all the Rugged::Remotes in
+    # the repository.
     def remotes
       Rugged::Remote.each(self)
     end
@@ -156,7 +153,7 @@ module Rugged
       tree = Rugged::Commit.lookup(self, revision).tree
       begin
         blob_data = tree.path(path)
-      rescue Rugged::IndexerError
+      rescue Rugged::TreeError
         return nil
       end
       blob = Rugged::Blob.lookup(self, blob_data[:oid])

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.18.0.gh.de28323'
+  Version = VERSION = '0.19.0'
 end

data/test/blob_test.rb

@@ -10,6 +10,81 @@ class BlobTest < Rugged::TestCase
     assert_equal "new file\n", blob.content
     assert_equal :blob, blob.type
     assert_equal oid, blob.oid
+    assert_equal "new file\n", blob.text
+  end
+
+  def test_blob_sloc
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    assert_equal 328, blob.sloc
+  end
+
+  def test_blob_content_with_size
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    content =  blob.content(10)
+    assert_equal "# Rugged\n*", content
+    assert_equal 10, content.size
+  end
+
+  def test_blob_content_with_size_gt_file_size
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    content =  blob.content(1000000)
+    assert_equal blob.size, content.size
+  end
+
+  def test_blob_content_with_zero_size
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    content =  blob.content(0)
+    assert_equal '', content
+  end
+
+  def test_blob_content_with_negative_size
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    content =  blob.content(-100)
+    assert_equal blob.size, content.size
+  end
+
+  def test_blob_text_with_max_lines
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    assert_equal "# Rugged\n", blob.text(1)
+  end
+
+  def test_blob_text_with_lines_gt_file_lines
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    text = blob.text(1000000)
+    assert_equal 464, text.lines.count
+  end
+
+  def test_blob_text_with_zero_lines
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    text = blob.text(0)
+    assert_equal '', text
+  end
+
+  def test_blob_text_with_negative_lines
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    text = blob.text(-100)
+    assert_equal 464, text.lines.count
+  end
+
+  def test_blob_text_default_encoding
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    assert_equal Encoding::UTF_8, blob.text.encoding
+  end
+
+  def test_blob_text_set_encoding
+    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
+    blob = @repo.lookup(oid)
+    assert_equal Encoding::ASCII_8BIT, blob.text(0, Encoding::ASCII_8BIT).encoding
   end
 end
 
@@ -29,6 +104,238 @@ class BlobWriteTest < Rugged::TestCase
   end
 
   def test_write_blob_data
-    Rugged::Blob.create(@repo, "a new blob content")
+    assert_equal '1d83f106355e4309a293e42ad2a2c4b8bdbe77ae',
+      Rugged::Blob.from_buffer(@repo, "a new blob content")
+  end
+
+  def test_write_blob_from_workdir
+    assert_equal '1385f264afb75a56a5bec74243be9b367ba4ca08',
+      Rugged::Blob.from_workdir(@repo, "README")
+  end
+
+  def test_write_blob_from_disk
+    file_path = File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
+    File.open(file_path, 'rb') do |file|
+      oid = Rugged::Blob.from_disk(@repo, file.path)
+      assert oid
+
+      blob = @repo.lookup(oid)
+      file.rewind
+      assert_equal file.read, blob.content
+    end
+  end
+
+  def test_blob_is_binary
+    binary_file_path = File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
+    binary_blob = @repo.lookup(Rugged::Blob.from_disk(@repo, binary_file_path))
+    assert binary_blob.binary?
+
+    text_file_path = File.join(TEST_DIR, (File.join('fixtures', 'text_file.md')))
+    text_blob = @repo.lookup(Rugged::Blob.from_disk(@repo, text_file_path))
+    refute text_blob.binary?
   end
 end
+
+class BlobDiffTest < Rugged::SandboxedTestCase
+  def test_diff_blob
+    repo = sandbox_init("diff")
+
+    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
+    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
+
+    blob  = repo.lookup(a.tree["readme.txt"][:oid])
+    other = repo.lookup(b.tree["readme.txt"][:oid])
+
+    patch = blob.diff(other)
+
+    assert_equal :modified, patch.delta.status
+
+    hunks = []
+    patch.each_hunk do |hunk|
+      assert_instance_of Rugged::Diff::Hunk, hunk
+      hunks << hunk
+    end
+    assert_equal 3, hunks.size
+
+    assert hunks[0].header.start_with? "@@ -1,4 +1,4 @@"
+    assert hunks[1].header.start_with? "@@ -7,10 +7,6 @@"
+    assert hunks[2].header.start_with? "@@ -24,12 +20,9 @@"
+
+    lines = []
+    hunks[0].each_line do |line|
+      lines << line
+    end
+    assert_equal 5, lines.size
+
+    assert_equal :deletion, lines[0].line_origin
+    assert_equal "The Git feature that really makes it stand apart from nearly every other SCM\n", lines[0].content
+
+    assert_equal :addition, lines[1].line_origin
+    assert_equal "The Git feature that r3ally mak3s it stand apart from n3arly 3v3ry other SCM\n", lines[1].content
+
+    assert_equal :context, lines[2].line_origin
+    assert_equal "out there is its branching model.\n", lines[2].content
+
+    assert_equal :context, lines[3].line_origin
+    assert_equal "\n", lines[3].content
+
+    assert_equal :context, lines[4].line_origin
+    assert_equal "Git allows and encourages you to have multiple local branches that can be\n", lines[4].content
+  end
+
+  def test_diff_string
+    repo = sandbox_init("diff")
+
+    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
+    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
+
+    blob  = repo.lookup(a.tree["readme.txt"][:oid])
+    other = repo.lookup(b.tree["readme.txt"][:oid]).content
+
+    patch = blob.diff(other)
+
+    assert_equal :modified, patch.delta.status
+
+    hunks = []
+    patch.each_hunk do |hunk|
+      assert_instance_of Rugged::Diff::Hunk, hunk
+      hunks << hunk
+    end
+    assert_equal 3, hunks.size
+
+    assert hunks[0].header.start_with? "@@ -1,4 +1,4 @@"
+    assert hunks[1].header.start_with? "@@ -7,10 +7,6 @@"
+    assert hunks[2].header.start_with? "@@ -24,12 +20,9 @@"
+
+    lines = []
+    hunks[0].each_line do |line|
+      lines << line
+    end
+    assert_equal 5, lines.size
+
+    assert_equal :deletion, lines[0].line_origin
+    assert_equal "The Git feature that really makes it stand apart from nearly every other SCM\n", lines[0].content
+
+    assert_equal :addition, lines[1].line_origin
+    assert_equal "The Git feature that r3ally mak3s it stand apart from n3arly 3v3ry other SCM\n", lines[1].content
+
+    assert_equal :context, lines[2].line_origin
+    assert_equal "out there is its branching model.\n", lines[2].content
+
+    assert_equal :context, lines[3].line_origin
+    assert_equal "\n", lines[3].content
+
+    assert_equal :context, lines[4].line_origin
+    assert_equal "Git allows and encourages you to have multiple local branches that can be\n", lines[4].content
+  end
+
+  def test_diff_nil
+    repo = sandbox_init("diff")
+
+    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
+
+    blob  = repo.lookup(a.tree["readme.txt"][:oid])
+
+    patch = blob.diff(nil)
+
+    assert_equal :deleted, patch.delta.status
+
+    hunks = []
+    patch.each_hunk do |hunk|
+      assert_instance_of Rugged::Diff::Hunk, hunk
+      hunks << hunk
+    end
+    assert_equal 1, hunks.size
+
+    assert hunks[0].header.start_with? "@@ -1,35 +0,0 @@"
+
+    lines = []
+    hunks[0].each_line do |line|
+      lines << line
+    end
+    assert_equal 35, lines.size
+
+    lines.each do |line|
+      assert_equal :deletion, line.line_origin
+    end
+  end
+
+  def test_diff_with_paths
+    repo = sandbox_init("diff")
+
+    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
+    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
+
+    blob  = repo.lookup(a.tree["readme.txt"][:oid])
+    other = repo.lookup(b.tree["readme.txt"][:oid])
+
+    patch = blob.diff(other, :old_path => "old_readme.txt", :new_path => "new_readme.txt")
+    assert_equal "old_readme.txt", patch.delta.old_file[:path]
+    assert_equal "new_readme.txt", patch.delta.new_file[:path]
+  end
+end
+
+class BlobCreateFromChunksTest < Rugged::TestCase
+  include Rugged::TempRepositoryAccess
+
+  def test_write_blob_from_chunks_with_hintpath
+    file_path= File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
+    File.open(file_path, 'rb') do |io|
+      oid = Rugged::Blob.from_chunks(@repo, io, 'archive.tar.gz2')
+      io.rewind
+      blob = @repo.lookup(oid)
+      assert_equal io.read, blob.content
+    end
+  end
+
+  def test_write_blob_from_chunks_without_hintpath
+    file_path= File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
+    File.open(file_path, 'rb') do |io|
+      oid = Rugged::Blob.from_chunks(@repo, io)
+      io.rewind
+      blob = @repo.lookup(oid)
+      assert_equal io.read, blob.content
+    end
+  end
+
+  class BrokenIO
+    def read(length)
+      raise IOError
+    end
+  end
+
+  def test_write_blob_from_chunks_broken_io
+    oid = Rugged::Blob.from_chunks(@repo, BrokenIO.new)
+    blob = @repo.lookup(oid)
+    assert_equal 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391',
+      blob.oid
+    assert_equal 0, blob.size
+  end
+
+  class OverflowIO
+    def initialize()
+      @called = false
+    end
+
+    def read(size)
+      res = @called ? nil : 'a' * size * 4
+      @called = true
+      res
+    end
+  end
+
+  def test_write_blob_from_chunks_overflow_io
+    assert Rugged::Blob.from_chunks(@repo, OverflowIO.new)
+  end
+
+  class BadIO
+    def read(length)
+      :invalid_data
+    end
+  end
+
+  def test_write_blob_from_chunks_bad_io
+    assert Rugged::Blob.from_chunks(@repo, BadIO.new)
+  end
+
+end