svnx 2.7.2 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759f64ff2fb82a12e58b4ae33be6f1ab5df391af
-  data.tar.gz: e319aced5f94a6447b1304e3684102427d111a73
+  metadata.gz: ee2f457c3e6d933420b413b096eedae95a3decbc
+  data.tar.gz: bf37347ef5a34295118aad381c99989654f691b8
 SHA512:
-  metadata.gz: b9307ee3595171bf6490a8b974e274ca95dd35a40a59e7ca48c2d0019ce0f77afc0da3fb554be80288a45da10a8f7c583954e9a9ac34f57efd5c8ed2843daf97
-  data.tar.gz: c3d7e0bbf22495b43c0db7d506bf3a941753a2085cd689cb0644d83135068b898ca12cfd2f5d3a6616791859df71db74f5333c48dc3ab7342530b2f36e8d7bd4
+  metadata.gz: 7bb4a5fb1970c4f169b8127980535f15ce625fc197b750cf6b630802c43e3cc8976605f44e56bd645bd0d2ed6c0a9cabcc6c4903fe73f3037d541c5cc54ef2fc
+  data.tar.gz: 5e5460362594822a2e48a1b59ab1b72523c1de289348568a9b80a42071fa41c59cc100a0416375a5ea9a1f14a968db1930f9fd9a34cdeab801f0ed3a411f1930

data/lib/svnx/base/action.rb

@@ -11,7 +11,7 @@ module Svnx
           super
         else
           type = args.first
-          types = constants(false)
+          types = constants false
           types.each do |t|
             tc = const_get t
             if tc.type == type.to_sym || tc.abbrev == type
@@ -53,9 +53,7 @@ module Svnx
       Action.const_set str.upcase, action
       methname = str + '?'
       define_method methname do
-        instance_eval do
-          @type.to_sym == sym
-        end
+        @type.to_sym == sym
       end      
     end
   end

data/lib/svnx/base/cmdline.rb

@@ -19,24 +19,19 @@ module Svnx::Base
     attr_reader :status  
 
     def initialize subcommand: nil, xml: true, caching: false, args: Array.new
-      debug "subcommand: #{subcommand}"
-      debug "args: #{args}"
       @subcommand = subcommand
       @xml = xml
       @caching = caching
       @args = args
-      debug "@args: #{@args}"
     end
 
     def execute
       cmdargs = [ 'svn', @subcommand ]
       cmdargs << '--xml' if @xml
       cmdargs.concat @args
-      debug "cmdargs: #{cmdargs}"
       
       cmdline = command_line cmdargs
       cmdline.execute
-      debug "cmdline: #{cmdline}"
       
       @output = cmdline.output
       @error = cmdline.error

data/lib/svnx/base/command.rb

@@ -29,22 +29,30 @@ module Svnx::Base
     attr_reader :options
     
     def initialize options, cmdlinecls: nil, optcls: nil, xml: false, caching: caching?
+      debug "options: #{options}"
       factory = CommandFactory.new
 
       params = factory.create self.class, cmdlinecls: cmdlinecls, optcls: optcls
       
       optcls ||= params.options
+      debug "optcls: #{optcls}"
       
       @options = optcls.new options
       cmdargs = @options.to_args
+      debug "cmdargs: #{cmdargs}"
       
       subcommand = params.subcommand
       
       cmdlinecls ||= params.cmdline
+
+      debug "subcommand: #{subcommand}"
       
       @cmdline = cmdlinecls.new(subcommand: subcommand, xml: xml, caching: caching, args: cmdargs)
+      debug "@cmdline: #{@cmdline}"
       
       @output = @cmdline.execute
+      debug "@output: #{@output}"
+      
       @error = @cmdline.error
       @status = @cmdline.status
     end

data/lib/svnx/base/command_factory.rb

@@ -20,7 +20,7 @@ module Svnx::Base
   class CommandFactory
     include Logue::Loggable
     
-    def create cmdcls, cmdlinecls: CommandLine, optcls: nil
+    def create cmdcls, cmdlinecls: nil, optcls: nil
       melements = ClassUtil.module_elements cmdcls
       
       optcls ||= begin

data/lib/svnx/base/entries.rb

@@ -42,14 +42,14 @@ module Svnx::Base
     end
 
     def [] idx
