svnx 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd37aad9c296bc3739eced16136fc73f1e8831ba
-  data.tar.gz: 2b829bf99dad72f3ec1bdc3a4913ff5a7e30879f
+  metadata.gz: 1a079b16c8a940b3a4d547cf7181bb598e708134
+  data.tar.gz: 362875ae5402a57065a2c923104f29e27c8e7fa7
 SHA512:
-  metadata.gz: 840ed6cfcd13332ffbcf8413adcc06fc9d18d7bf3d382f88e788297d776ca16f77b5650de4da706f9d8d63ee0bc5f3cb5ba7f64e44af0c2018febe41c964d64a
-  data.tar.gz: 637d08aa4258d2e044b01a8c9957a2d93f76eaed0755d5f605546b6dccc8436a167eef16a73f39b38ddf33828a66938ecc9ce22186773e272fe6b81f8e510756
+  metadata.gz: 212b6748b84d9298c1b9ff59387a7f5e392fb7829e9487b46801a51472c7f39ff0611f4b820526e1b42091ed5d7e73ea000ddbdfbc5ba7109df0515d9c4e5b1a
+  data.tar.gz: fbfbbf3cc940127e16fa01b7a0ab20e1100a862d6c642a7e7f8e8961c7f35cc7ccc0373d2c061671662ca75aa17fe98f5661c9aa1ae86da9e7ec74694d745fe5

data/lib/svnx/base/command.rb

@@ -65,7 +65,7 @@ module Svnx::Base
       
       if not @output.empty?
         entries_class ||= begin
-                            modl = ClassUtil::Util.find_module self.class
+                            modl = ClassUtil.find_module self.class
                             modl::Entries
                           end
         

data/lib/svnx/base/command_factory.rb

@@ -9,10 +9,10 @@ module Svnx::Base
     include Logue::Loggable
     
     def create cmdcls, cmdlinecls: nil, optcls: nil
-      melements = ClassUtil::Util.module_elements cmdcls
+      melements = ClassUtil.module_elements cmdcls
       
       optcls ||= begin
-                   modl = ClassUtil::Util.find_module cmdcls
+                   modl = ClassUtil.find_module cmdcls
                    modl::Options
                  end
 

data/lib/svnx/base/entries.rb

@@ -18,20 +18,12 @@ module Svnx::Base
 
     attr_reader :size
 
-    def initialize xmllines: nil, lines: nil
+    def initialize lines
       # it's a hash, but indexed with integers, for non-sequential access:
-      @entries = Hash.new
-
-      lines ||= xmllines
-
-      if lines.kind_of? Array
-        lines = lines.join ''
-      end
-
-      doc = REXML::Document.new lines
-      
+      @entries  = Hash.new
+      doc       = REXML::Document.new Array(lines).join
       @elements = get_elements doc
-      @size = @elements.size
+      @size     = @elements.size
     end
 
     def get_elements doc

data/lib/svnx/base/entry.rb

@@ -13,30 +13,16 @@ module Svnx::Base
   class Entry
     include Logue::Loggable
 
-    def initialize xmllines: nil, xmlelement: nil
-      if xmllines
-        if xmllines.kind_of? Array
-          xmllines = xmllines.join ''
-        end
-        doc = REXML::Document.new xmllines
-        set_from_xml doc
-      elsif xmlelement
-        set_from_element xmlelement
-      else
-        raise "must be initialized with xmllines (received: #{xmllines.inspect}) or xmlelement (received: #{xmlelement.inspect})"
-      end
-    end
-
-    def set_from_xml xmldoc
-      raise "must be implemented"
+    def initialize xmlelement
+      set_from_element xmlelement
     end
 
     def set_from_element elmt
       raise "must be implemented"
     end
 
-    def set_attr_var xmlelement, varname
-      set_var varname, attribute_value(xmlelement, varname)
+    def set_attr_var xmlelement, varname, attrname = varname
+      set_var varname, xmlelement && attribute_value(xmlelement, attrname)
     end
 
     def set_attr_vars xmlelement, *varnames
@@ -46,7 +32,7 @@ module Svnx::Base
     end
 
     def set_elmt_var xmlelement, varname
-      set_var varname, element_text(xmlelement, varname)
+      set_var varname, xmlelement && element_text(xmlelement, varname)
     end
 
     def set_elmt_vars xmlelement, *varnames
@@ -65,8 +51,7 @@ module Svnx::Base
 
     def element_text xmlelement, elmtname
       elmt = xmlelement.elements[elmtname.to_s]
-      # some elements don't have text:
-      (elmt && elmt.text) || ""
+      elmt && elmt.text || ""
     end  
   end
 end

data/lib/svnx/base/options.rb

@@ -9,29 +9,58 @@ 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
 
-    def check args, valid = Array.new
-      invalid = args.keys.reject do |field|
-        valid.include? field
+    class << self
+      # Creates a reader method for each field
+      def has_fields(*fields)
+        what = Array(fields).flatten
+        attr_reader(*what)
       end
+    end
 
-      unless invalid.empty?
-        raise "invalid fields for #{self.class}: #{invalid.join(' ')}"
+    def initialize args
+      fkeys = fields.keys
+      assign args, fkeys
+      validate args, fkeys
+    end
+    
+    def options_to_args
+      fields.keys.collect do |fld|
+        [ fld, get_args(fld) ]
       end
     end
+
+    def fields
+      raise "not implemented for #{self.class}"
+    end
     
     def to_args
-      Array.new.tap do |args|
-        options_to_args.each do |opt|
-          optname = opt[0]
-          values = opt[1]
-          if send optname
-            args.concat [ values ].flatten
-          end
-        end
-      end
+      options_to_args.collect do |opt|
+        send(opt.first) ? opt[1] : nil
+      end.compact.flatten
     end
+
+    def get_args field
+      val = fields[field]
+      case val
+      when Proc
+        val.call self
+      when nil
+        send field
+      else
+        val
+      end
+    end    
   end
 end

data/lib/svnx/blame/command.rb

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

data/lib/svnx/blame/entries.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/blame/entry'
+require 'svnx/base/entries'
+
+module Svnx::Blame
+  class Entries < Svnx::Base::Entries
+    def get_elements doc
+      # blame/target
+      doc.elements['blame'].elements['target'].elements
+    end
+
+    def create_entry xmlelement
+      Entry.new xmlelement
+    end
+  end
+end

data/lib/svnx/blame/entry.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/entry'
+require 'time'
+
+module Svnx
+  module Blame
+  end
+end
+
+module Svnx::Blame
+  class Entry < Svnx::Base::Entry
+    include Comparable
+    
+    attr_reader :line_number
+    attr_reader :revision
+    attr_reader :author
+    attr_reader :date
+    
+    def set_from_element elmt
+      set_attr_var elmt, 'line_number', 'line-number'
+      
+      commit = elmt.elements['commit']
+      set_attr_var commit, 'revision'
+      set_elmt_vars commit, 'author', 'date'
+    end
+
+    def set_commit_fields rev, auth, date
+      @commit_revision = rev
+      @commit_author   = auth
+      @commit_date     = date
+    end
+
+    def <=> other
+      line_number <=> other.line_number
+    end
+
+    def datetime
+      @dt ||= DateTime.parse date
+    end
+  end
+end

data/lib/svnx/blame/options.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/options'
+
+module Svnx
+  module Blame
+  end
+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
+  end
+end

data/lib/svnx/cat/options.rb

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

data/lib/svnx/commit/options.rb

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

data/lib/svnx/diff/options.rb

@@ -10,19 +10,18 @@ end
 
 module Svnx::Diff
   class Options < Svnx::Base::Options
-    FIELDS = [ :commit, :ignoreproperties, :ignorewhitespace, :paths, :url, :depth ]
+    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
+    has_fields FIELDS.keys
 
-    def options_to_args
-      Array.new.tap do |a|
-        a << [ :commit,           [ "-c",      commit ] ]
-        a << [ :ignoreproperties, "--ignore-properties" ] 
-        a << [ :depth,            [ "--depth", depth ] ] 
-        a << [ :ignorewhitespace, [ "-x",      "-bw" ] ]
-        a << [ :url,              url ]
-        a << [ :paths,            paths ]
-      end
+    def fields
+      FIELDS
     end
   end
 end

data/lib/svnx/info/entries.rb

@@ -11,7 +11,7 @@ module Svnx::Info
     end
 
     def create_entry xmlelement
-      Entry.new :xmlelement => xmlelement
+      Entry.new xmlelement
     end
   end
 end

data/lib/svnx/info/options.rb

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

data/lib/svnx/log/entries.rb

@@ -16,15 +16,15 @@ module Svnx::Log
     end
 
     def create_entry xmlelement
-      Entry.new xmlelement: xmlelement
+      Entry.new xmlelement
     end
 
     def match action, filter
-      matching = Array.new
-      each do |entry|
-        matching.concat entry.match(action, filter)
-      end
-      matching.sort
+      Array.new.tap do |a|
+        each do |entry|
+          a.concat entry.match(action, filter)
+        end
+      end.sort
     end
   end
 end

data/lib/svnx/log/options.rb

@@ -10,18 +10,18 @@ end
 
 module Svnx::Log
   class Options < Svnx::Base::Options
-    FIELDS = [ :limit, :verbose, :revision, :url, :path ]
+    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 FIELDS.keys
 
-    has_fields FIELDS
-    
-    def options_to_args
-      Array.new.tap do |a|
-        a << [ :limit,    [ "--limit", limit ] ]
-        a << [ :verbose,  "-v" ]
-        a << [ :revision, "-r" + revision.to_s ]
-        a << [ :url,      url ]
-        a << [ :path,     path ]
-      end
+    def fields
+      FIELDS
     end
   end
 end

data/lib/svnx/merge/options.rb

@@ -10,20 +10,18 @@ end
 
 module Svnx::Merge
   class Options < Svnx::Base::Options
-    # FIELDS = [ :commit, :range, :accept, :from, :path, :url ]
-    FIELDS = [ :commit, :range, :accept, :from, :to ]
+    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
+    has_fields FIELDS.keys
 
-    def options_to_args
-      # an array, not a hash, because "from" should be in the exec args before "url"/"path"
-      Array.new.tap do |a|
-        a << [ :commit, [ "-c", commit ] ]
-        a << [ :range,  [ "-r", range ] ]
-        a << [ :accept, [ "--accept", accept ] ]
-        a << [ :from,   from ]
-        a << [ :to,   to ]
-      end
-    end  
+    def fields
+      FIELDS
+    end
   end
 end

data/lib/svnx/project.rb

@@ -1,26 +1,19 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'logue/loggable'
-
 module Svnx
 end
 
 # 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
-  include Logue::Loggable
-  
+class Svnx::Project  
   attr_reader :dir
   
   def initialize dir: nil, url: nil, cls: nil
     @dir = dir
     @url = url
     @cls = cls
-    debug "dir: #{dir}"
-    debug "url: #{url}"
-    debug "cls: #{cls}"
   end
 
   def where
@@ -38,47 +31,34 @@ class Svnx::Project
     info.path
   end
 
-  def run_command cmdcls, cmdargs, args
-    cmd = cmdcls.new cmdargs, cls: @cls
-    cmd.respond_to?(:entries) ? cmd.entries : cmd.output
-  end
+  def self.add_delegator cmd
+    require "svnx/#{cmd}/command"
+    require "svnx/#{cmd}/options"
 
-  def self.add_command_delegator name, takes_multiple_paths
-    require "svnx/#{name}/command"
-
-    pathargs = takes_multiple_paths ? "paths: [ @dir ]" : "path: @dir"
+    initargs = Hash[url: "@url", path: "@dir", paths: "[ @dir ]"]
+    optcls   = Kernel.const_get "Svnx::#{cmd.to_s.capitalize}::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 ", "
     
-    unless NOURL.include? name
-      pathargs << ", url: @url"
-    end
+    src = Array.new.tap do |a|
+      a << "def #{cmd} #{params}, cls: @cls"
+      a << "  cmd = Svnx::#{cmd.to_s.capitalize}::Command.new({ #{cmdargs} }, cls: cls)"
+      a << "  cmd.respond_to?(:entries) ? cmd.entries : cmd.output"
+      a << "end"
+    end.join "\n"
     
-    args = [
-      "Svnx::#{name.to_s.capitalize}::Command",
-      "{ " + pathargs + " }",
-      "**args"
-    ]
-
-    src = [
-      "def #{name} cls: nil, **args",
-      "  run_command " + args.join(", ") + ", cls: @cls",
-      "end"
-    ].join("\n")
-
-    module_eval src
+    class_eval src
   end
 
-  NOURL = [ :diff, :update, :merge ]
-  
-  add_command_delegator :info,    false
-  
-  add_command_delegator :update,  true
-  
-  add_command_delegator :commit,  true
-  add_command_delegator :log,     false
-  
-  add_command_delegator :diff,    true
-  add_command_delegator :propset, false
-  add_command_delegator :propget, false
+  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

data/lib/svnx/propget/entries.rb

@@ -11,7 +11,7 @@ module Svnx::Propget
     end
 
     def create_entry xmlelement
-      Entry.new :xmlelement => xmlelement
+      Entry.new xmlelement
     end
   end
 end

data/lib/svnx/propget/options.rb

@@ -9,19 +9,19 @@ module Svnx
 end
 
 module Svnx::Propget
-  class Options < Svnx::Base::Options
-    FIELDS = [ :revision, :revprop, :name, :url, :path ]
+  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
+    has_fields FIELDS.keys
 
-    def options_to_args
-      Array.new.tap do |a|
-        a << [ :revision, [ "-r", revision ] ]
-        a << [ :revprop,  "--revprop" ]
-        a << [ :name,     name ]
-        a << [ :url,      url ]
-        a << [ :path,     path ]
-      end
+    def fields
+      FIELDS
     end
   end
 end

data/lib/svnx/propset/options.rb

@@ -10,19 +10,20 @@ end
 
 module Svnx::Propset
   class Options < Svnx::Base::Options
-    FIELDS = [ :file, :revision, :name, :value, :url, :path ]
+
+    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
+    has_fields FIELDS.keys
 
-    def options_to_args
-      Array.new.tap do |a|
-        a << [ :name,     name ]
-        a << [ :revision, [ "--revprop", "-r", revision ] ]
-        a << [ :file,     [ "--file", file ] ]
-        a << [ :value,    value ]
-        a << [ :url,      url ]
-        a << [ :path,     path ]
-      end
+    def fields
+      FIELDS
     end
   end
 end

data/lib/svnx/status/entries.rb

@@ -6,9 +6,9 @@ require 'svnx/base/entries'
 
 module Svnx::Status
   class Entries < Svnx::Base::Entries
-    def initialize args = Hash.new
-      @rootpath = args[:rootpath]
-      super
+    def initialize lines, rootpath: nil
+      @rootpath = rootpath
+      super lines
     end
 
     def get_elements doc
@@ -17,7 +17,7 @@ module Svnx::Status
     end
 
     def create_entry xmlelement
-      Entry.new xmlelement: xmlelement, rootpath: @rootpath
+      Entry.new xmlelement, rootpath: @rootpath
     end
   end
 end

data/lib/svnx/status/entry.rb

@@ -20,9 +20,9 @@ module Svnx::Status
     attr_reader :commit_revision
     attr_reader :name
 
-    def initialize xmlelement: nil, rootpath: nil
+    def initialize xmlelement, rootpath: nil
       @rootpath = rootpath
-      super xmlelement: xmlelement
+      super xmlelement
       # @status is an Svnx::Action
       @action = @status
     end
@@ -32,10 +32,10 @@ module Svnx::Status
 
       wcstatus = elmt.elements['wc-status']
       @status = Svnx::Action.new(wcstatus.attributes['item'])
-      @status_revision = wcstatus.attributes['revision']
+      set_attr_var wcstatus, 'status_revision', 'revision'
       
       commit = wcstatus.elements['commit']
-      @commit_revision = commit && commit.attributes['revision']
+      set_attr_var commit, 'commit_revision', 'revision'
       @name = @path.dup
 
       if @rootpath

data/lib/svnx/status/options.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/util/objutil'
+require 'svnx/base/options'
 
 module Svnx
   module Status
@@ -10,16 +10,16 @@ end
 
 module Svnx::Status
   class Options < Svnx::Base::Options
-    FIELDS = [ :revision, :url, :paths ]
-    
-    has_fields FIELDS
+    FIELDS = Hash.new.tap do |h|
+      h[:revision] = Svnx::Base::REVISION_FIELD
+      h[:paths]    = nil
+      h[:url]      = nil
+    end
     
-    def options_to_args
-      Array.new.tap do |a|
-        a << [ :revision, [ "-r", revision ] ]
-        a << [ :url,      url ]
-        a << [ :paths,    paths ]
-      end
+    has_fields FIELDS.keys
+
+    def fields
+      FIELDS
     end
   end
 end

data/lib/svnx/update/options.rb

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

data/lib/svnx/util/classutil.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module ClassUtil
-  module Util
+class ClassUtil
+  class << self
     def module_elements cls
       mods = cls.name.split "::"
       mods[0 .. -2]
@@ -12,8 +12,5 @@ module ClassUtil
       mod = module_elements(cls) * "::"
       Kernel.const_get mod
     end
-
-    module_function :module_elements
-    module_function :find_module
   end
 end

data/lib/svnx/util/objutil.rb

@@ -10,27 +10,37 @@ module Svnx
       end
     end
 
+    # raises an exception if any element in +args+ is not in +valid+.
     def validate args, valid = Array.new
-      invalid = args.keys.reject do |field|
-        valid.include? field
-      end
+      invalid = args.keys.reject { |field| valid.include? field }
+      invalid.empty? || raise(create_invalid_fields_message invalid)
+    end
 
-      unless invalid.empty?
-        raise "invalid fields for #{self.class}: #{invalid.join(' ')}"
-      end
+    def create_invalid_fields_message fields
+      Array.new.tap do |a|
+        a << "invalid"
+        a << (fields.size == 1 ? "field" : "fields" )
+        a << "for"
+        a << self.class.to_s + ":"
+        a.concat fields
+      end.join(" ")
     end
 
-    module ClassMethods  
-      def attr_readers symbols = Array.new
-        attr_reader(*symbols)
+    module ClassMethods
+      def attr_readers(*symbols)
+        what = Array(symbols).flatten
+        attr_reader(*what)
       end
 
-      def has_fields fields
-        attr_reader(*fields)
+      # 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)
         
         define_method :initialize do |args|
-          assign args, fields
-          validate args, fields
+          assign args, what
+          validate args, what
         end
       end
     end

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,6 +113,10 @@ files:
 - lib/svnx/base/entry.rb
 - lib/svnx/base/env.rb
 - lib/svnx/base/options.rb
+- lib/svnx/blame/command.rb
+- lib/svnx/blame/entries.rb
+- lib/svnx/blame/entry.rb
+- lib/svnx/blame/options.rb
 - lib/svnx/cat/command.rb
 - lib/svnx/cat/options.rb
 - lib/svnx/commit/command.rb