svnx 2.9.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e8e4a0e4c8becac18da9d39aaeb0f9db52e683
-  data.tar.gz: 247d8f5ba0974ba965066ef6058f073c53020757
+  metadata.gz: 1122bd68ff487bab49f705895f6055e7515fd976
+  data.tar.gz: fdaa77e7db8b9f74096297b900db7dbc4d17d323
 SHA512:
-  metadata.gz: 79e7e4bfad279b50d113d905cfba6ce0b8faffa1bddf7bfd11b67ac7dd8c841934369de3e2846dbd0ea7e4e31eae128770579e0de5a043cf25790c8f49e560c9
-  data.tar.gz: d4ad3cf461a5ff4d26635e452b3c056ad8edbacbcdf652a6a703d115b8025cb8cda70d90b19acd786ff76903ef3b59df84153ef8111a637f32a734990c4028ff
+  metadata.gz: b023f779f02aacba414699568ac6056fc62cf06c7c26729723034e8e4c16c40709dd062c10cadd37a4121a9aa694485169292df4a3a3e7e617ef61818a12e4f3
+  data.tar.gz: 6b81673dcaad702f88bbb826c2e609014dbe0599103e308a04d21d08192beb68e2b594574cc8ab2016ee6c4180bd006727393e2bc222048f33decfd846333b75

data/lib/svnx/base/action.rb

@@ -45,6 +45,7 @@ module Svnx
       :modified    => 'M',
       :replaced    => 'R',
       :unversioned => '?',
+      :missing     => '?',
       :external    => 'X',
       :normal      => 'q' # actually, X, but in a different column than X for external
     ].each do |sym, char|

data/lib/svnx/base/entries.rb

@@ -3,7 +3,6 @@
 
 require 'rexml/document'
 require 'nokogiri'
-require 'logue/loggable'
 
 module Svnx
   module Base
@@ -17,7 +16,7 @@ $use_nokogiri = true
 
 module Svnx::Base
   class Entries
-    include Logue::Loggable, Enumerable
+    include Enumerable
 
     attr_reader :size
 
@@ -41,29 +40,33 @@ module Svnx::Base
       raise "create_entry must be implemented for: #{self.class}"
     end
 
-    def [] idx
-      if idx >= size
-        raise "error: index #{idx} is not in range(0 .. #{size})"
-      elsif idx < 0
-        idx = size + idx
-      end
-      if entry = @entries[idx]
-        return entry
-      end
-      @entries[idx] = create_entry @elements[idx]
+    def to_index idx
+      idx < 0 ? size + idx : idx
     end
 
-    def each(&blk)
-      # all elements must be processed before each can run:
-      if @elements
-        @elements.each_with_index do |element, idx|
-          @entries[idx] ||= create_entry element
+    def [] idx
+      if idx.kind_of? Range
+        fridx = to_index idx.first
+        toidx = to_index idx.last
+        rg = Range.new fridx, toidx, idx.exclude_end?
+        rg.collect { |x| self[x] }
+      else
+        if idx >= size
+          raise "error: index #{idx} is not in range(0 .. #{size})"
+        else
+          idx = to_index idx
         end
-
-        @elements = nil
+        if entry = @entries[idx]
+          return entry
+        end
+        @entries[idx] = create_entry @elements[idx]
       end
-
-      @entries.keys.sort.collect { |idx| @entries[idx] }.each(&blk)
+    end
+      
+    def each(&blk)
+      (0 ... size).collect do |idx|
+        @entries[idx] ||= create_entry @elements[idx]
+      end.each(&blk)
     end
   end
 end

data/lib/svnx/base/fields.rb

@@ -1,7 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/util/strutil'
+module Svnx
+  module Base
+  end
+end
 
 module Svnx::Base
   module Fields

data/lib/svnx/base/tags.rb

@@ -61,6 +61,18 @@ module Svnx::Base
       def has_tag_argument tagname, methname
         has_field methname, to_args(tagname, methname)
       end
+
+      def has_tag_arg name
+        has_field name, to_args(to_tag(name), name)
+      end
+
+      def has_tag_arguments(*names)
+        names.each do |name|
+          tag = to_tag name
+          args = to_args tag, name
+          has_field name, args
+        end
+      end
     end
 
     extend ClassMethods

data/lib/svnx/commit/options.rb

@@ -11,6 +11,6 @@ end
 module Svnx::Commit
   class Options < Svnx::Base::Options
     has :file, :paths
-    has_fields with_revprop: to_args("--with-revprop", :with_revprop)
+    has_tag_arguments :with_revprop, :message, :username, :password
   end
 end

data/lib/svnx/log/options.rb

@@ -11,10 +11,8 @@ end
 
 module Svnx::Log
   class Options < Svnx::Base::Options
-    has_fields limit:   to_args("--limit", :limit),
-               verbose: "-v",
-               depth:   to_args("--depth", :depth)
-    has_tag_fields :stop_on_copy, :use_merge_history
+    has_tag_arguments :limit, :depth
+    has_tag_fields :verbose, :stop_on_copy, :use_merge_history
     has :revision, :url, :path
   end
 end

data/lib/svnx/propget/options.rb

@@ -9,9 +9,9 @@ module Svnx
 end
 
 module Svnx::Propget
-  class Options < Svnx::Base::Options    
-    has_fields revprop: "--revprop",
-               name:    nil
+  class Options < Svnx::Base::Options
+    has_tag_field :revprop
     has :revision, :url, :path
+    has_fields name: nil
   end
 end

data/lib/svnx/status/entry.rb

@@ -10,14 +10,40 @@ module Svnx
 end
 
 module Svnx::Status
+  class Commit
+    attr_reader :revision
+    attr_reader :author
+    attr_reader :date
+
+    def initialize elmt
+      rev = elmt['revision']
+      @revision = rev.nil? ? rev : rev.to_i
+      @author = elmt.at_xpath('author').text
+      @date = elmt.at_xpath('date').text
+    end
+  end
+  
+  class WorkingCopy
+    attr_reader :properties
+    attr_reader :status
+    attr_reader :revision
+    attr_reader :commit
+
+    def initialize wcstatus
+      @properties = wcstatus['props']
+      @status = Svnx::Action.new wcstatus['item']
+      @revision = (n = wcstatus['revision']) && n.to_i
+      commit = wcstatus.at_xpath 'commit'
+      @commit = commit && Commit.new(commit)
+    end
+  end
+  
   class Entry < Svnx::Base::Entry
     include Comparable
     
-    attr_reader :commit_revision
     attr_reader :name
     attr_reader :path
-    attr_reader :status
-    attr_reader :status_revision
+    attr_reader :working_copy
 
     def initialize xmlelement, rootpath: nil
       @rootpath = rootpath
@@ -26,15 +52,12 @@ module Svnx::Status
 
     def set_from_element elmt
       set_attr_var elmt, 'path'
-
       wcstatus = elmt.at_xpath 'wc-status'
-      @status = Svnx::Action.new wcstatus['item']
-      set_attr_var wcstatus, 'status_revision', 'revision'
       
-      commit = wcstatus.at_xpath 'commit'
-      set_attr_var commit, 'commit_revision', 'revision'
       @name = @path.dup
 
+      @working_copy = WorkingCopy.new wcstatus
+
       if @rootpath
         # name is prefixed with directory unless '.' is used as the argument
         @name.sub! Regexp.new('^' + @rootpath), ''

data/lib/svnx/update/options.rb

@@ -11,8 +11,7 @@ end
 module Svnx::Update
   class Options < Svnx::Base::Options
     has :revision, :paths
-    has_tag_argument "--depth", :depth
-    has_tag_argument "--set-depth", :set_depth
+    has_tag_arguments :depth, :set_depth
     has_tag_field :ignore_externals
   end
 end

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.9.0'
+  VERSION = '2.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-25 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable