pvn 0.0.7 → 0.0.8

data/lib/pvn/log/logfactory.rb

@@ -1,101 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'pvn/log/logentry'
-require 'pvn/base/textlines'
-
-module PVN; module Log; end; end
-
-module PVN;;Log
-  SVN_LOG_SUMMARY_LINE_RE = Regexp.new('^r(\d+) \| (\S+) \| (\S+) (\S+) (\S+) \((.*)\) \| (\d+) lines?$')
-  SVN_LOG_SEPARATOR_LINE_RE = Regexp.new('^-{72}$')
-  SVN_LOG_VERBOSE_START_RE = Regexp.new('^Changed paths:$')
-  SVN_LOG_FILE_NAME_RE = Regexp.new('^   (\w) (.*)$')
-
-  class TextFactory
-    include Loggable
-
-    def initialize lines
-      @textlines = TextLines.new lines
-      @entries = nil
-    end
-
-    def entries
-      @entries ||= read_entries
-    end
-
-    def read_entries
-      entries = Array.new
-      while entry = create_next_entry
-        entries << entry
-      end
-      entries
-    end
-
-    def match_line re, offset = 0
-      @textlines.match_line re, offset
-    end
-
-    def advance_line nlines = 1
-      @textlines.advance_line nlines
-    end
-
-    def match_log_start_line
-      match_line(SVN_LOG_SEPARATOR_LINE_RE) && match_line(SVN_LOG_SUMMARY_LINE_RE, 1)
-    end
-
-    def has_line?
-      @textlines.has_line?
-    end
-
-    def current_line
-      @textlines.line
-    end
-
-    def read_comment
-      comment = Array.new
-      while has_line? && !match_line(SVN_LOG_SEPARATOR_LINE_RE)
-        comment << current_line.chomp
-        advance_line
-      end
-      comment
-    end
-
-    def read_files
-      advance_line
-      files = Array.new
-      while (ln = current_line) && !ln.strip.empty?
-        md = match_line(SVN_LOG_FILE_NAME_RE)
-        changetype = md[1]
-        fname = md[2]
-        files << fname
-        advance_line
-      end        
-      files
-    end
-
-    def create_entry fielddata
-      advance_line 2
-      fields = Hash[Entry::FIELDS.zip fielddata[1 .. -1]]
-      if match_line SVN_LOG_VERBOSE_START_RE
-        fields[:files] = read_files
-      end
-      advance_line
-      fields[:comment] = read_comment
-      return Entry.new fields
-    end
-
-    def create_next_entry
-      while has_line?
-        if fielddata = match_log_start_line
-          return create_entry fielddata
-        else
-          advance_line
-        end
-      end
-      nil
-    end
-  end
-end

data/lib/pvn/log/logoptions.rb

@@ -1,43 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'synoption/set'
-require 'synoption/option'
-require 'synoption/boolean_option'
-require 'pvn/subcommands/revision/revision_regexp_option'
-
-module PVN
-  DEFAULT_LIMIT = 5
-
-  class LimitOption < Option
-    def initialize lmtargs = Hash.new
-      super :limit, '-l', "the number of log entries", DEFAULT_LIMIT, :negate => [ %r{^--no-?limit} ]
-    end
-  end
-
-  class VerboseOption < BooleanOption
-    def initialize optargs = Hash.new
-      super :verbose, '-v', [ "include the files in the change" ], false
-    end
-  end
-
-  class FormatOption < BooleanOption
-    def initialize optargs = Hash.new
-      super :format, '-f', "use the custom (colorized) format", true, :negate => [ '-F', %r{^--no-?format} ], :as_cmdline_option => nil
-    end
-  end
-
-  class LogOptionSet < OptionSet
-    attr_accessor :revision
-    attr_reader :format
-    
-    def initialize
-      super
-
-      add LimitOption.new
-      @revision = add RevisionRegexpOption.new(:unsets => :limit)
-      @verbose  = add VerboseOption.new
-      @format   = add FormatOption.new
-    end
-  end
-end

data/lib/pvn/revision.rb

@@ -1,119 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'pvn/log/logcmd'
-
-module PVN
-  # 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 Revision
-    include Loggable
-
-    DATE_REGEXP = Regexp.new('^\{(.*?)\}')
-    SVN_REVISION_WORDS = %w{ HEAD BASE COMMITTED PREV }
-
-    def self.revision_from_args optset, optargs
-      revarg = optargs.shift
-      RIEL::Log.debug "revarg: #{revarg}"
-      RIEL::Log.debug "optargs: #{optargs}"
-
-      rev = Revision.new(:fname => optset.arguments[0], :value => revarg, :use_cache => false).revision
-      RIEL::Log.debug "rev: #{rev}"
-
-      if rev.nil?
-        raise ArgumentError.new "invalid revision: #{revarg} on #{optargs[-1]}"
-      end
-      rev
-    end
-    
-    attr_reader :revision
-
-    def initialize args = Hash.new
-      debug "args        : #{args}".yellow
-      value = args[:value]
-      num = value.kind_of?(String) ? value.strip : value
-      debug "num        : #{num}".yellow
-      @fname = args[:fname]
-      debug "fname      : #{@fname}".yellow
-      
-      @revision = nil
-
-      from, to = num.kind_of?(String) ? num.split(':') : num
-      info "from: #{from}; to: #{to}".on_blue
-      info "from: #{from.class}; to: #{to.class}".on_blue
-
-      @revision = convert_to_revision from
-      if to
-        @revision += ':' + convert_to_revision(to)
-      end
-
-      info "@revision: #{@revision}; #{@revision.class}"
-    end
-
-    def to_s
-      @revision
-    end
-
-    def convert_to_revision arg
-      if SVN_REVISION_WORDS.include? arg
-        info "word: #{arg}"
-        arg
-      elsif neg = Integer.negative?(arg)
-        info "neg: #{arg}"
-        get_negative_revision neg
-      elsif arg.kind_of? Fixnum
-        info "fixnum: #{arg}"
-        arg.to_s
-      elsif md = DATE_REGEXP.match(arg)
-        info "md: #{md.inspect}".on_red
-        md[0]
-      elsif md = %r{^\+(\d+)}.match(arg)
-        arg = md[1].to_i
-        debug "arg: #{arg}"
-        get_revision @fname, nil, arg
-      else
-        arg.to_s
-      end
-    end
-
-    def get_negative_revision neg
-      debug "neg        : #{neg}"
-
-      # if these two are the same number (revision(-3) == revision(-2)) then
-      # we're at the end/beginning of the list.
-      currrev = get_negative_revision_unchecked neg
-      if neg == -1
-        debug "currrev: #{currrev}"
-        @revision = currrev
-      else
-        debug "neg        : #{neg}"
-        prevrev = get_negative_revision_unchecked neg + 1
-        
-        debug "prevrev: #{prevrev}"
-        debug "currrev: #{currrev}"
-
-        # $$$ does -r 123 -l 2 == -r 123 -l 3?
-        @revision = prevrev == currrev ? nil : currrev
-        # @revision = prevrev == currrev ? currrev : currrev
-      end
-    end
-
-    def get_negative_revision_unchecked neg
-      # count the limit backward, and get the "first" (last) match
-      limit = -1 * neg
-      get_revision @fname, limit, 1
-    end
-
-    def get_revision fname, limit, num
-      logcmd = LogCommand.new :limit => limit, :command_args => [ fname ]
-      entries = logcmd.entries
-      entry = entries[-1 * num]
-      entry && entry.revision.to_i
-    end
-  end
-end

data/lib/pvn/subcommands/diff/differ.rb

@@ -1,65 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pvn/io/element'
-require 'pvn/subcommands/diff/options'
-require 'pvn/subcommands/base/command'
-require 'tempfile'
-
-$io = $stdout
-
-module PVN::Subcommands::Diff
-  class Differ
-    include Loggable
-
-    attr_reader :whitespace
-    attr_reader :revision
-    
-    def initialize options
-    end
-
-    def to_revision_string rev
-      rev ? "revision #{rev}" : "working copy"
-    end
-
-    def write_to_temp entry, lines
-      Tempfile.open('pvn') do |to|
-        topath = to.path
-        info "topath: #{topath}"
-        to.puts lines
-        to.close
-        cmd = "diff -u"
-        label = " -L '#{entry.path} (revision 0)'"
-        2.times do
-          cmd << label
-        end
-        cmd << " #{frpath}"
-        cmd << " #{entry.path}"
-        IO.popen(cmd) do |io|
-          puts io.readlines
-        end
-      end
-    end
-
-    def run_diff_command entry, fromrev, torev, frompath, topath
-      info "whitespace: #{whitespace}"
-      
-      cmd = "diff -u"
-      if whitespace
-        cmd << " -x -b -x -w -x --ignore-eol-style"
-      end
-
-      [ fromrev, torev ].each do |rev|
-        revstr = to_revision_string rev
-        cmd << " -L '#{entry.path}\t(#{revstr})'"
-      end
-      cmd << " #{frompath}"
-      cmd << " #{topath}"
-      $io.puts "Index: #{entry.path}"
-      $io.puts "==================================================================="
-      IO.popen(cmd) do |io|
-        $io.puts io.readlines
-      end
-    end
-  end
-end

data/lib/pvn/subcommands/diff/local_differ.rb

@@ -1,103 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pvn/io/element'
-require 'pvn/subcommands/diff/options'
-require 'tempfile'
-require 'pvn/subcommands/diff/differ'
-
-module PVN::Subcommands::Diff
-  class LocalDiffer < Differ
-    def initialize options
-      super
-      
-      paths = options.paths
-      paths = %w{ . } if paths.empty?
-
-      info "paths: #{paths}".yellow
-
-      allentries = Array.new
-
-      # we sort only the sub-entries, so the order in which paths were specified is preserved
-
-      @whitespace = options.whitespace
-
-      paths.each do |path|
-        info "path: #{path}".red
-        elmt = PVN::IO::Element.new :local => path
-        entries = elmt.find_files_by_status
-        
-        allentries.concat entries.sort_by { |n| n.path }
-      end
-
-      info "allentries: #{allentries}"
-
-      allentries.each do |entry|
-        info "entry: #{entry.inspect}".on_blue
-        case entry.status
-        when 'modified'
-          show_as_modified entry
-        when 'deleted'
-          show_as_deleted entry
-        when 'added'
-          show_as_added entry
-        end
-      end
-    end
-
-    def read_working_copy entry
-      pn = Pathname.new entry.path
-      pn.readlines
-    end
-
-    def show_as_added entry
-      Tempfile.open('pvn') do |from|
-        # from is an empty file
-        from.close
-
-        # I think this is always revision 0
-        run_diff_command entry, 0, 0, from.path, entry.path
-      end
-    end
-
-    def show_as_deleted entry
-      elmt = PVN::IO::Element.new :local => entry.path
-
-      svninfo = elmt.get_info
-      lines = elmt.cat_remote
-
-      Tempfile.open('pvn') do |from|
-        from.puts lines
-        from.close
-        Tempfile.open('pvn') do |to|
-          # to is an empty file
-          to.close
-          run_diff_command entry, svninfo.revision, nil, from.path, to.path
-        end
-      end
-    end
-    
-    def show_as_modified entry
-      # only doing working copy to remote now      
-      elmt = PVN::IO::Element.new :local => entry.path
-
-      svninfo = elmt.get_info
-      remotelines = elmt.cat_remote
-
-      fromrev = svninfo.revision
-      torev = nil               # AKA working copy
-
-      wclines = read_working_copy entry
-
-      Tempfile.open('pvn') do |from|
-        from.puts remotelines
-        from.close
-        Tempfile.open('pvn') do |to|
-          to.puts wclines
-          to.close
-          run_diff_command entry, fromrev, torev, from.path, to.path
-        end
-      end
-    end
-  end
-end

data/lib/pvn/subcommands/diff/repository_differ.rb

@@ -1,145 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'pvn/io/element'
-require 'pvn/subcommands/diff/options'
-require 'tempfile'
-require 'pvn/subcommands/diff/differ'
-
-module PVN::Subcommands::Diff
-  # this will replace RevisionEntry
-  class Revision
-    include Loggable
-    
-    attr_reader :value
-    attr_reader :from
-    attr_reader :to
-
-    def initialize from, to = nil
-      if to
-        @from = from
-        @to = to
-      else
-        @from, @to = from.split(':')
-      end
-      info "@from: #{@from}"
-      info "@to: #{@to}"
-    end
-
-    def to_s
-      str = @from.to_s
-      if @to
-        str << ':' << @to.to_s
-      end
-      str
-    end
-
-    def head?
-      @to == nil
-    end
-  end
-
-  class RepositoryDiffer < Differ
-    include Loggable
-
-    attr_reader :whitespace
-    attr_reader :revision
-    
-    def initialize options
-      paths = options.paths
-      paths = %w{ . } if paths.empty?
-
-      info "paths: #{paths}"
-
-      allentries = Array.new
-
-      # we sort only the sub-entries, so the order in which paths were specified is preserved
-
-      @whitespace = options.whitespace
-      rev = options.revision
-      change = options.change
-      info "change: #{change}"
-      info "rev: #{rev}"
-      info "rev: #{rev.class}"
-
-      if change
-        @revision = Revision.new(change.to_i - 1, change.to_i)
-      elsif rev.kind_of?(Array)
-        if rev.size == 2
-          # this is some contorting, since -rx:y does not mean comparing the files
-          # in changelist x; it means all the entries from x+1 through y, inclusive.
-
-          ### $$$ this doesn't handle dates:
-          @revision = Revision.new(rev[0].to_i + 1, rev[0].to_i)
-        else
-          from, to = rev[0].split(':')
-          @revision = Revision.new(from.to_i + 1, to)
-        end
-      end
-
-      info "revision: #{@revision}; #{@revision.class}".on_blue
-
-      # maps from pathnames to { :first, :last } revision updated.
-      paths_to_revisions = Hash.new
-
-      paths.each do |path|
-        logentries = get_log_entries path, @revision
-        logentries.each do |logentry|
-          info "logentry: #{logentry}".yellow
-          info "logentry.revision: #{logentry.revision}".yellow
-          info "logentry.paths: #{logentry.paths}".yellow
-
-          # should add the revision to this, so we know which is the first
-          # version to compare against the last:
-
-          logentry.paths.each do |lp|
-            info "lp: #{lp.inspect}".cyan
-            allentries << { :path => lp, :revision => logentry.revision }
-            rec = paths_to_revisions[lp.name]
-            if rec
-              rec[:last] = logentry.revision
-            else
-              rec = { :first => logentry.revision, :action => lp.action }
-            end
-            paths_to_revisions[lp.name] = rec
-          end 
-        end
-      end
-
-      paths_to_revisions.sort.each do |name, revisions|
-        puts "name: #{name}"
-        puts "revisions: #{revisions}"
-      end
-
-      info "allentries: #{allentries}"
-
-      allentries.each do |entry|
-        info "entry: #{entry.inspect}".on_blue
-        next if true
-        case entry.status
-        when 'modified'
-          show_as_modified entry
-        when 'deleted'
-          show_as_deleted entry
-        when 'added'
-          show_as_added entry
-        end
-      end
-    end
-
-    def get_log_entries path, revision
-      cmdargs = Hash.new
-      cmdargs[:path] = path
-      cmdargs[:revision] = revision.to_s
-      cmdargs[:verbose] = true
-
-      # should be conditional on revision:
-      cmdargs[:use_cache] = false
-
-      logargs = SVNx::LogCommandArgs.new cmdargs
-      elmt    = PVN::IO::Element.new :local => path
-      log     = elmt.log logargs
-      entries = log.entries
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'pvn/subcommand/base/clargs'
-
-module PVN; module App; module Pct; end; end; end
-
-module PVN::App::Pct
-  class CmdLineArgs < Subcommand::CmdLineArgs
-    include Loggable
-
-    attr_reader :revision
-    attr_reader :path
-
-    def initialize args
-      @limit = nil
-      while !args.empty?
-        arg = args.shift
-        info "arg: #{arg}".cyan
-        case arg
-        when %r{-r(.*)}
-          md = Regexp.last_match
-          info "md: #{md}".on_yellow
-          @revision = Revision.new :value => md[1]
-        else
-          @path = arg
-        end
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-#!/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
-  end
-end

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

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

data/lib/pvn/svn/command/svncmd.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'riel'
-require 'rubygems'
-require 'system/cachecmd'
-
-module PVN
-  # A command that is a simple pass-through (more or less)
-  # to a svn command.
-  class SVNCommand < CachableCommand
-    def self.revision_from_args optset, cmdargs
-      require 'pvn/revision'
-      Revision.revision_from_args optset, cmdargs
-    end
-
-    def initialize args = Hash.new
-      super
-      info "self: #{self}"
-    end
-
-    def to_svn_command fullcmdargs
-      [ "svn", self.class::COMMAND ] + fullcmdargs
-    end
-
-    def command
-      @svncmd.join " "
-    end
-
-    def execute
-      cmdline = options.as_command_line
-      @svncmd = to_svn_command cmdline
-      info "@svncmd: #{@svncmd}"
-      cmd = @svncmd.join(" ")
-      sysexec cmd
-      # @output = IO.popen(cmd).readlines
-    end
-  end
-end

data/lib/pvn/svn/environment.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'rubygems'
-require 'riel'
-require 'singleton'
-
-module PVN
-  class Environment
-    include Singleton
-
-    DEFAULT_CACHE_DIR = '/tmp/pvn_testing_cache_dir'
-
-    attr_accessor :cache_dir
-    
-    def initialize
-      super
-
-      @cache_dir = DEFAULT_CACHE_DIR
-    end
-  end
-end
-