svnx 2.12.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7831460d0a7cf194803286b08e91c66352cd09
-  data.tar.gz: 524c096737fc930fa597a455efc04e02fa2fd661
+  metadata.gz: f98b4fa81ad8c5b9bf416f13852b1a67834da1b4
+  data.tar.gz: dac79326ace98a5f5f09ce621eee54b0af77de02
 SHA512:
-  metadata.gz: 7033404d1c9507cd1ac59c3d110e0e42a064d36952ab5bc4cf24d2cdec225feea2f85d05ca4125bd75c04c0eaa83e43b69b4c2244b8dbb7c4edb7c74eb6118f0
-  data.tar.gz: 198c69b523aa7cc2b0ea465aac9dba564918edc95e32d68160c6450cec46d1ce6ac987af251f84f67a5906566266c82edcb3659880d59e8cc8136a043ebeafc5
+  metadata.gz: d455288c34debd96c2cd7fa8d1c821978ff097b835e93211d0c3ecbc82c2cd507f542f752a0d9b38fc375a81601dbba02bda8df6ac29af839d64e7b0ad5ff390
+  data.tar.gz: 5367fcd349b41599f9a8d7b5b02e8d2034fb865bc268a49df0d0a5aa6cc56c5b3776ad2594d18b33be29f1c8003dc11534b86124de431d2a0b437333a0d99ca8

data/lib/svnx/merge/options.rb

@@ -10,10 +10,8 @@ end
 
 module Svnx::Merge
   class Options < Svnx::Base::Options
-    has_fields commit: to_args("-c", :commit),
-               range:  to_args("-r", :range),
-               accept: to_args("--accept", :accept),
-               from:   nil,
-               to:     nil
+    has_tag_argument :change, :revision, :accept
+    has_fields from: nil,
+               to:   nil
   end
 end

data/lib/svnx/project.rb

@@ -1,68 +1,13 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module Svnx
-end
+$stderr.puts "Svnx::Project deprecated for naming; use Svnx::Exec instead"
+
+require 'svnx/exec'
 
 # A low-level wrapper around the Svnx commands, converting arguments (svnx/<command>/options) into
 # entries (svnx/<command>/entry) or output. Enhances the low level functionality.
 
-class Svnx::Project  
-  attr_reader :dir
-  
-  def initialize dir: nil, url: nil, cmdlinecls: nil
-    @dir = dir
-    @url = url
-    @cmdlinecls = cmdlinecls
-  end
-
-  def where
-    @url || @dir
-  end
-  
-  def url
-    @url ||= begin
-               entries = info
-               entries && entries[0].url
-             end
-  end
-  
-  def path
-    info.path
-  end
-
-  def self.add_delegator cmd
-    require "svnx/#{cmd}/command"
-    require "svnx/#{cmd}/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 ", "
-    cmdargs  = fields.collect { |key| key.to_s + ": " + key.to_s }.join ", "
-    
-    src = Array.new.tap do |a|
-      a << "def #{cmd} #{params}, cmdlinecls: @cmdlinecls"
-      a << "  svncmd = #{modname}::Command.new({ #{cmdargs} }, cmdlinecls: cmdlinecls)"
-      a << "  svncmd.respond_to?(:entries) ? svncmd.entries : svncmd.output"
-      a << "end"
-    end.join "\n"
-    
-    class_eval src
-  end
-
-  add_delegator :commit
-  add_delegator :diff
-  add_delegator :info
-  add_delegator :log
-  add_delegator :propget
-  add_delegator :propset
-  add_delegator :update
-
-  def to_s
-    where.to_s
-  end  
+class Svnx::Project < Svnx::Exec
 end
 

data/lib/svnx/propget/options.rb

@@ -11,7 +11,7 @@ end
 module Svnx::Propget
   class Options < Svnx::Base::Options
     has_tag_field :revprop
-    has :revision, :url, :path
     has_field :name, nil
+    has :revision, :url, :path
   end
 end

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.12.0'
+  VERSION = '2.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable