svnx 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7703311a03e657be2fb6172c5b3b7de2f5f9434d
-  data.tar.gz: 80d187db92d50e7a81105cd202649c793b4b1c40
+  metadata.gz: c874ec9268528dbc63a6357a0183e9fae50adf52
+  data.tar.gz: c58d74793a24e79f12a70e57c3ddd2408e86a8db
 SHA512:
-  metadata.gz: 1f26504dbe28a179d7432d6e9ae30a315ab467efd832828b07f3927e7ce7c99815b827ba78df98533dbd67e16c36329da2bc5240d131da412e1d40dda65e8a9b
-  data.tar.gz: 005c59f2e7702a2832aeb104266773810d0ad8c0fb346ab3e274ac4a13d03586815d5ab7588640aaf2d6d448d60b8fa893fa806fd0c56aa2210bdb36e57888fe
+  metadata.gz: 2f55486032214b0bd5dacc429bc7596d37599bd1c0dbd02ee039ac21eab702546663363e0f894c2e75ff8c1dc0239536b75a79516c6c3831008b8edb7ecd8cb7
+  data.tar.gz: c6925299e2740810633112b502b6e5bbd6e95048ffe090e14001c58f83051814522eea553d1078d8901c48431cde2f341cb8fdf1d3c5c8358e807caf266fdb05

data/lib/svnx/base/cmdline.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
-require 'command/cacheable'
+require 'command/cacheable/command'
 require 'svnx/base/env'
 
 module Svnx
@@ -46,7 +46,7 @@ module Svnx::Base
     end
 
     def command_line cmdargs
-      Command::Cacheable::Command.new cmdargs, caching: @caching, dir: Svnx::Env.instance.cache_dir
+      ::Command::Cacheable::Command.new cmdargs, caching: @caching, cachedir: Svnx::Env.instance.cache_dir
     end
   end
 end

data/lib/svnx/base/command.rb

@@ -2,8 +2,6 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
-require 'command/cacheable/command'
-# require 'svnx/base/cmdline'
 require 'svnx/util/classutil'
 require 'svnx/base/command_factory'
 
@@ -28,40 +26,35 @@ module Svnx::Base
     attr_reader :output
     attr_reader :error
     attr_reader :status
-
     attr_reader :options
     
-    def initialize options, cls: nil, optcls: nil, exec: nil, xml: false, caching: caching?
+    def initialize options, cmdlinecls: nil, optcls: nil, xml: false, caching: caching?
       factory = CommandFactory.new
-      params = factory.create self.class, cmdlinecls: cls, optcls: optcls
       
-      optcls ||= params[:options_class]
+      params = factory.create self.class, cmdlinecls: cmdlinecls, optcls: optcls
+      
+      optcls ||= params.options
       
       @options = optcls.new options
       cmdargs = @options.to_args
-      subcommand = params[:subcommand]
       
-      cls ||= params[:command_line_class]
+      subcommand = params.subcommand
       
-      @cmdline = exec || cls.new(subcommand: subcommand, xml: xml, caching: caching, args: cmdargs)
-      debug "@cmdline: #{@cmdline}"
+      cmdlinecls ||= params.cmdline
       
-      @output = @cmdline.execute
-      debug "@output: #{@output && @output[0 .. 100]}"
+      @cmdline = cmdlinecls.new(subcommand: subcommand, xml: xml, caching: caching, args: cmdargs)
       
+      @output = @cmdline.execute
       @error = @cmdline.error
-      debug "@error: #{@error}"
-      
       @status = @cmdline.status
-      debug "@status: #{@status}"
     end
   end
 
   class EntriesCommand < Command
     attr_reader :entries
     
-    def initialize options, cls: Command::Cacheable::Command, exec: nil, caching: caching?, xml: true, entries_class: nil
-      super options, cls: cls, exec: exec, xml: xml, caching: caching
+    def initialize options, cmdlinecls: CommandLine, caching: caching?, xml: true, entries_class: nil
+      super options, cmdlinecls: cmdlinecls, xml: xml, caching: caching
       
       if not @output.empty?
         entries_class ||= begin

data/lib/svnx/base/command_factory.rb

@@ -5,10 +5,22 @@ require 'svnx/base/cmdline'
 require 'svnx/util/classutil'
 
 module Svnx::Base
+  class CommandParams
+    attr_reader :options
+    attr_reader :subcommand
+    attr_reader :cmdline
+
+    def initialize options: nil, subcommand: nil, cmdline: nil
+      @options = options
+      @subcommand = subcommand
+      @cmdline = cmdline
+    end
+  end
+  
   class CommandFactory
     include Logue::Loggable
     
-    def create cmdcls, cmdlinecls: nil, optcls: nil
+    def create cmdcls, cmdlinecls: CommandLine, optcls: nil
       melements = ClassUtil.module_elements cmdcls
       
       optcls ||= begin
@@ -16,9 +28,7 @@ module Svnx::Base
                    modl::Options
                  end
 
-      cmdlinecls ||= CommandLine
-
-      { options_class: optcls, subcommand: melements[-1].downcase, command_line_class: cmdlinecls }
+      CommandParams.new options: optcls, subcommand: melements[-1].downcase, cmdline: cmdlinecls 
     end
   end
 end

data/lib/svnx/base/entries.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'rexml/document'
+require 'nokogiri'
 require 'logue/loggable'
 
 module Svnx
@@ -12,6 +13,8 @@ end
 # this is a parse/process on-demand list of entries, acting like an
 # Enumerable.
 
+$use_nokogiri = true
+
 module Svnx::Base
   class Entries
     include Logue::Loggable, Enumerable
@@ -21,7 +24,11 @@ module Svnx::Base
     def initialize lines
       # it's a hash, but indexed with integers, for non-sequential access:
       @entries  = Hash.new
-      doc       = REXML::Document.new Array(lines).join
+      doc       = if $use_nokogiri
+                    Nokogiri::XML Array(lines).join
+                  else
+                    REXML::Document.new Array(lines).join
+                  end
       @elements = get_elements doc
       @size     = @elements.size
     end
@@ -34,24 +41,23 @@ module Svnx::Base
       raise "create_entry must be implemented for: #{self.class}"
     end
 
-    # this doesn't handle negative indices
     def [] idx
       if entry = @entries[idx]
         return entry
       end
-      if idx < 0 || idx >= size
+      if idx >= size
         raise "error: index #{idx} is not in range(0 .. #{size})"
+      elsif idx < 0
+        idx = size + idx
       end
-      @entries[idx] = create_entry @elements[idx + 1]
+      @entries[idx] = create_entry @elements[idx]
     end
 
     def each(&blk)
       # all elements must be processed before each can run:
       if @elements
-        # a little confusing here: REXML does each_with_index with idx
-        # zero-based, but elements[0] is invalid.
         @elements.each_with_index do |element, idx|
-          @entries[idx] ||= create_entry(element)
+          @entries[idx] ||= create_entry element
         end
 
         @elements = nil

data/lib/svnx/base/entry.rb

@@ -46,11 +46,11 @@ module Svnx::Base
     end
 
     def attribute_value xmlelement, attrname
-      xmlelement.attributes[attrname.to_s]
+      xmlelement[attrname.to_s]
     end
 
     def element_text xmlelement, elmtname
-      elmt = xmlelement.elements[elmtname.to_s]
+      elmt = xmlelement.at_xpath elmtname.to_s
       elmt && elmt.text || ""
     end  
   end

data/lib/svnx/blame/entries.rb

@@ -8,7 +8,7 @@ module Svnx::Blame
   class Entries < Svnx::Base::Entries
     def get_elements doc
       # blame/target
-      doc.elements['blame'].elements['target'].elements
+      doc.xpath '//blame/target/entry'
     end
 
     def create_entry xmlelement

data/lib/svnx/blame/entry.rb

@@ -21,7 +21,7 @@ module Svnx::Blame
     def set_from_element elmt
       set_attr_var elmt, 'line_number', 'line-number'
       
-      commit = elmt.elements['commit']
+      commit = elmt.at_xpath 'commit'
       set_attr_var commit, 'revision'
       set_elmt_vars commit, 'author', 'date'
     end

data/lib/svnx/diff/command.rb

@@ -9,8 +9,8 @@ module Svnx::Diff
   class Command < Svnx::Base::Command
     attr_reader :entries
     
-    def initialize cmdopts, cls: Svnx::Base::CommandLine
-      super cmdopts, cls: cls, xml: false, caching: true
+    def initialize cmdopts, cmdlinecls: Svnx::Base::CommandLine
+      super cmdopts, cmdlinecls: cmdlinecls, xml: false, caching: true
       if @output
         @entries = Svnx::Diff::Parser.new.parse_all_output @output.dup
       end

