amp-git 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -0,0 +1,45 @@
+GEM
+  remote: http://rubygems.org/
+  remote: http://gems.github.com/
+  specs:
+    amp-core (0.1.0)
+    amp-front (0.1.0)
+    builder (2.1.2)
+    cucumber (0.9.4)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    devver-construct (1.1.0)
+    diff-lcs (1.1.2)
+    gemcutter (0.6.1)
+    gherkin (2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json (1.4.6)
+    json_pure (1.4.6)
+    minitest (1.7.2)
+    rspec (1.3.1)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    term-ansicolor (1.0.5)
+    yard (0.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  amp-core (>= 0.1.0)
+  amp-front (>= 0.1.0)
+  cucumber
+  devver-construct
+  jeweler
+  minitest
+  rspec (< 2.0.0)
+  yard

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/amp-git.rb

@@ -1,49 +1,39 @@
-class Amp::Plugins::Git < Amp::Plugins::Base
-  @loader = lambda {
-    module ::Amp
+puts 'Loading amp-git...'
+
+require 'zlib'
+require 'stringio'
+
+# Must require the GitPicker or it won't be found.
+require 'amp-git/repository.rb'
+
+module Amp
+  module Git
+    autoload :Changeset,                 'amp-git/repo_format/changeset.rb'
+    autoload :WorkingDirectoryChangeset, 'amp-git/repo_format/changeset.rb'
+    autoload :VersionedFile,             'amp-git/repo_format/versioned_file.rb'
+    autoload :VersionedWorkingFile,      'amp-git/repo_format/versioned_file.rb'
+  end
+  module Core
+    module Repositories
       module Git
-        autoload :Changeset,                 "amp-git/repo_format/changeset.rb"
-        autoload :WorkingDirectoryChangeset, "amp-git/repo_format/changeset.rb"
-        autoload :VersionedFile,             "amp-git/repo_format/versioned_file.rb"
-        autoload :VersionedWorkingFile,      "amp-git/repo_format/versioned_file.rb"
-      end
-      module Core
-        module Repositories
-          module Git
-            include Support
-            autoload :LocalRepository,         "amp-git/repositories/local_repository.rb"
-            autoload :GitPicker,               "amp-git/repository.rb"
-            autoload :StagingArea,             "amp-git/repo_format/staging_area.rb"
-            autoload :RawObject,               "amp-git/repo_format/raw_object.rb"
-            autoload :LooseObject,             "amp-git/repo_format/loose_object.rb"
-            autoload :TreeObject,              "amp-git/repo_format/tree_object.rb"
-            autoload :CommitObject,            "amp-git/repo_format/commit_object.rb"
-            autoload :TagObject,               "amp-git/repo_format/tag_object.rb"
-            autoload :PackFile,                "amp-git/repo_format/packfile.rb"
-            autoload :PackFileIndex,           "amp-git/repo_format/packfile_index.rb"
-            autoload :PackFileIndexV1,         "amp-git/repo_format/packfile_index.rb"
-            autoload :PackFileIndexV2,         "amp-git/repo_format/packfile_index.rb"
-            autoload :Index,                   "amp-git/repo_format/index.rb"
-            module Encoding                             
-              autoload :BinaryDelta,           "amp-git/encoding/binary_delta.rb"
-            end
-          end
+        include Support
+        autoload :LocalRepository,         'amp-git/repositories/local_repository.rb'
+        autoload :NodeId,                  'amp-git/repo_format/node_id.rb'
+        autoload :StagingArea,             'amp-git/repo_format/staging_area.rb'
+        autoload :RawObject,               'amp-git/repo_format/raw_object.rb'
+        autoload :LooseObject,             'amp-git/repo_format/loose_object.rb'
+        autoload :TreeObject,              'amp-git/repo_format/tree_object.rb'
+        autoload :CommitObject,            'amp-git/repo_format/commit_object.rb'
+        autoload :TagObject,               'amp-git/repo_format/tag_object.rb'
+        autoload :PackFile,                'amp-git/repo_format/packfile.rb'
+        autoload :PackFileIndex,           'amp-git/repo_format/packfile_index.rb'
+        autoload :PackFileIndexV1,         'amp-git/repo_format/packfile_index.rb'
+        autoload :PackFileIndexV2,         'amp-git/repo_format/packfile_index.rb'
+        autoload :Index,                   'amp-git/repo_format/index.rb'
+        module Encoding                             
+          autoload :BinaryDelta,           'amp-git/encoding/binary_delta.rb'
         end
       end
     end
-    require 'zlib'
-    require 'stringio'
-  }
-  class << self
-    attr_reader :loader
-  end
-  def initialize(opts = {})
-    @opts = opts
-  end
-  
-  def load!
-    puts "Loading amp-git..."
-    require 'zlib'
-    self.class.loader.call
   end
-end
+end

data/lib/amp-git/amp_plugin.rb

@@ -0,0 +1,16 @@
+module Amp
+  module Core
+  end
+  module Support
+  end
+end
+
+class Amp::Plugins::Git < Amp::Plugins::Base
+  def initialize(opts={})
+    @opts = opts
+  end
+  
+  def load!
+    require 'amp-git'
+  end
+end

data/lib/amp-git/encoding/binary_delta.rb

@@ -59,6 +59,7 @@ module Amp
                 raise DeltaError.new("Expected input data to be #{@base_length} bytes, but was #{original.size} bytes.")
               end
               output = StringIO.new
+              output.string.force_encoding('BINARY') if output.string.respond_to?(:force_encoding)
               @hunks.each do |hunk|
                 hunk.apply(output, original)
               end
@@ -80,7 +81,7 @@ module Amp
             def read_little_endian_base128(fp)
               result = shift = 0
               begin
-                byte = Support::StringUtils.ord(fp.read(1))
+                byte = Support::HexString.from_bin(fp.read(1)).ord
                 result |= (byte & 0x7f) << shift
                 shift += 7
               end while byte & 0x80 > 0
@@ -95,7 +96,7 @@ module Amp
               # a copy from an input stream, or an "insert" which inserts specified
               # data.
               def self.parse(fp)
-                opcode = Support::StringUtils.ord(fp.read(1))
+                opcode = Support::HexString.from_bin(fp.read(1)).ord
                 if opcode & 0x80 == 0
                   InsertHunk.new(opcode, fp)
                 else
@@ -140,13 +141,13 @@ module Amp
                 @offset = @length = 0
                 shift = 0
                 0.upto(3) do
-                  @offset |= Support::StringUtils.ord(fp.read(1)) << shift if opcode & 0x01 > 0
+                  @offset |= Support::HexString.from_bin(fp.read(1)).ord << shift if opcode & 0x01 > 0
                   opcode >>= 1
                   shift += 8
                 end
                 shift = 0
                 0.upto(2) do
-                  @length |= Support::StringUtils.ord(fp.read(1)) << shift if opcode & 0x01 > 0
+                  @length |= Support::HexString.from_bin(fp.read(1)).ord << shift if opcode & 0x01 > 0
                   opcode >>= 1
                   shift += 8
                 end

data/lib/amp-git/repo_format/changeset.rb

@@ -28,14 +28,14 @@ module Amp
       attr_reader   :revision
       alias_method :repository, :repo
       
-      def initialize(repo, rev)
+      def initialize(repo, short_name)
         @repo       = repo
         if short_name.kind_of?(Integer)
-          @revision = rev
-          @node_id = convert_rev_to_node(rev)
+          @revision = short_name
+          @node_id = convert_rev_to_node(short_name)
         else
-          @revision = convert_node_to_rev(rev)
-          @node_id = rev
+          @revision = convert_node_to_rev(short_name)
+          @node_id = short_name
         end
       end
       
@@ -200,7 +200,7 @@ module Amp
       
     end
     
-    class WorkingDirectoryChangeset < Amp::Repositories::AbstractChangeset
+    class WorkingDirectoryChangeset < Amp::Core::Repositories::AbstractChangeset
       
       attr_accessor :repo
       alias_method :repository, :repo

data/lib/amp-git/repo_format/commit_object.rb

@@ -63,9 +63,9 @@ module Amp
             lines.each_with_index do |line, idx|
               case line
               when /^tree (.{40})/
-                @tree_ref = Support::StringUtils.unhexlify($1)
+                @tree_ref = NodeId.from_hex($1)
               when /^parent (.{40})/
-                @parent_refs << Support::StringUtils.unhexlify($1)
+                @parent_refs << NodeId.from_hex($1)
               when /^author #{AUTHOR_MATCH}/
                 @author = "#{$1} <#{$2}>"
                 @date = Time.at($3.to_i)

data/lib/amp-git/repo_format/index.rb

@@ -91,6 +91,7 @@ module Amp
                 header = fp.read(ENTRY_HEADER_SIZE).unpack(ENTRY_HEADER_FORMAT)
                 self.ctime, self.ctime_ns, self.mtime, self.mtime_ns, self.dev, self.inode, 
                             self.mode, self.uid, self.gid, self.size, self.hash_id, flags = header
+                self.hash_id = NodeId.from_bin(self.hash_id)
                 self.assume_valid  = flags & 0x8000 > 0
                 self.update_needed = flags & 0x4000 > 0
                 self.stage  = (flags & 0x3000) >> 12

data/lib/amp-git/repo_format/node_id.rb

@@ -0,0 +1,15 @@
+##################################################################
+#                  Licensing Information                         #
+#                                                                #
+#  The following code is licensed, as standalone code, under     #
+#  the Ruby License, unless otherwise directed within the code.  #
+#                                                                #
+#  For information on the license of this code when distributed  #
+#  with and used in conjunction with the other modules in the    #
+#  Amp project, please see the root-level LICENSE file.          #
+#                                                                #
+##################################################################
+
+module Amp::Core::Repositories::Git
+  NodeId = Amp::Core::Support::HexString
+end

data/lib/amp-git/repo_format/packfile.rb

@@ -96,10 +96,10 @@ module Amp
               # @param [IO, #read] fp the IO stream to read from
               # @return [Integer] the offset read
               def read_offset(fp)
-                byte = Support::StringUtils.ord(fp.read(1))
+                byte = Support::HexString.from_bin(fp.read(1)).ord
                 tot = byte & 0x7f
                 while (byte & 0x80) > 0
-                  byte = Support::StringUtils.ord(fp.read(1))
+                  byte = Support::HexString.from_bin(fp.read(1)).ord
                   tot = ((tot + 1) << 7) | (byte & 0x7f)
                   break if (byte & 0x80) == 0
                 end
@@ -114,12 +114,12 @@ module Amp
               # @return [Array(Integer, Integer)] the type and size of the entry packed
               #   into a tuple.
               def read_header(fp)
-                tags = Support::StringUtils.ord(fp.read(1))
+                tags = Support::HexString.from_bin(fp.read(1)).ord
                 type = (tags & 0x70) >> 4
                 size = tags & 0xF
                 shift = 4
                 while tags & 0x80 > 0
-                  tags = Support::StringUtils.ord(fp.read(1))
+                  tags = Support::HexString.from_bin(fp.read(1)).ord
                   size += (tags & 0x7F) << shift
                   shift += 7
                 end
@@ -161,8 +161,7 @@ module Amp
             def calculate_hash!
               prefix = PREFIX_NAME_LOOKUP[self.type]
               # add special cases for refs
-              self.hash_id = StringUtils.sha1("#{prefix} #{self.size}\0#{self.content}").digest
-              self.hash_id.force_encoding("ASCII-8BIT") if RUBY_VERSION >= "1.9"
+              self.hash_id = NodeId.sha1("#{prefix} #{self.size}\0#{self.content}")
             end
             
             ##
@@ -238,7 +237,7 @@ module Amp
           #   packfile.
           def object_for_hash(given_hash)
             @opener.open(name, "r") do |fp|
-              given_hash.force_encoding("ASCII-8BIT") if RUBY_VERSION >= "1.9"
+              given_hash.force_encoding("ASCII-8BIT") if given_hash.respond_to?(:force_encoding)
               entry = nil
               if index
                 starting_at = index.offset_for_hash(given_hash)

data/lib/amp-git/repo_format/packfile_index.rb

@@ -83,7 +83,7 @@ module Amp
           # uses fanout logic to determine the indices in which the desired
           # hash might be found. This range can be searched to find the hash.
           def search_range_for_hash(hash)
-            byte = Support::StringUtils.ord(hash[0,1])
+            byte = Support::HexString.from_bin(hash).ord
             min = byte > 0 ? (fanout[byte - 1]) : 0
             max = fanout[byte]
             min...max
@@ -162,7 +162,7 @@ module Amp
             # TODO: binary search!
             range.each do |idx|
               sha1 = @fp.read(SHA1_SIZE).unpack(SHA1_FORMAT).first # sha1s are 20 bytes
-              return offset_for_index(idx) if sha1 == hsh
+              return offset_for_index(idx) if sha1 == hsh.to_bin
             end
             raise PackFileIndexLookupError.new("Couldn't find the hash #{hsh.inspect} in the packfile index.")
           end

data/lib/amp-git/repo_format/tag_object.rb

@@ -64,7 +64,7 @@ module Amp
             lines.each_with_index do |line, idx|
               case line
               when /^object (.{40})/
-                @object_ref = Support::StringUtils.unhexlify($1)
+                @object_ref = NodeId.from_hex($1)
               when /^type (\S+)/
                 @reffed_type = $1
               when /^tag\s+(.*)\s*$/

data/lib/amp-git/repo_format/tree_object.rb

@@ -86,7 +86,7 @@ module Amp
             scanner = StringScanner.new(@content)
             until scanner.eos?
               break unless scanner.scan(/(\d+) (\S+?)\x00(.{20})/m)
-              new_entry = TreeEntry.new(scanner[2], scanner[1].to_i(8), scanner[3])
+              new_entry = TreeEntry.new(scanner[2], scanner[1].to_i(8), NodeId.from_bin(scanner[3]))
               @pairs[new_entry.name] = new_entry
             end
           end

data/spec/repo_format/node_id_spec.rb

@@ -0,0 +1,48 @@
+##################################################################
+#                  Licensing Information                         #
+#                                                                #
+#  The following code is licensed, as standalone code, under     #
+#  the Ruby License, unless otherwise directed within the code.  #
+#                                                                #
+#  For information on the license of this code when distributed  #
+#  with and used in conjunction with the other modules in the    #
+#  Amp project, please see the root-level LICENSE file.          #
+#                                                                #
+##################################################################
+
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Amp::Core::Repositories::Git::NodeId do
+  Subject = Amp::Core::Repositories::Git::NodeId
+  it 'created from binary' do
+    Subject.from_bin('A').should be
+  end
+
+  it 'created from hex' do
+    Subject.from_hex('41').should be
+  end
+
+  it 'created from sha1' do
+    Subject.sha1('A').should be
+  end
+
+  it 'is compareable' do
+    Subject.from_bin('A').should == Subject.from_bin('A')
+  end
+
+  let :single do
+    Subject.from_bin('A')
+  end
+
+  it 'can be represented as binary' do
+    single.to_bin.should == 'A'
+  end
+
+  it 'can be represented as hex' do
+    single.to_hex.should == '41'
+  end
+
+  it 'stringifies as hex' do
+    single.to_s.should == '41'
+  end
+end

data/spec/repo_format/spec_helper.rb

@@ -0,0 +1 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')

data/spec/spec_helper.rb

@@ -22,8 +22,6 @@ require 'spec'
 require 'spec/autorun'
 require 'construct'
 
-Amp::Plugins::Core.new.load!
-Amp::Plugins::Git.new.load!
 Spec::Runner.configure do |config|
   
 end

data/test/index_tests/test_index.rb

@@ -60,7 +60,7 @@ class TestGitIndex < AmpTestCase
     assert_equal 0x01f5, rakefile_info.uid
     assert_equal 0x14, rakefile_info.gid
     assert_equal 0x05c5, rakefile_info.size
-    assert_equal "53bbb0b38868a1bd2059a1174f54de63764013af", hexlify(rakefile_info.hash_id)
+    assert_equal "53bbb0b38868a1bd2059a1174f54de63764013af", rakefile_info.hash_id.to_hex
     assert_false rakefile_info.assume_valid
     assert_false rakefile_info.update_needed
     assert_equal 0, rakefile_info.stage

data/test/packfile_tests/test_packfile.rb

@@ -46,11 +46,11 @@ class TestPackfile < AmpTestCase
   end
   
   def test_commit_lookup
-    some_commit_obj = @packfile.object_for_hash(StringUtils.unhexlify("862a669a8ddf39a4c60be6bd40c97dc242b6128e"))
+    some_commit_obj = @packfile.object_for_hash(NodeId.from_hex("862a669a8ddf39a4c60be6bd40c97dc242b6128e"))
     assert_not_nil some_commit_obj
     assert_kind_of CommitObject, some_commit_obj
-    assert_equal "2ac9f8fa1628a094cced3534b63084d5f480d10a", hexlify(some_commit_obj.tree_ref)
-    assert_equal ["840c43e100120cd282cf9b334b08aa5fbe2634a0"], some_commit_obj.parent_refs.map {|x| hexlify(x)}
+    assert_equal NodeId.from_hex("2ac9f8fa1628a094cced3534b63084d5f480d10a"), some_commit_obj.tree_ref
+    assert_equal [NodeId.from_hex("840c43e100120cd282cf9b334b08aa5fbe2634a0")], some_commit_obj.parent_refs
     assert_equal "Michael Edgar <michael.j.edgar@dartmouth.edu>", some_commit_obj.author
     assert_equal "Michael Edgar <michael.j.edgar@dartmouth.edu>", some_commit_obj.committer
     assert_equal Time.at(1273260273), some_commit_obj.date
@@ -59,16 +59,16 @@ class TestPackfile < AmpTestCase
   
   # The previous test gets the first commit. no searching going on. This gets a further one.
   def test_further_lookup
-    some_commit_obj = @packfile.object_for_hash(StringUtils.unhexlify("958cd2af1c2676e9e90c7ea45bfe384acdcf42e0"))
+    some_commit_obj = @packfile.object_for_hash(NodeId.from_hex("958cd2af1c2676e9e90c7ea45bfe384acdcf42e0"))
     assert_not_nil some_commit_obj
   end
   
   def test_tree_lookup
-    some_tree_obj = @packfile.object_for_hash(StringUtils.unhexlify("2ac9f8fa1628a094cced3534b63084d5f480d10a"))
+    some_tree_obj = @packfile.object_for_hash(NodeId.from_hex("2ac9f8fa1628a094cced3534b63084d5f480d10a"))
     assert_not_nil some_tree_obj
     entry_names = %w(.document .gitignore LICENSE README.md Rakefile VERSION lib spec yard-struct.gemspec).sort
     assert_equal entry_names, some_tree_obj.entry_names.sort
-    lookedup_entry = TreeObject::TreeEntry.new("Rakefile", 0100644, StringUtils.unhexlify("53bbb0b38868a1bd2059a1174f54de63764013af"))
+    lookedup_entry = TreeObject::TreeEntry.new("Rakefile", 0100644, NodeId.from_hex("53bbb0b38868a1bd2059a1174f54de63764013af"))
     assert_equal lookedup_entry, some_tree_obj.tree_lookup("Rakefile")
   end
   

data/test/packfile_tests/test_packfile_index_v2.rb

@@ -84,7 +84,7 @@ class TestPackfileIndexV2 < AmpTestCase
              ["004EB28B17D7FC33C7B90D2B37E79566038E29C1", 0x001a82fe],
              ["00D917561EB69F243B326DAAA13F7C09D505DB9C", 0x0003518e]]
     pairs.each do |hsh, expected|
-      assert_equal expected, @index.offset_for_hash(StringUtils.unhexlify(hsh))
+      assert_equal expected, @index.offset_for_hash(NodeId.from_hex(hsh))
     end
   end
 end

data/test/packfile_tests/test_packfile_with_index.rb

@@ -47,11 +47,11 @@ class TestPackfileWithIndex < AmpTestCase
   end
   
   def test_commit_lookup
-    some_commit_obj = @packfile.object_for_hash(StringUtils.unhexlify("862a669a8ddf39a4c60be6bd40c97dc242b6128e"))
+    some_commit_obj = @packfile.object_for_hash(NodeId.from_hex("862a669a8ddf39a4c60be6bd40c97dc242b6128e"))
     assert_not_nil some_commit_obj
     assert_kind_of CommitObject, some_commit_obj
-    assert_equal "2ac9f8fa1628a094cced3534b63084d5f480d10a", hexlify(some_commit_obj.tree_ref)
-    assert_equal ["840c43e100120cd282cf9b334b08aa5fbe2634a0"], some_commit_obj.parent_refs.map {|x| hexlify(x)}
+    assert_equal NodeId.from_hex("2ac9f8fa1628a094cced3534b63084d5f480d10a"), some_commit_obj.tree_ref
+    assert_equal [NodeId.from_hex("840c43e100120cd282cf9b334b08aa5fbe2634a0")], some_commit_obj.parent_refs
     assert_equal "Michael Edgar <michael.j.edgar@dartmouth.edu>", some_commit_obj.author
     assert_equal "Michael Edgar <michael.j.edgar@dartmouth.edu>", some_commit_obj.committer
     assert_equal Time.at(1273260273), some_commit_obj.date
@@ -60,16 +60,16 @@ class TestPackfileWithIndex < AmpTestCase
   
   # The previous test gets the first commit. no searching going on. This gets a further one.
   def test_further_lookup
-    some_commit_obj = @packfile.object_for_hash(StringUtils.unhexlify("958cd2af1c2676e9e90c7ea45bfe384acdcf42e0"))
+    some_commit_obj = @packfile.object_for_hash(NodeId.from_hex("958cd2af1c2676e9e90c7ea45bfe384acdcf42e0"))
     assert_not_nil some_commit_obj
   end
   
   def test_tree_lookup
-    some_tree_obj = @packfile.object_for_hash(StringUtils.unhexlify("2ac9f8fa1628a094cced3534b63084d5f480d10a"))
+    some_tree_obj = @packfile.object_for_hash(NodeId.from_hex("2ac9f8fa1628a094cced3534b63084d5f480d10a"))
     assert_not_nil some_tree_obj
     entry_names = %w(.document .gitignore LICENSE README.md Rakefile VERSION lib spec yard-struct.gemspec).sort
     assert_equal entry_names, some_tree_obj.entry_names.sort
-    lookedup_entry = TreeObject::TreeEntry.new("Rakefile", 0100644, StringUtils.unhexlify("53bbb0b38868a1bd2059a1174f54de63764013af"))
+    lookedup_entry = TreeObject::TreeEntry.new("Rakefile", 0100644, NodeId.from_hex("53bbb0b38868a1bd2059a1174f54de63764013af"))
     assert_equal lookedup_entry, some_tree_obj.tree_lookup("Rakefile")
   end
   

data/test/test_commit_object.rb

@@ -23,7 +23,7 @@ class TestGitCommitObject < AmpTestCase
                "Michael Edgar <michael.j.edgar@dartmouth.edu> 1273865360 -0400\n\n"+
                "Removed the gemspec from the repo\n"
     @commit_obj = Amp::Core::Repositories::Git::CommitObject.new(
-                      Amp::Core::Support::StringUtils.sha1(@content), nil, @content)
+                      Amp::Core::Repositories::Git::NodeId.sha1(@content), nil, @content)
   end
   
   def test_correct_type
@@ -35,11 +35,11 @@ class TestGitCommitObject < AmpTestCase
   end
   
   def test_tree_ref
-    assert_equal unhexlify("ecb7b4460825bed7c0bc6d17004816d15ae32c5e"), @commit_obj.tree_ref
+    assert_equal NodeId.from_hex("ecb7b4460825bed7c0bc6d17004816d15ae32c5e"), @commit_obj.tree_ref
   end
   
   def test_parent_refs
-    assert_equal [unhexlify("8c27219d73786aa2e91d5ae964624ef36696c307")], @commit_obj.parent_refs
+    assert_equal [NodeId.from_hex("8c27219d73786aa2e91d5ae964624ef36696c307")], @commit_obj.parent_refs
   end
   
   def test_author

data/test/test_helper.rb

@@ -8,8 +8,6 @@ require 'test/unit'
 require 'minitest/unit'
 require 'tmpdir'
 
-Amp::Plugins::Core.new.load!
-Amp::Plugins::Git.new.load!
 class AmpTestCase < MiniTest::Unit::TestCase
   def setup
     super
@@ -27,14 +25,8 @@ class AmpTestCase < MiniTest::Unit::TestCase
     FileUtils.rm_rf @tempdir if defined?(@tempdir) && @tempdir && File.exist?(@tempdir)
   end
 
-  def hexlify(input)
-    Amp::Core::Support::StringUtils.hexlify(input)
-  end
-  
-  def unhexlify(input)
-    Amp::Core::Support::StringUtils.unhexlify(input)
-  end
-  
+  NodeId = Amp::Core::Repositories::Git::NodeId unless const_defined?(:NodeId)
+
   # taken from rubygems
   def write_file(path)
     path = File.join(@tempdir, path)

data/test/test_tag_object.rb

@@ -33,7 +33,7 @@ nLE/L9aUXdWeTFPron96DLA=
 -----END PGP SIGNATURE-----
 EOF
     @tag_obj = Amp::Core::Repositories::Git::TagObject.new(
-                   Amp::Core::Support::StringUtils.sha1(@content), nil, @content)
+                   NodeId.sha1(@content), nil, @content)
   end
   
   def test_correct_type
@@ -45,7 +45,7 @@ EOF
   end
   
   def test_object
-    assert_equal unhexlify("437b1b20df4b356c9342dac8d38849f24ef44f27"), @tag_obj.object_ref
+    assert_equal NodeId.from_hex("437b1b20df4b356c9342dac8d38849f24ef44f27"), @tag_obj.object_ref
   end
   
   def test_reffed_type

data/test/test_tree_object.rb

@@ -1,4 +1,3 @@
-##################################################################
 #                  Licensing Information                         #
 #                                                                #
 #  The following code is licensed, as standalone code, under     #
