svnx 2.0.6 → 2.1.0

data/lib/svnx/revision/date.rb

@@ -1,27 +1,27 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pathname'
-
 module Svnx
   module Revision
   end
 end
 
-class Svnx::Revision::DateToDate
-  attr_reader :from
-  attr_reader :to
-  
-  def initialize from, to
-    @from = from
-    @to = to
-  end
+module Svnx::Revision
+  class DateToDate
+    attr_reader :from
+    attr_reader :to
+    
+    def initialize from, to
+      @from = from
+      @to = to
+    end
 
-  def to_svn_str
-    [ @from, @to ].collect { |dt| "{" + to_svn_date(dt) + "}" }.join(":")
-  end
-  
-  def to_svn_date date
-    date.strftime "%Y-%m-%d"
+    def to_svn_str
+      [ @from, @to ].collect { |dt| "{" + to_svn_date(dt) + "}" }.join(":")
+    end
+    
+    def to_svn_date date
+      date.strftime "%Y-%m-%d"
+    end
   end
 end

data/lib/svnx/revision/error.rb

@@ -1,7 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module Svnx; module Revision; end; end
+module Svnx
+  module Revision
+  end
+end
 
 module Svnx::Revision
   class RevisionError < RuntimeError

data/lib/svnx/revision/range.rb

@@ -43,7 +43,8 @@ module Svnx::Revision
     end
 
     def head?
-      @to && @to.value == 'HEAD'
+      # return true/false instead of true/false/nil
+      @to ? @to.value == 'HEAD' : false
     end
 
     def working_copy?

data/lib/svnx/status/command.rb

@@ -5,6 +5,8 @@ require 'svnx/base/command'
 require 'svnx/status/options'
 require 'svnx/status/entries'
 
-class Svnx::Status::Command < Svnx::Base::EntriesCommand
-  noncaching
+module Svnx::Status
+  class Command < Svnx::Base::EntriesCommand
+    noncaching
+  end
 end

data/lib/svnx/status/entries.rb

@@ -4,18 +4,20 @@
 require 'svnx/status/entry'
 require 'svnx/base/entries'
 
-class Svnx::Status::Entries < Svnx::Base::Entries
-  def initialize args = Hash.new
-    @rootpath = args[:rootpath]
-    super
-  end
+module Svnx::Status
+  class Entries < Svnx::Base::Entries
+    def initialize args = Hash.new
+      @rootpath = args[:rootpath]
+      super
+    end
 
-  def get_elements doc
-    # status/target
-    doc.elements['status'].elements['target'].elements
-  end
+    def get_elements doc
+      # status/target
+      doc.elements['status'].elements['target'].elements
+    end
 
-  def create_entry xmlelement
-    Svnx::Status::Entry.new xmlelement: xmlelement, rootpath: @rootpath
+    def create_entry xmlelement
+      Entry.new xmlelement: xmlelement, rootpath: @rootpath
+    end
   end
 end

data/lib/svnx/status/entry.rb

@@ -9,49 +9,47 @@ module Svnx
   end
 end
 
-class Svnx::Status::Entry < Svnx::Base::Entry
-  include Comparable, Logue::Loggable
-  
-  attr_reader :status
-  attr_reader :path
-  attr_reader :status_revision
-  attr_reader :action
-  attr_reader :commit_revision
-  attr_reader :name
-
-  def initialize xmlelement: nil, rootpath: nil
-    @rootpath = rootpath
-    super xmlelement: xmlelement
-    # @status is an Svnx::Action
-    @action = @status
-  end
-
-  def set_from_element elmt
-    set_attr_var elmt, 'path'
-
-    wcstatus = elmt.elements['wc-status']
-    @status = Svnx::Action.new(wcstatus.attributes['item'])
-    @status_revision = wcstatus.attributes['revision']
+module Svnx::Status
+  class Entry < Svnx::Base::Entry
+    include Comparable
     