data/lib/svnx/info/entries.rb

@@ -7,7 +7,7 @@ require 'svnx/base/entries'
 module Svnx::Info
   class Entries < Svnx::Base::Entries
     def get_elements doc
-      doc.elements['info'].elements
+      doc.xpath 'info/entry'
     end
 
     def create_entry xmlelement

data/lib/svnx/info/entry.rb

@@ -21,16 +21,16 @@ module Svnx::Info
     def set_from_element elmt
       set_attr_vars elmt, 'kind', 'path', 'revision'
       set_elmt_var  elmt, 'url'
-      if relurl = elmt.elements['relative-url']
+      if relurl = elmt.at_xpath('relative-url')
         @relative_url = relurl.text
       end
       
-      repo = elmt.elements['repository']
+      repo = elmt.at_xpath 'repository'
       set_elmt_var repo, 'root'
 
       @wc_root = nil
-      if wcinfo = elmt.elements['wc-info']
-        if wcroot = wcinfo.elements['wcroot-abspath']
+      if wcinfo = elmt.at_xpath('wc-info')
+        if wcroot = wcinfo.at_xpath('wcroot-abspath')
           @wc_root = wcroot.text
         end
       end

data/lib/svnx/log/entries.rb

@@ -7,7 +7,7 @@ require 'svnx/log/entry'
 module Svnx::Log
   class Entries < Svnx::Base::Entries
     def get_elements doc
-      doc.elements['log'].elements
+      doc.xpath '//log/logentry'
     end
 
     def create_entry xmlelement

data/lib/svnx/log/entry.rb

@@ -16,7 +16,7 @@ module Svnx::Log
       
       set_elmt_vars elmt, 'author', 'date', 'msg'
 
-      @paths = elmt.elements.to_a('paths/path').collect do |pe|
+      @paths = elmt.xpath('paths/path').collect do |pe|
         kind = attribute_value pe, 'kind'
         action = attribute_value pe, 'action'
         name = pe.text
@@ -24,7 +24,7 @@ module Svnx::Log
         EntryPath.new(kind: kind, action: Svnx::Action.new(action), name: name)
       end.sort                  # sorted, because svn is not consistent with order
 
-      @entries = elmt.elements.to_a('logentry').collect do |le|
+      @entries = elmt.xpath('logentry').collect do |le|
         Entry.new le
       end
     end

data/lib/svnx/project.rb

@@ -10,10 +10,10 @@ end
 class Svnx::Project  
   attr_reader :dir
   
-  def initialize dir: nil, url: nil, cls: nil
+  def initialize dir: nil, url: nil, cmdlinecls: nil
     @dir = dir
     @url = url
-    @cls = cls
+    @cmdlinecls = cmdlinecls
   end
 
   def where
@@ -43,8 +43,8 @@ class Svnx::Project
     cmdargs  = fields.collect { |key| key.to_s + ": " + key.to_s }.join ", "
     
     src = Array.new.tap do |a|
-      a << "def #{cmd} #{params}, cls: @cls"
-      a << "  cmd = Svnx::#{cmd.to_s.capitalize}::Command.new({ #{cmdargs} }, cls: cls)"
+      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 << "end"
     end.join "\n"

data/lib/svnx/propget/entries.rb

@@ -7,7 +7,7 @@ require 'svnx/base/entries'
 module Svnx::Propget
   class Entries < Svnx::Base::Entries
     def get_elements doc
-      doc.elements['properties'].elements
+      doc.xpath '//properties/target'
     end
 
     def create_entry xmlelement

data/lib/svnx/propget/entry.rb

@@ -17,7 +17,7 @@ module Svnx::Propget
     def set_from_element elmt
       set_attr_vars elmt, :path
 
-      prop = elmt.elements["property"]
+      prop = elmt.at_xpath "property"
       set_attr_vars prop, :name
       @value = prop.text
     end

data/lib/svnx/status/entries.rb

@@ -12,8 +12,12 @@ module Svnx::Status
     end
 
     def get_elements doc
-      # status/target
-      doc.elements['status'].elements['target'].elements
+      if $use_nokogiri
+        doc.xpath '//status/target/entry'
+      else
+        # status/target
+        doc.elements['status'].elements['target'].elements
+      end
     end
 
     def create_entry xmlelement

