pvn 0.0.3 → 0.0.4

data/lib/pvn/app.rb

@@ -9,13 +9,11 @@ require 'pvn/io/element'
 require 'svnx/log/entries'
 
 require 'pvn/subcommands/log/command'
-
-# not yet supported:
-# require 'pvn/subcommands/pct/command'
+require 'pvn/subcommands/pct/command'
 
 # the old ones:
 require 'pvn/diff/diffcmd'
-require 'pvn/pct/pctcmd'
+# require 'pvn/pct/pctcmd'
 require 'pvn/describe'
 require 'pvn/upp/uppcmd'
 require 'pvn/wherecmd'
@@ -46,8 +44,7 @@ module PVN::App
         when "log"
           run_command PVN::Subcommands::Log::Command, args
         when "pct"
-          $stderr.puts "subcommand 'pct' is not yet supported"
-          exit(-1)
+          run_command PVN::Subcommands::Pct::Command, args
         else
           $stderr.puts "ERROR: subcommand not valid: #{arg}"
           exit(-1)
@@ -62,7 +59,7 @@ module PVN::App
         cmdcls.new args
         exit(0)
       rescue => e
-        # puts e.backtrace
+        puts e.backtrace
         $stderr.puts e
         exit(-1)
       end
@@ -84,6 +81,7 @@ module PVN::App
     end
 
     SUBCOMMANDS = [ PVN::Subcommands::Log::Command,
+                    PVN::Subcommands::Pct::Command,
 #                    DiffCommand, 
 #                    DescribeCommand, 
 #                    PctCommand,

data/lib/pvn/io/element.rb

@@ -62,7 +62,67 @@ module PVN::IO
       end
     end
 
-    def svninfo
+    def get_info
+      cmdargs = SVNx::InfoCommandArgs.new :path => @local
+      infcmd  = SVNx::InfoCommand.new cmdargs
+      output  = infcmd.execute
+      
+      infentries = SVNx::Info::Entries.new :xmllines => output
+      infentries[0]
+    end
+
+    def repo_root
+      get_info.root
+    end
+
+    # returns a set of entries modified over the given revision
+    def find_modified_entries revision
+      cmdargs = Hash.new
+
+      cmdargs[:path] = @local
+
+      info "cmdargs[:revision]: #{cmdargs[:revision]}"
+      
+      # we can't cache this, because we don't know if there has been an svn
+      # update since the previous run:
+      cmdargs[:use_cache] = false
+      cmdargs[:limit] = nil
+      cmdargs[:verbose] = true
+      cmdargs[:revision] = revision
+
+      logargs = SVNx::LogCommandArgs.new cmdargs
+      entries = log(logargs).entries
+
+      modified = Set.new
+
+      info "entries: #{entries}"
+      entries.each do |entry|
+        info "entry: #{entry}".on_blue
+        info entry.paths
+        entry.paths.each do |epath|
+          modified << epath if epath.action == 'M'
+        end
+      end
+
+      modified
+    end
+
+    # returns a set of local files that are in the given status
+    def find_files_by_status status
+      cmdargs = SVNx::StatusCommandArgs.new :path => @local, :use_cache => false
+
+      cmd = SVNx::StatusCommand.new cmdargs
+      xml = cmd.execute
+      entries = SVNx::Status::Entries.new :xmllines => xml
+
+      entries.select do |entry|
+        entry.status == status
+      end
+    end
+
+    # returns a set of local files that are in modified status
+    def find_modified_files
+      find_files_by_status 'modified'
     end
 
     # returns log entries

data/lib/pvn/revision/entry.rb

@@ -3,6 +3,9 @@
 
 require 'svnx/log/entries'
 
+# This is an abuse of all the element/entry nonsense in this code. This will
+# replace lib/pvn/revision.rb as PVN::Revision.                                                                            
+
 module PVN::Revision
   DATE_REGEXP = Regexp.new '^\{(.*?)\}'
   SVN_REVISION_WORDS = %w{ HEAD BASE COMMITTED PREV }

data/lib/pvn/subcommands/log/command.rb

@@ -9,11 +9,9 @@ require 'pvn/subcommands/base/command'
 
 module PVN::Subcommands::Log
   class Command < PVN::Subcommands::Base::Command
-    include Loggable
 
     DEFAULT_LIMIT = 15
 
-    description "this is a description of log"
     subcommands [ "log" ]
     description "Print log messages for the given files."
     usage       "[OPTIONS] FILE..."

data/lib/pvn/subcommands/pct/command.rb

@@ -1,15 +1,188 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module PVN; module App; end; end
+require 'pvn/io/element'
+require 'pvn/subcommands/pct/options'
+require 'pvn/subcommands/base/command'
+require 'svnx/info/command'
+require 'svnx/status/command'
+require 'svnx/cat/command'
+require 'set'
 
-module PVN::App::Pct
-  class Command
-    include Loggable
+module PVN::Subcommands::Pct
+  class DiffCount
+    attr_reader :from
+    attr_reader :to
 
+    def initialize from = 0, to = 0
+      @from = from
+      @to = to
+    end
+
+    def print name
+      diff = to - from
+      diffpct = diff == 0 ? 0 : 100.0 * diff / from
+      
+      printf "%8d %8d %8d %8.1f%% %s\n", from, to, diff, diffpct, name
+    end
+
+    def << diff
+      @from += diff.from
+      @to += diff.to
+    end
+  end
+
+  class Command < PVN::Subcommands::Base::Command
+
+    DEFAULT_LIMIT = 15
+
+    subcommands [ "pct" ]
+    description "Compares revisions as a percentage of lines modified."
+    usage       "[OPTIONS] FILE..."
+    summary   [ "Compares to revisions, showing the changes in the size (length)",
+                "of files that have been modified in the latter revision, to",
+                "show the extent to which they have increased or decreased.",
+                "The columns are:",
+                " - length in svn repository",
+                " - length in local version",
+                " - difference",
+                " - percentage change",
+                " - file name",
+                "The total numbers are displayed as the last line.",
+                "Added and deleted files are not included." ]
+    
+    optscls
+
+    example "pvn pct foo.rb",       "Prints the changes in foo.rb, working copy against BASE."
+    example "pvn pct -r114:121",    "Prints the changes for all files, revision 114 against 121. (not yet supported)"
+    example "pvn pct -rHEAD",       "Prints the changes, working copy against HEAD. (not yet supported)"
+    example "pvn pct -r117",        "Prints the changes between revision 117 and the previous revision. (not yet supported)"
+    example "pvn pct -7",           "Prints the changes between relative revision -7 and the previous revision. (not yet supported)"
+    example "pvn pct -r31 -4",      "Prints the changes between revision 31 and relative revision -4. (not yet supported)"
+    
     def initialize args
-      clargs = PVN::App::Pct::CmdLineArgs.new args
-      info "clargs: #{clargs}"
+      options = PVN::Subcommands::Pct::OptionSet.new 
+      options.process args
+
+      return show_help if options.help 
+
+      info "options: #{options}"
+
+      path    = options.paths[0] || "."
+      cmdargs = Hash.new
+
+      cmdargs[:path] = path
+
+      if options.revision && !options.revision.empty?
+        compare_by_revisions options
+      else
+        compare_local_to_base options
+      end
+    end
+
+    ### $$$ this belongs in Revision
+    def get_from_to_revisions rev
+      if rev.kind_of? Array
+        if rev.size == 1
+          if md = Regexp.new('(.+):(.+)').match(rev[0])
+            return [ md[1], md[2] ]
+          else
+            return [ (rev[0].to_i - 1).to_s, rev[0] ]
+          end
+        else
+          return [ rev[0], rev[1] ]
+        end
+      else
+        info "rev: #{rev}".bold.white.on_red
+      end
+    end
+
+    def compare_by_revisions options
+      # what was modified between the revisions?
+
+      path = options.paths[0] || "."
+
+      elmt = PVN::IO::Element.new :local => path || '.'
+      modified = elmt.find_modified_entries options.revision
+
+      modnames = modified.collect { |m| m.name }
+
+      info "modnames: #{modnames.inspect}".yellow
+
+      rev = options.revision
+
+      info "rev: #{rev}; #{rev.class}".blue.on_yellow
+      info "rev: #{rev.inspect}; #{rev.class}".blue.on_yellow
+
+      fromrev, torev = get_from_to_revisions options.revision
+
+      info "fromrev: #{fromrev}; torev: #{torev}".black.on_green
+      info "fromrev: #{fromrev.class}; torev: #{torev.class}".black.on_green
+
+      total = DiffCount.new
+
+      reporoot = elmt.repo_root
+
+      modnames.each do |mod|
+        info "mod: #{mod}"
+
+        fullpath = reporoot + mod
+        
+        from_count = get_line_count fullpath, fromrev
+        info "from_count: #{from_count}".red
+
+        to_count = get_line_count fullpath, torev
+        info "to_count: #{to_count}".red
+
+        dc = DiffCount.new from_count, to_count
+        total << dc
+        dc.print mod
+      end
+
+      total.print 'total'
+    end
+
+    def get_line_count path, revision
+      cmdargs = SVNx::CatCommandArgs.new :path => path, :revision => revision
+      catcmd = SVNx::CatCommand.new cmdargs
+      info "catcmd: #{catcmd}"
+      
+      count = catcmd.execute.size
+      info "count: #{count}"
+
+      count
+    end
+
+    def compare_local_to_base options
+      # do we support multiple paths?
+      path = options.paths[0] || '.'
+
+      elmt = PVN::IO::Element.new :local => path || '.'
+      modified = elmt.find_modified_files
+
+      total = DiffCount.new    
+
+      modified.each do |entry|
+        catcmd = SVNx::CatCommand.new entry.path
+        info "catcmd: #{catcmd}"
+          
+        svn_count = catcmd.execute.size
+        info "svn_count: #{svn_count}"
+        
+        local_count = Pathname.new(entry.path).readlines.size
+        info "local_count: #{local_count}"
+
+        dc = DiffCount.new svn_count, local_count
+        total << dc
+        dc.print entry.path
+      end
+
+      total.print 'total'
+    end
+  end
+end
+
+__END__
 
       elmt = PVN::IO::Element.new :local => clargs.path || '.'
       info "elmt: #{elmt}".red

data/lib/pvn/subcommands/pct/options.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/subcommands/revision/multiple_revisions_option'
+require 'pvn/subcommands/base/options'
+
+module PVN::Subcommands::Pct
+  class OptionSet < PVN::Subcommands::Base::OptionSet
+    has_option :revision, PVN::MultipleRevisionsRegexpOption
+    has_option :help,     PVN::Subcommands::Base::HelpOption
+    
+    def paths
+      unprocessed
+    end
+  end
+end

data/lib/pvn/subcommands/revision/multiple_revisions_option.rb

@@ -6,13 +6,7 @@ require 'pvn/subcommands/revision/revision_regexp_option'
 module PVN
   # A revision option with multiple values.
   class MultipleRevisionsRegexpOption < RevisionRegexpOption
-    REVISION_DESCRIPTION = [ "revision to apply.",
-                             "ARG can be relative, of the form:",
-                             "    +N : N revisions from the BASE",
-                             "    -N : N revisions from the HEAD,",
-                             "         when -1 is the previous revision" ,
-                             "Multiple revisions can be specified." ,
-                           ]
+    REVISION_DESCRIPTION = RevisionRegexpOption::REVISION_DESCRIPTION + [ "Multiple revisions can be specified." ]
     
     def set_value val
       currval = value

data/lib/pvn/subcommands/revision/revision_option.rb

@@ -72,5 +72,8 @@ module PVN
       revval   = reventry.value.to_s
       revval
     end
+
+    def entry
+    end
   end
 end

data/lib/pvn/subcommands/revision/revision_regexp_option.rb

@@ -6,7 +6,7 @@ require 'pvn/subcommands/revision/revision_option'
 module PVN
   # A revision that is also set by -N and +N.
   class RevisionRegexpOption < PVN::RevisionOption
-    TAG_RE = Regexp.new('^(?:([\-\+]\d+)|(-r(.+)))$')
+    TAG_RE = Regexp.new '^(?:([\-\+]\d+)|(-r(.+)))$'
 
     REVISION_DESCRIPTION = [ "revision to apply.",
                              "ARG can be relative, of the form:",
@@ -16,20 +16,15 @@ module PVN
                            ]
     
     def initialize revargs = Hash.new
-      # info "revargs: #{revargs}"
       revargs[:regexp] = TAG_RE
       super
     end
 
     def resolve_value optset, unprocessed
       val = value
-      # info "val: #{val}"
-
-      md = TAG_RE.match val
-      # info "md: #{md.inspect}"
+      md  = TAG_RE.match val
 
       if md && md[3]
-        # info "md[3]: #{md[3]}"
         @value = md[3]
       end
       

data/lib/pvn.rb

@@ -4,5 +4,5 @@ $:.unshift(fdirname) unless
   $:.include?(fdirname) || $:.include?(File.expand_path(fdirname))
 
 module PVN
-  VERSION = '0.0.1'
+  VERSION = '0.0.4'
 end

data/lib/svnx/cat/command.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/command'
+
+module SVNx
+  class CatCommandLine < CommandLine
+    def initialize args = Array.new
+      super "cat", args.to_a
+    end
+
+    def uses_xml?
+      false
+    end
+  end
+
+  class CatCommandArgs < CommandArgs
+    attr_reader :revision
+    attr_reader :use_cache
+
+    def initialize args = Hash.new
+      @use_cache = args[:use_cache].nil? || args[:use_cache]
+      @revision = args[:revision]
+      super
+    end
+
+    def to_a
+      ary = Array.new
+      if @revision
+        @revision.each do |rev|
+          ary << "-r#{rev}"
+        end
+      end
+    
+      if @path
+        ary << @path
+      end
+    end
+  end  
+
+  class CatCommand < Command
+    def command_line
+      CatCommandLine.new @args
+    end
+  end
+end

data/lib/svnx/command.rb

@@ -11,22 +11,35 @@ module SVNx
   class CommandLine < System::CommandLine
     def initialize subcmd, args = Array.new
       info "args: #{args}"
-      cmdargs = [ 'svn', subcmd, '--xml' ].concat args
+      cmdargs = [ 'svn', subcmd ]
+      cmdargs << '--xml' if uses_xml?
+      cmdargs.concat args
       info "cmdargs: #{cmdargs}"
       super cmdargs
     end
+
+    def uses_xml?
+      true
+    end
   end
 
   class CachingCommandLine < System::CachingCommandLine
     def initialize subcmd, args = Array.new
       info "args: #{args}"
-      cmdargs = [ 'svn', subcmd, '--xml' ].concat args
+      cmdargs << '--xml' if uses_xml?
+      cmdargs.concat args
       info "cmdargs: #{cmdargs}"
       super cmdargs
     end
+
+    def uses_xml?
+      true
+    end
   end
 
   class CommandArgs
+    include Loggable
+    
     attr_accessor :path
 
     def initialize args = Hash.new

data/lib/svnx/entries.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rexml/document'
+
+module SVNx
+  # this is a parse/process on-demand list of entries, acting like an
+  # Enumerable.
+
+  class Entries
+    include Loggable, Enumerable
+
+    attr_reader :size
+
+    def initialize args = Hash.new
+      # it's a hash, but indexed with integers.
+      @entries = Hash.new
+
+      if xmllines = args[:xmllines]
+        # this is preferred
+
+        if xmllines.kind_of? Array
+          xmllines = xmllines.join ''
+        end
+
+        doc = REXML::Document.new xmllines
+
+        @elements = get_elements doc
+        @size = @elements.size
+      elsif xmlentries = args[:xmlentries]
+        raise "argument xmlentries is no longer supported"
+      end
+    end
+
+    def get_elements doc
+    end
+
+    def create_entry xmlelement
+    end
+
+    def [] idx
+      @entries[idx] ||= create_entry(@elements[idx + 1])
+    end
+
+    def each(&blk)
+      # all elements must be processed before this can happen:
+      if @elements
+        # a little confusing here: REXML does each_with_index with idx
+        # zero-based, but elements[0] is invalid.
+        @elements.each_with_index do |element, idx|
+          @entries[idx] ||= create_entry(element)
+        end
+
+        @elements = nil
+      end
+
+      @entries.keys.sort.collect { |idx| @entries[idx] }.each(&blk)
+    end
+  end
+end

data/lib/svnx/entry.rb

@@ -9,6 +9,30 @@ module SVNx
   class Entry
     include Loggable
 
+    def initialize args = Hash.new
+      if xmllines = args[:xmllines]
+        if xmllines.kind_of? Array
+          xmllines = xmllines.join ''
+        end
+
+        doc = REXML::Document.new xmllines
+
+        set_from_xml doc
+      elsif elmt = args[:xmlelement]
+        set_from_element elmt
+      else
+        raise "must be initialized with xmllines or xmlelement"
+      end
+    end
+
+    def set_from_xml xmldoc
+      raise "must be implemented"
+    end
+
+    def set_from_element elmt
+      raise "must be implemented"
+    end
+
     def get_attribute xmlelement, attrname
       xmlelement.attributes[attrname]
     end

data/lib/svnx/info/command.rb

@@ -6,16 +6,23 @@ require 'svnx/command'
 module SVNx
   class InfoCommandLine < CommandLine
     def initialize args = Array.new
-      super "info", args
+      super "info", args.to_a
     end
   end
 
   class InfoCommandArgs < CommandArgs
+    def to_a
+      ary = Array.new
+      if @path
+        ary << @path
+      end
+      ary
+    end
   end  
 
   class InfoCommand < Command
     def command_line
-      InfoCommandLine.new @cmdargs
+      InfoCommandLine.new @args
     end
   end
 end

data/lib/svnx/info/entries.rb

@@ -1,27 +1,19 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-# require 'svnx/info/entry'
-
-module SVNx; module Info; end; end
+require 'svnx/info/entry'
+require 'svnx/entries'
 
 module SVNx::Info
-  class Entries < Array
+  class Entries < SVNx::Entries
     include Loggable
 
-    def initialize args = Hash.new
-      if xmllines = args[:xmllines]
-        doc = REXML::Document.new xmllines
+    def get_elements doc
+      doc.elements['info'].elements
+    end
 
-        # xxx
-        doc.elements.each('xxx') do |entryelement|
-          self << Entry.new(:xmlelement => entryelement)
-        end
-      elsif xml = args[:xml]
-        xml.xmlentries.each do |xmlentry|
-          self << Entry.new(:xmlentry => xmlentry)
-        end          
-      end
+    def create_entry xmlelement
+      Entry.new :xmlelement => xmlelement
     end
   end
 end

data/lib/svnx/info/entry.rb

@@ -11,24 +11,25 @@ module SVNx::Info
     attr_reader :root
     attr_reader :kind
     attr_reader :path
-    
-    def initialize args = Hash.new
-      if xmllines = args[:xmllines]
-        doc = REXML::Document.new xmllines
-        entry = doc.elements['info/entry']
 
-        set_attr_var entry, 'kind'
-        set_attr_var entry, 'path'
-        set_elmt_var entry, 'url'
-        
-        repo = entry.elements['repository']
-        # set_elmt_var doc, 'info/entry/repository/root'
-        set_elmt_var repo, 'root'
-      else
-        raise "must be initialized with xmllines"
-      end
+    def set_from_xml xmldoc
+      entry = xmldoc.elements['info/entry']
 
-      info "self: #{self.inspect}"
+      set_attr_var entry, 'kind'
+      set_attr_var entry, 'path'
+      set_elmt_var entry, 'url'
+
+      repo = entry.elements['repository']
+      set_elmt_var repo, 'root'
+    end
+
+    def set_from_element elmt
+      set_attr_var elmt, 'kind'
+      set_attr_var elmt, 'path'
+      set_elmt_var elmt, 'url'
+      
+      repo = elmt.elements['repository']
+      set_elmt_var repo, 'root'
     end
   end
 end

data/lib/svnx/log/command.rb

@@ -11,10 +11,6 @@ require 'svnx/command'
 module SVNx
   CACHE_DIR = "/tmp/cache_dir_for_log_command"
 
-  class LogOptions
-    attr_reader :revision
-  end    
-
   class LogCommandLine < CommandLine
     def initialize args = Array.new
       info "args: #{args}"

data/lib/svnx/log/entries.rb

@@ -1,57 +1,18 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'svnx/entries'
 require 'svnx/log/entry'
-require 'rexml/document'
 
 module SVNx::Log
-  class Entries
-    include Loggable, Enumerable
+  class Entries < SVNx::Entries
 
-    def initialize args = Hash.new
-      @entries = Hash.new
-
-      if xmllines = args[:xmllines]
-        # this is preferred
-
-        if xmllines.kind_of? Array
-          xmllines = xmllines.join ''
-        end
-
-        doc = REXML::Document.new xmllines
-
-        @logelements = doc.elements['log'].elements
-        @size = @logelements.size
-      elsif xmlentries = args[:xmlentries]
-        # this is legacy:
-
-        xmlentries.each do |xmlentry|
-          @entries[@entries.size] = Entry.new(:xmlentry => xmlentry)
-        end
-      end
+    def get_elements doc
+      doc.elements['log'].elements
     end
 
-    def [] idx
-      @entries[idx] ||= Entry.new(:xmlelement => @logelements[idx + 1])
-    end
-
-    def size
-      @size
-    end
-
-    def each(&blk)
-      # all elements must be processed before this can happen:
-      if @logelements
-        @logelements.each_with_index do |logelement, idx|
-          # info "logelement: #{logelement}"
-          # info "idx: #{idx}"
-          @entries[idx] ||= Entry.new(:xmlelement => logelement)
-        end
-
-        @logelements = nil
-      end
-
-      @entries.keys.sort.collect { |idx| @entries[idx] }.each(&blk)
+    def create_entry xmlelement
+      Entry.new :xmlelement => xmlelement
     end
   end
 end

data/lib/svnx/log/entry.rb

@@ -9,31 +9,22 @@ module SVNx::Log
   class Entry < SVNx::Entry
 
     attr_reader :revision, :author, :date, :paths, :msg
-    
-    def initialize args = Hash.new
-      # this is log/logentry from "svn log --xml"
-      if xmlelement = args[:xmlelement]
-        set_attr_var xmlelement, 'revision'
-
-        %w{ author date msg }.each do |field|
-          set_elmt_var xmlelement, field
-        end
-        
-        @paths = Array.new
-
-        xmlelement.elements.each('paths/path') do |pe|
-          kind = get_attribute pe, 'kind'
-          action = get_attribute pe, 'action'
-          name = pe.text
-
-          @paths << LogEntryPath.new(:kind => kind, :action => action, :name => name)
-        end
-      else
-        @revision = args[:revision]
-        @author = args[:author]
-        @date = args[:date]
-        @paths = args[:paths]
-        @message = args[:message]
+
+    def set_from_element elmt
+      set_attr_var elmt, 'revision'
+
+      %w{ author date msg }.each do |field|
+        set_elmt_var elmt, field
+      end
+      
+      @paths = Array.new
+
+      elmt.elements.each('paths/path') do |pe|
+        kind = get_attribute pe, 'kind'
+        action = get_attribute pe, 'action'
+        name = pe.text
+
+        @paths << LogEntryPath.new(:kind => kind, :action => action, :name => name)
       end
     end
 
@@ -50,5 +41,9 @@ module SVNx::Log
       @action = args[:action]
       @name = args[:name]
     end
+
+    def to_s
+      @name
+    end
   end
 end

data/lib/svnx/status/command.rb

@@ -6,16 +6,23 @@ require 'svnx/command'
 module SVNx
   class StatusCommandLine < CommandLine
     def initialize args = Array.new
-      super "status", args
+      super "status", args.to_a
     end
   end
 
   class StatusCommandArgs < CommandArgs
+    def to_a
+      ary = Array.new
+      if @path
+        ary << @path
+      end
+      ary
+    end
   end  
 
   class StatusCommand < Command
     def command_line
-      StatusCommandLine.new @cmdargs
+      StatusCommandLine.new @args
     end
   end
 end

data/lib/svnx/status/entries.rb

@@ -2,21 +2,16 @@
 # -*- ruby -*-
 
 require 'svnx/status/entry'
+require 'svnx/entries'
 
 module SVNx::Status
-  class Entries < Array
-    include Loggable
-
-    def initialize args = Hash.new
-      super()
-
-      raise "not implemented"
+  class Entries < SVNx::Entries
+    def get_elements doc
+      doc.elements['status'].elements['target'].elements
+    end
 
-      if xmlentries = args[:xml]
-        xmlentries.each do |xmlentry|
-          self << Entry.new(:xml => xmlentry)
-        end
-      end
+    def create_entry xmlelement
+      Entry.new :xmlelement => xmlelement
     end
   end
 end

data/lib/svnx/status/entry.rb

@@ -10,24 +10,27 @@ module SVNx::Status
 
     attr_reader :status
     attr_reader :path
-    
-    def initialize args = Hash.new
-      if xmllines = args[:xmllines]
-        doc    = REXML::Document.new xmllines
-        stelmt = doc.elements['status']
-        tgt    = stelmt.elements['target']
 
-        set_attr_var tgt, 'path'
-        
-        if entry = tgt.elements['entry']
-          wcstatus = entry.elements['wc-status']
-          @status = wcstatus.attributes['item']
-        else
-          @status = "unchanged"
-        end
-      else
-        raise "must be initialized with xmllines"
-      end
+    def set_from_xml xmldoc
+      stelmt = xmldoc.elements['status']
+      tgt    = stelmt.elements['target']
+
+      set_attr_var tgt, 'path'      
+      @status = if entry = tgt.elements['entry']
+                  wcstatus = entry.elements['wc-status']
+                  wcstatus.attributes['item']
+                else
+                  "unchanged"
+                end
+    end
+
+    def set_from_element elmt
+      set_attr_var elmt, 'path'
+      @status = if wcstatus = elmt.elements['wc-status']
+                  wcstatus.attributes['item']
+                else
+                  "unchanged"
+                end
     end
   end
 end

data/test/integration/svnx/log/test.rb

@@ -24,8 +24,8 @@ module SVNx::Log
     end
     
     def test_entry_from_command
-      lcargs = LogCommandArgs.new :limit => 2, :verbose => false, :use_cache => false
-      lc = LogCommand.new lcargs
+      lcargs = SVNx::LogCommandArgs.new :limit => 2, :verbose => false, :use_cache => false
+      lc = SVNx::LogCommand.new lcargs
       
       lc.execute
       output = lc.output

data/test/unit/svnx/info/entries_test.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/info/tc'
+require 'svnx/info/entries'
+
+module SVNx::Info
+  class EntriesTestCase < SVNx::Info::TestCase
+    
+    def test_create_from_xml
+      entries = Entries.new :xmllines => get_test_lines_two_entries
+      info "entries: #{entries}"
+
+      assert_equal 2, entries.size
+
+      exproot = 'file:///home/jpace/Programs/Subversion/Repositories/wiquery'
+
+      assert_entry_equals entries[0], :path => 'pom.xml',   :kind => 'file', :url => exproot + '/trunk/pom.xml',   :root => exproot
+      assert_entry_equals entries[1], :path => 'Orig.java', :kind => 'file', :url => exproot + '/trunk/Orig.java', :root => exproot
+    end
+  end
+end

data/test/unit/svnx/info/entry_test.rb

@@ -7,36 +7,8 @@ require 'svnx/info/entry'
 module SVNx::Info
   class EntryTestCase < SVNx::Info::TestCase
     include Loggable
-    
     def test_entry_from_xml
-      # svn info --xml ./wiquery-core/pom.xml
-      xml = Array.new
-      xml << '<?xml version="1.0"?>'
-      xml << '<info>'
-      xml << '<entry'
-      xml << '   kind="file"'
-      xml << '   path="wiquery-core/pom.xml"'
-      xml << '   revision="1950">'
-      xml << '<url>file:///home/jpace/Programs/Subversion/Repositories/wiquery/trunk/wiquery-core/pom.xml</url>'
-      xml << '<repository>'
-      xml << '<root>file:///home/jpace/Programs/Subversion/Repositories/wiquery</root>'
-      xml << '<uuid>9d44104b-4b85-4781-9eca-83ed02b512a0</uuid>'
-      xml << '</repository>'
-      xml << '<wc-info>'
-      xml << '<schedule>normal</schedule>'
-      xml << '<depth>infinity</depth>'
-      xml << '<text-updated>2011-11-28T11:26:07.772551Z</text-updated>'
-      xml << '<checksum>3b2a51d21a9517a4d3dc5865c4b56db9</checksum>'
-      xml << '</wc-info>'
-      xml << '<commit'
-      xml << '   revision="1907">'
-      xml << '<author>hielke.hoeve@gmail.com</author>'
-      xml << '<date>2011-11-14T10:50:38.389281Z</date>'
-      xml << '</commit>'
-      xml << '</entry>'
-      xml << '</info>'
-
-      xmllines = xml.collect { |line| line + "\n" }
+      xmllines = get_test_lines_one_entry
       
       expdata = {
         :url  => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery/trunk/wiquery-core/pom.xml',
@@ -45,7 +17,7 @@ module SVNx::Info
         :root => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery'
       }
 
-      entry = Entry.new :xmllines => xmllines.join('')
+      entry = Entry.new :xmllines => xmllines
       assert_entry_equals entry, expdata
     end
   end

data/test/unit/svnx/log/entries_test.rb

@@ -13,19 +13,22 @@ module SVNx::Log
       assert entry.message
       assert entry.author
     end
-    
-    def test_create_from_xml
+
+    def assert_log_entry_1947 entry
       expdata = '1947', 'reiern70', '2011-11-14T12:24:45.757124Z', 'added a convenience method to set the range'
       expdata << { :kind => 'file', 
         :action => 'M', 
         :name => '/trunk/wiquery-jquery-ui/src/test/java/org/odlabs/wiquery/ui/slider/SliderTestCase.java'
       }
       
+      assert_log_entry_equals entry, expdata
+    end
+    
+    def test_create_from_xml
       entries = Entries.new :xmllines => get_test_lines_limit_15
-
-      assert_log_entry_equals entries[2], expdata
+      assert_log_entry_1947 entries[2]
     end
-
+    
     def test_no_author_field
       entries = Entries.new :xmllines => get_test_lines_no_author
       nentries = entries.size
@@ -69,5 +72,17 @@ module SVNx::Log
       assert_nil real_entries[16]
       assert_nil real_entries[18]
     end
+
+    def test_each
+      idx = 0
+
+      entries = Entries.new :xmllines => get_test_lines_limit_15
+      entries.each do |entry|
+        if idx == 2
+          assert_log_entry_1947 entry
+        end
+        idx += 1
+      end
+    end
   end
 end

data/test/unit/svnx/status/entries_test.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/status/tc'
+require 'svnx/status/entries'
+
+module SVNx::Status
+  class EntriesTestCase < SVNx::Status::TestCase
+    
+    def test_create_from_xml
+      entries = Entries.new :xmllines => get_test_lines_all
+
+      assert_equal 4, entries.size
+      assert_status_entry_equals 'added',   'Orig.java', entries[0]
+      assert_status_entry_equals 'deleted', 'LICENSE', entries[1]
+      assert_status_entry_equals 'modified', 'pom.xml', entries[2]
+      assert_status_entry_equals 'modified', 'wiquery-core/src/main/java/org/odlabs/wiquery/core/effects/EffectBehavior.java', entries[3]
+    end
+  end
+end

data/test/unit/svnx/status/entry_test.rb

@@ -30,10 +30,8 @@ module SVNx::Status
       xml << "</target>\n"
       xml << "</status>\n"
 
-      expdata = { :path => 'LICENSE', :status => 'deleted' }
-
       entry = Entry.new :xmllines => xml.join('')
-      assert_entry_equals entry, expdata
+      assert_status_entry_equals 'deleted', 'LICENSE', entry
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pvn
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-01 00:00:00 -04:00
+date: 2012-09-04 00:00:00 -04:00
 default_executable: pvn
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,10 +61,12 @@ files:
 - lib/system/command.rb
 - lib/system/cachecmd.rb
 - lib/system/cmdexec.rb
+- lib/svnx/cat/command.rb
 - lib/svnx/status/command.rb
 - lib/svnx/status/entries.rb
 - lib/svnx/status/entry.rb
 - lib/svnx/command.rb
+- lib/svnx/entries.rb
 - lib/svnx/info/command.rb
 - lib/svnx/info/entries.rb
 - lib/svnx/info/entry.rb
@@ -76,6 +78,7 @@ files:
 - lib/pvn/subcommands/base/clargs.rb
 - lib/pvn/subcommands/base/command.rb
 - lib/pvn/subcommands/base/doc.rb
+- lib/pvn/subcommands/pct/options.rb
 - lib/pvn/subcommands/pct/clargs.rb
 - lib/pvn/subcommands/pct/command.rb
 - lib/pvn/subcommands/log/options.rb
@@ -125,7 +128,9 @@ files:
 - test/unit/synoption/option_test.rb
 - test/unit/system/command/caching_test.rb
 - test/unit/system/command/line_test.rb
+- test/unit/svnx/status/entries_test.rb
 - test/unit/svnx/status/entry_test.rb
+- test/unit/svnx/info/entries_test.rb
 - test/unit/svnx/info/entry_test.rb
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb
@@ -182,7 +187,9 @@ test_files:
 - test/unit/synoption/option_test.rb
 - test/unit/system/command/caching_test.rb
 - test/unit/system/command/line_test.rb
+- test/unit/svnx/status/entries_test.rb
 - test/unit/svnx/status/entry_test.rb
+- test/unit/svnx/info/entries_test.rb
 - test/unit/svnx/info/entry_test.rb
 - test/unit/svnx/log/entries_test.rb
 - test/unit/svnx/log/entry_test.rb