svnx 2.0.6 → 2.1.0

data/lib/svnx/info/command.rb

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

data/lib/svnx/info/entries.rb

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

data/lib/svnx/info/entry.rb

@@ -8,25 +8,31 @@ module Svnx
   end
 end
 
-class Svnx::Info::Entry < Svnx::Base::Entry
-  attr_reader :url
-  attr_reader :root
-  attr_reader :kind
-  attr_reader :path
-  attr_reader :revision
-  attr_reader :wc_root
+module Svnx::Info
+  class Entry < Svnx::Base::Entry
+    attr_reader :url
+    attr_reader :root
+    attr_reader :kind
+    attr_reader :path
+    attr_reader :revision
+    attr_reader :wc_root
+    attr_reader :relative_url
 
-  def set_from_element elmt
-    set_attr_vars elmt, 'kind', 'path', 'revision'
-    set_elmt_var  elmt, 'url'
-    
-    repo = elmt.elements['repository']
-    set_elmt_var repo, 'root'
+    def set_from_element elmt
+      set_attr_vars elmt, 'kind', 'path', 'revision'
+      set_elmt_var  elmt, 'url'
+      if relurl = elmt.elements['relative-url']
+        @relative_url = relurl.text
+      end
+      
+      repo = elmt.elements['repository']
+      set_elmt_var repo, 'root'
 
-    @wc_root = nil
-    if wcinfo = elmt.elements['wc-info']
-      if wcroot = wcinfo.elements['wcroot-abspath']
-        @wc_root = wcroot.text
+      @wc_root = nil
+      if wcinfo = elmt.elements['wc-info']
+        if wcroot = wcinfo.elements['wcroot-abspath']
+          @wc_root = wcroot.text
+        end
       end
     end
   end

data/lib/svnx/info/options.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/util/objutil'
 require 'svnx/base/options'
 
 module Svnx
@@ -9,20 +8,18 @@ module Svnx
   end
 end
 
-class Svnx::Info::Options < Svnx::Base::Options
-  attr_reader :revision
-  attr_reader :url
-  attr_reader :path
-  
-  def initialize args
-    assign args, :revision, :url, :path
-  end
+module Svnx::Info
+  class Options < Svnx::Base::Options
+    FIELDS = [ :revision, :url, :path ]
+    
+    has_fields FIELDS
 
-  def options_to_args
-    Array.new.tap do |optargs|
-      optargs << [ :revision, [ "-r", revision ] ]
-      optargs << [ :url,      url ]
-      optargs << [ :path,     path ]
+    def options_to_args
+      Array.new.tap do |a|
+        a << [ :revision, [ "-r", revision ] ]
+        a << [ :url,      url ]
+        a << [ :path,     path ]
+      end
     end
   end
 end

data/lib/svnx/io/directory.rb

@@ -10,5 +10,7 @@ end
 # An element unites an svn element and a file/directory (at least one of
 # which should exist).
 
-class Svnx::IO::Directory < Element
+module Svnx::IO
+  class Directory < Element
+  end
 end

data/lib/svnx/io/element.rb

@@ -16,110 +16,112 @@ end
 # An element unites an svn element and a file/directory (at least one of
 # which should exist).
 
-class Svnx::IO::Element
-  include Logue::Loggable, Comparable
-
-  attr_reader :svn
-  attr_reader :path
-  attr_reader :local
-  
-  def initialize args = Hash.new
-    info "args: #{args.inspect}".color("438802")
-    
-    # svnurl = args[:svnurl]
-    # fname  = args[:filename] || args[:file] # legacy
-    # $$$ todo: map svnurl to SVNElement, and fname to FSElement
+module Svnx::IO
+  class Element
+    include Logue::Loggable, Comparable
 
-    @svn   = args[:svn] # || (args[:file] && SVNElement.new(:filename => args[:file]))
-    @local = args[:local] && Pathname.new(args[:local]) # && PVN::FSElement.new(args[:local] || args[:file])
-    @path  = args[:path]
+    attr_reader :svn
+    attr_reader :path
+    attr_reader :local
     
