pvn 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8783d050b1dd5c8455f7207f9a1933b00ac080b3
-  data.tar.gz: 74df918bdd23b67089dddad91d5736162e72e49f
+  metadata.gz: 6b0945592450e9be1066e1c2a6e5b1cabd6e4791
+  data.tar.gz: 0634a3af015e06243c293815d5e9f15c838cabfc
 SHA512:
-  metadata.gz: a84f65d9a725d0f1d45127836d079f2e6bd7d359664f66f828f6c051ca6ed7092757cdfd5654a48eb96a5a0e90c65fdeae3f23bb488c73b83b0044678301457a
-  data.tar.gz: c3520d5756c9d08280cf979ec9fbafcda60ca4f366973a9132c10cff1da5a956d4de78a79a1ef37c56558c02a0a5672cc2d7800250ea53a8a1764534a13f2f5f
+  metadata.gz: d7d422306e8d5e8098954ffc962d43bb962c188069ec292d23a9bfbbd9859968ab9e98fa4b8bd064b666c88f9b92de8d2046a7ca0b0ba9fce8e3384102d8fade
+  data.tar.gz: d3a8cb1fb34373095fb1cde9bd3cb13c5872fd525805cf5d30a929d82d121276cb61c04210d15ddbd4f6f2fc1e185a537bc596c3a4847a6465efc8d4ae516130

data/lib/pvn.rb

@@ -1,3 +1,3 @@
 module PVN
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/pvn/diff/change.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/action'
+require 'svnx/base/action'
 require 'logue/loggable'
 
 module PVN; module Diff; end; end
@@ -16,7 +16,7 @@ module PVN::Diff
     
     def initialize revision, action
       @revision = to_revision(revision)
-      @action = action.kind_of?(SVNx::Action) || SVNx::Action.new(action)
+      @action = action.kind_of?(SVNx::Action) ? action : SVNx::Action.new(action)
     end
 
     def to_revision rev

data/lib/pvn/diff/changed_paths.rb

@@ -4,7 +4,7 @@
 require 'pvn/diff/log_paths'
 require 'pvn/diff/status_paths'
 require 'pvn/diff/local_path'
-require 'pvn/revision/range'
+require 'svnx/revision/range'
 require 'logue/loggable'
 
 module PVN::Diff
@@ -17,14 +17,14 @@ module PVN::Diff
     end
 
     def diff_revision_to_working_copy revision, whitespace
-      # fromrev = revision.from.value
-
-      info "revision: #{revision}".color(:cyan)
-      rev = PVN::Revision::Range.new revision.to_s, 'HEAD'
-      info "rev: #{rev}".color(:cyan)
+      info "revision: #{revision}"
+      rev = SVNx::Revision::Range.new revision.to_s, 'HEAD'
+      info "rev: #{rev}"
 
       logpaths = LogPaths.new rev, @paths
+      info "logpaths: #{logpaths}"
       name_to_logpath = logpaths.to_map
+      info "name_to_logpath: #{name_to_logpath}"
 
       statuspaths = StatusPaths.new revision, @paths
       name_to_statuspath = statuspaths.to_map
@@ -43,13 +43,9 @@ module PVN::Diff
 
         ### $$$ silliness because I don't have Diff::Name integrated:
         logname = '/' + name
-        
         logpath = name_to_logpath[logname]
-        info "logpaths: #{logpaths}"
-
         stpath = name_to_statuspath[name]
-        info "stpath: #{stpath}"
-
+        
         # frrev = nil
 
         if logpath

data/lib/pvn/diff/local_path.rb

@@ -12,17 +12,26 @@ module PVN::Diff
       @elmt = PVN::IO::Element.new :local => @entry.path
       name = entry.path
       action = SVNx::Action.new @entry.status
-      revision = action.added? ? 0 : @elmt.get_info.revision
+      info "action: #{action}".color('#4addaf')
+      revision = if action.added?
+                   0
+                 elsif action.unversioned?
+                   nil
+                 else
+                   @elmt.get_info.revision
+                 end
       super name, revision, action, nil
     end
 
     def show_diff whitespace = nil
-      case @entry.status
-      when 'modified'
+      info "@entry.status: #{@entry.status}".color('#22c3c3')
+      # crappy programming here. this should be pushed into PVN::Element.
+      st = @entry.status
+      if st.modified?
         show_as_modified whitespace
-      when 'deleted'
+      elsif st.deleted?
         show_as_deleted
-      when 'added'
+      elsif st.added?
         show_as_added
       end
     end

data/lib/pvn/diff/log_path.rb

@@ -3,6 +3,7 @@
 
 require 'pvn/io/element'
 require 'pvn/diff/path'
+require 'svnx/revision/argument'
 
 module PVN::Diff
   # this is a path wrapping a log entry; it could also be a RemotePath or a
@@ -50,7 +51,7 @@ module PVN::Diff
       displaypath = get_display_path
 
       rev_change = changes.detect do |chg| 
-        revarg = PVN::Revision::Argument.new chg.revision
+        revarg = SVNx::Revision::Argument.create chg.revision
         revarg > revision.from
       end
 
@@ -73,6 +74,8 @@ module PVN::Diff
     def get_diff_revision change, revision
       # find the first revision where logpath was in svn, no earlier than the
       # revision.from value
+      info "change: #{change.class}"
+      info "change.action: #{change.action}"
       if change.action.added?
         change.revision.to_i
       elsif change.revision.to_i >= revision.from.value
@@ -126,8 +129,8 @@ module PVN::Diff
 
     def revisions_later_than revision
       changes.select do |chg|
-        x = PVN::Revision::Argument.new chg.revision
-        y = PVN::Revision::Argument.new revision
+        x = SVNx::Revision::Argument.create chg.revision
+        y = SVNx::Revision::Argument.create revision
         x > y
       end
     end

data/lib/pvn/diff/log_paths.rb

@@ -26,12 +26,15 @@ module PVN::Diff
     end
 
     def add_path logentry, logentrypath, pathinfo
+      info "logentry: #{logentry}".color('#fa3d3d')
+
       name = logentrypath.name
       revision = logentry.revision
       action = logentrypath.action
+      info "action: #{action}"
       url = pathinfo.url
 
-      info "action: #{action}"
+      info "action: #{action}".color('#fa3d3d')
       info "url: #{url}"
       
       path = @elements.detect { |element| element.name == name }

data/lib/pvn/diff/repository_differ.rb

@@ -32,8 +32,9 @@ module PVN::Diff
       # (argument); this only handling revision numbers (not dates) for now.
 
       rev = change ? [ change.to_i - 1, change.to_i ] : options.revision
-      info "rev: #{rev}"
-      @revision = PVN::Revision::Range.new(*rev)
+      from, to = rev[0], rev[1]
+
+      @revision = SVNx::Revision::Range.new from, to
       info "@revision: #{@revision}"
 
       # this indicates that this should be split into two classes:

data/lib/pvn/diff/status_paths.rb

@@ -20,9 +20,13 @@ module PVN::Diff
 
     def add elmt, url
       status = elmt.find_files_by_status
+      info "status: #{status}".color('#33facc')
       status.entries.each do |entry|
+        info "entry: #{entry}".color('#33facc')
         # we don't care about unversioned entries for diffing.
-        next if entry.status == 'unversioned'
+        info "entry.status: #{entry.status}".color('#33facc')
+        info "entry.status.class: #{entry.status.class}".color('#33facc')
+        next if entry.status.unversioned?
         
         # svn log prepends /; svn status does not
         # name = '/' + entry.path
@@ -49,9 +53,10 @@ module PVN::Diff
       #     else
       #         it is compared to BASE
 
-      info "status_entry.status: #{status_entry.status}"
+      info "status_entry.status: #{status_entry.status}".color('#2c2cdd')
 
       action = SVNx::Action.new status_entry.status
+      info "action: #{action}".color('#2c2cdd')
       case
       when action.added?
         info "added"

data/lib/pvn/io/element.rb

@@ -5,9 +5,12 @@ require 'rubygems'
 require 'logue/loggable'
 require 'svnx/log/entries'
 require 'svnx/status/entries'
+require 'svnx/status/command'
 require 'svnx/info/entries'
+require 'svnx/info/command'
+require 'svnx/cat/command'
 require 'pvn/io/fselement'
-require 'svnx/exec'
+require 'svnx/io/element'
 
 module PVN; module IO; end; end
 
@@ -33,6 +36,9 @@ module PVN::IO
       @path  = args[:path]
       
       info "local: #{@local.inspect}"
+
+      @svnelement = SVNx::IO::Element.new args
+      info "@svnelement: #{@svnelement}"
     end
 
     def exist?
@@ -40,28 +46,17 @@ module PVN::IO
     end
 
     def directory?
-      if exist?
-        @local.directory?
-      else
-        # look it up with svn info
-        false
-      end
+      @svnelement.directory?
     end
 
     def file?
-      if exist?
-        @local.file?
-      else
-        raise "need this"
-      end
+      @svnelement.file?
     end
 
     def get_info revision = nil
       usepath = @local || @path
-      output = SVNx::Exec.new.info usepath, revision
-      
-      infentries = SVNx::Info::Entries.new :xmllines => output
-      infentries[0]
+      inf = SVNx::InfoExec.new path: usepath, revision: revision
+      inf.entry
     end
 
     def repo_root
@@ -80,29 +75,14 @@ module PVN::IO
       end
     end
 
-    # returns a set of entries modified over the given revision
-    def find_modified_entries revision
-      svninfo = get_info
-
-      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:
-      xmllines = SVNx::Exec.new.log @local, revision, nil, true, false
-      entries = SVNx::Log::Entries.new :xmllines => xmllines
-      
-      modified = Set.new
-
-      entries.each do |entry|
-        entry.paths.each do |epath|
-          if epath.action == 'M' && epath.name.start_with?(filter)
-            modified << epath
-          end
-        end
-      end
+    def status_to_symbol status
+      # add a ? if not there already
+      (status.to_s.sub(%r{\??$}, '?')).to_sym
+    end
 
-      modified
+    # returns a set of entries matching status for the given revision
+    def find_entries revision, status
+      @svnelement.find_in_log revision, status
     end
 
     def cat revision, use_cache = false
@@ -116,29 +96,18 @@ module PVN::IO
         path << '@' << revision.to_s
       end
       info "path: #{path}"
-      SVNx::Exec.new.cat path, nil, use_cache
+      catexec = SVNx::CatExec.new path: path, revision: nil, use_cache: use_cache
+      catexec.output
     end
 
-    # returns a set of local files that are in the given status
+    # returns a set of local files that have the given status/action
     def find_files_by_status status = nil
-      xmllines = SVNx::Exec.new.status @local, false
-      entries = SVNx::Status::Entries.new :xmllines => xmllines
-
-      entries.select do |entry|
-        status.nil? || 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'
+      @svnelement.find_by_status status
     end
 
     # returns log entries
     def logentries revision
-      # use_cache should be conditional on revision:
-      xmllines = SVNx::Exec.new.log @local, revision.to_s, nil, true, false
-      SVNx::Log::Entries.new :xmllines => xmllines
+      @svnelement.log_entries :revision => revision
     end
     
     def <=> other

data/lib/pvn/log/command.rb

@@ -5,8 +5,7 @@ require 'pvn/io/element'
 require 'pvn/log/formatter/entries_formatter'
 require 'pvn/log/options'
 require 'pvn/command/command'
-require 'pvn/log/entries'
-require 'pvn/log/user_entries'
+require 'svnx/log/command'
 
 module PVN::Log
   class Command < PVN::Command::Command
@@ -41,11 +40,39 @@ module PVN::Log
       info "paths: #{paths}"
 
       allentries = Array.new
-      
-      entcls = options.user ? UserEntries : Entries
 
-      paths.each do |path|
-        allentries.concat entcls.new(path, options).entries
+      args = { revision: options.revision, limit: options.limit, files: options.files, use_cache: false }
+
+      if options.user
+        limit = args[:limit]
+        args[:limit] = nil
+        args[:user] = options.user
+
+        paths.each do |path|
+          args[:path] = path
+
+          exec = SVNx::LogExec.new args
+          # SVNx::Entries => Array entries:
+
+          userentries = Hash.new
+          exec.entries.entries.each do |entry|
+            break if userentries.size >= limit
+            if entry.author == args[:user]
+              userentries[userentries.size] = entry
+            end
+          end
+          
+          raise "ERROR: no matching log entries for '#{args[:user]}'" if userentries.empty?
+
+          allentries.concat userentries.values
+        end
+      else
+        paths.each do |path|
+          args[:path] = path
+          exec = SVNx::LogExec.new args
+          # SVNx::Entries => Array entries:
+          allentries.concat exec.entries.entries
+        end
       end
 
       # we can show relative revisions for a single path, without filtering by
@@ -58,7 +85,7 @@ module PVN::Log
       from_tail = show_relative && !options.limit
 
       ef = PVN::Log::EntriesFormatter.new options.color, allentries, from_head, from_tail
-      puts ef.format
+      $io.puts ef.format
     end
   end
 end

data/lib/pvn/log/formatter/path_formatter.rb

@@ -11,7 +11,11 @@ module PVN::Log
       'M' => :modified,
       'A' => :added,
       'D' => :deleted,
-      'R' => :renamed
+      'R' => :renamed,
+      SVNx::Action::MODIFIED => :modified,
+      SVNx::Action::ADDED => :added,
+      SVNx::Action::DELETED => :deleted,
+      # SVNx::Action::RENAMED => :renamed
     }
 
     def initialize use_colors, paths
@@ -26,7 +30,7 @@ module PVN::Log
         if field = PATH_ACTIONS[path.action]
           pstr << colorize(path.name, field)
         else
-          raise "wtf?: #{path.action}"
+          raise "wtf?: #{path.action.inspect}; #{path.action.class}"
         end
 
         if path.kind == 'dir'

data/lib/pvn/pct/local_differ.rb

@@ -3,14 +3,14 @@
 
 require 'pvn/io/element'
 require 'pvn/pct/differ'
-require 'svnx/exec'
 
 module PVN::Pct
   class LocalDiffer < Differ
     def get_diff_counts path, options
       elmt = PVN::IO::Element.new :local => path
