amp-core 0.1.0 → 0.2.0

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem 'rspec', '< 2.0.0'
   gem 'yard'
   gem 'cucumber'
+  gem 'haml'  # for templates
 end

data/VERSION

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

data/lib/amp-core.rb

@@ -1,53 +1,35 @@
+puts "Loading amp-core..."
+
+require 'amp-core/command_ext/repository_loading'
+require 'amp-core/repository/repository.rb'
+require 'amp-core/repository/generic_repo_picker.rb'
+
+Dir[File.join(File.dirname(__FILE__), 'amp-core', 'commands', '**', '*.rb')].each do |file|
+  require file
+end
+
 module Amp
-  module Core
-  end
   module Support
+    autoload :Template,       'amp-core/templates/template.rb'
   end
-end
-
-class Amp::Plugins::Core < Amp::Plugins::Base
-  # this is necessary to prevent loading when #load! isn't called.
-  @loader = lambda {
-    $:.unshift(File.expand_path(File.dirname(__FILE__)))
-    module ::Amp
-      module Core
-        module Repositories
-          autoload :GenericRepoPicker,         'amp-core/repository/generic_repo_picker.rb'
-          autoload :AbstractLocalRepository,   'amp-core/repository/abstract/abstract_local_repo.rb'
-          autoload :AbstractStagingArea,       'amp-core/repository/abstract/abstract_staging_area.rb'
-          autoload :AbstractChangeset,         'amp-core/repository/abstract/abstract_changeset.rb'
-          autoload :AbstractVersionedFile,     'amp-core/repository/abstract/abstract_versioned_file.rb'
-          autoload :CommonChangesetMethods,    'amp-core/repository/abstract/common_methods/changeset.rb'
-          autoload :CommonLocalRepoMethods,    'amp-core/repository/abstract/common_methods/local_repo.rb'
-          autoload :CommonStagingAreaMethods,  'amp-core/repository/abstract/common_methods/staging_area.rb'
-          autoload :CommonChangesetMethods,    'amp-core/repository/abstract/common_methods/changeset.rb'
-          autoload :CommonVersionedFileMethods,'amp-core/repository/abstract/common_methods/versioned_file.rb'
-        end
-        module Support
-          autoload :EncodingUtils,  'amp-core/support/encoding_utils.rb'
-          autoload :Platform,       'amp-core/support/platform_utils.rb'
-          autoload :RootedOpener,   'amp-core/support/rooted_opener.rb'
-          autoload :StringUtils,    'amp-core/support/string_utils.rb'
-        end
-      end
+  module Core
+    module Repositories
+      autoload :GenericRepoPicker,         'amp-core/repository/generic_repo_picker.rb'
+      autoload :AbstractLocalRepository,   'amp-core/repository/abstract/abstract_local_repo.rb'
+      autoload :AbstractStagingArea,       'amp-core/repository/abstract/abstract_staging_area.rb'
+      autoload :AbstractChangeset,         'amp-core/repository/abstract/abstract_changeset.rb'
+      autoload :AbstractVersionedFile,     'amp-core/repository/abstract/abstract_versioned_file.rb'
+      autoload :CommonChangesetMethods,    'amp-core/repository/abstract/common_methods/changeset.rb'
+      autoload :CommonLocalRepoMethods,    'amp-core/repository/abstract/common_methods/local_repo.rb'
+      autoload :CommonStagingAreaMethods,  'amp-core/repository/abstract/common_methods/staging_area.rb'
+      autoload :CommonChangesetMethods,    'amp-core/repository/abstract/common_methods/changeset.rb'
+      autoload :CommonVersionedFileMethods,'amp-core/repository/abstract/common_methods/versioned_file.rb'
     end
-  }
-  class << self
-    attr_reader :loader
-  end
-
-  def initialize(opts={})
-    @opts = opts
-  end
-  
-  def load!
-    puts "Loading amp-core..."
-    require 'amp-core/command_ext/repository_loading'
-    require 'amp-core/repository/repository.rb'
-    require 'amp-core/repository/generic_repo_picker.rb'
-    ::Amp::Support.class_eval do
-      autoload :Template,                  "amp-core/templates/template.rb"
+    module Support
+      autoload :EncodingUtils,  'amp-core/support/encoding_utils.rb'
+      autoload :Platform,       'amp-core/support/platform_utils.rb'
+      autoload :RootedOpener,   'amp-core/support/rooted_opener.rb'
+      autoload :HexString,      'amp-core/support/hex_string.rb'
     end
