pvn 0.0.7 → 0.0.8

data/lib/pvn/diff/status_paths.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/io/element'
+require 'pvn/diff/path'
+require 'pvn/diff/paths'
+
+module PVN::Diff
+  # represents the log entries from one revision through another.
+  class StatusPaths < Paths
+    include Loggable
+
+    def add_for_path path
+      pathelmt = PVN::IO::Element.new :local => path
+      pathinfo = pathelmt.get_info
+      elmt = PVN::IO::Element.new :local => path
+      add elmt, pathinfo.url
+    end
+
+    def add elmt, url
+      status = elmt.find_files_by_status
+      info "status: #{status}"
+      status.entries.each do |entry|
+        # we don't care about unversioned entries for diffing.
+        next if entry.status == 'unversioned'
+        
+        info "@revision: #{@revision}"
+        info "entry: #{entry}"
+        # svn log prepends /; svn status does not
+        name = '/' + entry.path
+        info "name: #{name}"
+        rev = :working_copy
+        info "rev: #{rev}"
+
+        # what Status::Entry calls a status, we call an action, unifying it with
+        # svn log representation.
+        action = entry.status
+        info "action: #{action}"
+        revisions = get_status_revisions entry
+        info "revisions: #{revisions}"
+
+        info "status.revision: #{entry.status_revision}"
+
+        @elements << Path.new(name, entry.status_revision, action, url)
+      end
+    end
+
+    # this may belong in Status::Entry
+    def get_status_revisions status_entry
+      # the printing revision in svn (svn diff -r20) are confusing, but this
+      # is what it looks like:
+
+      # when a file is added locally
+      #     the revisions are (0, 0)
+      # when a file is modified:
+      #     if the file is modified in other revisions since givenfromrev
+      #         the revision is (most recent rev, working copy)
+      #     otherwise
+      #         the revision is (previous revision, working copy)
+      # when a file is deleted:
+      #     the revision is (given from rev, working copy)
+
+      # okay, summary #2:
+
+      # if a file is modified,
+      #     if the file existed at fromrev
+      #         it is compared with fromrev
+      #     else
+      #         it is compared to BASE
+
+      info "status_entry.status: #{status_entry.status}"
+
+      action = SVNx::Action.new status_entry.status
+      case
+      when action.added?
+        info "added"
+        [ 0, 0 ]
+      when action.deleted?
+        info "deleted"
+        [ @revision.from, :working_copy ]
+      when action.modified?
+        info "modified"
+        [ status_entry.status_revision, :working_copy ]
+      end
+    end    
+  end
+end

data/lib/pvn/io/element.rb

@@ -3,7 +3,6 @@
 
 require 'rubygems'
 require 'riel'
-require 'pvn/base/util'
 
 require 'svnx/log/command'
 require 'svnx/log/entries'
@@ -124,9 +123,22 @@ module PVN::IO
       modified
     end
 
-    def cat_remote rev = nil
-      raise "revision not yet supported: #{rev}" if rev
-      catargs = SVNx::CatCommandArgs.new :path => @local, :use_cache => false
+    def xxxcat_remote rev = nil
+      path = @local || @svn
+      info "path: #{path}".blue
+      info "rev: #{rev}; #{rev.class}".blue
+      catargs = SVNx::CatCommandArgs.new :path => path, :use_cache => false, :revision => rev
+      cmd = SVNx::CatCommand.new catargs
+      cmd.execute
+    end
+
+    def cat revision, use_cache = false
+      path = (@local || @path || @svn).dup
+      if revision && revision != :working_copy
+        path << '@' << revision.to_s
+      end
+      info "path: #{path}"
+      catargs = SVNx::CatCommandArgs.new :path => path, :use_cache => use_cache
       cmd = SVNx::CatCommand.new catargs
       cmd.execute
     end
@@ -139,8 +151,8 @@ module PVN::IO
     def find_files_by_status status = nil
       cmdargs = SVNx::StatusCommandArgs.new :path => @local, :use_cache => false
       cmd = SVNx::StatusCommand.new cmdargs
-      xml = cmd.execute
-      entries = SVNx::Status::Entries.new :xmllines => xml
+      xmllines = cmd.execute
+      entries = SVNx::Status::Entries.new :xmllines => xmllines
       
       if status
         entries.select do |entry|
@@ -164,12 +176,21 @@ module PVN::IO
       SVNx::Log::Entries.new :xmllines => cmd.execute
     end
 