-      modified = elmt.find_modified_files
-
+      modified = elmt.find_files_by_status :modified
+      info "modified: #{modified}".color('#fa4434')
+      
       # total = PVN::DiffCount.new
 
       modified = modified.sort_by { |n| n.path }
@@ -18,9 +18,9 @@ module PVN::Pct
       diff_counts = Array.new
 
       modified.each do |entry|
-        info "entry.path: #{entry.path}"
-        lines = SVNx::Exec.new.cat entry.path, nil, false
-        svn_count = lines.size
+        info "entry.path: #{entry.path}".color('#fa4434')
+        catexec = SVNx::CatExec.new path: entry.path, revision: nil, use_cache: false
+        svn_count = catexec.output.size
         local_count = Pathname.new(entry.path).readlines.size
         
         dc = PVN::DiffCount.new svn_count, local_count, entry.path

data/lib/pvn/pct/repository_differ.rb

@@ -3,7 +3,7 @@
 
 require 'pvn/io/element'
 require 'pvn/pct/differ'
-require 'pvn/revision/range'
+require 'svnx/revision/range'
 require 'rainbow'
 
 module PVN::Pct
@@ -21,7 +21,7 @@ module PVN::Pct
     end
 
     def get_modified elmt, fromrev, torev
-      modified = elmt.find_modified_entries [ fromrev + ':' + torev ]
+      modified = elmt.find_entries [ fromrev + ':' + torev ], :modified
       modified.collect { |m| m.name }.sort.uniq
     end
 
@@ -45,12 +45,14 @@ module PVN::Pct
     
     def get_diff_counts path, options
       revision = options.revision
+      info "revision: #{revision}".color('#fafa33')
 
       # revision -r20 is like diff -c20:
       fromrev, torev = get_from_to_revisions revision
       
       elmt = PVN::IO::Element.new :local => path
       modnames = get_modified elmt, fromrev, torev
+      info "modnames: #{modnames}"
 
       reporoot = elmt.repo_root
 
@@ -64,6 +66,7 @@ module PVN::Pct
       modnames.each do |mod|
         fullpath = reporoot + mod
         elmt = PVN::IO::Element.new :path => fullpath
+        info "elmt: #{elmt}"
         
         next unless has_revisions? elmt, fromrev, torev
         next if directory? elmt

data/lib/pvn/revision/base_option.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'synoption/option'
-require 'svnx/exec'
+require 'svnx/revision/argument'
 
 module PVN
   class BaseRevisionOption < Synoption::Option
@@ -19,22 +19,23 @@ module PVN
 
     def resolve_value optset, unprocessed
       val = value
-      if PVN::Revision::RELATIVE_REVISION_RE.match val
+      if SVNx::Revision::RELATIVE_REVISION_RE.match val
         @value = relative_to_absolute val, unprocessed[0]
       end
     end
 
     def relative_to_absolute rel, path
       limit = rel[0, 1] == '-' ? rel.to_i.abs : nil
-      xmllines = run_log_command limit, path
-
+      entries = run_log_command limit, path
+      
       # This is Argument, not Range, because we're getting the value
-      reventry = PVN::Revision::Argument.new rel, xmllines
+      reventry = SVNx::Revision::Argument.create rel, entries: entries
       reventry.value.to_s
     end
     
     def run_log_command limit, path
-      SVNx::Exec.new.log path, nil, limit, false, false
+      logexec = SVNx::LogExec.new path: path, limit: limit, revision: nil, verbose: false, use_cache: false
+      logexec.entries
     end
 
     def entry

data/lib/pvn/seek/path.rb

@@ -2,23 +2,10 @@
 # -*- ruby -*-
 
 require 'logue/loggable'
-require 'pvn/log/entries'
 require 'pvn/seek/seeker'
+require 'svnx/log/command'
 
 module PVN::Seek
-  class PathLogOptions
-    def initialize revision
-      @revision = revision
-    end
-
-    def limit; nil; end
-    def verbose; nil; end
-    def revision; @revision; end
-    def user; nil; end
-    def use_cache; nil; end
-    def files; end
-  end
-
   class Path
     include Logue::Loggable
 
@@ -36,8 +23,9 @@ module PVN::Seek
     end
 
     def get_entries revision
-      logentries = PVN::Log::Entries.new @path, PathLogOptions.new(revision)
-      logentries.to_a
+      args = { revision: revision, limit: nil, files: nil, use_cache: nil, path: @path }
+      exec = SVNx::LogExec.new args
+      exec.entries.to_a
     end
 
     def show_no_match type, entries

data/lib/pvn/seek/seeker.rb

@@ -1,10 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/log/entries'
 require 'logue/loggable'
-require 'svnx/exec'
 require 'pvn/seek/match'
+require 'svnx/cat/command'
 
 module PVN::Seek
   class Seeker
@@ -18,8 +17,8 @@ module PVN::Seek
     end
 
     def cat revision
-      ex = SVNx::Exec.new
-      ex.cat @path, revision, true
+      ex = SVNx::CatExec.new path: @path, revision: revision, use_cache: true
+      ex.output
     end
 
     def matches? previous_entry, current_entry

data/lib/pvn/status/formatter/entry_formatter.rb

@@ -17,9 +17,9 @@ module PVN::Status
     def format
       lines = Array.new
       lines << if use_colors
-                 "    " + colorize(entry.path, entry.status.to_sym)
+                 "    " + colorize(entry.path, entry.status.type)
                else
-                 "#{entry.status[0 .. 0].upcase}   #{entry.path}"
+                 "#{entry.status.type.to_s[0 .. 0].upcase}   #{entry.path}"
                end
       lines
     end

data/test/integration/pvn/diff/changed_paths_test.rb

@@ -20,9 +20,19 @@ module PVN::Diff
       if Logue::Log.verbose
         puts strio.string
       end
-      
+
       actlines = strio.string.split "\n"
 
+      if false
+        puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+        puts actlines
+        puts "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
+
+        puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+        puts explines
+        puts "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
+      end
+
       assert_arrays_equal explines, actlines
 
       $io = $stdout
@@ -99,7 +109,7 @@ module PVN::Diff
       
       # -r20 means -r20:working_copy
 
-      revision = PVN::Revision::Range.new 20, nil
+      revision = SVNx::Revision::Range.new 20, nil
       whitespace = false
       paths = %w{ . }
 

data/test/integration/pvn/diff/log_paths_test.rb

@@ -3,7 +3,7 @@
 
 require 'integration/tc'
 require 'pvn/diff/log_paths'
-require 'pvn/revision/range'
+require 'svnx/revision/range'
 
 module PVN::Diff
   class LogPathsTestCase < PVN::IntegrationTestCase
@@ -15,7 +15,7 @@ module PVN::Diff
     end
       
     def test_revision_to_revision
