svnx 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efa7ac9d66ff0fccb1677b36b5c09af3336531b9
-  data.tar.gz: 330d83eeccec6b97006895f25492203cca0229fd
+  metadata.gz: 759f64ff2fb82a12e58b4ae33be6f1ab5df391af
+  data.tar.gz: e319aced5f94a6447b1304e3684102427d111a73
 SHA512:
-  metadata.gz: 8ac35abce7e13bcaa25da8f999bc96a6545571edb3f4d2e638700e8e2909132b70c5e2b9a0abe643765de2a3452d38c10006a82f2456351473275a2e59e3fbb3
-  data.tar.gz: 863f9b79dafd6541d62e52d1ca0e08ec50487db4a559b61a267c3ef803becfcfd05598bc8a9d70909ec43b5c2eb689ef6d5ed5a1d5b52d65abe8633abfb239ee
+  metadata.gz: b9307ee3595171bf6490a8b974e274ca95dd35a40a59e7ca48c2d0019ce0f77afc0da3fb554be80288a45da10a8f7c583954e9a9ac34f57efd5c8ed2843daf97
+  data.tar.gz: c3d7e0bbf22495b43c0db7d506bf3a941753a2085cd689cb0644d83135068b898ca12cfd2f5d3a6616791859df71db74f5333c48dc3ab7342530b2f36e8d7bd4

data/lib/svnx/base/options.rb

@@ -17,7 +17,7 @@ module Svnx::Base
       def mapping field
         case field
         when :revision
-          Proc.new { |x| [ "-r", x.send(:revision) ] }
+          to_args "-r", field
         when :ignorewhitespace, :ignore_whitespace
           %w{ -x -bw -x --ignore-eol-style }
         when :paths
@@ -29,7 +29,7 @@ module Svnx::Base
         when :url
           nil
         when :file
-          Proc.new { |x| [ "--file", x.file ] }
+          to_args "--file", field
         else
           raise "invalid field '#{field}'"
         end
@@ -42,6 +42,10 @@ module Svnx::Base
         end
       end
 
+      def to_args tagname, methname
+        Proc.new { |obj| [ tagname, obj.send(methname) ] }
+      end
+
       def to_tag sym, invoke = nil
         tag = "--" + StringUtil.with_dashes(sym)
         if invoke

data/lib/svnx/commit/options.rb

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

data/lib/svnx/diff/options.rb

@@ -10,10 +10,10 @@ end
 
 module Svnx::Diff
   class Options < Svnx::Base::Options
-    has_fields commit:           Proc.new { |x| [ "-c", x.commit ] },
+    has_fields commit:           to_args("-c", :commit),
                ignoreproperties: "--ignore-properties",
-               depth:            Proc.new { |x| [ "--depth", x.depth ] }
-
+               depth:            to_args("--depth", :depth)
+    
     has :ignorewhitespace, :paths, :url
   end
 end

data/lib/svnx/log/options.rb

@@ -11,11 +11,11 @@ end
 
 module Svnx::Log
   class Options < Svnx::Base::Options
-    has_fields limit:             Proc.new { |x| [ "--limit", x.send(:limit) ] },
+    has_fields limit:             to_args("--limit", :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) ] }
+               use_merge_history: to_tag(:use_merge_history),
+               depth:             to_args("--depth", :depth)
     has :revision, :url, :path
   end
 end

data/lib/svnx/merge/options.rb

@@ -10,9 +10,9 @@ end
 
 module Svnx::Merge
   class Options < Svnx::Base::Options
-    has_fields commit: Proc.new { |x| [ "-c",       x.commit ] },
-               range:  Proc.new { |x| [ "-r",       x.range ]  },
-               accept: Proc.new { |x| [ "--accept", x.accept ] },
+    has_fields commit: to_args("-c", :commit),
+               range:  to_args("-r", :range),
+               accept: to_args("--accept", :accept),
                from:   nil,
                to:     nil
   end

data/lib/svnx/propset/options.rb

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

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.7.1'
+  VERSION = '2.7.2'
 end

data/svnx.gemspec

@@ -27,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "command-cacheable", "~> 0.2"
-  spec.add_runtime_dependency "logue", "~> 1.0.16"
-  spec.add_runtime_dependency "nokogiri", "~> 1.10.3"
+  spec.add_dependency "command-cacheable", "~> 0.2"
+  spec.add_dependency "logue", ">= 1.0.16"
+  spec.add_dependency "nokogiri", "~> 1.10.3"
+  spec.add_dependency "rainbow", "~> 3.0.0"
   
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable
@@ -28,14 +28,14 @@ dependencies:
   name: logue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.16
 - !ruby/object:Gem::Dependency
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.10.3
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement