svnx 1.0.1 → 2.0.6

data/lib/svnx/log/command.rb

@@ -1,6 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/log/args'
-require 'svnx/log/exec'
-require 'svnx/log/line'
+require 'svnx/log/options'
+require 'svnx/log/entries'
+require 'svnx/base/command'
+
+class Svnx::Log::Command < Svnx::Base::EntriesCommand
+  noncaching
+end

data/lib/svnx/log/entries.rb

@@ -4,22 +4,25 @@
 require 'svnx/base/entries'
 require 'svnx/log/entry'
 
-module SVNx::Log
-  class Entries < SVNx::Entries
-    def get_elements doc
-      doc.elements['log'].elements
-    end
+module Svnx
+  module Log
+  end
+end
 
-    def create_entry xmlelement
-      Entry.new :xmlelement => xmlelement
-    end
+class Svnx::Log::Entries < Svnx::Base::Entries
+  def get_elements doc
+    doc.elements['log'].elements
+  end
+
+  def create_entry xmlelement
+    Svnx::Log::Entry.new xmlelement: xmlelement
+  end
 
-    def match action, filter
-      matching = Array.new
-      each do |entry|
-        matching.concat entry.match(action, filter)
-      end
-      matching.sort
+  def match action, filter
+    matching = Array.new
+    each do |entry|
+      matching.concat entry.match(action, filter)
     end
+    matching.sort
   end
 end

data/lib/svnx/log/entry.rb

@@ -3,70 +3,82 @@
 
 require 'svnx/base/entry'
 require 'svnx/base/action'
+require 'time'
 
-module SVNx; module Log; end; end
+module Svnx
+  module Log
+  end
+end
 
-module SVNx::Log
-  class Entry < SVNx::Entry
-    attr_reader :revision, :author, :date, :paths, :msg
+class Svnx::Log::EntryPath
+  include Comparable
+  
+  attr_reader :kind, :action, :name
+  
+  def initialize args = Hash.new
+    @kind = args[:kind]
+    @action = args[:action]
+    @name = args[:name]
+  end
 
-    def set_from_element elmt
-      set_attr_var elmt, 'revision'
+  def to_s
+    @name
+  end
 
-      %w{ author date msg }.each do |field|
-        set_elmt_var elmt, field
-      end
-      
-      @paths = Array.new
+  def <=> other
+    name <=> other.name
+  end
 
-      elmt.elements.each('paths/path') do |pe|
-        kind = get_attribute pe, 'kind'
-        action = get_attribute pe, 'action'
-        name = pe.text
+  def match? action, filter
+    @action.to_s == action.to_s && @name.start_with?(filter)
+  end
+end
 
-        @paths << LogEntryPath.new(kind: kind, action: SVNx::Action.new(action), name: name)
-      end
-      
-      # Svn isn't consistent with the order of paths
-      @paths.sort!
-    end
+class Svnx::Log::Entry < Svnx::Base::Entry
+  attr_reader :revision, :author, :date, :paths, :msg
 
-    def message
-      @msg
-    end
+  def set_from_element elmt
+    set_attr_var elmt, 'revision'
+    set_elmt_vars elmt, 'author', 'date', 'msg'
+    
+    @paths = Array.new
 
-    def to_s
-      [ @revision, @author, @date, @msg, @paths ].collect { |x| x.to_s }.join " "
-    end
+    elmt.elements.each('paths/path') do |pe|
+      kind = attribute_value pe, 'kind'
+      action = attribute_value pe, 'action'
+      name = pe.text
 
-    def match action, filter
-      paths.select do |path|
-        path.match? action, filter
-      end
+      @paths << Svnx::Log::EntryPath.new(kind: kind, action: Svnx::Action.new(action), name: name)
     end
-  end
-  
-  class LogEntryPath
-    include Comparable
-    
-    attr_reader :kind, :action, :name
     
-    def initialize args = Hash.new
-      @kind = args[:kind]
-      @action = args[:action]
-      @name = args[:name]
-    end
+    # Svn isn't consistent with the order of paths
+    @paths.sort!
+  end
 
-    def to_s
-      @name
-    end
+  def message
+    @msg
+  end
 
-    def <=> other
-      name <=> other.name
+  def to_s
+    [ @revision, @author, @date, @msg, @paths ].collect { |x| x.to_s }.join " "
+  end
+
+  def match action, filter
+    paths.select do |path|
+      path.match? action, filter
     end
+  end
 
-    def match? action, filter
-      @action.to_s == action.to_s && @name.start_with?(filter)
+  def datetime
+    @dt ||= DateTime.parse date
+  end
+
+  def find_paths args
+    paths.select do |path|
+      if args[:kind]
+        path.kind == args[:kind]
+      end
     end
   end
 end
+

data/lib/svnx/log/options.rb

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

data/lib/svnx/merge/command.rb

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

data/lib/svnx/merge/options.rb

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

data/lib/svnx/project.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+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
+  attr_reader :dir
+  
+  def initialize dir: nil, url: nil, exec: nil
+    @dir = dir
+    @url = url
+    @exec = exec
+  end
+
+  def where
+    @url || @dir
+  end
+  
+  def url
+    @url ||= begin
+               entries = info
+               entries && entries[0].url
+             end
+  end
+  
+  def path
+    info.path
+  end
+
+  def run_command cmdcls, cmdargs, args, exec: nil
+    cmdargs = cmdargs.merge args
+    cmd = cmdcls.new cmdargs, exec: exec
+    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 }")
+    
+    args = [
+      "Svnx::#{name.to_s.capitalize}::Command",
+      pathargs,
+      "args",
+      "exec: exec"
+    ]
+    
+    src = [
+      "def #{name} exec: @exec, **args",
+      "  run_command " + args.join(", "),
+      "end"
+    ].join("\n")
+    module_eval src
+  end
+
+  add_command_delegator :info,    false
+  
+  add_command_delegator :update,  true
+  add_command_delegator :merge,   true
+  add_command_delegator :commit,  true
+  
+  add_command_delegator :log,     false
+  add_command_delegator :diff,    false
+  add_command_delegator :propset, false
+  add_command_delegator :propget, false
+
+  def to_s
+    where.to_s
+  end  
+end

data/lib/svnx/propget/command.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/propget/options'
+require 'svnx/base/command'
+
+class Svnx::Propget::Command < Svnx::Base::EntriesCommand
+  noncaching
+end

data/lib/svnx/propget/entries.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/propget/entry'
+require 'svnx/base/entries'
+
+class Svnx::Propget::Entries < Svnx::Base::Entries
+  def get_elements doc
+    doc.elements['properties'].elements
+  end
+
+  def create_entry xmlelement
+    Svnx::Propget::Entry.new :xmlelement => xmlelement
+  end
+end

data/lib/svnx/propget/entry.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/base/entry'
+
+module Svnx
+  module Propget
+  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
+
+    prop = elmt.elements["property"]
+    set_attr_vars prop, :name
+    @value = prop.text
+  end
+end

data/lib/svnx/propget/options.rb

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

data/lib/svnx/propset/command.rb

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

data/lib/svnx/propset/options.rb

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