-      if entry = @entries[idx]
-        return entry
-      end
       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]
     end
 

data/lib/svnx/base/entry.rb

@@ -21,8 +21,18 @@ module Svnx::Base
       raise "must be implemented"
     end
 
-    def set_attr_var xmlelement, varname, attrname = varname
-      set_var varname, xmlelement && attribute_value(xmlelement, attrname)
+    def set_attr_var xmlelement, varname, attrname = varname, convert: nil
+      value = if xmlelement
+                val = attribute_value xmlelement, attrname
+                if convert
+                  val = val.send convert
+                end
+                val
+              else
+                nil
+              end
+      
+      set_var varname, value
     end
 
     def set_attr_vars xmlelement, *varnames

data/lib/svnx/base/options.rb

@@ -54,6 +54,20 @@ module Svnx::Base
           tag
         end
       end
+
+      def has_tag_field name
+        has_field name, to_tag(name)
+      end
+
+      def has_tag_fields(*names)
+        names.each do |name|
+          has_tag_field name
+        end
+      end
+
+      def has_tag_argument tagname, methname
+        has_field methname, to_args(tagname, methname)
+      end
     end
 
     def initialize args

data/lib/svnx/log/entry.rb

@@ -11,7 +11,7 @@ module Svnx::Log
     attr_reader :revision, :reverse_merge, :author, :date, :paths, :msg, :entries
 
     def set_from_element elmt
-      set_attr_var elmt, 'revision'
+      set_attr_var elmt, 'revision', convert: :to_i
       @reverse_merge = attribute_value elmt, 'reverse-merge'
       
       set_elmt_vars elmt, 'author', 'date', 'msg'
@@ -33,6 +33,10 @@ module Svnx::Log
       [ @revision, @author, @date, @msg ].collect { |x| x.to_s }.join " "
     end
 
+    def inspect
+      to_s
+    end
+
     def match action, filter
       paths.select do |path|
         path.match? action, filter

data/lib/svnx/log/options.rb

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

data/lib/svnx/project.rb

@@ -35,8 +35,9 @@ class Svnx::Project
     require "svnx/#{cmd}/command"
     require "svnx/#{cmd}/options"
 
-    initargs = Hash[url: "@url", path: "@dir", paths: "[ @dir ]"]
-    optcls   = Kernel.const_get "Svnx::#{cmd.to_s.capitalize}::Options"
+    modname  = Kernel.const_get "Svnx::" + cmd.to_s.capitalize    
+    initargs = { url: "@url", path: "@dir", paths: "[ @dir ]" }
+    optcls   = modname::Options
     opts     = optcls.new Hash.new
     fields   = opts.fields.keys
     params   = fields.collect { |key| key.to_s + ": " + (initargs[key] || "nil") }.join ", "
@@ -44,8 +45,8 @@ class Svnx::Project
     
     src = Array.new.tap do |a|
       a << "def #{cmd} #{params}, cmdlinecls: @cmdlinecls"
-      a << "  cmd = Svnx::#{cmd.to_s.capitalize}::Command.new({ #{cmdargs} }, cmdlinecls: cmdlinecls)"
-      a << "  cmd.respond_to?(:entries) ? cmd.entries : cmd.output"
+      a << "  svncmd = #{modname}::Command.new({ #{cmdargs} }, cmdlinecls: cmdlinecls)"
+      a << "  svncmd.respond_to?(:entries) ? svncmd.entries : svncmd.output"
       a << "end"
     end.join "\n"
     

data/lib/svnx/propset/options.rb

@@ -13,7 +13,7 @@ module Svnx::Propset
     has_fields name:     nil,
                revision: Proc.new { |x| [ "--revprop", "-r", x.send(:revision) ] }
     has :file
-    has_fields value: nil
+    has_field :value, nil
     has :url, :path
   end
 end

data/lib/svnx/update/options.rb

@@ -10,7 +10,9 @@ end
 
 module Svnx::Update
   class Options < Svnx::Base::Options
-    has :revision
-    has :paths
+    has :revision, :paths
+    has_tag_argument "--depth", :depth
+    has_tag_argument "--set-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.7.2'
+  VERSION = '2.8.1'
 end

metadata

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