pvn 0.0.7 → 0.0.8

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pvn
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jeff Pace
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-15 00:00:00 -04:00
+date: 2012-09-30 00:00:00 -04:00
 default_executable: pvn
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,13 +45,17 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - bin/pvndiff
+- bin/quotes.txt
 - bin/quote.rb
 - bin/pvn
+- bin/quotes.orig.txt
+- bin/change.rb
 - bin/modify_timestamps.rb
 - bin/populate.rb
 - lib/synoption/boolean_option.rb
 - lib/synoption/option.rb
 - lib/synoption/fixnum_option.rb
+- lib/synoption/matchers.rb
 - lib/synoption/match.rb
 - lib/synoption/exception.rb
 - lib/synoption/base_option.rb
@@ -75,70 +79,63 @@ files:
 - lib/svnx/info/command.rb
 - lib/svnx/info/entries.rb
 - lib/svnx/info/entry.rb
+- lib/svnx/action.rb
 - lib/svnx/entry.rb
 - lib/svnx/log/command.rb
 - lib/svnx/log/entries.rb
 - lib/svnx/log/entry.rb
-- lib/pvn/subcommands/status/options.rb
-- lib/pvn/subcommands/status/command.rb
-- lib/pvn/subcommands/base/options.rb
-- lib/pvn/subcommands/base/color_option.rb
-- lib/pvn/subcommands/base/clargs.rb
-- lib/pvn/subcommands/base/command.rb
-- lib/pvn/subcommands/base/doc.rb
-- lib/pvn/subcommands/diff/local_differ.rb
-- lib/pvn/subcommands/diff/options.rb
-- lib/pvn/subcommands/diff/repository_differ.rb
-- lib/pvn/subcommands/diff/command.rb
-- lib/pvn/subcommands/diff/differ.rb
-- lib/pvn/subcommands/pct/local_differ.rb
-- lib/pvn/subcommands/pct/options.rb
-- lib/pvn/subcommands/pct/repository_differ.rb
-- lib/pvn/subcommands/pct/clargs.rb
-- lib/pvn/subcommands/pct/diffcount.rb
-- lib/pvn/subcommands/pct/command.rb
-- lib/pvn/subcommands/pct/differ.rb
-- lib/pvn/subcommands/log/options.rb
-- lib/pvn/subcommands/log/command.rb
-- lib/pvn/subcommands/revision/base_option.rb
-- lib/pvn/subcommands/revision/revision_regexp_option.rb
-- lib/pvn/subcommands/revision/multiple_revisions_option.rb
-- lib/pvn/subcommands/revision/revision_option.rb
-- lib/pvn/describe.rb
+- lib/pvn/command/options.rb
+- lib/pvn/command/color_option.rb
+- lib/pvn/command/clargs.rb
+- lib/pvn/command/command.rb
+- lib/pvn/command/doc.rb
+- lib/pvn/app/runner.rb
+- lib/pvn/util/array.rb
+- lib/pvn/util/textlines.rb
+- lib/pvn/util/color_formatter.rb
 - lib/pvn/config.rb
 - lib/pvn/cmddoc.rb
-- lib/pvn/revision.rb
+- lib/pvn/status/options.rb
+- lib/pvn/status/command.rb
 - lib/pvn/status/formatter/entry_formatter.rb
 - lib/pvn/status/formatter/status_formatter.rb
 - lib/pvn/status/formatter/entries_formatter.rb
-- lib/pvn/base/textlines.rb
-- lib/pvn/base/color_formatter.rb
-- lib/pvn/base/util.rb
-- lib/pvn/diff/diffcmd.rb
-- lib/pvn/diff/diffopts.rb
+- lib/pvn/diff/log_paths.rb
+- lib/pvn/diff/local_differ.rb
+- lib/pvn/diff/paths.rb
+- lib/pvn/diff/path.rb
+- lib/pvn/diff/options.rb
+- lib/pvn/diff/repository_differ.rb
+- lib/pvn/diff/revision.rb
+- lib/pvn/diff/command.rb
+- lib/pvn/diff/path_revision.rb
 - lib/pvn/diff/differ.rb
+- lib/pvn/diff/status_paths.rb
 - lib/pvn/io/element.rb
 - lib/pvn/io/fselement.rb
-- lib/pvn/wherecmd.rb
 - lib/pvn/app.rb
+- lib/pvn/pct/local_differ.rb
+- lib/pvn/pct/options.rb
+- lib/pvn/pct/repository_differ.rb
+- lib/pvn/pct/diffcount.rb
+- lib/pvn/pct/command.rb
+- lib/pvn/pct/differ.rb
 - lib/pvn/doc.rb
-- lib/pvn/log/logentry.rb
-- lib/pvn/log/logcmd.rb
-- lib/pvn/log/logfactory.rb
-- lib/pvn/log/logoptions.rb
+- lib/pvn/log/options.rb
+- lib/pvn/log/command.rb
 - lib/pvn/log/formatter/entry_formatter.rb
 - lib/pvn/log/formatter/summary_formatter.rb
 - lib/pvn/log/formatter/entries_formatter.rb
 - lib/pvn/log/formatter/message_formatter.rb
 - lib/pvn/log/formatter/log_formatter.rb
 - lib/pvn/log/formatter/path_formatter.rb
-- lib/pvn/svn/svninfo.rb
-- lib/pvn/svn/command/svncmd.rb
-- lib/pvn/svn/svnroot.rb
-- lib/pvn/svn/svnelement.rb
-- lib/pvn/svn/environment.rb
-- lib/pvn/revision/entry.rb
-- lib/pvn/upp/uppcmd.rb
+- lib/pvn/revision/range.rb
+- lib/pvn/revision/argument.rb
+- lib/pvn/revision/base_option.rb
+- lib/pvn/revision/revision_regexp_option.rb
+- lib/pvn/revision/error.rb
+- lib/pvn/revision/multiple_revisions_option.rb
+- lib/pvn/revision/revision_option.rb
 - lib/pvn.rb
 - test/unit/synoption/set_test.rb
 - test/unit/synoption/match_test.rb
@@ -146,24 +143,35 @@ files:
 - test/unit/synoption/option_test.rb
 - test/unit/system/command/caching_test.rb
 - test/unit/system/command/line_test.rb
+- test/unit/system/command/cachefile_test.rb
 - test/unit/svnx/status/entries_test.rb
 - test/unit/svnx/status/entry_test.rb
+- test/unit/svnx/action_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
 - test/unit/svnx/log/cmargs_test.rb
-- test/unit/pvn/subcommands/log/options_test.rb
-- test/unit/pvn/subcommands/revision/multiple_revisions_option_test.rb
-- test/unit/pvn/subcommands/revision/revision_regexp_option_test.rb
-- test/unit/pvn/subcommands/revision/revision_option_test.rb
+- test/unit/pvn/diff/revision_test.rb
+- test/unit/pvn/diff/path_test.rb
+- test/unit/pvn/diff/path_revision_test.rb
 - test/unit/pvn/io/element/log/log_test.rb
+- test/unit/pvn/log/options_test.rb
 - test/unit/pvn/log/formatter/entry_formatter_test.rb
 - test/unit/pvn/app_test.rb
-- test/unit/pvn/revision/entry_test.rb
-- test/integration/svnx/log/test.rb
-- test/integration/pvn/subcommands/diff/command_test.rb
-- test/integration/pvn/subcommands/log/command_test.rb
+- test/unit/pvn/revision/argument_test.rb
+- test/unit/pvn/revision/range_test.rb
+- test/unit/pvn/revision/multiple_revisions_option_test.rb
+- test/unit/pvn/revision/revision_regexp_option_test.rb
+- test/unit/pvn/revision/revision_option_test.rb
+- test/integration/pvn/status/command_test.rb
+- test/integration/pvn/diff/repository_differ_test.rb
+- test/integration/pvn/diff/local_differ_test.rb
+- test/integration/pvn/diff/log_paths_test.rb
+- test/integration/pvn/diff/status_paths_test.rb
+- test/integration/pvn/diff/command_test.rb
+- test/integration/pvn/pct/command_test.rb
+- test/integration/pvn/log/command_test.rb
 - README.markdown
 has_rdoc: true
 homepage: http://www.incava.org/projects/pvn
@@ -206,21 +214,32 @@ test_files:
 - test/unit/synoption/option_test.rb
 - test/unit/system/command/caching_test.rb
 - test/unit/system/command/line_test.rb
+- test/unit/system/command/cachefile_test.rb
 - test/unit/svnx/status/entries_test.rb
 - test/unit/svnx/status/entry_test.rb
+- test/unit/svnx/action_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
 - test/unit/svnx/log/cmargs_test.rb
-- test/unit/pvn/subcommands/log/options_test.rb
-- test/unit/pvn/subcommands/revision/multiple_revisions_option_test.rb
-- test/unit/pvn/subcommands/revision/revision_regexp_option_test.rb
-- test/unit/pvn/subcommands/revision/revision_option_test.rb
+- test/unit/pvn/diff/revision_test.rb
+- test/unit/pvn/diff/path_test.rb
+- test/unit/pvn/diff/path_revision_test.rb
 - test/unit/pvn/io/element/log/log_test.rb
+- test/unit/pvn/log/options_test.rb
 - test/unit/pvn/log/formatter/entry_formatter_test.rb
 - test/unit/pvn/app_test.rb
-- test/unit/pvn/revision/entry_test.rb
-- test/integration/svnx/log/test.rb
-- test/integration/pvn/subcommands/diff/command_test.rb
-- test/integration/pvn/subcommands/log/command_test.rb
+- test/unit/pvn/revision/argument_test.rb
+- test/unit/pvn/revision/range_test.rb
+- test/unit/pvn/revision/multiple_revisions_option_test.rb
+- test/unit/pvn/revision/revision_regexp_option_test.rb
+- test/unit/pvn/revision/revision_option_test.rb
+- test/integration/pvn/status/command_test.rb
+- test/integration/pvn/diff/repository_differ_test.rb
+- test/integration/pvn/diff/local_differ_test.rb
+- test/integration/pvn/diff/log_paths_test.rb
+- test/integration/pvn/diff/status_paths_test.rb
+- test/integration/pvn/diff/command_test.rb
+- test/integration/pvn/pct/command_test.rb
+- test/integration/pvn/log/command_test.rb

data/lib/pvn/describe.rb

@@ -1,40 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'system/command'
-# require 'pvn/diff'
-
-module PVN
-  class DescribeCommand < Command
-    COMMAND = "describe"
-
-    self.doc do |doc|
-      doc.subcommands = [ COMMAND, 'desc' ]
-      doc.description = "Describes the changes of one or more revisions."
-      doc.usage       =  "[OPTIONS] FILE..."
-      doc.summary     = [ "  Prints the log message and the files changed for the given",
-                          "  revisions." ]
-      doc.examples   << [ "pvn describe -1 foo.rb", "Prints the summary for the most recent revision of foo.rb." ]
-    end
-    
-    # has_option :limit, '-l', "the number of log entries", DEFAULT_LIMIT, :negate => [ %r{^--no-?limit} ]
-    has_revision_option :multiple => true
-
-    def initialize args = Hash.new
-      info "args: #{args}".on_blue
-      super
-    end
-
-    def run args
-      info "args: #{args}".on_yellow
-      revisions = find_option(:revision).value
-
-      info "revisions: #{revisions}".yellow
-
-      revisions.each do |rev|
-        info "svn log -r #{rev}"
-        info "svn diff --summarize -c #{rev}"
-      end
-    end
-  end
-end

data/lib/pvn/diff/diffcmd.rb

@@ -1,49 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pvn/config'
-require 'pvn/svn/command/svncmd'
-require 'pvn/diff/diffopts'
-
-module PVN  
-  class DiffCommand < SVNCommand
-    COMMAND = "diff"
-
-    attr_reader :options
-    
-    self.doc do |doc|
-      doc.subcommands = [ COMMAND ]
-      doc.description = "Displays differences between revisions."
-      doc.usage       = "[OPTIONS] FILE..."
-      doc.summary     = [ "Compare two revisions, filtering through external programs.",
-                          "For each file compared, the file extension is used to find",
-                          "a diff program." ]
-      doc.options.concat DiffOptionSet.new.options
-      doc.examples   << [ "pvn diff foo.rb", "Compares foo.rb against the last updated version." ]
-      doc.examples   << [ "pvn diff -3 StringExt.java", "Compares StringExt.java at change (HEAD - 3), using a Java-specific program such as DiffJ." ]
-      doc.examples   << [ "pvn diff -r +4 -w", "Compares the 4th revision against the working copy, ignoring whitespace." ]
-    end
-    
-    def initialize args = Hash.new
-      @options = DiffOptionSet.new
-      debug "args: #{args.inspect}".yellow
-
-      super
-    end
-
-    def use_cache?
-      super && !against_head?
-    end
-
-    def against_head?
-      @options.change.value.nil? && @options.revision.head?
-    end
-    
-    # @todo implement
-    if true
-      self.options do |opts|
-        # opts.add :diffcmd
-      end
-    end
-  end
-end

data/lib/pvn/diff/diffopts.rb

@@ -1,58 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'synoption/set'
-require 'pvn/subcommands/revision/revision_option'
-
-module PVN
-  thisfile = Pathname.new __FILE__
-  PVNDIFF_CMD = (thisfile.parent.parent.parent.parent + "bin/pvndiff").expand_path
-
-  POS_NEG_NUMERIC_RE = Regexp.new('^[\-\+]?\d+$')
-  
-  # "pvn diff -3" == "pvn diff -c -3", not "pvn diff -r -3", because
-  # we diff for the change, not from that revision to head.
-
-  class DiffRevisionOption < RevisionOption
-    def head?
-      value.nil? || value == 'HEAD'
-    end
-  end
-  
-  class DiffChangeOption < Option
-    def initialize chgargs = Hash.new
-      chgargs[:setter] = :revision_from_args
-      chgargs[:regexp] = POS_NEG_NUMERIC_RE
-      
-      super :change, '-c', "change", chgargs
-    end
-  end
-
-  class DiffWhitespaceOption < Option
-    def initialize wsargs = Hash.new
-      super :whitespace, '-W', "ignore all whitespace", wsargs
-    end
-
-    def to_command_line
-      if value
-        %w{ -x -w -x -b -x --ignore-eol-style }
-      end
-    end
-  end
-
-  class DiffOptionSet < OptionSet
-    attr_reader :change
-    attr_reader :revision
-    
-    def initialize
-      super
-      
-      # diffcmd is old/new option style (non-subclass of Option)
-      diffcmd = PVNDIFF_CMD.exist? && PVNDIFF_CMD
-      @diffcmdopt = add Option.new :diffcmd, "--diff-cmd", "the program to run diff through", diffcmd, :negate => [ %r{^--no-?diff-?cmd} ]
-      @change     = add DiffChangeOption.new
-      @revision   = add DiffRevisionOption.new
-      @whitespace = add DiffWhitespaceOption.new
-    end
-  end
-end

data/lib/pvn/log/logcmd.rb

@@ -1,135 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'system/command'
-require 'system/cachecmd'
-require 'pvn/svn/command/svncmd'
-require 'pvn/log/logfactory'
-require 'pvn/log/logoptions'
-
-module PVN
-  class LogCommand < SVNCommand
-    COMMAND = "log"
-    REVISION_ARG = '-r'
-
-    attr_reader :options
-
-    self.doc do |doc|
-      doc.subcommands = [ COMMAND, 'l' ]
-      doc.description = "Print log messages for the given files."
-      doc.usage       = "[OPTIONS] FILE..."
-      doc.summary     = [ "Prints the log entries for the given files, with colorized",
-                          "output. Unlike 'svn log', which prints all log entries, ",
-                          "'pvn log' prints #{DEFAULT_LIMIT} entries by default.",
-                          "As with other pvn commands, 'pvn log' accepts relative ",
-                          "revisions."
-                        ]
-      doc.options.concat LogOptionSet.new.options
-      doc.examples   << [ "pvn log foo.rb",       "Prints the latest #{DEFAULT_LIMIT} log entries for foo.rb." ]
-      doc.examples   << [ "pvn log -l 25 foo.rb", "Prints 25 log entries for the file." ]
-      doc.examples   << [ "pvn log -3 foo.rb",    "Prints the log entry for revision (HEAD - 3)." ]
-      doc.examples   << [ "pvn log +3 foo.rb",    "Prints the 3rd log entry." ]
-      doc.examples   << [ "pvn log -l 10 -F",     "Prints the latest 10 entries, unformatted." ]
-      doc.examples   << [ "pvn log -r 122 -v",    "Prints log entry for revision 122, with the files in that change." ]
-    end
-    
-    def initialize args = Hash.new
-      @options = LogOptionSet.new
-      
-      debug "args: #{args.inspect}"
-      
-      @options.revision.fromdate = args[:fromdate]
-      @options.revision.todate = args[:todate]
-
-      @options.options.each do |opt|
-        info "opt: #{opt}".blue
-      end
-
-      @entries = nil
-
-      super
-    end
-
-    def has_entries?
-      true
-    end
-
-    def use_cache?
-      # use cache unless log is to head.
-      super && !@options.revision.head?
-    end
-
-    def entries
-      @entries ||= begin
-                     # of course this assumes that output is in plain text (non-XML)
-                     factory = PVN::Log::TextFactory.new output
-                     factory.entries
-                   end
-    end
-
-    def revision_of_nth_entry num
-      entry = nth_entry num
-      entry && entry.revision.to_i
-    end
-
-    def nth_entry n
-      entries[-1 * n]
-    end
-
-    def write_entries
-      info "@options: #{@options.inspect}"
-      info "@options.format: #{@options.format.inspect}".yellow
-
-      entries.each do |entry|
-        info "@options.format.value: #{@options.format.value}"
-        entry.write @options.format.value
-      end
-      unless @options.format
-        puts PVN::Log::Entry::BANNER
-      end
-    end
-
-    # this may be faster than get_nth_entry
-    def read_from_log_output n_matches
-      loglines = output.reverse
-
-      entries = entries
-      entry = entries[-1 * n_matches]
-      
-      if true
-        return entry && entry.revision.to_i
-      end
-
-      loglines.each do |line|
-        next unless md = SVN_LOG_SUMMARY_LINE_RE.match(line)
-        
-        info "md: #{md}".yellow
-        
-        n_matches -= 1
-        if n_matches == 0
-          return md[1].to_i
-        end
-      end
-      nil
-    end
-  end
-end
-
-module PVN::Log
-  class Command < CachableCommand
-    def initialize args
-      command = %w{ svn log }
-
-      # todo: handle revision conversion:
-      fromrev = args[:fromrev]
-      torev   = args[:torev]
-
-      if fromrev && torev
-        command << "-r" << "#{fromrev}:#{torev}"
-      elsif args[:fromdate] && args[:todate]
-        command << "-r" << "\{#{fromdate}\}:\{#{todate}\}"
-      end
-      debug "command: #{command}".on_red
-    end
-  end
-end

data/lib/pvn/log/logentry.rb

@@ -1,116 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'pvn/config'
-
-module PVN; module Log; end; end
-
-module PVN::Log
-  class Entry
-    include Loggable
-
-    FIELDS = [ :revision,
-               :user,
-               :date,
-               :time,
-               :tz,
-               :dtg,
-               :nlines,
-               :files,
-               :comment ]
-
-    FIELDS.each do |field|
-      attr_reader field
-    end
-
-    WRITE_FORMAT_DEFAULT = ('#{revision.yellow}\t#{user.green}\t#{date} #{time}\n' +
-                            '#{list(comment)}#{cr(files)}' +
-                            '#{list(files, :blue, :on_yellow)}\n')
-    
-    WRITE_SUMMARY_LINE = 'r#{revision} | #{user} | #{date} #{time} #{tz} (#{dtg}) | #{nlines} #{nlines.to_i == 1 ? "line" : "lines"}\n'
-    
-    WRITE_UNFORMATTED_VERBOSE = (WRITE_SUMMARY_LINE + 
-                                 'Changed Paths:\n' +
-                                 '#{list(files)}\n' +
-                                 '#{plainlist(comment)}')
-    
-    WRITE_UNFORMATTED_TERSE = (WRITE_SUMMARY_LINE + '\n' +
-                               '#{plainlist(comment)}')
-
-    BANNER = '-' * 72
-    
-    def set_from_args name, args
-      self.instance_variable_set '@' + name.to_s, args[name]
-    end
-
-    # Reads a log entry from the text, starting at the first line at or after
-    # lidx, matching the svn log separator line. Returns [ entry, new_index ],
-    # where new_index is the updated index into the lines. Returns nil if the
-    # text does not match the expected plain text format.
-    def self.create_from_text lines, lidx = 0
-      return TextOutputReader.create_from_text lines, lidx
-    end
-
-    def initialize args = Hash.new
-      FIELDS.each do |field|
-        set_from_args field, args
-      end
-    end
-
-    def cr ary
-      ary && !ary.empty? ? "\n" : ''
-    end
-
-    def list lines, *colors
-      return '' unless lines
-      
-      lines.collect do |line|
-        ln = line.chomp
-        colors.each do |color|
-          ln = ln.send(color)
-        end
-        "    " + ln + "\n"
-      end.join('')
-    end
-
-    def plainlist lines
-      return '' unless lines
-      
-      # ensure that each has a newline
-      lines.collect do |line|
-        line.chomp + "\n"
-      end.join('')
-    end
-
-    def write formatted
-      # ------------------------------------------------------------------------
-      # r1907 | hielke.hoeve@gmail.com | 2011-11-14 05:50:38 -0500 (Mon, 14 Nov 2011) | 1 line
-      #
-      # back to dev
-
-      if formatted
-        cfg = PVN::Configuration.read
-        
-        logcfg = cfg.section "log"
-        info "logcfg: #{logcfg}"
-        format = logcfg && logcfg.assoc('format') && logcfg.assoc('format')[1]
-        info "format: #{format}"
-
-        format ||= WRITE_FORMAT_DEFAULT
-
-        # @todo allow reformatting of date and time
-        # format = WRITE_FORMAT_DEFAULT
-        msg = eval('"' + format + '"')
-        print msg
-      else
-        puts BANNER
-
-        fmt = files ? WRITE_UNFORMATTED_VERBOSE : WRITE_UNFORMATTED_TERSE
-        
-        puts eval('"' + fmt + '"')
-      end
-    end
-  end
-end