-    info "local: #{@local.inspect}"
-  end
+    def initialize args = Hash.new
+      info "args: #{args.inspect}".color("438802")
+      
+      # svnurl = args[:svnurl]
+      # fname  = args[:filename] || args[:file] # legacy
+      # $$$ todo: map svnurl to SVNElement, and fname to FSElement
+
+      @svn   = args[:svn] # || (args[:file] && SVNElement.new(:filename => args[:file]))
+      @local = args[:local] && Pathname.new(args[:local]) # && PVN::FSElement.new(args[:local] || args[:file])
+      @path  = args[:path]
+      
+      info "local: #{@local.inspect}"
+    end
 
-  def exist?
-    @local && @local.exist?
-  end
+    def exist?
+      @local && @local.exist?
+    end
 
-  def directory?
-    @local && @local.directory?
-  end
+    def directory?
+      @local && @local.directory?
+    end
 
-  def file?
-    @local && @local.file?
-  end
+    def file?
+      @local && @local.file?
+    end
 
-  def get_info revision = nil
-    return nil unless in_svn?
-    
-    usepath = @local ? @local.to_path : @path
-    inf = Svnx::Info::Command.new url: usepath, revision: revision
-    inf.entry
-  end
+    def get_info revision = nil
+      return nil unless in_svn?
+      
+      usepath = @local ? @local.to_path : @path
+      inf = Svnx::Info::Command.new url: usepath, revision: revision
+      inf.entry
+    end
 
-  def in_svn?
-    # svn status can only be a local path:
-    if @local
-      st = Svnx::StatusExec.new path: @local.to_path
-      st.entries.size == 0 || st.entries[0].status.to_s != 'unversioned'
-    else
-      raise "cannot determine svn status without a local path; only target '#{@path}' defined"
+    def in_svn?
+      # svn status can only be a local path:
+      if @local
+        st = Svnx::StatusExec.new path: @local.to_path
+        st.entries.size == 0 || st.entries[0].status.to_s != 'unversioned'
+      else
+        raise "cannot determine svn status without a local path; only target '#{@path}' defined"
+      end
     end
-  end
 
-  def find_entries args = Hash.new
-    revision = args[:revision]
-    status = args[:status]
-    
-    if revision.nil?
-      find_by_status status
-    else
-      find_in_log revision, status
+    def find_entries args = Hash.new
+      revision = args[:revision]
+      status = args[:status]
+      
+      if revision.nil?
+        find_by_status status
+      else
+        find_in_log revision, status
+      end
     end
-  end
 
-  def find_in_log revision, action
-    svninfo = get_info
+    def find_in_log revision, action
+      svninfo = get_info
 
-    filter = svninfo.url.dup
-    filter.slice! svninfo.root
+      filter = svninfo.url.dup
+      filter.slice! svninfo.root
 
-    # we can't cache this, because we don't know if there has been an svn
-    # update since the previous run:
-    logexec = Svnx::LogExec.new path: @local, revision: revision, verbose: true, use_cache: false
-    entries = logexec.entries
-    
-    act = action.kind_of?(Svnx::Action) ? action : Svnx::Action.new(action)
-    entries.match act, filter
-  end
+      # we can't cache this, because we don't know if there has been an svn
+      # update since the previous run:
+      logexec = Svnx::LogExec.new path: @local, revision: revision, verbose: true, use_cache: false
+      entries = logexec.entries
+      
+      act = action.kind_of?(Svnx::Action) ? action : Svnx::Action.new(action)
+      entries.match act, filter
+    end
 
-  def find_by_status status
-    statexec = Svnx::StatusExec.new path: @local, use_cache: false
-    entries = statexec.entries
+    def find_by_status status
+      statexec = Svnx::StatusExec.new path: @local, use_cache: false
+      entries = statexec.entries
 
-    entries.select do |entry|
-      status.nil? || entry.status.to_s == status.to_s
-    end.sort
-  end
+      entries.select do |entry|
+        status.nil? || entry.status.to_s == status.to_s
+      end.sort
+    end
 
-  def log_entries args = Hash.new
-    rev = args[:revision]
-    # use_cache should be conditional on revision:
-    logexec = Svnx::LogExec.new :path => @local, :revision => rev && rev.to_s, :verbose => true, :use_cache => false
-    logexec.entries
-  end
+    def log_entries args = Hash.new
+      rev = args[:revision]
+      # use_cache should be conditional on revision:
+      logexec = Svnx::LogExec.new :path => @local, :revision => rev && rev.to_s, :verbose => true, :use_cache => false
+      logexec.entries
+    end
 
-  def cat args = Hash.new
-    rev = args[:revision]
-    catexec = Svnx::CatExec.new :path => @local, :revision => rev && rev.to_s, :use_cache => false
-    catexec.output
-  end
+    def cat args = Hash.new
+      rev = args[:revision]
+      catexec = Svnx::CatExec.new :path => @local, :revision => rev && rev.to_s, :use_cache => false
+      catexec.output
+    end
 
-  def to_s
-    "svn => " + @svn.to_s + "; local => " + @local.to_s
-  end
+    def to_s
+      "svn => " + @svn.to_s + "; local => " + @local.to_s
+    end
 
-  def <=> other
-    @local <=> other.local
+    def <=> other
+      @local <=> other.local
+    end
   end
 end

data/lib/svnx/log/command.rb

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

data/lib/svnx/log/entries.rb

@@ -9,20 +9,22 @@ module Svnx
   end
 end
 
-class Svnx::Log::Entries < Svnx::Base::Entries
-  def get_elements doc
-    doc.elements['log'].elements
-  end
+module Svnx::Log
+  class 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 create_entry xmlelement
+      Entry.new xmlelement: xmlelement
+    end
 
-  def match action, filter
-    matching = Array.new
-    each do |entry|
-      matching.concat entry.match(action, filter)
+    def match action, filter
+      matching = Array.new
+      each do |entry|
+        matching.concat entry.match(action, filter)
+      end
+      matching.sort
     end
-    matching.sort
   end
 end

data/lib/svnx/log/entry.rb

@@ -4,81 +4,59 @@
 require 'svnx/base/entry'
 require 'svnx/base/action'
 require 'time'
+require 'svnx/log/entrypath'
 
 module Svnx
   module Log
   end
 end
 
-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 to_s
-    @name
-  end
-
-  def <=> other
-    name <=> other.name
-  end
+module Svnx::Log
+  class Entry < Svnx::Base::Entry
+    attr_reader :revision, :author, :date, :paths, :msg
 
-  def match? action, filter
-    @action.to_s == action.to_s && @name.start_with?(filter)
-  end
-end
-
-class Svnx::Log::Entry < Svnx::Base::Entry
-  attr_reader :revision, :author, :date, :paths, :msg
+    def set_from_element elmt
+      set_attr_var elmt, 'revision'
+      set_elmt_vars elmt, 'author', 'date', 'msg'
+      
+      @paths = Array.new
 
-  def set_from_element elmt
-    set_attr_var elmt, 'revision'
-    set_elmt_vars elmt, 'author', 'date', 'msg'
-    
-    @paths = Array.new
+      elmt.elements.each('paths/path') do |pe|
+        kind = attribute_value pe, 'kind'
+        action = attribute_value pe, 'action'
+        name = pe.text
 
-    elmt.elements.each('paths/path') do |pe|
-      kind = attribute_value pe, 'kind'
-      action = attribute_value pe, 'action'
-      name = pe.text
-
-      @paths << Svnx::Log::EntryPath.new(kind: kind, action: Svnx::Action.new(action), name: name)
+        @paths << EntryPath.new(kind: kind, action: Svnx::Action.new(action), name: name)
+      end
+      
+      # Svn isn't consistent with the order of paths
+      @paths.sort!
     end
-    
-    # Svn isn't consistent with the order of paths
-    @paths.sort!
-  end
 
-  def message
-    @msg
-  end
+    def message
+      @msg
+    end
 
-  def to_s
-    [ @revision, @author, @date, @msg, @paths ].collect { |x| x.to_s }.join " "
-  end
+    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
+    def match action, filter
+      paths.select do |path|
+        path.match? action, filter
+      end
     end
-  end
 
-  def datetime
-    @dt ||= DateTime.parse date
-  end
+    def datetime
+      @dt ||= DateTime.parse date
+    end
 
-  def find_paths args
-    paths.select do |path|
-      if args[:kind]
-        path.kind == args[:kind]
+    def find_paths args
+      paths.select do |path|
+        if args[:kind]
+          path.kind == args[:kind]
+        end
       end
     end
   end
 end
-