rugged 0.17.0.b7 → 0.18.0.b1

data/lib/rugged.rb

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

data/lib/rugged/index.rb

@@ -1,5 +1,13 @@
 module Rugged
   class Index
     include Enumerable
+
+    def to_s
+      s = "#<Rugged::Index\n"
+      self.each do |entry|
+        s << "  [#{entry[:stage]}] '#{entry[:path]}'\n"
+      end
+      s + '>'
+    end
   end
 end

data/lib/rugged/remote.rb

@@ -0,0 +1,13 @@
+module Rugged
+  class Remote
+    # Push a list of refspecs to the given remote.
+    #
+    # refspecs - A list of refspecs that should be pushed to the remote.
+    #
+    # Returns a hash containing the pushed refspecs as keys and
+    # any error messages or +nil+ as values.
+    def push(refspecs)
+      @owner.push(self, refspecs)
+    end
+  end
+end

data/lib/rugged/repository.rb

@@ -146,13 +146,13 @@ module Rugged
       Branch.create(self, name, target)
     end
 
-    # Get the content of a file at a specific revision.
+    # Get the blob at a path for a specific revision.
     #
     # revision - The String SHA1.
     # path     - The String file path.
     #
     # Returns a String.
-    def file_at(revision, path)
+    def blob_at(revision, path)
       tree = Rugged::Commit.lookup(self, revision).tree
       begin
         blob_data = tree.path(path)
@@ -160,7 +160,7 @@ module Rugged
         return nil
       end
       blob = Rugged::Blob.lookup(self, blob_data[:oid])
-      (blob.type == :blob) ? blob.content : nil
+      (blob.type == :blob) ? blob : nil
     end
   end
 end

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.17.0.b7'
+  Version = VERSION = '0.18.0.b1'
 end

data/test/blob_test.rb

@@ -1,26 +1,22 @@
 require "test_helper"
 
-context "Rugged::Blob tests" do
-  setup do
-    @path = File.dirname(__FILE__) + '/fixtures/testrepo.git/'
-    @repo = Rugged::Repository.new(@path)
-    @oid = "fa49b077972391ad58037050f2a75f74e3671e92"
-  end
+class BlobTest < Rugged::TestCase
+  include Rugged::RepositoryAccess
 
-  test "can read the blob data" do
-    blob = @repo.lookup(@oid)
+  def test_read_blob_data
+    oid = "fa49b077972391ad58037050f2a75f74e3671e92"
+    blob = @repo.lookup(oid)
     assert_equal 9, blob.size
     assert_equal "new file\n", blob.content
     assert_equal :blob, blob.type
-    assert_equal @oid, blob.oid
+    assert_equal oid, blob.oid
   end
+end
 
-  test "can write new blob data" do
-    oid = Rugged::Blob.create(@repo, "a new blob content")
-    rm_loose(oid)
-  end
+class BlobWriteTest < Rugged::TestCase
+  include Rugged::TempRepositoryAccess
 
-  test "gets the complete content if it has nulls" do
+  def test_fetch_blob_content_with_nulls
     content = "100644 example_helper.rb\x00\xD3\xD5\xED\x9DA4_"+
                "\xE3\xC3\nK\xCD<!\xEA-_\x9E\xDC=40000 examples\x00"+
                "\xAE\xCB\xE9d!|\xB9\xA6\x96\x024],U\xEE\x99\xA2\xEE\xD4\x92"
@@ -30,7 +26,9 @@ context "Rugged::Blob tests" do
     oid = @repo.write(content, 'tree')
     blob = @repo.lookup(oid)
     assert_equal content, blob.read_raw.data
-    rm_loose(oid)
   end
 
+  def test_write_blob_data
+    Rugged::Blob.create(@repo, "a new blob content")
+  end
 end

data/test/branch_test.rb

@@ -1,13 +1,10 @@
 # encoding: UTF-8
 require "test_helper"
 
-context "Rugged::Branch.each_name" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-  end
+class BranchTest < Rugged::TestCase
+  include Rugged::TempRepositoryAccess
 
-  test "lists the names of all branches in a bare repository" do
+  def test_list_all_names
     assert_equal [
       "master",
       "origin/HEAD",
@@ -16,40 +13,26 @@ context "Rugged::Branch.each_name" do
     ], Rugged::Branch.each_name(@repo).sort
   end
 
-  test "can list only local branches" do
+  def test_list_only_local_branches
     assert_equal ["master"], Rugged::Branch.each_name(@repo, :local).sort
   end
 
-  test "can list only remote branches" do
+  def test_list_only_remote_branches
     assert_equal [
       "origin/HEAD",
       "origin/master",
       "origin/packed",
     ], Rugged::Branch.each_name(@repo, :remote).sort
   end
-end
 
-context "Rugged::Branch#tip" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-  end
-
-  test "returns the latest commit of the branch" do
+  def test_get_latest_commit_in_branch
     tip = Rugged::Branch.lookup(@repo, "master").tip
 
     assert_kind_of Rugged::Commit, tip
     assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", tip.oid
   end
-end
 
-context "Rugged::Branch.lookup" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-  end
-
-  test "can look up local branches" do
+  def test_lookup_local_branch
     branch = Rugged::Branch.lookup(@repo, "master")
     refute_nil branch
 
@@ -58,7 +41,7 @@ context "Rugged::Branch.lookup" do
     assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", branch.tip.oid
   end
 
-  test "can look up remote branches" do
+  def test_lookup_remote_branches
     branch = Rugged::Branch.lookup(@repo, "origin/packed", :remote)
     refute_nil branch
 
@@ -67,7 +50,7 @@ context "Rugged::Branch.lookup" do
     assert_equal "41bc8c69075bbdb46c5c6f0566cc8cc5b46e8bd9", branch.tip.oid
   end
 
-  test "can look up branches with non 7-bit ASCII characters" do
+  def test_lookup_unicode_branch_name
     new_branch = @repo.create_branch("Ångström", "5b5b025afb0b4c913b4c338a42934a3863bf3644")
     refute_nil new_branch
 
@@ -76,28 +59,14 @@ context "Rugged::Branch.lookup" do
 
     assert_equal new_branch, retrieved_branch
   end
-end
 
-context "Rugged::Repository.delete" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-  end
-
-  test "deletes a branch from the repository" do
+  def test_delete_branch
     branch = @repo.create_branch("test_branch")
     branch.delete!
     assert_nil Rugged::Branch.lookup(@repo, "test_branch")
   end
-end
-
-context "Rugged::Repository.move" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-  end
 
-  test "renames a branch" do
+  def test_rename_branch
     branch = @repo.create_branch("test_branch")
 
     branch.move('other_branch')
@@ -105,15 +74,8 @@ context "Rugged::Repository.move" do
     assert_nil Rugged::Branch.lookup(@repo, "test_branch")
     refute_nil Rugged::Branch.lookup(@repo, "other_branch")
   end
-end
-
-context "Rugged::Repository#create_branch" do
-  setup do
-    @path = temp_repo("testrepo.git")
-    @repo = Rugged::Repository.new(@path)
-  end
 
-  test "can create a new branch" do
+  def test_create_new_branch
     new_branch = @repo.create_branch("test_branch", "5b5b025afb0b4c913b4c338a42934a3863bf3644")
 
     refute_nil new_branch
@@ -126,7 +88,7 @@ context "Rugged::Repository#create_branch" do
     refute_nil @repo.branches.find { |p| p.name == "test_branch" }
   end
 
-  test "can create branches with non 7-bit ASCII names" do
+  def test_create_unicode_branch
     branch_name = "A\314\212ngstro\314\210m"
     new_branch = @repo.create_branch(branch_name, "5b5b025afb0b4c913b4c338a42934a3863bf3644")
 
@@ -140,7 +102,7 @@ context "Rugged::Repository#create_branch" do
     refute_nil @repo.branches.find { |p| p.name == branch_name }
   end
 
-  test "can create a new branch with an abbreviated sha" do
+  def test_create_branch_short_sha
     new_branch = @repo.create_branch("test_branch", "5b5b025")
 
     refute_nil new_branch
@@ -151,7 +113,7 @@ context "Rugged::Repository#create_branch" do
     assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
   end
 
-  test "can create a new branch from a tag name" do
+  def test_create_branch_from_tag
     new_branch = @repo.create_branch("test_branch", "refs/tags/v0.9")
 
     refute_nil new_branch
@@ -162,7 +124,7 @@ context "Rugged::Repository#create_branch" do
     assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
   end
 
-  test "can create a new branch from implicit head" do
+  def test_create_branch_from_head
     new_branch = @repo.create_branch("test_branch")
 
     refute_nil new_branch
@@ -173,7 +135,7 @@ context "Rugged::Repository#create_branch" do
     assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", new_branch.tip.oid
   end
 
-  test "can create a new branch from explicit head" do
+  def test_create_branch_explicit_head
     new_branch = @repo.create_branch("test_branch", "HEAD")
 
     refute_nil new_branch
@@ -184,8 +146,9 @@ context "Rugged::Repository#create_branch" do
     assert_equal "36060c58702ed4c2a40832c51758d5344201d89a", new_branch.tip.oid
   end
 
-  test "can create a new branch from a commit object" do
-    new_branch = @repo.create_branch("test_branch", Rugged::Commit.lookup(@repo, "5b5b025afb0b4c913b4c338a42934a3863bf3644"))
+  def test_create_branch_from_commit
+    new_branch = @repo.create_branch("test_branch",
+      Rugged::Commit.lookup(@repo, "5b5b025afb0b4c913b4c338a42934a3863bf3644"))
 
     refute_nil new_branch
     assert_equal "test_branch", new_branch.name
@@ -195,31 +158,33 @@ context "Rugged::Repository#create_branch" do
     assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", new_branch.tip.oid
   end
 
-  test "can not create a new branch from a tree" do
-    assert_raises Rugged::InvalidError do
-      @repo.create_branch("test_branch", Rugged::Tree.lookup(@repo, "f60079018b664e4e79329a7ef9559c8d9e0378d1"))
+  def test_create_branch_from_tree_fails
+    assert_raises ArgumentError, Rugged::InvalidError do
+      @repo.create_branch("test_branch",
+        Rugged::Tree.lookup(@repo, "f60079018b664e4e79329a7ef9559c8d9e0378d1"))
     end
-   end
+  end
 
-  test "can not create a new branch from a blob" do
-    assert_raises Rugged::InvalidError do
-      @repo.create_branch("test_branch", Rugged::Blob.lookup(@repo, "1385f264afb75a56a5bec74243be9b367ba4ca08"))
+  def test_create_branch_from_blob_fails
+    assert_raises ArgumentError, Rugged::InvalidError do
+      @repo.create_branch("test_branch",
+        Rugged::Blob.lookup(@repo, "1385f264afb75a56a5bec74243be9b367ba4ca08"))
     end
   end
 
-  test "can not create a new branch from an unknown branch" do
+  def test_create_branch_from_unknown_ref_fails
     assert_raises Rugged::ReferenceError do
       @repo.create_branch("test_branch", "i_do_not_exist")
     end
   end
 
-  test "can not create a new branch from an unknown commit" do
+  def test_create_branch_from_unknown_commit_fails
     assert_raises Rugged::ReferenceError do
       @repo.create_branch("test_branch", "dd15de908706711b51b7acb24faab726d2b3cb16")
     end
   end
 
-  test "can not create a new branch from a non canonical branch name" do
+  def test_create_branch_from_non_canonical_fails
     assert_raises Rugged::ReferenceError do
       @repo.create_branch("test_branch", "packed")
     end

data/test/commit_test.rb

@@ -1,12 +1,9 @@
 require "test_helper"
 
-context "Rugged::Commit tests" do
-  setup do
-    @path = File.dirname(__FILE__) + '/fixtures/testrepo.git/'
-    @repo = Rugged::Repository.new(@path)
-  end
+class TestCommit < Rugged::TestCase
+  include Rugged::RepositoryAccess
 
-  test "can read the commit data" do
+  def test_read_commit_data
     oid = "8496071c1b46c854b31185ea97743be6a8774479"
     obj = @repo.lookup(oid)
 
@@ -30,7 +27,7 @@ context "Rugged::Commit tests" do
     assert_equal [], obj.parents
   end
 
-  test "can have multiple parents" do
+  def test_commit_with_multiple_parents
     oid = "a4a7dce85cf63874e984719f4fdd239f5145052f"
     obj = @repo.lookup(oid)
     parents = obj.parents.map {|c| c.oid }
@@ -38,7 +35,7 @@ context "Rugged::Commit tests" do
     assert parents.include?("c47800c7266a2be04c571c04d5a6614691ea99bd")
   end
 
-  test "can list parent oids only" do
+  def test_get_parent_oids
     oid = "a4a7dce85cf63874e984719f4fdd239f5145052f"
     obj = @repo.lookup(oid)
     parents = obj.parent_oids
@@ -46,24 +43,65 @@ context "Rugged::Commit tests" do
     assert parents.include?("c47800c7266a2be04c571c04d5a6614691ea99bd")
   end
 
-  test "can read a tree oid only" do
+  def test_get_tree_oid
     oid = "8496071c1b46c854b31185ea97743be6a8774479"
     obj = @repo.lookup(oid)
 
     assert_equal obj.tree_oid, "181037049a54a1eb5fab404658a3a250b44335d7"
   end
+end
 
-  test "can write new commit data" do
+class CommitWriteTest < Rugged::TestCase
+  include Rugged::TempRepositoryAccess
+
+  def test_write_a_commit
     person = {:name => 'Scott', :email => 'schacon@gmail.com', :time => Time.now }
 
-    commit_oid = Rugged::Commit.create(@repo,
+    Rugged::Commit.create(@repo,
+      :message => "This is the commit message\n\nThis commit is created from Rugged",
+      :committer => person,
+      :author => person,
+      :parents => [@repo.head.target],
+      :tree => "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")
+  end
+
+  def test_write_commit_with_time_offset
+    person = {:name => 'Jake', :email => 'jake@github.com', :time => Time.now, :time_offset => 3600}
+
+    oid = Rugged::Commit.create(@repo,
       :message => "This is the commit message\n\nThis commit is created from Rugged",
       :committer => person,
       :author => person,
       :parents => [@repo.head.target],
       :tree => "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")
 
-    rm_loose(commit_oid)
+    commit = @repo.lookup(oid)
+    assert_equal 3600, commit.committer[:time_offset]
+  end
+
+  def test_write_invalid_parents
+    person = {:name => 'Jake', :email => 'jake@github.com', :time => Time.now, :time_offset => 3600}
+
+    assert_raises TypeError do
+      Rugged::Commit.create(@repo,
+        :message => "This is the commit message\n\nThis commit is created from Rugged",
+        :committer => person,
+        :author => person,
+        :parents => [:invalid_parent],
+        :tree => "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")
+    end
   end
 
+  def test_write_empty_email
+    person = {:name => 'Jake', :email => '', :time => Time.now}
+
+    assert_raises Rugged::InvalidError do
+      Rugged::Commit.create(@repo,
+        :message => "This is the commit message\n\nThis commit is created from Rugged",
+        :committer => person,
+        :author => person,
+        :parents => [@repo.head.target],
+        :tree => "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")
+    end
+  end
 end

data/test/config_test.rb

@@ -1,28 +1,30 @@
 require "test_helper"
 
-context "Rugged::Config tests" do
-  setup do
-    @repo = Rugged::Repository.new(temp_repo('testrepo.git'))
-  end
+class ConfigTest < Rugged::TestCase 
+  include Rugged::RepositoryAccess
 
-  test "can read the config file from repo" do
+  def test_read_config_file
     config = @repo.config
     assert_equal 'false', config['core.bare']
     assert_nil config['not.exist']
   end
 
-  test "can read the config file from path" do
+  def test_read_config_from_path
     config = Rugged::Config.new(File.join(@repo.path, 'config'))
     assert_equal 'false', config['core.bare']
   end
 
-  test "can read the global config file" do
+  def test_read_global_config_file
     config = Rugged::Config.global
-    assert_not_nil config['user.name']
+    assert config['user.name'] != nil
     assert_nil config['core.bare']
   end
+end
 
-  test "can write config values" do
+class ConfigWriteTest < Rugged::TestCase
+  include Rugged::TempRepositoryAccess
+
+  def test_write_config_values
     config = @repo.config
     config['custom.value'] = 'my value'
 
@@ -33,12 +35,11 @@ context "Rugged::Config tests" do
     assert_match(/value = my value/, content)
   end
 
-  test "can delete config values" do
+  def test_delete_config_values
     config = @repo.config
     config.delete('core.bare')
 
     config2 = @repo.config
     assert_nil config2.get('core.bare')
   end
-
 end