-      revision = PVN::Revision::Range.new '15', '16'
+      revision = SVNx::Revision::Range.new '15', '16'
       paths = %w{ . }
       logpaths = LogPaths.new revision, paths
       exppaths = [

data/test/integration/pvn/diff/status_paths_test.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'pvn/diff/status_paths'
-require 'pvn/revision/range'
+require 'svnx/revision/range'
 require 'pp'
 require 'integration/tc'
 
@@ -17,7 +17,7 @@ module PVN::Diff
       
     def test_to_working_copy
       # revision doesn't matter:
-      revision = PVN::Revision::Range.new '20'
+      revision = SVNx::Revision::Range.new '20'
       paths = %w{ . }
       statuspaths = StatusPaths.new revision, paths
       expnames = [

data/test/integration/pvn/log/command_test.rb

@@ -7,21 +7,14 @@ require 'stringio'
 
 module PVN::Log
   class CommandTest < PVN::IntegrationTestCase
-    
-    def test_path
-      Command.new [ PT_DIRNAME ]
-    end
-    
     def test_invalid_path
       assert_raises(RuntimeError) do
         Command.new %w{ /this/doesnt/exist }
       end
     end
 
-    def test_user
-      # filter_for_user
-      # fetch_log_in_pieces (-n LIMIT, LIMIT * 2, LIMIT * 4, LIMIT * 8 ... )
-      # PVN::Log::Command.new [ PT_DIRNAME ]
+    def assert_command_output expected, args = Array.new
+      super PVN::Log::Command, expected, args
     end
 
     def test_doc
@@ -80,7 +73,54 @@ module PVN::Log
                   "    Prints log entries only for user 'barney', with the default limit.",
                  ]
       
-      assert_command_output Command, expected, %w{ -h }
+      assert_command_output expected, %w{ -h }
+    end
+
+    def test_command_default
+      expected = Array.new
+      expected << "\e[1m22\e[0m        \e[1m-1\e[0m        \e[1m\e[36mLyle\e[0m                     \e[1m\e[35m12-09-18 11:32:19\e[0m"
+      expected << ""
+      expected << "\e[37mDon't pay no attention to that alky. He can't hold a gun, much less shoot it.\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+      expected << "\e[1m21\e[0m        \e[1m-2\e[0m        \e[1m\e[36mGovernor William J. Le Petomane\e[0m \e[1m\e[35m12-09-18 11:30:10\e[0m"
+      expected << ""
+      expected << "\e[37mWe've gotta protect our phoney baloney jobs, gentlemen!\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+      expected << "\e[1m20\e[0m        \e[1m-3\e[0m        \e[1m\e[36mHoward Johnson\e[0m           \e[1m\e[35m12-09-18 11:28:08\e[0m"
+      expected << ""
+      expected << "\e[37mY'know, Nietzsche says: \"Out of chaos comes order.\"\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+      expected << "\e[1m19\e[0m        \e[1m-4\e[0m        \e[1m\e[36mLili von Shtupp\e[0m          \e[1m\e[35m12-09-16 14:24:07\e[0m"
+      expected << ""
+      expected << "\e[37m\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+      expected << "\e[1m18\e[0m        \e[1m-5\e[0m        \e[1m\e[36mLili von Shtupp\e[0m          \e[1m\e[35m12-09-16 14:09:45\e[0m"
+      expected << ""
+      expected << "\e[37mWillkommen, Bienvenue, Welcome, C'mon in.\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+
+      assert_command_output expected
+    end
+
+    def test_command_user
+      expected = Array.new
+      expected << "\e[1m13\e[0m                  \e[1m\e[36mJim\e[0m                      \e[1m\e[35m12-09-16 13:51:55\e[0m"
+      expected << ""
+      expected << "\e[37mWe're not sure. Are we...black?\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+      expected << "\e[1m3\e[0m                   \e[1m\e[36mJim\e[0m                      \e[1m\e[35m12-09-15 17:29:15\e[0m"
+      expected << ""
+      expected << "\e[37mBoy, is he strict!\e[0m"
+      expected << ""
+      expected << "-------------------------------------------------------"
+
+      assert_command_output expected, %w{ -u Jim  }
     end
   end
 end

data/test/unit/pvn/io/element/log/log_test.rb

@@ -7,7 +7,7 @@ require 'pvn/io/element'
 require 'resources'
 
 module PVN::IO::IOElement
-  class LogTestCase ###$$$ < PVN::Log::TestCase
+  class LogTestCase ### < PVN::Log::TestCase
     def assert_log_entries_size expsize, dirlog
       assert_equal expsize, dirlog.entries.size
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synoption
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: riel
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,6 @@ files:
 - lib/pvn/io/element.rb
 - lib/pvn/io/fselement.rb
 - lib/pvn/log/command.rb
-- lib/pvn/log/entries.rb
 - lib/pvn/log/formatter/date_formatter.rb
 - lib/pvn/log/formatter/entries_formatter.rb
 - lib/pvn/log/formatter/entry_formatter.rb
@@ -116,17 +115,13 @@ files:
 - lib/pvn/log/formatter/path_formatter.rb
 - lib/pvn/log/formatter/summary_formatter.rb
 - lib/pvn/log/options.rb
-- lib/pvn/log/user_entries.rb
 - lib/pvn/pct/command.rb
 - lib/pvn/pct/differ.rb
 - lib/pvn/pct/local_differ.rb
 - lib/pvn/pct/options.rb
 - lib/pvn/pct/repository_differ.rb
-- lib/pvn/revision/argument.rb
 - lib/pvn/revision/base_option.rb
-- lib/pvn/revision/error.rb
 - lib/pvn/revision/multiple_revisions_option.rb
-- lib/pvn/revision/range.rb
 - lib/pvn/revision/revision_option.rb
 - lib/pvn/revision/revision_regexp_option.rb
 - lib/pvn/seek/command.rb
@@ -159,9 +154,7 @@ files:
 - test/unit/pvn/io/element/log/log_test.rb
 - test/unit/pvn/log/formatter/entry_formatter_test.rb
 - test/unit/pvn/log/options_test.rb
-- test/unit/pvn/revision/argument_test.rb
 - test/unit/pvn/revision/multiple_revisions_option_test.rb
-- test/unit/pvn/revision/range_test.rb
 - test/unit/pvn/revision/revision_option_test.rb
 - test/unit/pvn/revision/revision_regexp_option_test.rb
 homepage: http://www.incava.org/projects/pvn
@@ -205,8 +198,6 @@ test_files:
 - test/unit/pvn/io/element/log/log_test.rb
 - test/unit/pvn/log/formatter/entry_formatter_test.rb
 - test/unit/pvn/log/options_test.rb
-- test/unit/pvn/revision/argument_test.rb
 - test/unit/pvn/revision/multiple_revisions_option_test.rb
-- test/unit/pvn/revision/range_test.rb
 - test/unit/pvn/revision/revision_option_test.rb
 - test/unit/pvn/revision/revision_regexp_option_test.rb

data/lib/pvn/log/entries.rb

@@ -1,28 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'logue/loggable'
-require 'svnx/exec'
-require 'svnx/log/entries'
-
-module PVN::Log
-  class Entries < SVNx::Log::Entries
-    include Logue::Loggable
-
-    def initialize path, options
-      revision = options.revision
-      limit = limit options
-      verbose = options.files
-
-      # we can't cache this, because we don't know if there has been an svn
-      # update since the previous run:
-      use_cache = false
-      xmllines = SVNx::Exec.new.log path, revision, limit, verbose, use_cache
-      super :xmllines => xmllines
-    end
-
-    def limit options
-      options.limit
-    end
-  end
-end

data/lib/pvn/log/user_entries.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pvn/log/entries'
-require 'logue/loggable'
-
-module PVN::Log
-  class UserEntries < PVN::Log::Entries
-    include Logue::Loggable
-
-    def initialize path, options
-      @user = options.user
-      @limit = options.limit
-
-      super
-      
-      filter_entries_for_user
-    end
-
-    def limit options
-      nil
-    end
-
-    def filter_entries_for_user
-      userentries = Hash.new
-      each do |entry|
-        break if userentries.size >= @limit
-        if entry.author == @user
-          userentries[userentries.size] = entry
-        end
-      end
-
-      raise "ERROR: no matching log entries for '#{@user}'" if userentries.empty?
-
-      @entries = userentries
-    end
-  end
-end

data/lib/pvn/revision/argument.rb

@@ -1,118 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/log/entries'
-require 'pvn/revision/error'
-require 'logue/loggable'
-
-module PVN; 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 PVN::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
-
-    DATE_REGEXP = Regexp.new '^\{(.*?)\}'
-    SVN_ARGUMENT_WORDS = %w{ HEAD BASE COMMITTED PREV }
-    
-    # these are also valid revisions
-    # :working_copy
-    # :head
-
-    attr_reader :value
-    attr_reader :log_entry
-
-    class << self
-      alias_method :orig_new, :new
-
-      def new value, xmllines = nil
-        # these are lines from "svn log -v <file>"
-        if xmllines.kind_of? Array
-          xmllines = xmllines.join ''
-        end
-        
-        case value
-        when Fixnum
-          if value < 0
-            RelativeArgument.orig_new value, xmllines
-          else
-            FixnumArgument.orig_new value
-          end
-        when String
-          if SVN_ARGUMENT_WORDS.include? value
-            StringArgument.orig_new value
-          elsif md = RELATIVE_REVISION_RE.match(value)
-            RelativeArgument.orig_new md[0].to_i, xmllines
-          elsif DATE_REGEXP.match value
-            StringArgument.orig_new value
-          else
-            FixnumArgument.orig_new value.to_i
-          end
-        when Symbol
-          raise RevisionError.new "symbol not yet handled"
-        when Date
-          # $$$ this (and Time) will probably have to be converted to svn's format
-          raise RevisionError.new "date not yet handled"
-        when Time
-          raise RevisionError.new "time not yet handled"
-        end          
-      end
-
-      def matches_relative? str
-        RELATIVE_REVISION_RE.match str
-      end
-    end
-
-    def initialize value
-      @value = value
-    end
-
-    def to_s
-      @value.to_s
-    end
-
-    def <=> other
-      @value <=> other.value
-    end
-  end
-
-  class FixnumArgument < Argument
-  end
-
-  class StringArgument < Argument
-  end
-
-  class WorkingCopyArgument < Argument
-  end
-
-  # this is of the form -3, which is revision[-3] (second one from the most
-  # recent; -1 is the most recent).
-  class RelativeArgument < FixnumArgument
-    def initialize value, xmllines
-      unless xmllines
-        raise RevisionError.new "cannot determine relative revision without xmllines"
-      end
-      
-      logentries = SVNx::Log::Entries.new :xmllines => xmllines
-      nentries = logentries.size
-
-      # logentries are in descending order, so the most recent one is index 0
-
-      if value.abs > nentries
-        raise RevisionError.new "ERROR: no entry for revision: #{value.abs}; number of entries: #{nentries}"
-      else
-        idx = value < 0 ? -1 + value.abs : nentries - value
-        @log_entry = logentries[idx]
-        super @log_entry.revision.to_i
-      end
-    end
-  end
-end

data/lib/pvn/revision/error.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module PVN; module Revision; end; end
-
-module PVN
-  module Revision
-    class RevisionError < RuntimeError
-    end
-  end
-end

data/lib/pvn/revision/range.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/log/entries'
-require 'pvn/revision/argument'
-require 'logue/loggable'
-
-module PVN; module Revision; end; end
-
-module PVN::Revision
-  # this is of the form: -r123:456
-  class Range
-    include Logue::Loggable
-    
-    attr_reader :from
-    attr_reader :to
-
-    def initialize from, to = nil, xmllines = nil
-      if to
-        @from = to_revision from, xmllines
-        @to = to_revision to, xmllines
-      elsif from.kind_of? String
-        @from, @to = from.split(':').collect { |x| to_revision x, xmllines }
-      else
-        @from = to_revision from, xmllines
-        @to = :working_copy
-      end
-    end
-
-    def to_revision val, xmllines
-      val.kind_of?(Argument) || Argument.new(val, xmllines)
-    end
-    
-    def to_s
-      str = @from.to_s
-      unless working_copy?
-        str << ':' << @to.to_s
-      end
-      str
-    end
-
-    def head?
-      @to == :head
-    end
-
-    def working_copy?
-      @to == nil || @to == :wc || @to == :working_copy
-    end
-  end
-end

data/test/unit/pvn/revision/argument_test.rb

@@ -1,157 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'tc'
-require 'svnx/log/entries'
-require 'pvn/revision/argument'
-
-require 'resources'
-
-module PVN::Revision
-  class ArgumentTestCase < PVN::TestCase
-    def setup
-      # This is the equivalent of "log" at revision 22, when this file was added
-      # at revision 13. Using this instead of just "log" when regenerating the
-      # resource files keeps the revisions from bouncing around.
-      @xmllines = Resources::PT_LOG_R22_13_SECONDFILE_TXT.readlines
-    end
-
-    def create_argument value
-      Argument.new value, @xmllines
-    end
-
-    def assert_argument_value exp_value, value
-      arg = create_argument value
-      assert_equal exp_value, arg.value
-    end
-
-    def assert_argument_value_raises value
-      assert_raises(PVN::Revision::RevisionError) do 
-        assert_argument_value nil, value
-      end
-    end
-
-    def assert_argument_to_s exp_str, value
-      arg = create_argument value
-      assert_equal exp_str, arg.to_s
-    end      
-
-    def assert_compare op, exp, xval, yval
-      x = create_argument xval
-      y = create_argument yval
-      msg = "xval: #{xval}; yval: #{yval}"
-      assert_equal exp, x.send(op, y), msg
-    end
-
-    def assert_argument_eq expeq, xval, yval
-      # it's the emoticon programming language
-      assert_compare :==, expeq, xval, yval
-    end
-
-    def assert_argument_gt expeq, xval, yval
-      assert_compare :>, expeq, xval, yval
-    end
-
-    def test_absolute_midrange
-      assert_argument_value 19, 19
-    end
-
-    def test_absolute_most_recent
-      assert_argument_value 22, 22
-    end
-
-    def test_absolute_least_recent
-      assert_argument_value 13, 13
-    end
-
-    def test_absolute_midrange_as_string
-      assert_argument_value 19, '19'
-    end
-
-    def test_absolute_most_recent_as_string
-      assert_argument_value 22, '22'
-    end
-
-    def test_absolute_least_recent_as_string
-      assert_argument_value 13, '13'
-    end
-
-    def test_svn_word
-      %w{ HEAD BASE COMMITTED PREV }.each do |word|
-        assert_argument_value word, word
-      end
-    end
-
-    def test_negative_most_recent
-      assert_argument_value 22, -1
-    end
-
-    def test_negative_second_most_recent
-      assert_argument_value 20, -2
-    end
-
-    def test_negative_least_recent
-      assert_argument_value 13, -5
-    end
-
-    def test_negative_too_far_back
-      assert_argument_value_raises(-6)
-    end
-
-    def test_negative_most_recent_as_string
-      assert_argument_value 22, '-1'
-    end
-
-    def test_negative_second_most_recent_as_string
-      assert_argument_value 20, '-2'
-    end
-
-    def test_negative_least_recent_as_string
-      assert_argument_value 13, '-5'
-    end
-
-    def test_negative_too_far_back_as_string
-      assert_argument_value_raises '-6'
-    end
-
-    def test_positive_most_recent
-      assert_argument_value 22, '+5'
-    end
-
-    def test_positive_second_most_recent
-      assert_argument_value 20, '+4'
-    end
-
-    def test_positive_least_recent
-      assert_argument_value 13, '+1'
-    end
-
-    def test_positive_too_far_forward
-      assert_argument_value_raises '+6'
-    end
-
-    def xxxtest_range_svn_word_to_number
-      assert_argument_value 'BASE:1', 'BASE:1'
-    end
-
-    def xxxtest_date
-      assert_argument_to_s '1967-12-10', '1967-12-10'
-    end
-
-    def test_to_s
-      assert_argument_to_s '5', '5'
-      assert_argument_to_s 'HEAD', 'HEAD'
-    end
-
-    def test_eq
-      assert_argument_eq true, '5', '5'
-      assert_argument_eq false, '4', '5'
-      assert_argument_eq false, '5', '4'
-    end
-
-    def test_gt
-      assert_argument_gt true, '17', '16'
-      assert_argument_gt false, '13', '14'
-    end
-  end
-end

data/test/unit/pvn/revision/range_test.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'tc'
-require 'svnx/log/entries'
-require 'pvn/revision/range'
-
-require 'resources'
-
-module PVN::Revision
-  class RangeTestCase < PVN::TestCase
-    def test_init
-      rr = Range.new '143:199'
-      assert_equal '143', rr.from.to_s
-      assert_equal '199', rr.to.to_s
-      assert_equal '143:199', rr.to_s
-    end
-
-    def test_to_working_copy
-      rr = Range.new '143'
-      assert_equal '143', rr.from.to_s
-      assert_nil rr.to
-      assert_equal '143', rr.to_s
-    end
-  end
-end