@@ -21,7 +20,7 @@ class TestGitTreeObject < AmpTestCase
                "\xE3\xC3\nK\xCD<!\xEA-_\x9E\xDC=40000 examples\x00"+
                "\xAE\xCB\xE9d!|\xB9\xA6\x96\x024],U\xEE\x99\xA2\xEE\xD4\x92"
     @tree_obj = Amp::Core::Repositories::Git::TreeObject.new(
-                    Amp::Core::Support::StringUtils.sha1(@content), nil,@content)
+                    NodeId.sha1(@content), nil,@content)
   end
   
   def test_correct_type
@@ -47,8 +46,8 @@ class TestGitTreeObject < AmpTestCase
   end
   
   def test_parses_refs
-    expected_first = "\xD3\xD5\xED\x9DA4_\xE3\xC3\nK\xCD<!\xEA-_\x9E\xDC="
-    expected_second = "\xAE\xCB\xE9d!|\xB9\xA6\x96\x024],U\xEE\x99\xA2\xEE\xD4\x92"
+    expected_first = NodeId.from_bin("\xD3\xD5\xED\x9DA4_\xE3\xC3\nK\xCD<!\xEA-_\x9E\xDC=")
+    expected_second = NodeId.from_bin("\xAE\xCB\xE9d!|\xB9\xA6\x96\x024],U\xEE\x99\xA2\xEE\xD4\x92")
     assert_equal expected_first, @tree_obj.tree_lookup("example_helper.rb").ref
     assert_equal expected_second, @tree_obj.tree_lookup("examples").ref
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Edgar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2010-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -131,11 +132,13 @@ files:
 - features/step_definitions/amp-git_steps.rb
 - features/support/env.rb
 - lib/amp-git.rb
+- lib/amp-git/amp_plugin.rb
 - lib/amp-git/encoding/binary_delta.rb
 - lib/amp-git/repo_format/changeset.rb
 - lib/amp-git/repo_format/commit_object.rb
 - lib/amp-git/repo_format/index.rb
 - lib/amp-git/repo_format/loose_object.rb
+- lib/amp-git/repo_format/node_id.rb
 - lib/amp-git/repo_format/packfile.rb
 - lib/amp-git/repo_format/packfile_index.rb
 - lib/amp-git/repo_format/raw_object.rb
@@ -145,8 +148,9 @@ files:
 - lib/amp-git/repo_format/versioned_file.rb
 - lib/amp-git/repositories/local_repository.rb
 - lib/amp-git/repository.rb
-- lib/amp_plugin.rb
 - spec/amp-git_spec.rb
+- spec/repo_format/node_id_spec.rb
+- spec/repo_format/spec_helper.rb
 - spec/repository_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -199,6 +203,8 @@ specification_version: 3
 summary: The git plugin for Amp.
 test_files: 
 - spec/amp-git_spec.rb
+- spec/repo_format/node_id_spec.rb
+- spec/repo_format/spec_helper.rb
 - spec/repository_spec.rb
 - spec/spec_helper.rb
 - test/index_tests/test_helper.rb

data/lib/amp_plugin.rb

@@ -1 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'amp-git'))