svnx 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50079e8c0d3f86c8a009821814c9e9a78c45bdeb
-  data.tar.gz: c49d4ebfdad90bd3c802bee3a594568a403382e1
+  metadata.gz: b8ec7139dbe80c6857309246b41071cc4db44d4e
+  data.tar.gz: 09a10d1d01c520b4c9754e3f551f1b2086830c81
 SHA512:
-  metadata.gz: 50257c6d0088444a0f6e879dfb88b6b4fe532637e2f4f5d35a7b9a23953dd56688b1b640a35f118addb9286773ee418764d6d53ac33e8cbf74e8f9f85c9a277e
-  data.tar.gz: 7810f14c074ef37485d10a18073852d3b9350446b3cf37b7a21759319cd50a9fedad75d3ac18523d3e4f72fc5634812f8108b83d96fc620d1841f18f966ee1b5
+  metadata.gz: 0a7031a81df0adc128f5a9bd835fef720372a6051ff3badbc71054286fcc3232f96b42d6dc4ac7c1fae081073e109216b635e3f99cd5377c81b79360a6e8f298
+  data.tar.gz: 30238c1108f0f22efd176f338c6db0b0faf5500c0712225ccaafcaf5693f70304ffc0026f5ca2025a79adb8c86e1dda0dab4109a250da1c0c2b911a87ae1ffdf

data/lib/svnx/base/options.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/util/objutil'
+require 'svnx/util/strutil'
 
 module Svnx
   module Base
@@ -16,7 +17,7 @@ module Svnx::Base
       def mapping field
         case field
         when :revision
-          Proc.new { |x| [ "-r", x.revision ] }
+          Proc.new { |x| [ "-r", x.send(:revision) ] }
         when :ignorewhitespace, :ignore_whitespace
           %w{ -x -bw -x --ignore-eol-style }
         when :paths
@@ -28,7 +29,7 @@ module Svnx::Base
         when :url
           nil
         when :file
-          Proc.new { |x| [ "-F", x.file ] }
+          Proc.new { |x| [ "--file", x.file ] }
         else
           raise "invalid field '#{field}'"
         end
@@ -40,6 +41,15 @@ module Svnx::Base
           has_field field, arg
         end
       end
+
+      def to_tag sym, invoke = nil
+        tag = "--" + StringUtil.with_dashes(sym)
+        if invoke
+          Proc.new { |x| [ tag, x.send(sym) ] }
+        else
+          tag
+        end
+      end
     end
 
     def initialize args

data/lib/svnx/log/options.rb

@@ -2,6 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/base/options'
+require 'svnx/util/strutil'
 
 module Svnx
   module Log
@@ -10,10 +11,11 @@ end
 
 module Svnx::Log
   class Options < Svnx::Base::Options
-    has_fields limit:    Proc.new { |x| [ "--limit", x.limit ] },
-               verbose:  "-v",
-
-               revision: Proc.new { |x| "-r" + x.revision.to_s }
-    has :url, :path
+    has_fields limit:             Proc.new { |x| [ "--limit", x.send(:limit) ] },
+               verbose:           "-v",
+               stop_on_copy:      to_tag(:stop_on_copy),
+               use_merge_history: "--use-merge-history",
+               depth:             Proc.new { |x| [ "--depth", x.send(:depth) ] }
+    has :revision, :url, :path
   end
 end

data/lib/svnx/update/options.rb

@@ -10,6 +10,7 @@ end
 
 module Svnx::Update
   class Options < Svnx::Base::Options
-    has :revision, :paths
+    has :revision
+    has :paths
   end
 end

data/lib/svnx/util/strutil.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+class StringUtil
+  class << self
+    def with_dashes x
+      x.to_s.gsub "_", "-"
+    end
+
+    def with_underscores x
+      x.to_s.gsub "-", "_"
+    end
+  end
+end

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.6.0'
+  VERSION = '2.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable
@@ -196,6 +196,7 @@ files:
 - lib/svnx/util/dateutil.rb
 - lib/svnx/util/englishtime.rb
 - lib/svnx/util/objutil.rb
+- lib/svnx/util/strutil.rb
 - lib/svnx/util/timeutil.rb
 - lib/svnx/version.rb
 - repackage