svnx 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e756a5b2625c284861b85b3a7b0543ef044e8ff
-  data.tar.gz: e49bdcff5e52a538fcbd247da3d609afba5ac105
+  metadata.gz: c59030d9c9032d6cde4df27c198fa1b61a20fe23
+  data.tar.gz: 1245d9f6e2061ae99acb6c28564fddd183d17826
 SHA512:
-  metadata.gz: f062f3d0079b5ef799c366762301782db8251e7efb0cef86d776ca1c46b22d585502b89d97c1619fa14d2b3a7c5c052595a14e9a8a059c67fe4914ddab7ed9d8
-  data.tar.gz: e5d72e5378080300fd11e988e54283676b0e2d1749725aa4512e51d78563d27d516756db0d91722c886ba6d07802925963412fedefd69ff67f5abc9856ba9fd3
+  metadata.gz: f6facfd37a2ef2ff64c4169a196e3cf629f9d2bb8b434e2f552221556f7c985c700d5151c822245388481c796bc720607c196cadac72914f989697f8e5a01e04
+  data.tar.gz: 0e99b63b59d841b4abc1a9d081f2380ee2a756cb13f1bb58324832f37801b4fe7799961398190e80e5a4c5188dfb6f6f1fd5c0feaccce617a8c3d82f7673bc55

data/lib/svnx.rb

@@ -2,5 +2,5 @@
 # -*- ruby -*-
 
 module SVNx
-  VERSION = "0.1.0"
+  VERSION = "0.4.0"
 end

data/lib/svnx/revision/argfactory.rb

@@ -0,0 +1,51 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module SVNx; module Revision; end; end
+
+module SVNx::Revision  
+  class ArgumentFactory
+    include Logue::Loggable
+
+    DATE_REGEXP = Regexp.new '^\{(.*?)\}'
+    SVN_ARGUMENT_WORDS = %w{ HEAD BASE COMMITTED PREV }
+
+    def create value, args = Hash.new
+      case value
+      when Fixnum
+        create_for_fixnum value, args
+      when String
+        create_for_string value, args
+      when Symbol
+        raise RevisionError.new "symbol not yet handled"
+      when Date
+        # $$$ this (and Time) will probably have to be converted to svn's format
+        raise RevisionError.new "date not yet handled"
+      when Time
+        raise RevisionError.new "time not yet handled"
+      end          
+    end
+
+    def create_for_fixnum value, args
+      if value < 0
+        # these are log entries:
+        RelativeArgument.new value, entries: args[:entries]
+      else
+        IndexArgument.new value
+      end
+    end
+
+    def create_for_string value, args
+      case 
+      when SVN_ARGUMENT_WORDS.include?(value)
+        StringArgument.new value
+      when md = RELATIVE_REVISION_RE.match(value)
+        RelativeArgument.new md[0].to_i, entries: args[:entries]
+      when DATE_REGEXP.match(value)
+        StringArgument.new value
+      else
+        IndexArgument.new value.to_i
+      end
+    end
+  end
+end

data/lib/svnx/revision/argument.rb

@@ -4,6 +4,7 @@
 require 'svnx/log/entries'
 require 'svnx/revision/error'
 require 'logue/loggable'
+require 'svnx/revision/argfactory'
 
 module SVNx; module Revision; end; end
 
@@ -20,9 +21,6 @@ module SVNx::Revision
   class Argument
     include Logue::Loggable, Comparable
 
-    DATE_REGEXP = Regexp.new '^\{(.*?)\}'
-    SVN_ARGUMENT_WORDS = %w{ HEAD BASE COMMITTED PREV }
-    
     # these are also valid revisions
     # :working_copy
     # :head
@@ -30,41 +28,8 @@ module SVNx::Revision
     attr_reader :value
 
     class << self
-      alias_method :orig_new, :new
-
-      def new value, args = Hash.new
-        # these are log entries:
-        entries = args[:entries]
-        
-        case value
-        when Fixnum
-          if value < 0
-            RelativeArgument.orig_new value, entries: entries
-          else
-            FixnumArgument.orig_new value
-          end
-        when String
-          if SVN_ARGUMENT_WORDS.include? value
-            StringArgument.orig_new value
-          elsif md = RELATIVE_REVISION_RE.match(value)
-            RelativeArgument.orig_new md[0].to_i, entries: entries
-          elsif DATE_REGEXP.match value
-            StringArgument.orig_new value
-          else
-            FixnumArgument.orig_new value.to_i
-          end
-        when Symbol
-          raise RevisionError.new "symbol not yet handled"
-        when Date
-          # $$$ this (and Time) will probably have to be converted to svn's format
-          raise RevisionError.new "date not yet handled"
-        when Time
-          raise RevisionError.new "time not yet handled"
-        end          
-      end
-
-      def matches_relative? str
-        RELATIVE_REVISION_RE.match str
+      def create value, args = Hash.new
+        ArgumentFactory.new.create value, args
       end
     end
 
@@ -81,18 +46,15 @@ module SVNx::Revision
     end
   end
 
-  class FixnumArgument < Argument
+  class IndexArgument < Argument
   end
 
   class StringArgument < Argument
   end
 
-  class WorkingCopyArgument < Argument
-  end
-
   # this is of the form -3, which is revision[-3] (second one from the most
   # recent; -1 is the most recent).
-  class RelativeArgument < FixnumArgument
+  class RelativeArgument < IndexArgument
     def initialize value, args
       entries = args[:entries]
       
@@ -107,7 +69,7 @@ module SVNx::Revision
       if value.abs > nentries
         raise RevisionError.new "ERROR: no entry for revision: #{value.abs}; number of entries: #{nentries}"
       else
-        idx = value < 0 ? -1 + value.abs : nentries - value
+        idx = value < 0 ? value.abs - 1 : nentries - value
         log_entry = entries[idx]
         super log_entry.revision.to_i
       end

data/lib/svnx/revision/error.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module SVNx
-  module Revision
-    class RevisionError < RuntimeError
-    end
+module SVNx; module Revision; end; end
+
+module SVNx::Revision
+  class RevisionError < RuntimeError
   end
 end

data/lib/svnx/revision/range.rb

@@ -28,7 +28,7 @@ module SVNx::Revision
     end
 
     def to_revision val, entries
-      val.kind_of?(Argument) || Argument.new(val, entries: entries)
+      val.kind_of?(Argument) ? val : Argument.create(val, entries: entries)
     end
     
     def to_s
@@ -40,7 +40,7 @@ module SVNx::Revision
     end
 
     def head?
-      @to == :head
+      @to && @to.value == 'HEAD'
     end
 
     def working_copy?

data/test/unit/svnx/revision/argfactory_test.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/log/entries'
+require 'svnx/revision/argument'
+require 'resources'
+
+module SVNx::Revision
+  class ArgumentFactoryTestCase < SVNx::TestCase
+    def setup
+      xmllines = Resources::PT_LOG_R22_13_SECONDFILE_TXT.readlines
+      @entries = SVNx::Log::Entries.new :xmllines => xmllines
+    end
+
+    def test_create
+      arg = ArgumentFactory.new.create 14, entries: @entries
+      assert_not_nil arg
+    end
+
+    def test_index_argument
+      arg = ArgumentFactory.new.create 14, entries: @entries
+      assert_kind_of IndexArgument, arg
+    end
+
+    def test_string_svn_words
+      %w{ HEAD BASE COMMITTED PREV }.each do |word|
+        arg = ArgumentFactory.new.create word, entries: @entries
+        assert_kind_of StringArgument, arg
+      end
+    end
+
+    def test_date
+      arg = ArgumentFactory.new.create '{2012-12-10}', entries: @entries
+      assert_kind_of StringArgument, arg
+    end
+
+    def test_relative_argument_fixnum
+      arg = ArgumentFactory.new.create(-4, entries: @entries)
+      assert_kind_of IndexArgument, arg
+      assert_equal 15, arg.value
+    end
+
+    def test_relative_argument_string
+      arg = ArgumentFactory.new.create('-4', entries: @entries)
+      assert_kind_of IndexArgument, arg
+      assert_equal 15, arg.value
+    end
+  end
+end

data/test/unit/svnx/revision/argument_test.rb

@@ -16,8 +16,12 @@ module SVNx::Revision
       @entries = SVNx::Log::Entries.new :xmllines => xmllines
     end
 
+    def new_argument value
+      Argument.new value
+    end
+
     def create_argument value
-      Argument.new value, entries: @entries
+      Argument.create value, entries: @entries
     end
 
     def assert_argument_value exp_value, value
@@ -52,6 +56,12 @@ module SVNx::Revision
       assert_compare :>, expeq, xval, yval
     end
 
+    def test_new_and_create_same
+      x = new_argument 13
+      y = create_argument 13
+      assert_equal y.value, x.value
+    end
+
     def test_absolute_midrange
       assert_argument_value 19, 19
     end

data/test/unit/svnx/revision/range_test.rb

@@ -4,22 +4,46 @@
 require 'tc'
 require 'svnx/log/entries'
 require 'svnx/revision/range'
+require 'svnx/revision/argument'
+require 'svnx/revision/argfactory'
 require 'resources'
 
 module SVNx::Revision
   class RangeTestCase < SVNx::TestCase
+    def setup
+      xmllines = Resources::PT_LOG_R22_13_SECONDFILE_TXT.readlines
+      @entries = SVNx::Log::Entries.new :xmllines => xmllines
+    end
+
+    def assert_range expstr, expfrom, expto, argfrom, argto = nil
+      rg = Range.new argfrom, argto
+      msg = "from: #{argfrom}; to: #{argto}"
+      
+      assert_equal expfrom, rg.from.to_s, msg
+      assert_equal expto, rg.to.to_s, msg
+      assert_equal expstr, rg.to_s, msg
+      rg
+    end
+
     def test_init
-      rr = Range.new '143:199'
-      assert_equal '143', rr.from.to_s
-      assert_equal '199', rr.to.to_s
-      assert_equal '143:199', rr.to_s
+      assert_range '143:199', '143', '199', '143:199'
     end
 
     def test_to_working_copy
-      rr = Range.new '143'
-      assert_equal '143', rr.from.to_s
-      assert_nil rr.to
-      assert_equal '143', rr.to_s
+      rr = assert_range '143', '143', '', '143'
+      assert rr.working_copy?
+    end
+
+    def test_init_takes_arguments
+      fa = Argument.new 143
+      ta = Argument.new 199
+      rr = Range.new fa, ta
+      assert_range '143:199', '143', '199', fa, ta
+    end
+
+    def test_to_head
+      rr = assert_range '143:HEAD', '143', 'HEAD', '143', 'HEAD'
+      assert rr.head?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logue
@@ -51,13 +51,13 @@ files:
 - lib/svnx/command.rb
 - lib/svnx/entries.rb
 - lib/svnx/entry.rb
-- lib/svnx/exec.rb
 - lib/svnx/info/command.rb
 - lib/svnx/info/entries.rb
 - lib/svnx/info/entry.rb
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
+- lib/svnx/revision/argfactory.rb
 - lib/svnx/revision/argument.rb
 - lib/svnx/revision/error.rb
 - lib/svnx/revision/range.rb
@@ -76,6 +76,7 @@ files:
 - test/unit/svnx/info/entries_test.rb
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
+- test/unit/svnx/revision/argfactory_test.rb
 - test/unit/svnx/revision/argument_test.rb
 - test/unit/svnx/revision/range_test.rb
 - test/unit/svnx/status/entries_test.rb
@@ -115,6 +116,7 @@ test_files:
 - test/unit/svnx/info/entries_test.rb
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
+- test/unit/svnx/revision/argfactory_test.rb
 - test/unit/svnx/revision/argument_test.rb
 - test/unit/svnx/revision/range_test.rb
 - test/unit/svnx/status/entries_test.rb

data/lib/svnx/exec.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/cat/command'
-require 'svnx/log/command'
-require 'svnx/info/command'
-require 'svnx/status/command'
-
-# executes 'svn <command>' and returns the output as XML lines (by default,
-# according to the underlying option).
-module SVNx
-  class Exec
-    def cat path, revision, use_cache
-      cmdargs = CatCommandArgs.new :path => path, :revision => revision, :use_cache => use_cache
-      run_command CatCommand, cmdargs
-    end
-    
-    def log path, revision, limit, verbose, use_cache
-      cmdargs = LogCommandArgs.new :path => path, :revision => revision, :limit => limit, :verbose => verbose, :use_cache => use_cache
-      run_command LogCommand, cmdargs
-    end
-
-    def info path, revision
-      cmdargs = InfoCommandArgs.new :path => path, :revision => revision
-      run_command InfoCommand, cmdargs
-    end
-
-    def status path, use_cache
-      cmdargs = StatusCommandArgs.new :path => path, :use_cache => use_cache
-      run_command StatusCommand, cmdargs
-    end
-
-    private
-    def run_command cmdcls, args
-      cmd = cmdcls.new args
-      cmd.execute
-    end
-  end
-end