data/lib/svnx/status/entry.rb

@@ -30,11 +30,11 @@ module Svnx::Status
     def set_from_element elmt
       set_attr_var elmt, 'path'
 
-      wcstatus = elmt.elements['wc-status']
-      @status = Svnx::Action.new(wcstatus.attributes['item'])
+      wcstatus = elmt.at_xpath 'wc-status'
+      @status = Svnx::Action.new(wcstatus['item'])
       set_attr_var wcstatus, 'status_revision', 'revision'
       
-      commit = wcstatus.elements['commit']
+      commit = wcstatus.at_xpath 'commit'
       set_attr_var commit, 'commit_revision', 'revision'
       @name = @path.dup
 

data/lib/svnx/util/dateutil.rb

@@ -2,30 +2,16 @@
 # -*- ruby -*-
 
 require 'time'
+require 'svnx/util/englishtime'
 
 class DateUtil
   class << self
-    def relative_full datetime, reltime = Time.now
-      secs = (reltime - datetime).to_i
-      if ago = to_time_units(secs)
-        ago + " ago (" + fmt_mmdd_hhmm(datetime) + ")"
+    def relative_full datetime, reltime = nil
+      et = EnglishTime.new datetime
+      if reltime
+        et.since reltime, "earlier"
       else
-        datetime.strftime "%Y/%m/%d %H:%M"
-      end
-    end
-
-    # returns the value in seconds, minutes, hours, or days, if within a week
-    def to_time_units seconds
-      secs = seconds.to_i
-
-      if secs < 120
-        "#{secs} seconds"
-      elsif (min = secs / 60) < 120
-        "#{min} minutes"
-      elsif (hour = min / 60) < 72
-        "#{hour} hours"
-      elsif (day = hour / 24) < 7
-        "#{day} days"
+        et.ago
       end
     end
 

data/lib/svnx/util/englishtime.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'time'
+require 'svnx/util/timeutil'
+
+class EnglishTime
+  attr_reader :time
+  
+  def initialize time
+    @time = time
+  end
+  
+  def ago
+    since Time.new, "ago"
+  end
+  
+  def earlier totime
+    since totime, "earlier"
+  end
+  
+  def since totime, name
+    diff = totime - @time
+    seconds = diff.to_i
+    if units = TimeUtil.new.to_units(seconds)
+      sprintf "%s %s %s (%s)", units.first, units.last, name, @time.strftime("%m/%d %H:%M")
+    else
+      @time.strftime "%Y/%m/%d %H:%M"
+    end
+  end
+end

data/lib/svnx/util/timeutil.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'time'
+
+class TimeUtil
+  attr_reader :intervals
+
+  def initialize 
+    @intervals = Hash.new.tap do |h|
+      h[:seconds] = 60
+      h[:minutes] = 60
+      h[:hours] = 24
+      h[:days] = 7
+    end
+  end
+  
+  # returns the value in seconds, minutes, hours, days, etc.
+  def to_units seconds
+    secs = seconds.to_i
+
+    max = Hash.new.tap do |h|
+      h[:seconds] = 120
+      h[:minutes] = 120
+      h[:hours] = 72
+      h[:days] = 18
+      h[:weeks] = 4
+    end
+
+    num = secs
+    max.each do |field, value|
+      if num < value
+        return [ num, field ]
+      elsif ival = @intervals[field]
+        num /= ival
+      end
+    end
+    nil
+  end
+end

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.4.1'
+  VERSION = '2.5.0'
 end

data/svnx.gemspec

@@ -28,9 +28,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "command-cacheable", "~> 0.2"
+  spec.add_runtime_dependency "logue", "~> 1.0.16"
+  
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "logue", "~> 1.0.16"
   spec.add_development_dependency "test-unit", "~> 3.1.5"
   spec.add_development_dependency "paramesan", "~> 0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: logue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
+        version: 1.0.16
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.0.16
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: logue
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,9 @@ files:
 - lib/svnx/update/options.rb
 - lib/svnx/util/classutil.rb
 - lib/svnx/util/dateutil.rb
+- lib/svnx/util/englishtime.rb
 - lib/svnx/util/objutil.rb
+- lib/svnx/util/timeutil.rb
 - lib/svnx/version.rb
 - repackage
 - svnx.gemspec
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby objects from the Subversion command line