rugged 0.0.1 → 0.1.0

data/README.md

@@ -20,7 +20,7 @@ Next, you need to install rake-compiler:
 
 Now that those are installed, you can install Rugged:
 
-    $ git clone git://github.com/libgit2/rubbit.git
+    $ git clone git://github.com/libgit2/rugged.git
     $ cd rugged
     $ rake compile
     $ rake test
@@ -48,19 +48,17 @@ Repository is the main repository object that everything
 else will emanate from.
 
     repo =
-    Rugged::Repository.new(path, git_dir=nil, index_path=nil)
+    Rugged::Repository.new(path)
       ctnt, type = repo.read(sha)
       gobj = repo.lookup(sha, type[?])  # optional type argument for checking
       sha  = repo.write(content, type)
       sha  = repo.hash(content, type)
       bool = repo.exists(sha)
+      index = repo.index
 
-If Repository is initialized without `git_dir`, path + '.git' will be assumed
-and path will be assumed to be the working directory.  If `path` is a git 
-directory, then `git_dir` will be set to that and none of the Rugged functions
-that need a working directory will work. If the `index_path` is not specified, 
-the `git_dir` path plus '/index' will be assumed.
-
+The 'path' argument must point to an actual git repository folder. The library
+will automatically guess if it's a bare repository or a '.git' folder inside a
+working repository, and locate the working path accordingly.
 
 Object Access
 -----------------
@@ -146,11 +144,13 @@ anything beneath them (useful for a `git log master ^origin/master` type deal).
 Index/Staging Area
 -------------------
 
-We can inspect and manipulate the Git Index as well.
+We can inspect and manipulate the Git Index as well. To work with the index inside
+of an existing repository, instantiate it by using the `Repository.index` method instead
+of manually opening the Index by its path.
 
-    # the remove and add functions immediately flush to the index file on disk
+    # TODO: the remove and add functions immediately flush to the index file on disk
     index =
-    Rugged::Index.new(repo, path=nil)  # TODO: take a repo or a path
+    Rugged::Index.new(path)
             index.refresh              # re-read the index file from disk
       int = index.entry_count # count of index entries
       ent = index.get_entry(i/path)

data/Rakefile

@@ -22,18 +22,16 @@ end
 
 task :default => :test
 
-if command? :turn
-  desc "Run tests"
-  task :test do
-    suffix = "-n #{ENV['TEST']}" if ENV['TEST']
-    sh "turn test/*_test.rb #{suffix}"
-  end
-else
-  Rake::TestTask.new do |t|
-    t.libs << 'lib'
-    t.pattern = 'test/**/*_test.rb'
-    t.verbose = false
-  end
+desc "Run tests"
+task :turn do
+  suffix = "-n #{ENV['TEST']}" if ENV['TEST']
+  sh "turn test/*_test.rb #{suffix}"
+end
+
+Rake::TestTask.new do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
 if command? :kicker

data/lib/rugged.rb

@@ -1,4 +1,5 @@
 require 'rugged/rugged'
+require 'rugged/person'
 require 'rugged/index'
 require 'rugged/tree'
 require 'rugged/tree_entry'

data/lib/rugged/index.rb

@@ -1,4 +1,4 @@
-class Rugged
+module Rugged
   class Index
     include Enumerable
 

data/lib/rugged/person.rb

@@ -0,0 +1,20 @@
+module Rugged
+  class Person
+    attr_accessor :name, :email
+
+	def initialize(name, email, time)
+		@name = name
+		@email = email
+		@time = time.to_i
+	end
+
+	def time
+		Time.at(@time)
+	end
+
+	def time=(t)
+		@time = t.to_i
+	end
+
+  end
+end

data/lib/rugged/tree.rb

@@ -1,4 +1,4 @@
-class Rugged
+module Rugged
   class Tree
     include Enumerable
 

data/lib/rugged/tree_entry.rb

@@ -1,4 +1,4 @@
-class Rugged
+module Rugged
   class TreeEntry
 
     def <=>(a)

data/lib/rugged/version.rb

@@ -1,3 +1,3 @@
-class Rugged
-  Version = VERSION = '0.0.1'
+module Rugged
+  Version = VERSION = '0.1.0'
 end

data/test/blob_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path "../test_helper", __FILE__
+
+context "Rugged::Blob tests" do
+  setup do
+    @path = File.dirname(__FILE__) + '/fixtures/testrepo.git/'
+    @repo = Rugged::Repository.new(@path)
+    @sha = "fa49b077972391ad58037050f2a75f74e3671e92"
+  end
+
+  test "can read the blob data" do
+    blob = @repo.lookup(@sha)
+    assert_equal 9, blob.size
+    assert_equal "new file\n", blob.content
+    assert_equal "blob", blob.type
+    assert_equal @sha, blob.sha
+  end
+
+  test "can rewrite blob data" do
+    blob = @repo.lookup(@sha)
+    blob.content = "my new content"
+    assert_equal @sha, blob.sha
+    blob.write # should change the sha
+    assert_equal "2dd916ea1ff086d61fbc1c286079305ffad4e92e", blob.sha
+    FileUtils.rm File.join(@path, "objects/2d/d916ea1ff086d61fbc1c286079305ffad4e92e")
+  end
+
+  test "can write new blob data" do
+    blob = Rugged::Blob.new(@repo)
+    blob.content = "a new blob content"
+    blob.write
+  end
+end

data/test/commit_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 
 context "Rugged::Commit tests" do
   setup do
@@ -16,13 +16,13 @@ context "Rugged::Commit tests" do
     assert_equal obj.message_short, "testing"
     assert_equal obj.time.to_i, 1273360386
     c = obj.committer
-    assert_equal c['name'], "Scott Chacon"
-    assert_equal c['time'].to_i, 1273360386
-    assert_equal c['email'], "schacon@gmail.com"
+    assert_equal c.name, "Scott Chacon"
+    assert_equal c.time.to_i, 1273360386
+    assert_equal c.email, "schacon@gmail.com"
     c = obj.author
-    assert_equal c['name'], "Scott Chacon"
-    assert_equal c['time'].to_i, 1273360386
-    assert_equal c['email'], "schacon@gmail.com"
+    assert_equal c.name, "Scott Chacon"
+    assert_equal c.time.to_i, 1273360386
+    assert_equal c.email, "schacon@gmail.com"
     assert_equal obj.tree.sha, "181037049a54a1eb5fab404658a3a250b44335d7"
   end
   
@@ -33,4 +33,21 @@ context "Rugged::Commit tests" do
     obj.write
   end
 
+  test "can write new commit data" do
+    tsha = "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b"
+    tree = @repo.lookup(tsha)
+
+    obj = Rugged::Commit.new(@repo)
+    person = Rugged::Person.new('Scott', 'schacon@gmail.com', Time.now)
+
+    obj.message = 'new message'
+    obj.author = person
+    obj.committer = person
+    obj.tree = tree
+    obj.write
+
+    pp obj
+    pp obj.sha
+  end
+
 end

data/test/fixtures/testrepo.git/objects/36/9b00a7700cca3a506d79e301d6ad8bf735d9ee

@@ -0,0 +1,3 @@
+x
��[
+�0Fa���Y�$��! �\A�wz
�@3���|<��A�u3
+�/v�dB�1�L2�<Cn�	G�f?���B3�{�Z���R������!{����>'�r�뗪�^�
�i2o

data/test/index_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 require 'base64'
 require 'tempfile'
 require 'fileutils'
@@ -81,8 +81,8 @@ context "Rugged::Index reading stuff" do
 
     assert_equal 'new_path', e.path
     assert_equal '12ea3153a78002a988bb92f4123e7e831fd1138a', e.sha
-    assert_equal now, e.mtime
-    assert_equal now, e.ctime
+    assert_equal now.to_i, e.mtime.to_i
+    assert_equal now.to_i, e.ctime.to_i
     assert_equal 1000, e.file_size
     assert_equal 234881027, e.dev 
     assert_equal 88888, e.ino 

data/test/lib_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 require 'base64'
 
 context "Rugged::Lib stuff" do
@@ -6,27 +6,27 @@ context "Rugged::Lib stuff" do
   end
 
   test "can convert hex into raw sha" do
-    raw = Rugged::Lib.hex_to_raw("ce08fe4884650f067bd5703b6a59a8b3b3c99a09")
+    raw = Rugged::hex_to_raw("ce08fe4884650f067bd5703b6a59a8b3b3c99a09")
     b64raw = Base64.encode64(raw).strip
     assert_equal "zgj+SIRlDwZ71XA7almos7PJmgk=", b64raw
   end
 
   test "converts hex into raw sha correctly" do
     hex = "ce08fe4884650f067bd5703b6a59a8b3b3c99a09"
-    raw1 = Rugged::Lib.hex_to_raw(hex)
+    raw1 = Rugged::hex_to_raw(hex)
     raw2 = [hex].pack("H*")
     assert_equal raw1, raw2
   end
 
   test "can convert raw sha into hex" do
     raw = Base64.decode64("FqASNFZ4mrze9Ld1ITwjqL109eA=")
-    hex = Rugged::Lib.raw_to_hex(raw)
+    hex = Rugged::raw_to_hex(raw)
     assert_equal "16a0123456789abcdef4b775213c23a8bd74f5e0", hex
   end
 
   test "converts raw into hex sha correctly" do
-    raw = Rugged::Lib.hex_to_raw("ce08fe4884650f067bd5703b6a59a8b3b3c99a09")
-    hex1 = Rugged::Lib.raw_to_hex(raw)
+    raw = Rugged::hex_to_raw("ce08fe4884650f067bd5703b6a59a8b3b3c99a09")
+    hex1 = Rugged::raw_to_hex(raw)
     hex2 = raw.unpack("H*")[0]
     assert_equal hex1, hex2
   end

data/test/object_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 require 'base64'
 
 context "Rugged::Object stuff" do

data/test/repo_pack_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 require 'base64'
 
 context "Rugged::Repository packed stuff" do

data/test/repo_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 require 'base64'
 
 context "Rugged::Repository stuff" do

data/test/tag_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 
 context "Rugged::Tag tests" do
   setup do
@@ -11,15 +11,15 @@ context "Rugged::Tag tests" do
     obj = @repo.lookup(sha)
 
     assert_equal sha, obj.sha
-	  assert_equal "tag", obj.type
-	  assert_equal "test tag message\n", obj.message
-	  assert_equal "v1.0", obj.name
-	  assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", obj.target.sha
-	  assert_equal "commit", obj.target_type
-	  c = obj.tagger
-	  assert_equal "Scott Chacon", c['name']
-    assert_equal 1288114383, c['time'].to_i
-    assert_equal "schacon@gmail.com", c['email']
+    assert_equal "tag", obj.type
+    assert_equal "test tag message\n", obj.message
+    assert_equal "v1.0", obj.name
+    assert_equal "5b5b025afb0b4c913b4c338a42934a3863bf3644", obj.target.sha
+    assert_equal "commit", obj.target_type
+    c = obj.tagger
+    assert_equal "Scott Chacon", c.name
+    assert_equal 1288114383, c.time.to_i
+    assert_equal "schacon@gmail.com", c.email
   end
   
   test "can write the tag data" do

data/test/tree_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 
 context "Rugged::Tree tests" do
   setup do

data/test/walker_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path "../test_helper", __FILE__
 require 'base64'
 
 context "Rugged::Walker stuff" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rugged
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Scott Chacon
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,12 +36,13 @@ files:
 - Rakefile
 - LICENSE
 - lib/rugged/index.rb
-- lib/rugged/ribbit.bundle
+- lib/rugged/person.rb
 - lib/rugged/rugged.bundle
 - lib/rugged/tree.rb
 - lib/rugged/tree_entry.rb
 - lib/rugged/version.rb
 - lib/rugged.rb
+- test/blob_test.rb
 - test/commit_test.rb
 - test/fixtures/testrepo.git/config
 - test/fixtures/testrepo.git/description
@@ -56,6 +57,7 @@ files:
 - test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd
 - test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2
 - test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a
+- test/fixtures/testrepo.git/objects/36/9b00a7700cca3a506d79e301d6ad8bf735d9ee
 - test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057
 - test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045
 - test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644