svnx 2.0.6 → 2.1.0

data/lib/svnx/log/entrypath.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/action'
+
+module Svnx
+  module Log
+  end
+end
+
+module Svnx::Log
+  class EntryPath
+    include Comparable
+    
+    attr_reader :kind, :action, :name
+    
+    def initialize args = Hash.new
+      @kind = args[:kind]
+      @action = args[:action]
+      @name = args[:name]
+    end
+
+    def to_s
+      @name
+    end
+
+    def <=> other
+      name <=> other.name
+    end
+
+    def match? action, filter
+      @action.to_s == action.to_s && @name.start_with?(filter)
+    end
+  end
+end

data/lib/svnx/log/options.rb

@@ -8,24 +8,20 @@ module Svnx
   end
 end
 
-class Svnx::Log::Options < Svnx::Base::Options
-  attr_reader :limit
-  attr_reader :verbose
-  attr_reader :revision
-  attr_reader :url
-  attr_reader :path
-  
-  def initialize args
-    assign args, :limit, :verbose, :revision, :url, :path
-  end
-  
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :limit,    [ "--limit", limit ] ]
-      optargs << [ :verbose,  "-v" ]
-      optargs << [ :revision, "-r" + revision.to_s ]
-      optargs << [ :url,      url ]
-      optargs << [ :path,     path ]
+module Svnx::Log
+  class Options < Svnx::Base::Options
+    FIELDS = [ :limit, :verbose, :revision, :url, :path ]
+
+    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
     end
   end
 end

data/lib/svnx/merge/command.rb

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

data/lib/svnx/merge/options.rb

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

data/lib/svnx/project.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'logue/loggable'
+
 module Svnx
 end
 
@@ -8,12 +10,17 @@ end
 # entries (svnx/<command>/entry) or output. Enhances the low level functionality.
 
 class Svnx::Project
+  include Logue::Loggable
+  
   attr_reader :dir
   
-  def initialize dir: nil, url: nil, exec: nil
+  def initialize dir: nil, url: nil, cls: nil
     @dir = dir
     @url = url
-    @exec = exec
+    @cls = cls
+    debug "dir: #{dir}"
+    debug "url: #{url}"
+    debug "cls: #{cls}"
   end
 
   def where
@@ -31,40 +38,45 @@ class Svnx::Project
     info.path
   end
 
-  def run_command cmdcls, cmdargs, args, exec: nil
-    cmdargs = cmdargs.merge args
-    cmd = cmdcls.new cmdargs, exec: exec
+  def run_command cmdcls, cmdargs, args
+    cmd = cmdcls.new cmdargs, cls: @cls
     cmd.respond_to?(:entries) ? cmd.entries : cmd.output
   end
 
   def self.add_command_delegator name, takes_multiple_paths
     require "svnx/#{name}/command"
 
-    pathargs = (takes_multiple_paths ? "{ paths: [ @dir ], url: @url }" : "{ path: @dir, url: @url }")
+    pathargs = takes_multiple_paths ? "paths: [ @dir ]" : "path: @dir"
+    
+    unless NOURL.include? name
+      pathargs << ", url: @url"
+    end
     
     args = [
       "Svnx::#{name.to_s.capitalize}::Command",
-      pathargs,
-      "args",
-      "exec: exec"
+      "{ " + pathargs + " }",
+      "**args"
     ]
-    
+
     src = [
-      "def #{name} exec: @exec, **args",
-      "  run_command " + args.join(", "),
+      "def #{name} cls: nil, **args",
+      "  run_command " + args.join(", ") + ", cls: @cls",
       "end"
     ].join("\n")
+
     module_eval src
   end
 
+  NOURL = [ :diff, :update, :merge ]
+  
   add_command_delegator :info,    false
   
   add_command_delegator :update,  true
-  add_command_delegator :merge,   true
-  add_command_delegator :commit,  true
   
+  add_command_delegator :commit,  true
   add_command_delegator :log,     false
-  add_command_delegator :diff,    false
+  
+  add_command_delegator :diff,    true
   add_command_delegator :propset, false
   add_command_delegator :propget, false
 

data/lib/svnx/propget/command.rb

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

data/lib/svnx/propget/entries.rb

@@ -4,12 +4,14 @@
 require 'svnx/propget/entry'
 require 'svnx/base/entries'
 
-class Svnx::Propget::Entries < Svnx::Base::Entries
-  def get_elements doc
-    doc.elements['properties'].elements
-  end
+module Svnx::Propget
+  class Entries < Svnx::Base::Entries
+    def get_elements doc
+      doc.elements['properties'].elements
+    end
 
-  def create_entry xmlelement
-    Svnx::Propget::Entry.new :xmlelement => xmlelement
+    def create_entry xmlelement
+      Entry.new :xmlelement => xmlelement
+    end
   end
 end

data/lib/svnx/propget/entry.rb

@@ -8,16 +8,18 @@ module Svnx
   end
 end
 
-class Svnx::Propget::Entry < Svnx::Base::Entry
-  attr_reader :path
-  attr_reader :name
-  attr_reader :value
-  
-  def set_from_element elmt
-    set_attr_vars elmt, :path
+module Svnx::Propget
+  class Entry < Svnx::Base::Entry
+    attr_reader :path
+    attr_reader :name
+    attr_reader :value
+    
+    def set_from_element elmt
+      set_attr_vars elmt, :path
 
-    prop = elmt.elements["property"]
-    set_attr_vars prop, :name
-    @value = prop.text
+      prop = elmt.elements["property"]
+      set_attr_vars prop, :name
+      @value = prop.text
+    end
   end
 end

data/lib/svnx/propget/options.rb

@@ -8,24 +8,20 @@ module Svnx
   end
 end
 
-class Svnx::Propget::Options < Svnx::Base::Options
-  attr_reader :revision
-  attr_reader :revprop
-  attr_reader :name
-  attr_reader :url
-  attr_reader :path
-  
-  def initialize args
-    assign args, :revision, :revprop, :name, :url, :path
-  end
+module Svnx::Propget
+  class Options < Svnx::Base::Options
+    FIELDS = [ :revision, :revprop, :name, :url, :path ]
+
+    has_fields FIELDS
 
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :revision, [ "-r", revision ] ]
-      optargs << [ :revprop,  "--revprop" ]
-      optargs << [ :name,     name ]
-      optargs << [ :url,      url ]
-      optargs << [ :path,     path ]
+    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
     end
   end
 end

data/lib/svnx/propset/command.rb

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

data/lib/svnx/propset/options.rb

@@ -8,26 +8,21 @@ module Svnx
   end
 end
 
-class Svnx::Propset::Options < Svnx::Base::Options
-  attr_reader :file
-  attr_reader :revision
-  attr_reader :name
-  attr_reader :value
-  attr_reader :url
-  attr_reader :path
-  
-  def initialize args
-    assign args, :file, :revision, :name, :value, :url, :path
-  end
+module Svnx::Propset
+  class Options < Svnx::Base::Options
+    FIELDS = [ :file, :revision, :name, :value, :url, :path ]
+    
+    has_fields FIELDS
 
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :name,     name ]
-      optargs << [ :revision, [ "--revprop", "-r", revision ] ]
-      optargs << [ :file,     [ "--file", file ] ]
-      optargs << [ :value,    value ]
-      optargs << [ :url,      url ]
-      optargs << [ :path,     path ]
+    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
     end
   end
 end

data/lib/svnx/revision/argfactory.rb

@@ -1,9 +1,13 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module Svnx; module Revision; end; end
+module Svnx
+  module Revision
+    RELATIVE_REVISION_RE = Regexp.new '^([\+\-])(\d+)$'
+  end
+end
 
-module Svnx::Revision  
+module Svnx::Revision
   class ArgumentFactory
     include Logue::Loggable
 

data/lib/svnx/revision/argument.rb

@@ -6,21 +6,24 @@ require 'svnx/revision/error'
 require 'logue/loggable'
 require 'svnx/revision/argfactory'
 
-module Svnx; module Revision; end; end
-
 # We represent what svn calls a revision (-r134:{2010-1-1}) as a Range,
 # consisting of a from and to (optional) Argument.
+
+module Svnx
+  module Revision
+  end
+end
+
 module Svnx::Revision
-  RELATIVE_REVISION_RE = Regexp.new '^([\+\-])(\d+)$'
-  
-  # Returns the Nth revision from the given logging output.
-  
-  # -n means to count from the end of the list.
-  # +n means to count from the beginning of the list.
-  #  n means the literal revision number.  
   class Argument
     include Logue::Loggable, Comparable
 
+    # Returns the Nth revision from the given logging output.
+    
+    # -n means to count from the end of the list.
+    # +n means to count from the beginning of the list.
+    #  n means the literal revision number.  
+
     # these are also valid revisions
     # :working_copy
     # :head
@@ -42,27 +45,27 @@ module Svnx::Revision
     end
 
     def <=> other
-      if other.kind_of? Argument
-        @value <=> other.value
-      else
-        @value <=> other
-      end
+      @value <=> (other.kind_of?(Argument) ? other.value : other)
     end
   end
+end
 
+module Svnx::Revision
   class IndexArgument < Argument
   end
+end
 
+module Svnx::Revision
   class StringArgument < Argument
   end
+end
 
-  # this is of the form -3, which is revision[-3] (second one from the most
-  # recent; -1 is the most recent).
+# this is of the form -3, which is revision[-3] (second one from the most
+# recent; -1 is the most recent).
+module Svnx::Revision
   class RelativeArgument < IndexArgument
     def initialize value, args
-      entries = args[:entries]
-      
-      unless entries
+      unless entries = args[:entries]
         raise RevisionError.new "cannot determine relative revision without entries"
       end