svnx 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1122bd68ff487bab49f705895f6055e7515fd976
-  data.tar.gz: fdaa77e7db8b9f74096297b900db7dbc4d17d323
+  metadata.gz: af7831460d0a7cf194803286b08e91c66352cd09
+  data.tar.gz: 524c096737fc930fa597a455efc04e02fa2fd661
 SHA512:
-  metadata.gz: b023f779f02aacba414699568ac6056fc62cf06c7c26729723034e8e4c16c40709dd062c10cadd37a4121a9aa694485169292df4a3a3e7e617ef61818a12e4f3
-  data.tar.gz: 6b81673dcaad702f88bbb826c2e609014dbe0599103e308a04d21d08192beb68e2b594574cc8ab2016ee6c4180bd006727393e2bc222048f33decfd846333b75
+  metadata.gz: 7033404d1c9507cd1ac59c3d110e0e42a064d36952ab5bc4cf24d2cdec225feea2f85d05ca4125bd75c04c0eaa83e43b69b4c2244b8dbb7c4edb7c74eb6118f0
+  data.tar.gz: 198c69b523aa7cc2b0ea465aac9dba564918edc95e32d68160c6450cec46d1ce6ac987af251f84f67a5906566266c82edcb3659880d59e8cc8136a043ebeafc5

data/lib/svnx/base/fields.rb

@@ -32,8 +32,14 @@ module Svnx::Base
     end
 
     def fields
+      # instance variable on the class itself, not an instance of the class
       varname = '@fields'
-      self.class.instance_variable_defined?(varname) && self.class.instance_variable_get(varname)
+      cls = self.class
+      if cls.instance_variable_defined? varname
+        cls.instance_variable_get varname
+      else
+        false
+      end
     end
 
     module ClassMethods
@@ -42,8 +48,6 @@ module Svnx::Base
         attr_reader(*what)
       end
       
-      # Creates a reader method for each field, and assigns and validates them from an initialize
-      # method, which is also created.
       def has_fields fields = Hash.new
         fields.each do |name, arg|
           has_field name, arg

data/lib/svnx/base/tags.rb

@@ -11,7 +11,7 @@ module Svnx::Base
         case field
         when :revision
           to_args "-r", field
-        when :ignorewhitespace, :ignore_whitespace
+        when :ignore_whitespace
           %w{ -x -bw -x --ignore-eol-style }
         when :paths
           nil
@@ -28,6 +28,7 @@ module Svnx::Base
         end
       end
 
+      # for common options/tags
       def has(*fields)
         fields.each do |field|
           arg = mapping field
@@ -35,42 +36,32 @@ module Svnx::Base
         end
       end
 
+      # gets the value for the tag/option by calling methname
       def to_args tagname, methname
         Proc.new { |obj| [ tagname, obj.send(methname) ] }
       end
 
-      def to_tag sym, invoke = nil
-        tag = "--" + Svnx::StringUtil.with_dashes(sym)
-        if invoke
-          Proc.new { |x| [ tag, x.send(sym) ] }
-        else
-          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
+      # converts the symbol to a tag
+      def to_tag sym
+        "--" + Svnx::StringUtil.with_dashes(sym)
       end
 
-      def has_tag_argument tagname, methname
-        has_field methname, to_args(tagname, methname)
+      # tags with no argument
+      def has_tag_field(*names)
+        has_tags(false, *names)
       end
 
-      def has_tag_arg name
-        has_field name, to_args(to_tag(name), name)
+      # tags with an argument
+      def has_tag_argument(*names)
+        has_tags(true, *names)
       end
 
-      def has_tag_arguments(*names)
+      # tags with an argument
+      def has_tags(argument, *names)
         names.each do |name|
           tag = to_tag name
-          args = to_args tag, name
-          has_field name, args
+          value = argument ? to_args(tag, name) : tag
+          has_field name, value
         end
       end
     end

data/lib/svnx/blame/options.rb

@@ -10,6 +10,6 @@ end
 
 module Svnx::Blame
   class Options < Svnx::Base::Options
-    has :revision, :paths, :urls, :ignorewhitespace
+    has :revision, :paths, :urls, :ignore_whitespace
   end
 end

data/lib/svnx/commit/options.rb

@@ -11,6 +11,6 @@ end
 module Svnx::Commit
   class Options < Svnx::Base::Options
     has :file, :paths
-    has_tag_arguments :with_revprop, :message, :username, :password
+    has_tag_argument :with_revprop, :message, :username, :password
   end
 end

data/lib/svnx/diff/options.rb

@@ -10,10 +10,8 @@ end
 
 module Svnx::Diff
   class Options < Svnx::Base::Options
-    has_fields commit:           to_args("-c", :commit),
-               ignoreproperties: "--ignore-properties",
-               depth:            to_args("--depth", :depth)
-    
-    has :ignorewhitespace, :paths, :url
+    has_tag_argument :change, :depth
+    has_tag_field :ignore_properties
+    has :ignore_whitespace, :paths, :url
   end
 end

data/lib/svnx/log/options.rb

@@ -11,8 +11,8 @@ end
 
 module Svnx::Log
   class Options < Svnx::Base::Options
-    has_tag_arguments :limit, :depth
-    has_tag_fields :verbose, :stop_on_copy, :use_merge_history
+    has_tag_argument :limit, :depth
+    has_tag_field :verbose, :stop_on_copy, :use_merge_history
     has :revision, :url, :path
   end
 end

data/lib/svnx/propget/options.rb

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

data/lib/svnx/update/options.rb

@@ -11,7 +11,7 @@ end
 module Svnx::Update
   class Options < Svnx::Base::Options
     has :revision, :paths
-    has_tag_arguments :depth, :set_depth
+    has_tag_argument :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.11.0'
+  VERSION = '2.12.0'
 end

metadata

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