svnx 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 182d4597707fd26ecddd3a1ea79ca60f9394fe83
-  data.tar.gz: c2a7e445bf8454ca3e66db6823a0f85fe91a7ba4
+  metadata.gz: 9e756a5b2625c284861b85b3a7b0543ef044e8ff
+  data.tar.gz: e49bdcff5e52a538fcbd247da3d609afba5ac105
 SHA512:
-  metadata.gz: 5e94d144f15aa124cd3c787c4ce983801f6a52bb3b3bc9f83c6d3dc0cc80d17f44b737f58fb12cf19793f4af0c5f38b8a03ac5744c3bcb2f43ba3ba7923f0cef
-  data.tar.gz: 697d80dddd57c3c4b5b39aae20224540cb9d7d0142b64c6b57be2257424f18930f7d45ca36dee5b1766861d98d1bea72b64e5b34b99b7adf925c77aa2caa2788
+  metadata.gz: f062f3d0079b5ef799c366762301782db8251e7efb0cef86d776ca1c46b22d585502b89d97c1619fa14d2b3a7c5c052595a14e9a8a059c67fe4914ddab7ed9d8
+  data.tar.gz: e5d72e5378080300fd11e988e54283676b0e2d1749725aa4512e51d78563d27d516756db0d91722c886ba6d07802925963412fedefd69ff67f5abc9856ba9fd3

data/lib/svnx.rb

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

data/lib/svnx/revision/argument.rb

@@ -0,0 +1,116 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/log/entries'
+require 'svnx/revision/error'
+require 'logue/loggable'
+
+module SVNx; module Revision; end; end
+
+# We represent what svn calls a revision (-r134:{2010-1-1}) as a Range,
+# consisting of a from and to (optional) Argument.
+module SVNx::Revision
+  RELATIVE_REVISION_RE = Regexp.new '^([\+\-])(\d+)$'
+  
+  # Returns the Nth revision from the given logging output.
+  
+  # -n means to count from the end of the list.
+  # +n means to count from the beginning of the list.
+  #  n means the literal revision number.  
+  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
+
+    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
+      end
+    end
+
+    def initialize value
+      @value = value
+    end
+
+    def to_s
+      @value.to_s
+    end
+
+    def <=> other
+      @value <=> other.value
+    end
+  end
+
+  class FixnumArgument < 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
+    def initialize value, args
+      entries = args[:entries]
+      
+      unless entries
+        raise RevisionError.new "cannot determine relative revision without entries"
+      end
+      
+      nentries = entries.size
+
+      # logentries are in descending order, so the most recent one is index 0
+
+      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
+        log_entry = entries[idx]
+        super log_entry.revision.to_i
+      end
+    end
+  end
+end

data/lib/svnx/revision/error.rb

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

data/lib/svnx/revision/range.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/log/entries'
+require 'svnx/revision/argument'
+require 'logue/loggable'
+
+module SVNx; module Revision; end; end
+
+module SVNx::Revision
+  # this is of the form: -r123:456
+  class Range
+    include Logue::Loggable
+    
+    attr_reader :from
+    attr_reader :to
+
+    def initialize from, to = nil, entries = nil
+      if to
+        @from = to_revision from, entries
+        @to = to_revision to, entries
+      elsif from.kind_of? String
+        @from, @to = from.split(':').collect { |x| to_revision x, entries }
+      else
+        @from = to_revision from, entries
+        @to = :working_copy
+      end
+    end
+
+    def to_revision val, entries
+      val.kind_of?(Argument) || Argument.new(val, entries: entries)
+    end
+    
+    def to_s
+      str = @from.to_s
+      unless working_copy?
+        str << ':' << @to.to_s
+      end
+      str
+    end
+
+    def head?
+      @to == :head
+    end
+
+    def working_copy?
+      @to == nil || @to == :wc || @to == :working_copy
+    end
+  end
+end

data/test/unit/svnx/action_test.rb

@@ -5,7 +5,7 @@ require 'tc'
 require 'svnx/action'
 
 module SVNx
-  class ActionTestCase < PVN::TestCase
+  class ActionTestCase < SVNx::TestCase
     def assert_action_equals expadd, expdel, expmod, expunver, *vals
       vals.each do |val|
         action = Action.new val

data/test/unit/svnx/cat/command_test.rb

@@ -5,7 +5,7 @@ require 'tc'
 require 'svnx/cat/command'
 
 module SVNx::Cat
-  class CommandTestCase < PVN::TestCase
+  class CommandTestCase < SVNx::TestCase
     EXPROOT = 'file:///Programs/Subversion/Repositories/pvntestbed.from'
 
     def test_cat_default

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

@@ -0,0 +1,157 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/log/entries'
+require 'svnx/revision/argument'
+require 'resources'
+
+module SVNx::Revision
+  class ArgumentTestCase < SVNx::TestCase
+    def setup
+      # This is the equivalent of "log" at revision 22, when this file was added
+      # at revision 13. Using this instead of just "log" when regenerating the
+      # resource files keeps the revisions from bouncing around.
+      xmllines = Resources::PT_LOG_R22_13_SECONDFILE_TXT.readlines
+      @entries = SVNx::Log::Entries.new :xmllines => xmllines
+    end
+
+    def create_argument value
+      Argument.new value, entries: @entries
+    end
+
+    def assert_argument_value exp_value, value
+      arg = create_argument value
+      assert_equal exp_value, arg.value
+    end
+
+    def assert_argument_value_raises value
+      assert_raises(SVNx::Revision::RevisionError) do 
+        assert_argument_value nil, value
+      end
+    end
+
+    def assert_argument_to_s exp_str, value
+      arg = create_argument value
+      assert_equal exp_str, arg.to_s
+    end      
+
+    def assert_compare op, exp, xval, yval
+      x = create_argument xval
+      y = create_argument yval
+      msg = "xval: #{xval}; yval: #{yval}"
+      assert_equal exp, x.send(op, y), msg
+    end
+
+    def assert_argument_eq expeq, xval, yval
+      # it's the emoticon programming language
+      assert_compare :==, expeq, xval, yval
+    end
+
+    def assert_argument_gt expeq, xval, yval
+      assert_compare :>, expeq, xval, yval
+    end
+
+    def test_absolute_midrange
+      assert_argument_value 19, 19
+    end
+
+    def test_absolute_most_recent
+      assert_argument_value 22, 22
+    end
+
+    def test_absolute_least_recent
+      assert_argument_value 13, 13
+    end
+
+    def test_absolute_midrange_as_string
+      assert_argument_value 19, '19'
+    end
+
+    def test_absolute_most_recent_as_string
+      assert_argument_value 22, '22'
+    end
+
+    def test_absolute_least_recent_as_string
+      assert_argument_value 13, '13'
+    end
+
+    def test_svn_word
+      %w{ HEAD BASE COMMITTED PREV }.each do |word|
+        assert_argument_value word, word
+      end
+    end
+
+    def test_negative_most_recent
+      assert_argument_value 22, -1
+    end
+
+    def test_negative_second_most_recent
+      assert_argument_value 20, -2
+    end
+
+    def test_negative_least_recent
+      assert_argument_value 13, -5
+    end
+
+    def test_negative_too_far_back
+      assert_argument_value_raises(-6)
+    end
+
+    def test_negative_most_recent_as_string
+      assert_argument_value 22, '-1'
+    end
+
+    def test_negative_second_most_recent_as_string
+      assert_argument_value 20, '-2'
+    end
+
+    def test_negative_least_recent_as_string
+      assert_argument_value 13, '-5'
+    end
+
+    def test_negative_too_far_back_as_string
+      assert_argument_value_raises '-6'
+    end
+
+    def test_positive_most_recent
+      assert_argument_value 22, '+5'
+    end
+
+    def test_positive_second_most_recent
+      assert_argument_value 20, '+4'
+    end
+
+    def test_positive_least_recent
+      assert_argument_value 13, '+1'
+    end
+
+    def test_positive_too_far_forward
+      assert_argument_value_raises '+6'
+    end
+
+    def xxxtest_range_svn_word_to_number
+      assert_argument_value 'BASE:1', 'BASE:1'
+    end
+
+    def xxxtest_date
+      assert_argument_to_s '1967-12-10', '1967-12-10'
+    end
+
+    def test_to_s
+      assert_argument_to_s '5', '5'
+      assert_argument_to_s 'HEAD', 'HEAD'
+    end
+
+    def test_eq
+      assert_argument_eq true, '5', '5'
+      assert_argument_eq false, '4', '5'
+      assert_argument_eq false, '5', '4'
+    end
+
+    def test_gt
+      assert_argument_gt true, '17', '16'
+      assert_argument_gt false, '13', '14'
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/log/entries'
+require 'svnx/revision/range'
+require 'resources'
+
+module SVNx::Revision
+  class RangeTestCase < SVNx::TestCase
+    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
+    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
+    end
+  end
+end

data/test/unit/system/command/line_test.rb

@@ -5,7 +5,7 @@ require 'tc'
 require 'system/command/line'
 
 module System
-  class CommandLineTestCase < PVN::TestCase
+  class CommandLineTestCase < SVNx::TestCase
     def test_ctor
       cl = System::CommandLine.new [ "ls" ]
       assert_equal "ls", cl.to_command

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Jeff Pace
@@ -58,6 +58,9 @@ files:
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
+- lib/svnx/revision/argument.rb
+- lib/svnx/revision/error.rb
+- lib/svnx/revision/range.rb
 - lib/svnx/status/command.rb
 - lib/svnx/status/entries.rb
 - lib/svnx/status/entry.rb
@@ -73,6 +76,8 @@ 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/argument_test.rb
+- test/unit/svnx/revision/range_test.rb
 - test/unit/svnx/status/entries_test.rb
 - test/unit/system/command/cachefile_test.rb
 - test/unit/system/command/caching_test.rb
@@ -110,6 +115,8 @@ 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/argument_test.rb
+- test/unit/svnx/revision/range_test.rb
 - test/unit/svnx/status/entries_test.rb
 - test/unit/system/command/cachefile_test.rb
 - test/unit/system/command/caching_test.rb