+    # returns log entries
+    def logentries revision
+      # use_cache should be conditional on revision:
+      # cmdargs[:use_cache] = false
+      cmdargs = SVNx::LogCommandArgs.new :path => @local, :revision => revision.to_s, :use_cache => false, :verbose => true
+      cmd = SVNx::LogCommand.new cmdargs
+      SVNx::Log::Entries.new :xmllines => cmd.execute
+    end
+    
     # returns :added, :deleted, "modified"
     def status
       cmdargs = SVNx::StatusCommandArgs.new :path => @local
       cmd = SVNx::StatusCommand.new :cmdargs => cmdargs
-      xml = cmd.execute.join ''
-      entries = SVNx::Status::Entries.new :xml => SVNx::Status::XMLEntries.new(xml)
+      xmllines = cmd.execute
+      entries = SVNx::Status::Entries.new :xmllines => xmllines
       entry = entries[0]
       entry.status
     end

data/lib/pvn/{subcommands/log → log}/command.rb

@@ -3,11 +3,11 @@
 
 require 'pvn/io/element'
 require 'pvn/log/formatter/entries_formatter'
-require 'pvn/subcommands/log/options'
-require 'pvn/subcommands/base/command'
+require 'pvn/log/options'
+require 'pvn/command/command'
 
-module PVN::Subcommands::Log
-  class Command < PVN::Subcommands::Base::Command
+module PVN::Log
+  class Command < PVN::Command::Command
 
     DEFAULT_LIMIT = 15
 

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

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/log/entry'
-require 'pvn/base/color_formatter'
+require 'pvn/util/color_formatter'
 
 module PVN; module Log; end; end
 

data/lib/pvn/{subcommands/log → log}/options.rb

@@ -5,11 +5,11 @@ require 'synoption/set'
 require 'synoption/option'
 require 'synoption/fixnum_option'
 require 'synoption/boolean_option'
-require 'pvn/subcommands/revision/multiple_revisions_option'
-require 'pvn/subcommands/base/options'
-require 'pvn/subcommands/base/color_option'
+require 'pvn/revision/multiple_revisions_option'
+require 'pvn/command/options'
+require 'pvn/command/color_option'
 
-module PVN::Subcommands::Log
+module PVN::Log
   DEFAULT_LIMIT = 5
 
   class LimitOption < PVN::FixnumOption
@@ -30,10 +30,10 @@ module PVN::Subcommands::Log
     end
   end
 
-  class OptionSet < PVN::Subcommands::Base::OptionSet
+  class OptionSet < PVN::Command::OptionSet
     has_option :revision, PVN::MultipleRevisionsRegexpOption, [ :unsets => :limit ]
-    has_option :color,    PVN::Subcommands::Base::ColorOption
-    has_option :help,     PVN::Subcommands::Base::HelpOption
+    has_option :color,    PVN::Command::ColorOption
+    has_option :help,     PVN::Command::HelpOption
     has_option :limit,    LimitOption
     has_option :user,     UserOption
     has_option :verbose,  PVN::BooleanOption, [ :verbose, '-v', [ "include the files in the change" ], false ]

data/lib/pvn/{subcommands/pct → pct}/command.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/subcommands/pct/options'
-require 'pvn/subcommands/base/command'
-require 'pvn/subcommands/pct/local_differ'
-require 'pvn/subcommands/pct/repository_differ'
+require 'pvn/pct/options'
+require 'pvn/command/command'
+require 'pvn/pct/local_differ'
+require 'pvn/pct/repository_differ'
 
-module PVN::Subcommands::Pct
-  class Command < PVN::Subcommands::Base::Command
+module PVN::Pct
+  class Command < PVN::Command::Command
 
     subcommands [ "pct" ]
     description "Compares revisions as a percentage of lines modified."

data/lib/pvn/{subcommands/pct → pct}/diffcount.rb

@@ -17,7 +17,7 @@ module PVN
       diff = to - from
       diffpct = diff == 0 ? 0 : 100.0 * diff / from
       
-      printf "%8d %8d %8d %8.1f%% %s\n", from, to, diff, diffpct, name
+      $io.printf "%8d %8d %8d %8.1f%% %s\n", from, to, diff, diffpct, name
     end
 
     def << diff

data/lib/pvn/{subcommands/pct → pct}/differ.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/subcommands/pct/diffcount'
+require 'pvn/pct/diffcount'
 
-module PVN::Subcommands::Pct
+module PVN::Pct
   class Differ
     include Loggable
 

data/lib/pvn/{subcommands/pct → pct}/local_differ.rb

@@ -3,10 +3,10 @@
 
 require 'pvn/io/element'
 require 'svnx/cat/command'
-require 'pvn/subcommands/pct/diffcount'
-require 'pvn/subcommands/pct/differ'
+require 'pvn/pct/diffcount'
+require 'pvn/pct/differ'
 
-module PVN::Subcommands::Pct
+module PVN::Pct
   class LocalDiffer < Differ
     def get_diff_counts path, options
       elmt = PVN::IO::Element.new :local => path

data/lib/pvn/pct/options.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/revision/multiple_revisions_option'
+require 'pvn/command/options'
+
+module PVN::Pct
+  class OptionSet < PVN::Command::OptionSet
+    has_option :revision, PVN::MultipleRevisionsRegexpOption
+    has_option :help,     PVN::Command::HelpOption
+  end
+end

data/lib/pvn/{subcommands/pct → pct}/repository_differ.rb

@@ -2,11 +2,10 @@
 # -*- ruby -*-
 
 require 'pvn/io/element'
-require 'svnx/cat/command'
-require 'pvn/subcommands/pct/diffcount'
-require 'pvn/subcommands/pct/differ'
+require 'pvn/pct/diffcount'
+require 'pvn/pct/differ'
 
-module PVN::Subcommands::Pct
+module PVN::Pct
   class RepositoryDiffer < Differ
     ### $$$ this belongs in Revision
     def get_from_to_revisions rev
@@ -24,13 +23,6 @@ module PVN::Subcommands::Pct
         info "rev: #{rev}".bold.white.on_red
       end
     end
-
-    def get_line_count path, revision
-      info "path: #{path}".yellow
-      cmdargs = SVNx::CatCommandArgs.new :path => path, :revision => revision
-      catcmd = SVNx::CatCommand.new cmdargs
-      catcmd.execute.size
-    end
     
     def get_diff_counts path, options
       diff_counts = Array.new
@@ -62,8 +54,8 @@ module PVN::Subcommands::Pct
         next unless elmt.has_revision? torev
         next if elmt.get_info.kind == 'dir'
 
-        from_count = get_line_count fullpath, fromrev
-        to_count = get_line_count fullpath, torev
+        from_count = elmt.cat(fromrev).size
+        to_count = elmt.cat(torev).size
 
         name = mod.dup
         name.slice! filterre

data/lib/pvn/revision/{entry.rb → argument.rb}

@@ -2,25 +2,29 @@
 # -*- ruby -*-
 
 require 'svnx/log/entries'
+require 'pvn/revision/error'
 
-# 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; 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
-  class RevisionError < RuntimeError
-  end
-
-  DATE_REGEXP = Regexp.new '^\{(.*?)\}'
-  SVN_REVISION_WORDS = %w{ HEAD BASE COMMITTED PREV }
   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 Entry
-    include Loggable
+  class Argument
+    include 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
@@ -28,37 +32,36 @@ module PVN::Revision
     class << self
       alias_method :orig_new, :new
 
-      def new args = Hash.new
-        value = args[:value]
-
+      def new value, xmllines = nil
         # these are lines from "svn log -v <file>"
-        xmllines = args[:xmllines]
         if xmllines.kind_of? Array
           xmllines = xmllines.join ''
         end
-
+        
         case value
         when Fixnum
           if value < 0
-            RelativeEntry.orig_new value, xmllines
+            RelativeArgument.orig_new value, xmllines
           else
-            FixnumEntry.orig_new value
+            FixnumArgument.orig_new value
           end
         when String
-          if SVN_REVISION_WORDS.include? value
-            StringEntry.orig_new value
+          if SVN_ARGUMENT_WORDS.include? value
+            StringArgument.orig_new value
           elsif md = RELATIVE_REVISION_RE.match(value)
-            RelativeEntry.orig_new md[0].to_i, xmllines
+            RelativeArgument.orig_new md[0].to_i, xmllines
           elsif DATE_REGEXP.match value
-            StringEntry.orig_new value
+            StringArgument.orig_new value
           else
-            FixnumEntry.orig_new value.to_i
+            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 "date not yet handled"
+          raise RevisionError.new "date not yet handled"
         when Time
-          raise "time not yet handled"
+          raise RevisionError.new "time not yet handled"
         end          
       end
 
@@ -70,22 +73,34 @@ module PVN::Revision
     def initialize value
       @value = value
     end
+
+    def to_s
+      @value.to_s
+    end
+
+    def <=> other
+      @value <=> other.value
+    end
   end
 
-  class FixnumEntry < Entry
+  class FixnumArgument < Argument
   end
 
-  class StringEntry < Entry
+  class StringArgument < Argument
   end
 
-  class RelativeEntry < FixnumEntry
+  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

data/lib/pvn/{subcommands/revision → revision}/base_option.rb

@@ -5,7 +5,6 @@ require 'riel'
 require 'rubygems'
 require 'synoption/option'
 require 'svnx/log/command'
-require 'pvn/revision/entry'
 
 module PVN
   class BaseRevisionOption < Option
@@ -31,7 +30,8 @@ module PVN
       limit = rel[0, 1] == '-' ? rel.to_i.abs : nil
       xmllines = run_log_command limit, path
 
-      reventry = PVN::Revision::Entry.new :value => rel, :xmllines => xmllines
+      # This is Argument, not Range, because we're getting the value
+      reventry = PVN::Revision::Argument.new rel, xmllines
       revval   = reventry.value.to_s
       revval
     end

data/lib/pvn/revision/error.rb

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

data/lib/pvn/{subcommands/revision → revision}/multiple_revisions_option.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/subcommands/revision/revision_regexp_option'
+require 'pvn/revision/revision_regexp_option'
 
 module PVN
   # A revision option with multiple values.

data/lib/pvn/revision/range.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/log/entries'
+require 'pvn/revision/argument'
+
+module PVN; module Revision; end; end
+
+module PVN::Revision
+  # this is of the form: -r123:456
+  class Range
+    include 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/lib/pvn/{subcommands/revision → revision}/revision_option.rb

@@ -1,20 +1,13 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/subcommands/revision/base_option'
+require 'pvn/revision/base_option'
 
 module PVN
   class RevisionOption < BaseRevisionOption
     attr_accessor :fromdate
     attr_accessor :todate
 
-    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" ,
-                           ]
-    
     def initialize revargs = Hash.new
       @fromdate = nil
       @todate = nil

data/lib/pvn/{subcommands/revision → revision}/revision_regexp_option.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/subcommands/revision/revision_option'
+require 'pvn/revision/revision_option'
 
 module PVN
   # A revision that is also set by -N and +N.
@@ -19,7 +19,7 @@ module PVN
       revargs[:regexp] = TAG_RE
       super
     end
-
+    
     def resolve_value optset, unprocessed
       val = value
       md  = TAG_RE.match val

data/lib/pvn/{subcommands/status → status}/command.rb

@@ -2,16 +2,16 @@
 # -*- ruby -*-
 
 require 'pvn/io/element'
-require 'pvn/subcommands/base/command'
-require 'pvn/subcommands/status/options'
+require 'pvn/command/command'
+require 'pvn/status/options'
 require 'pvn/status/formatter/entries_formatter'
 
-module PVN::Subcommands::Status
-  class Command < PVN::Subcommands::Base::Command
+module PVN::Status
+  class Command < PVN::Command::Command
 
     DEFAULT_LIMIT = 15
 
-    subcommands [ "status" ]
+    subcommands [ "status", "st" ]
     description "Prints the status for locally changed files."
     usage       "[OPTIONS] FILE..."
     summary     [ "Prints the status for the given files, with colorized",
@@ -41,7 +41,7 @@ module PVN::Subcommands::Status
       end
 
       fmtr = PVN::Status::EntriesFormatter.new options.color, allentries
-      puts fmtr.format
+      $io.puts fmtr.format
     end
   end
 end

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

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/status/entry'
-require 'pvn/base/color_formatter'
+require 'pvn/util/color_formatter'
 
 module PVN; module Status; end; end
 

data/lib/pvn/status/options.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/command/options'
+require 'pvn/command/color_option'
+
+module PVN::Status
+  class OptionSet < PVN::Command::OptionSet
+    has_option :color,    PVN::Command::ColorOption
+    has_option :help,     PVN::Command::HelpOption
+  end
+end

data/lib/pvn/{base/util.rb → util/array.rb}

@@ -2,7 +2,8 @@
 # -*- ruby -*-
 
 module PVN
-  module Util
+  # a bad name, but I'm not sure if I'm going to monkey patch Array
+  module ArrayUtil
     POS_NEG_NUMERIC_RE = Regexp.new('^[\-\+]?\d+$')
 
     # Returns the list joined by spaces, with each element in the list in double

data/lib/pvn.rb

@@ -1,8 +1,3 @@
-fdirname = File.dirname(__FILE__)
-
-$:.unshift(fdirname) unless
-  $:.include?(fdirname) || $:.include?(File.expand_path(fdirname))
-
 module PVN
-  VERSION = '0.0.4'
+  VERSION = '0.0.8'
 end