-    self.class.loader.call
   end
 end

data/lib/amp-core/amp_plugin.rb

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

data/lib/amp-core/commands/info.rb

@@ -0,0 +1,9 @@
+Amp::Command.create('info') do |c|
+  c.has_repo
+  c.validates_argument_count(:minimum => 1)
+  c.on_call do
+    arguments.each do |arg|
+      p repository[arg]
+    end
+  end
+end

data/lib/amp-core/commands/root.rb

@@ -0,0 +1,6 @@
+Amp::Command.create('root') do |c|
+  c.has_repo
+  c.on_call do
+    p repository.root
+  end
+end

data/lib/amp-core/support/{string_utils.rb → hex_string.rb}

@@ -19,26 +19,76 @@ module Amp
       # This module is a set of string functions that we use frequently.
       # They sued to be monkey-patched onto the String class, but we don't
       # do that anymore.
-      module StringUtils
-        module_function
-        
+      class HexString
+        # Construct a HexString
+        def self.from_bin(bin)
+          HexString === bin ? bin : new(bin, nil)
+        end
+
+        # Construct a HexString
+        def self.from_hex(hex)
+          HexString === hex ? hex : new(nil, hex)
+        end
+
+        # Mainly internal/test helper method; change the encoding in 1.9
+        def self.as_binary(s)
+          if s.respond_to?(:force_encoding)
+            s.force_encoding('binary')
+          else
+            s
+          end
+        end
+
+        def self.sha1(str)
+          HexString.from_bin(Digest::SHA1.new.update(str).digest)
+        end
+
+        # Assumes one or the other argument will be nil.
+        # Mostly an internal constructor
+        def initialize(binary_part, hex_part)
+          @binary = self.class.as_binary(binary_part)
+          @hex = hex_part
+        end
+
+        def <=>(other)
+          to_s <=> other.to_s
+        end
+        include Comparable
+
+        # Return raw binary data
+        def to_bin
+          @binary ||= unhexlify
+        end
+
+        # Return hexidecimal representation of binary data
+        def to_hex
+          @hex ||= hexlify
+        end
+
+        # Return hexidecimal representation of binary data
+        alias_method :to_s, :to_hex
+
         # Converts this text into hex. each letter is replaced with
         # it's hex counterpart 
-        def hexlify(src)
-          str = ""
-          src.each_byte do |i|
-            str << i.to_s(16).rjust(2, "0")
+        def hexlify
+          hex = ""
+          @binary.each_byte do |i|
+            hex << i.to_s(16).rjust(2, "0")
           end
-          str
+          hex
+        end
+        
+        def empty?
+          to_bin.size == 0
         end
         
         if RUBY_VERSION < "1.9"
           # Returns the value of the first byte of the string.
           #
           # @return [Fixnum, 0 <= x < 256] The value of the first byte.
-          def ord(str)
-            raise ArgumentError.new('empty string') if str.empty?
-            str[0]
+          def ord
+            raise ArgumentError.new('empty string') if to_bin.empty?
+            to_bin[0]
           end
           ##
           # Converts a string of hex into the binary values it represents. This is used for
@@ -46,40 +96,35 @@ module Amp
           #
           # @example StringUtils.unhexlify("DEADBEEF") #=> "\336\255\276\357"
           # @return [String] the string decoded from hex form
-          def unhexlify(src)
-            str = "\000" * (src.size/2)
+          def unhexlify
+            bin = "\000" * (@hex.size/2)
             c = 0
-            (0..src.size-2).step(2) do |i|
-              hex = src[i,2].to_i(16)
-              str[c] = hex
+            (0..@hex.size-2).step(2) do |i|
+              byte = @hex[i,2].to_i(16)
+              bin[c] = byte
               c += 1
             end
-            str
+            bin
           end
         else
           # Returns the value of the first byte of the string.
           #
           # @return [Fixnum, 0 <= x < 256] The value of the first byte.
-          def ord(str)
-            raise ArgumentError.new('empty string') if str.empty?
-            str.ord
+          def ord
+            to_bin.ord
           end
 
-          def unhexlify(str)
-            str = "\000" * (src.size/2)
+          def unhexlify
+            bin = "\000" * (@hex.size/2)
             c = 0
-            (0..src.size-2).step(2) do |i|
-              hex = src[i,2].to_i(16)
-              str[c] = hex.chr
+            (0..@hex.size-2).step(2) do |i|
+              byte = @hex[i,2].to_i(16)
+              bin[c] = byte.chr
               c += 1
             end
-            str
+            bin
           end
         end
-        
-        def sha1(str)
-          Digest::SHA1.new.update(str)
-        end
       end
     end
   end

data/spec/plugin_spec.rb

@@ -0,0 +1,23 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require '../amp-front/lib/amp-front'
+require 'amp-core/amp_plugin'
+
+describe "plugin" do
+  it "should have a plugin constant: Amp::Plugins::Core" do
+    result = nil
+    Amp::Plugins.class_eval do
+      result = const_defined?(:Core)
+    end
+    result.should be_true
+  end
+
+  it 'should load the plugin' do
+    plugin = Amp::Plugins::Core.new
+    # this is entirely too white-box, but other tests already loaded everything
+    # mucking with the environment would be kind of messy
+    plugin.should_receive(:require)
+    plugin.load!
+  end
+end

data/spec/repository_specs/repository_spec.rb

@@ -34,7 +34,6 @@ describe Amp::Core::Repositories do
     end
 
     it 'Picks the first loaded Repository type to match.' do
-      p Amp::Core::Repositories::GenericRepoPicker.all_pickers
       Amp::Core::Repositories.pick(nil, nil, false).should == @expected
     end
   end

data/spec/spec_helper.rb

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

data/spec/support_specs/hex_string_spec.rb

@@ -0,0 +1,112 @@
+# encoding: UTF-8
+# chosen as something that forces the subject to deal with encodings
+##################################################################
+#                  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.          #
+#                                                                #
+#  © Michael J. Edgar and Ari Brown, 2009-2010                   #
+#                                                                #
+##################################################################
+
+require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+
+describe Amp::Core::Support::HexString do
+  Subject = Amp::Core::Support::HexString
+  describe 'created from binary data' do
+    it 'can be created without error' do
+      Subject.from_bin('A').should be_kind_of(Subject)
+    end
+
+    it 'is compareable' do
+      Subject.from_bin('A').should == Subject.from_bin('A')
+    end
+
+    it 'is compareable and right' do
+      Subject.from_bin('A').should_not == Subject.from_bin('B')
+    end
+
+    describe '#ord' do
+      it 'raises an ArgumentError on an empty string' do
+        lambda { Subject.from_bin('').ord }.should raise_error(ArgumentError)
+      end
+      
+      it 'returns the first byte of a simple character' do
+        Subject.from_bin('A').ord.should == 65
+      end
+
+      it 'returns the first byte of a complex character' do
+        Subject.from_bin('™').ord.should == 226
+      end
+    end
+    
+    describe '#to_bin' do
+      it 'maintains itself' do
+        Subject.from_bin('abcd').to_bin.should == "abcd"
+      end
+    end
+    
+    describe '#to_hex' do
+      it 'converts text data to its hex form' do
+        Subject.from_bin('ABCD').to_hex.should == '41424344'
+      end
+    end
+
+    describe '#to_s' do
+      it 'same result as to_hex' do
+        s = Subject.from_bin('ABCD')
+        s.to_s.should == s.to_hex
+      end
+    end
+  end
+
+  describe 'created from hex string' do
+    it 'can be created without error' do
+      Subject.from_hex('ab').should be_kind_of(Subject)
+    end
+
+    describe '#ord' do
+      it 'raises an ArgumentError on an empty string' do
+        lambda { Subject.new('').ord }.should raise_error(ArgumentError)
+      end
+      
+      it 'returns the first byte of a simple character' do
+        Subject.from_hex('41').ord.should == 65
+      end
+
+      it 'returns the first byte of a complex character' do
+        Subject.from_hex('e2').ord.should == 226
+      end
+    end
+    
+    describe '#to_bin' do
+      it 'converts a few hex bytes to binary' do
+        Subject.from_hex('abcd').to_bin.should == Subject.as_binary("\xab\xcd")
+      end
+    end
+    
+    describe '#to_hex' do
+      it 'maintains itself' do
+        Subject.from_hex('ABCD').to_hex.should == 'ABCD'
+      end
+    end
+
+    describe '#to_s' do
+      it 'same result as to_hex' do
+        s = Subject.from_hex('ABCD')
+        s.to_s.should == s.to_hex
+      end
+    end
+  end
+
+  describe '::sha1' do
+    it 'creates a HexString' do
+      Subject.sha1('A').should be_kind_of(Subject)
+    end
+  end
+end

data/test/test_templates.rb

@@ -18,7 +18,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'amp-front'
 require 'amp-core'
-Amp::Plugins::Core.new.load!
 
 class TestTemplates < Test::Unit::TestCase
   include Amp::Support

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 
@@ -79,7 +79,10 @@ files:
 - features/step_definitions/amp-core_steps.rb
 - features/support/env.rb
 - lib/amp-core.rb
+- lib/amp-core/amp_plugin.rb
 - lib/amp-core/command_ext/repository_loading.rb
+- lib/amp-core/commands/info.rb
+- lib/amp-core/commands/root.rb
 - lib/amp-core/repository/abstract/abstract_changeset.rb
 - lib/amp-core/repository/abstract/abstract_local_repo.rb
 - lib/amp-core/repository/abstract/abstract_staging_area.rb
@@ -91,9 +94,9 @@ files:
 - lib/amp-core/repository/generic_repo_picker.rb
 - lib/amp-core/repository/repository.rb
 - lib/amp-core/support/encoding_utils.rb
+- lib/amp-core/support/hex_string.rb
 - lib/amp-core/support/platform_utils.rb
 - lib/amp-core/support/rooted_opener.rb
-- lib/amp-core/support/string_utils.rb
 - lib/amp-core/templates/git/blank.log.erb
 - lib/amp-core/templates/git/default.log.erb
 - lib/amp-core/templates/mercurial/blank.commit.erb
@@ -101,17 +104,17 @@ files:
 - lib/amp-core/templates/mercurial/default.commit.erb
 - lib/amp-core/templates/mercurial/default.log.erb
 - lib/amp-core/templates/template.rb
-- spec/amp-core_spec.rb
 - spec/command_ext_specs/repository_loading_spec.rb
 - spec/command_ext_specs/spec_helper.rb
+- spec/plugin_spec.rb
 - spec/repository_specs/repository_spec.rb
 - spec/repository_specs/spec_helper.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support_specs/encoding_utils_spec.rb
+- spec/support_specs/hex_string_spec.rb
 - spec/support_specs/platform_utils_spec.rb
 - spec/support_specs/spec_helper.rb
-- spec/support_specs/string_utils_spec.rb
 - test/test_templates.rb
 has_rdoc: true
 homepage: http://github.com/michaeledgar/amp-core
@@ -144,14 +147,14 @@ signing_key:
 specification_version: 3
 summary: The core plugin for Amp. Necessary for Amp to function.
 test_files: 
-- spec/amp-core_spec.rb
 - spec/command_ext_specs/repository_loading_spec.rb
 - spec/command_ext_specs/spec_helper.rb
+- spec/plugin_spec.rb
 - spec/repository_specs/repository_spec.rb
 - spec/repository_specs/spec_helper.rb
 - spec/spec_helper.rb
 - spec/support_specs/encoding_utils_spec.rb
+- spec/support_specs/hex_string_spec.rb
 - spec/support_specs/platform_utils_spec.rb
 - spec/support_specs/spec_helper.rb
-- spec/support_specs/string_utils_spec.rb
 - test/test_templates.rb

data/spec/amp-core_spec.rb

@@ -1,11 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "amp-core" do
-  it "should have a plugin constant: Amp::Plugins::Core" do
-    result = nil
-    Amp::Plugins.class_eval do
-      result = const_defined?(:Core)
-    end
-    result.should be_true
-  end
-end

data/spec/support_specs/string_utils_spec.rb

@@ -1,44 +0,0 @@
-##################################################################
-#                  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.          #
-#                                                                #
-#  © Michael J. Edgar and Ari Brown, 2009-2010                   #
-#                                                                #
-##################################################################
-
-require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
-
-describe Amp::Core::Support::StringUtils do
-  describe '#ord' do
-    it 'raises an ArgumentError on an empty string' do
-      lambda { Amp::Core::Support::StringUtils.ord('') }.should raise_error(ArgumentError)
-    end
-    
-    it 'returns the first byte of the string' do
-      Amp::Core::Support::StringUtils.ord('A').should == 65
-      Amp::Core::Support::StringUtils.ord('™').should == 226
-    end
-  end
-  
-  describe '#unhexlify' do
-    it 'converts a few hex bytes to binary' do
-      Amp::Core::Support::StringUtils.unhexlify('abcd').should == "\xab\xcd"
-    end
-  end
-  
-  describe '#hexlify' do
-    it 'converts text data to its hex form' do
-      Amp::Core::Support::StringUtils.hexlify('ABCD').should == '41424344'
-    end
-    
-    it 'converts binary data to its hex form' do
-      Amp::Core::Support::StringUtils.hexlify('ABCD').should == '41424344'
-    end
-  end
-end