svnx 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463c73abc8399e2d2523e291ff0ef7811fa6e6aa
-  data.tar.gz: 274b486f2a2ed07454f0e7558debe3091ffe6011
+  metadata.gz: 50079e8c0d3f86c8a009821814c9e9a78c45bdeb
+  data.tar.gz: c49d4ebfdad90bd3c802bee3a594568a403382e1
 SHA512:
-  metadata.gz: f2328dd5361f057257b8a7a6180b081acb6d2ef38dbf894fdede9ea12139c42731a654fc1a060941ef2b4008e60bb258b8bb1cb1e989c7e9e587baec0e0a7fe2
-  data.tar.gz: 04ee53c34807d2cad0c8656aced13d0bd1e6856e95c2c25839c121a9d87aa14bef369ec5ba2d0876ceaf6779517b45ed558144d3c1bfcb1cdd2e32555ff5f08b
+  metadata.gz: 50257c6d0088444a0f6e879dfb88b6b4fe532637e2f4f5d35a7b9a23953dd56688b1b640a35f118addb9286773ee418764d6d53ac33e8cbf74e8f9f85c9a277e
+  data.tar.gz: 7810f14c074ef37485d10a18073852d3b9350446b3cf37b7a21759319cd50a9fedad75d3ac18523d3e4f72fc5634812f8108b83d96fc620d1841f18f966ee1b5

data/README.md

@@ -5,6 +5,8 @@ svnx(1) - Subversion extensions
 
 Svnx is a module that wraps the `svn` command line.
 
+## COMMANDS
+
 ## AUTHOR
 
 Jeff Pace

data/Rakefile

@@ -6,6 +6,6 @@ task :default => :test
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.warning = true
+  t.warning = false
   t.verbose = true
 end

data/lib/svnx/add/command.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/add/options'
+require 'svnx/base/command'
+
+module Svnx::Add
+  class Command < Svnx::Base::Command
+    noncaching
+  end
+end

data/lib/svnx/add/options.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/options'
+
+module Svnx
+  module Add
+  end
+end
+
+module Svnx::Add
+  class Options < Svnx::Base::Options
+    has :paths
+  end
+end

data/lib/svnx/base/options.rb

@@ -9,28 +9,42 @@ module Svnx
 end
 
 module Svnx::Base
-  REVISION_FIELD = Proc.new { |x| [ "-r", x.revision ] }
-  IGNORE_WHITESPACE = { ignorewhitespace: %w{ -x -bw -x --ignore-eol-style } }
-
-  REVISION_PATHS_URLS_FIELDS = Hash.new.tap do |h|
-    h[:revision] = REVISION_FIELD
-    h[:paths]    = nil
-    h[:urls]     = nil
-  end
-  
   class Options
     include Svnx::ObjectUtil
 
     class << self
-      # Creates a reader method for each field
-      def has_fields(*fields)
-        what = Array(fields).flatten
-        attr_reader(*what)
+      def mapping field
+        case field
+        when :revision
+          Proc.new { |x| [ "-r", x.revision ] }
+        when :ignorewhitespace, :ignore_whitespace
+          %w{ -x -bw -x --ignore-eol-style }
+        when :paths
+          nil
+        when :path
+          nil
+        when :urls
+          nil
+        when :url
+          nil
+        when :file
+          Proc.new { |x| [ "-F", x.file ] }
+        else
+          raise "invalid field '#{field}'"
+        end
+      end
+
+      def has(*fields)
+        fields.each do |field|
+          arg = mapping field
+          has_field field, arg
+        end
       end
     end
 
     def initialize args
       fkeys = fields.keys
+      
       assign args, fkeys
       validate args, fkeys
     end
@@ -40,10 +54,6 @@ module Svnx::Base
         [ fld, get_args(fld) ]
       end
     end
-
-    def fields
-      raise "not implemented for #{self.class}"
-    end
     
     def to_args
       options_to_args.collect do |opt|

data/lib/svnx/blame/options.rb

@@ -10,12 +10,6 @@ end
 
 module Svnx::Blame
   class Options < Svnx::Base::Options
-    FIELDS = Svnx::Base::REVISION_PATHS_URLS_FIELDS.merge(Svnx::Base::IGNORE_WHITESPACE)
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has :revision, :paths, :urls, :ignorewhitespace
   end
 end

data/lib/svnx/cat/options.rb

@@ -10,16 +10,6 @@ end
 
 module Svnx::Cat
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:revision] = Svnx::Base::REVISION_FIELD
-      h[:path]     = nil
-      h[:url]      = nil
-    end
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has :revision, :path, :url
   end
 end

data/lib/svnx/commit/options.rb

@@ -10,15 +10,6 @@ end
 
 module Svnx::Commit
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:file]  = Proc.new { |x| [ "-F", x.file ] }
-      h[:paths] = nil
-    end
-
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has :file, :paths
   end
 end

data/lib/svnx/diff/options.rb

@@ -10,18 +10,10 @@ end
 
 module Svnx::Diff
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:commit]           = Proc.new { |x| [ "-c", x.commit ] }
-      h[:ignoreproperties] = "--ignore-properties"
-      h[:depth]            = Proc.new { |x| [ "--depth", x.depth ] }
-      h[:paths]            = nil
-      h[:url]              = nil
-    end.merge(Svnx::Base::IGNORE_WHITESPACE)
-    
-    has_fields FIELDS.keys
+    has_fields commit:           Proc.new { |x| [ "-c", x.commit ] },
+               ignoreproperties: "--ignore-properties",
+               depth:            Proc.new { |x| [ "--depth", x.depth ] }
 
-    def fields
-      FIELDS
-    end
+    has :ignorewhitespace, :paths, :url
   end
 end

data/lib/svnx/info/options.rb

@@ -10,16 +10,6 @@ end
 
 module Svnx::Info
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:revision] = Svnx::Base::REVISION_FIELD
-      h[:path]     = nil
-      h[:url]      = nil
-    end
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has :revision, :path, :url
   end
 end

data/lib/svnx/log/entry.rb

@@ -17,11 +17,7 @@ module Svnx::Log
       set_elmt_vars elmt, 'author', 'date', 'msg'
 
       @paths = elmt.xpath('paths/path').collect do |pe|
-        kind = attribute_value pe, 'kind'
-        action = attribute_value pe, 'action'
-        name = pe.text
-
-        EntryPath.new(kind: kind, action: Svnx::Action.new(action), name: name)
+        EntryPath.new attr: pe
       end.sort                  # sorted, because svn is not consistent with order
 
       @entries = elmt.xpath('logentry').collect do |le|
@@ -34,7 +30,7 @@ module Svnx::Log
     end
 
     def to_s
-      [ @revision, @author, @date, @msg, @paths ].collect { |x| x.to_s }.join " "
+      [ @revision, @author, @date, @msg ].collect { |x| x.to_s }.join " "
     end
 
     def match action, filter

data/lib/svnx/log/entrypath.rb

@@ -12,12 +12,23 @@ module Svnx::Log
   class EntryPath
     include Comparable
     
-    attr_reader :kind, :action, :name
+    attr_reader :kind, :action, :name, :prop_mods, :text_mods
     
-    def initialize args = Hash.new
-      @kind = args[:kind]
-      @action = args[:action]
-      @name = args[:name]
+    def initialize attr: nil, kind: nil, action: nil, name: nil, prop_mods: nil, text_mods: nil
+      if attr
+        @kind = attribute_value attr, 'kind'
+        act = attribute_value attr, 'action'
+        @action = Svnx::Action.new act
+        @name = attr.text
+        @prop_mods = "true" == attribute_value(attr, 'prop-mods')
+        @text_mods = "true" == attribute_value(attr, 'text-mods')
+      else
+        @kind = kind
+        @action = action
+        @name = name
+        @prop_mods = prop_mods
+        @text_mods = text_mods
+      end
     end
 
     def to_s
@@ -31,5 +42,10 @@ module Svnx::Log
     def match? action, filter
       @action.to_s == action.to_s && @name.start_with?(filter)
     end
+
+    def attribute_value xmlelement, attrname, meth = nil
+      value = xmlelement[attrname.to_s]
+      meth ? value.send(meth) : value
+    end    
   end
 end

data/lib/svnx/log/options.rb

@@ -10,18 +10,10 @@ end
 
 module Svnx::Log
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:limit]    = Proc.new { |x| [ "--limit", x.limit ] }
-      h[:verbose]  = "-v"
-      h[:revision] = Proc.new { |x| "-r" + x.revision.to_s }
-      h[:url]      = nil
-      h[:path]     = nil
-    end
+    has_fields limit:    Proc.new { |x| [ "--limit", x.limit ] },
+               verbose:  "-v",
 
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+               revision: Proc.new { |x| "-r" + x.revision.to_s }
+    has :url, :path
   end
 end

data/lib/svnx/merge/options.rb

@@ -10,18 +10,10 @@ end
 
 module Svnx::Merge
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:commit] = Proc.new { |x| [ "-c",       x.commit ] }
-      h[:range]  = Proc.new { |x| [ "-r",       x.range ]  }
-      h[:accept] = Proc.new { |x| [ "--accept", x.accept ] }
-      h[:from]   = nil
-      h[:to]     = nil
-    end
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has_fields commit: Proc.new { |x| [ "-c",       x.commit ] },
+               range:  Proc.new { |x| [ "-r",       x.range ]  },
+               accept: Proc.new { |x| [ "--accept", x.accept ] },
+               from:   nil,
+               to:     nil
   end
 end

data/lib/svnx/propget/options.rb

@@ -10,18 +10,8 @@ end
 
 module Svnx::Propget
   class Options < Svnx::Base::Options    
-    FIELDS = Hash.new.tap do |h|
-      h[:revision] = Svnx::Base::REVISION_FIELD
-      h[:revprop]  = "--revprop"
-      h[:name]     = nil
-      h[:url]      = nil
-      h[:path]     = nil
-    end
-
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has_fields revprop: "--revprop",
+               name:    nil
+    has :revision, :url, :path
   end
 end

data/lib/svnx/propset/options.rb

@@ -10,20 +10,10 @@ end
 
 module Svnx::Propset
   class Options < Svnx::Base::Options
-
-    FIELDS = Hash.new.tap do |h|
-      h[:name]     = nil
-      h[:revision] = Proc.new { |x| [ "--revprop", "-r", x.revision ] }
-      h[:file]     = Proc.new { |x| [ "--file", x.file ] }
-      h[:value]    = nil
-      h[:url]      = nil
-      h[:path]     = nil
-    end
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has_fields name:     nil,
+               revision: Proc.new { |x| [ "--revprop", "-r", x.revision ] }
+    has :file
+    has_fields value: nil
+    has :url, :path
   end
 end

data/lib/svnx/status/options.rb

@@ -10,16 +10,6 @@ end
 
 module Svnx::Status
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:revision] = Svnx::Base::REVISION_FIELD
-      h[:paths]    = nil
-      h[:url]      = nil
-    end
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has :revision, :paths, :url
   end
 end

data/lib/svnx/update/options.rb

@@ -10,15 +10,6 @@ end
 
 module Svnx::Update
   class Options < Svnx::Base::Options
-    FIELDS = Hash.new.tap do |h|
-      h[:revision] = Svnx::Base::REVISION_FIELD
-      h[:paths]    = nil
-    end
-    
-    has_fields FIELDS.keys
-
-    def fields
-      FIELDS
-    end
+    has :revision, :paths
   end
 end

data/lib/svnx/util/objutil.rb

@@ -26,22 +26,32 @@ module Svnx
       end.join(" ")
     end
 
+    def fields
+      self.class.instance_variable_get '@fields'
+    end
+
     module ClassMethods
       def attr_readers(*symbols)
         what = Array(symbols).flatten
         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 xhas_fields(*fields)
-        what = Array(fields).flatten
-        attr_reader(*what)
+      def has_fields fields = Hash.new
+        @fields ||= Hash.new
+        @fields.merge! fields
+
+        fields.keys.each do |field|
+          attr_reader field
+        end        
+      end
+
+      def has_field name, arg
+        @fields ||= Hash.new
+        @fields.merge! name => arg
         
-        define_method :initialize do |args|
-          assign args, what
-          validate args, what
-        end
+        attr_reader name
       end
     end
 

data/lib/svnx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable
@@ -139,6 +139,8 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- lib/svnx/add/command.rb
+- lib/svnx/add/options.rb
 - lib/svnx/base/action.rb
 - lib/svnx/base/cmdline.rb
 - lib/svnx/base/command.rb
@@ -219,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Ruby objects from the Subversion command line