-    commit = wcstatus.elements['commit']
-    @commit_revision = commit && commit.attributes['revision']
-    @name = @path.dup
-
-    info "@name: #{@name}"
-    info "@path: #{@path}"
-    info "@rootpath: #{@rootpath}"
+    attr_reader :status
+    attr_reader :path
+    attr_reader :status_revision
+    attr_reader :action
+    attr_reader :commit_revision
+    attr_reader :name
+
+    def initialize xmlelement: nil, rootpath: nil
+      @rootpath = rootpath
+      super xmlelement: xmlelement
+      # @status is an Svnx::Action
+      @action = @status
+    end
 
-    if @rootpath
-      # name is prefixed with directory unless '.' is used as the argument
-      @name.sub! Regexp.new('^' + @rootpath), ''
+    def set_from_element elmt
+      set_attr_var elmt, 'path'
+
+      wcstatus = elmt.elements['wc-status']
+      @status = Svnx::Action.new(wcstatus.attributes['item'])
+      @status_revision = wcstatus.attributes['revision']
+      
+      commit = wcstatus.elements['commit']
+      @commit_revision = commit && commit.attributes['revision']
+      @name = @path.dup
+
+      if @rootpath
+        # name is prefixed with directory unless '.' is used as the argument
+        @name.sub! Regexp.new('^' + @rootpath), ''
+      end
     end
-  end
 
-  def to_s
-    "path: #{@path}; status: #{@status}"
-  end
+    def to_s
+      "path: #{@path}; status: #{@status}"
+    end
 
-  def <=> other
-    path <=> other.path
+    def <=> other
+      path <=> other.path
+    end
   end
 end

data/lib/svnx/status/options.rb

@@ -2,27 +2,24 @@
 # -*- ruby -*-
 
 require 'svnx/util/objutil'
-require 'svnx/base/options'
 
 module Svnx
   module Status
   end
 end
 
-class Svnx::Status::Options < Svnx::Base::Options
-  attr_reader :revision
-  attr_reader :url
-  attr_reader :paths
-  
-  def initialize args
-    assign args, :revision, :url, :paths
-  end
-  
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :revision, [ "-r", @revision ] ]
-      optargs << [ :url,      @url ]
-      optargs << [ :paths,    @paths ]
+module Svnx::Status
+  class Options < Svnx::Base::Options
+    FIELDS = [ :revision, :url, :paths ]
+    
+    has_fields FIELDS
+    
+    def options_to_args
+      Array.new.tap do |a|
+        a << [ :revision, [ "-r", revision ] ]
+        a << [ :url,      url ]
+        a << [ :paths,    paths ]
+      end
     end
   end
 end

data/lib/svnx/update/command.rb

@@ -4,6 +4,8 @@
 require 'svnx/base/command'
 require 'svnx/update/options'
 
-class Svnx::Update::Command < Svnx::Base::Command
-  noncaching
+module Svnx::Update
+  class Command < Svnx::Base::Command
+    noncaching
+  end
 end

data/lib/svnx/update/options.rb

@@ -8,18 +8,17 @@ module Svnx
   end
 end
 
-class Svnx::Update::Options < Svnx::Base::Options
-  attr_reader :revision
-  attr_reader :paths
-  
-  def initialize args = Hash.new
-    assign args, :revision, :paths
-  end
-  
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :revision, [ "-r", revision ] ]
-      optargs << [ :paths,    paths ]
+module Svnx::Update
+  class Options < Svnx::Base::Options
+    FIELDS = [ :revision, :paths ]
+    
+    has_fields FIELDS
+    
+    def options_to_args
+      Array.new.tap do |a|
+        a << [ :revision, [ "-r", revision ] ]
+        a << [ :paths,    paths ]
+      end
     end
   end
 end

data/lib/svnx/util/classutil.rb

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

data/lib/svnx/util/dateutil.rb

@@ -14,6 +14,7 @@ class DateUtil
       end
     end
 
+    # returns the value in seconds, minutes, hours, or days, if within a week
     def to_time_units seconds
       secs = seconds.to_i
 

data/lib/svnx/util/objutil.rb

@@ -2,13 +2,43 @@
 # -*- ruby -*-
 
 module Svnx
-end
+  module ObjectUtil
+    # shortcut for "@var = args[:var]", for multiple variable names, which are symbols.
+    def assign args, symbols = Array.new
+      symbols.each do |symbol|
+        instance_variable_set "@" + symbol.to_s, args[symbol]
+      end
+    end
+
+    def validate args, valid = Array.new
+      invalid = args.keys.reject do |field|
+        valid.include? field
+      end
+
+      unless invalid.empty?
+        raise "invalid fields for #{self.class}: #{invalid.join(' ')}"
+      end
+    end
+
+    module ClassMethods  
+      def attr_readers symbols = Array.new
+        attr_reader(*symbols)
+      end
+
+      def has_fields fields
+        attr_reader(*fields)
+        
+        define_method :initialize do |args|
+          assign args, fields
+          validate args, fields
+        end
+      end
+    end
+
+    extend ClassMethods
 
-module Svnx::ObjectUtil
-  # shortcut for "@var = args[:var]", for multiple variable names, which are symbols.
-  def assign args, *symbols
-    symbols.each do |symbol|
-      instance_variable_set "@" + symbol.to_s, args[symbol]
+    def self.included other
+      other.extend ClassMethods
     end
   end
 end

data/lib/svnx/version.rb

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

data/repackage

@@ -0,0 +1 @@
+rake && rm -rf pkg/svnx-2.0.8* && rake build && sudo gem uni svnx && sudo gem i ./pkg/svnx-2.0.8.gem

data/svnx.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+lib = File.expand_path '../lib', __FILE__
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
 require 'svnx/version'
 
 Gem::Specification.new do |spec|
@@ -16,19 +16,20 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
+  if spec.respond_to? :metadata
     spec.metadata['allowed_push_host'] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match %r{^(test|spec|features)/} }
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "logue", "~> 1.0.6"
   spec.add_development_dependency "test-unit", "~> 3.1.5"
+  spec.add_development_dependency "paramesan"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.5
+- !ruby/object:Gem::Dependency
+  name: paramesan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bridges the Subversion command line, returning Ruby objects.
 email:
 - jeugenepace@gmail.com
@@ -75,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".glarkrc"
+- ".zshrc"
 - Features.txt
 - Gemfile
 - History.txt
@@ -82,9 +97,18 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- lib/cmdline/arg.rb
+- lib/cmdline/cachefile.rb
+- lib/cmdline/caching.rb
+- lib/cmdline/filename.rb
+- lib/cmdline/gzpathname.rb
+- lib/cmdline/line.rb
 - lib/svnx/base/action.rb
+- lib/svnx/base/action_status.rb
+- lib/svnx/base/cmd.rb
 - lib/svnx/base/cmdline.rb
 - lib/svnx/base/command.rb
+- lib/svnx/base/command_factory.rb
 - lib/svnx/base/entries.rb
 - lib/svnx/base/entry.rb
 - lib/svnx/base/env.rb
@@ -106,6 +130,7 @@ files:
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
+- lib/svnx/log/entrypath.rb
 - lib/svnx/log/options.rb
 - lib/svnx/merge/command.rb
 - lib/svnx/merge/options.rb
@@ -127,13 +152,11 @@ files:
 - lib/svnx/status/options.rb
 - lib/svnx/update/command.rb
 - lib/svnx/update/options.rb
+- lib/svnx/util/classutil.rb
 - lib/svnx/util/dateutil.rb
 - lib/svnx/util/objutil.rb
 - lib/svnx/version.rb
-- lib/system/command/arg.rb
-- lib/system/command/cachefile.rb
-- lib/system/command/caching.rb
-- lib/system/command/line.rb
+- repackage
 - svnx.gemspec
 homepage: https://github.com/jpace/svnx
 licenses: