pvn 0.0.1

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

@@ -0,0 +1,60 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/subcommands/base/doc'
+
+module PVN; module Subcommands; module Base; end; end; end
+
+module PVN::Subcommands::Base
+  class Command
+    include Loggable
+
+    @@doc_for_class = Hash.new { |h, k| h[k] = PVN::Subcommands::Documentation.new }
+    
+    class << self
+      def getdoc
+        @@doc_for_class[self]
+      end
+
+      def subcommands sc
+        getdoc.subcommands = sc
+      end
+
+      def description desc
+        getdoc.description = desc
+      end
+
+      def usage usg
+        getdoc.usage = usg
+      end
+
+      def summary smry
+        getdoc.summary = smry
+      end
+
+      def options opts
+        getdoc.options.concat opts
+      end
+
+      def optscls
+        optmodule = self.to_s.sub %r{::\w+$}, ''
+        optcls = optmodule + '::OptionSet'
+        optset = instance_eval optcls + '.new'
+        getdoc.options.concat optset.options
+      end
+
+      def example *ex
+        getdoc.examples << ex
+      end
+    end
+
+    def to_doc io
+      doc = self.class.getdoc
+      doc.write io
+    end
+
+    def show_help
+      to_doc $stdout
+    end
+  end
+end

data/lib/pvn/subcommands/base/doc.rb

@@ -0,0 +1,94 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+module PVN; module Subcommands; module Base; end; end; end
+
+# this is the same as in pvn/cmddoc.rb
+
+module PVN::Subcommands
+  class Documentation
+    attr_accessor :description
+    attr_accessor :usage
+    attr_accessor :summary
+    
+    attr_reader :examples
+    attr_reader :options
+
+    def initialize(&blk)
+      @subcommands = nil
+      @description = nil
+      @usage = nil
+      @summary = nil
+      @options = Array.new
+      @examples = Array.new
+      if blk
+        blk.call
+      end
+    end
+
+    def subcommands args = nil
+      if args
+        @subcommands = args
+      end
+      @subcommands
+    end
+
+    def subcommands= args
+      @subcommands = args
+    end
+
+    def write io = $stdout
+      doc = Array.new
+
+      subcmds = @subcommands
+
+      subcmdstr = subcmds[0].dup
+      if subcmds.size > 1
+        subcmdstr << " (" << subcmds[1 .. -1].join(" ") << ")"
+      end
+
+      io.puts subcmdstr + ": " + @description
+      io.puts "usage: " + subcmds[0] + " " + @usage
+      io.puts ""
+      io.puts @summary.collect { |line| "  " + line }
+
+      write_section "options", @options, io do |opt, io|
+        option_to_doc opt, io
+      end
+
+      write_section "examples", @examples, io do |ex, io|
+        example_to_doc ex, io
+      end
+    end
+
+    def write_section name, section, io
+      if section.length > 0
+        io.puts ""
+        io.puts "#{name.capitalize}:"
+        io.puts ""
+        
+        section.each do |opt|
+          yield opt, io
+        end
+      end
+    end
+
+    def example_to_doc ex, io
+      ex.each_with_index do |line, idx|
+        if idx == 0
+          io.puts "  % #{line}"
+        else
+          io.puts "    #{line}"
+        end
+      end
+      io.puts
+    end
+
+    def option_to_doc opt, io
+      opt.to_doc io
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'synoption/set'
+require 'synoption/option'
+require 'synoption/boolean_option'
+
+module PVN; module Subcommands; end; end
+
+module PVN::Subcommands::Base
+  class HelpOption < PVN::BooleanOption
+    def initialize args = Hash.new
+      super :help, '-h', "display help", nil
+    end
+  end
+
+  class OptionSet < PVN::OptionSet
+    def paths
+      unprocessed
+    end
+  end
+end

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

@@ -0,0 +1,70 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/io/element'
+require 'pvn/log/formatter/entries_formatter'
+require 'pvn/subcommands/base/doc'
+require 'pvn/subcommands/log/options'
+require 'pvn/subcommands/base/command'
+
+module PVN::Subcommands::Log
+  class Command < PVN::Subcommands::Base::Command
+    include Loggable
+
+    DEFAULT_LIMIT = 15
+
+    description "this is a description of log"
+    subcommands [ "log" ]
+    description "Print log messages for the given files."
+    usage       "[OPTIONS] FILE..."
+    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 subcommands, 'pvn log' accepts relative ",
+                  "revisions."
+                ]
+
+    optscls
+
+    example "pvn log foo.rb",       "Prints the latest #{DEFAULT_LIMIT} log entries for foo.rb."
+    example "pvn log -l 25 foo.rb", "Prints 25 log entries for the file."
+    example "pvn log -3 foo.rb",    "Prints the log entry for revision (HEAD - 3)."
+    example "pvn log +3 foo.rb",    "Prints the 3rd log entry."
+    example "pvn log -l 10 -F",     "Prints the latest 10 entries, uncolorized."
+    example "pvn log -r 122 -v",    "Prints log entry for revision 122, with the files in that change."
+    
+    def initialize args
+      options = PVN::Subcommands::Log::OptionSet.new 
+      options.process args
+
+      return show_help if options.help 
+
+      path      = options.paths[0] || "."
+      cmdargs   = Hash.new
+      cmdargs[:path] = path
+      
+      [ :limit, :verbose, :revision ].each do |field|
+        cmdargs[field] = options.send field
+      end
+      
+      # we can't cache this, because we don't know if there has been an svn
+      # update since the previous run:
+      cmdargs[:use_cache] = false
+
+      logargs   = SVNx::LogCommandArgs.new cmdargs
+      elmt      = PVN::IO::Element.new :local => path || '.'
+      log       = elmt.log logargs
+      nentries  = log.entries.size
+
+      # this should be refined to options.revision.head? && options.limit
+      from_head = !options.revision
+      from_tail = !options.limit && !options.revision
+      
+      # this dictates whether to show +N and/or -1:
+      totalentries = options.limit || options.revision ? nil : nentries
+
+      ef = PVN::Log::EntriesFormatter.new options.format, log.entries, from_head, from_tail
+      puts ef.format
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+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'
+
+module PVN::Subcommands::Log
+  DEFAULT_LIMIT = 5
+
+  class LimitOption < PVN::FixnumOption
+    def initialize lmtargs = Hash.new
+      super :limit, '-l', "the number of log entries", DEFAULT_LIMIT, :negate => [ %r{^--no-?limit} ]
+    end
+  end
+
+  class VerboseOption < PVN::BooleanOption
+    def initialize optargs = Hash.new
+      super :verbose, '-v', [ "include the files in the change" ], false
+    end
+  end
+
+  class FormatOption < PVN::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 OptionSet < PVN::Subcommands::Base::OptionSet
+    has_option :revision, PVN::MultipleRevisionsRegexpOption, [ :unsets => :limit ]
+    has_option :format,   FormatOption
+    has_option :help,     PVN::Subcommands::Base::HelpOption
+    has_option :limit,    LimitOption
+    has_option :verbose,  PVN::BooleanOption, [ :verbose, '-v', [ "include the files in the change" ], false ]
+    
+    def paths
+      unprocessed
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+#!/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/command.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+module PVN; module App; end; end
+
+module PVN::App::Pct
+  class Command
+    include Loggable
+
+    def initialize args
+      clargs = PVN::App::Pct::CmdLineArgs.new args
+      info "clargs: #{clargs}"
+
+      elmt = PVN::IO::Element.new :local => clargs.path || '.'
+      info "elmt: #{elmt}".red
+
+      stats = { :modified => 0, :added => 0, :deleted => 0 }
+
+      if elmt.directory?
+        info "elmt.directory?: #{elmt.directory?}"
+
+        # $$$ todo: recurse even when local has been removed (this is the
+        # awaited "pvn find").
+        
+        changed = Array.new
+        elmt.local.find do |fd|
+          info "fd: #{fd}; #{fd.class}"
+          Find.prune if fd.rootname.to_s == '.svn'
+          if fd.file?
+            subelmt = PVN::IO::Element.new :local => fd.to_s
+            info "subelmt: #{subelmt}"
+            status = subelmt.status
+            info "status: #{status}".red
+          end
+        end
+
+        # info "changed: #{changed}"
+      elsif elmt.file?
+        info "elmt.local: #{elmt.local}".cyan
+
+        status = elmt.status
+        info "status: #{status}"
+
+        case status
+        when "added"
+          info "elmt: #{elmt}".green
+        when "modified"
+          info "elmt: #{elmt}".yellow
+        when "deleted"
+          info "elmt: #{elmt}".red
+        else
+          info "elmt: #{elmt}".cyan
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/subcommands/revision/revision_regexp_option'
+
+module PVN
+  # A revision option with multiple values.
+  class MultipleRevisionsRegexpOption < RevisionRegexpOption
+    REVISION_DESCRIPTION = [ "revision to apply.",
+                             "ARG can be relative, of the form:",
+                             "    +N : N revisions from the BASE",
+                             "    -N : N revisions from the HEAD,",
+                             "         when -1 is the previous revision" ,
+                             "Multiple revisions can be specified." ,
+                           ]
+    
+    def set_value val
+      currval = value
+      if currval
+        super [ currval, val ].flatten
+      else
+        super [ val ]
+      end
+    end
+
+    def resolve_value optset, unprocessed
+      newvalues = Array.new
+      currvalues = value
+
+      currvalues.each do |currval|
+        md = TAG_RE.match currval
+        if md
+          convval = md[2] ? md[3] : relative_to_absolute(currval, unprocessed[0])
+          newvalues << convval
+        else
+          newvalues << currval
+        end
+      end
+
+      @value = newvalues
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'riel'
+require 'rubygems'
+require 'synoption/option'
+require 'svnx/log/command'
+require 'pvn/revision/entry'
+
+module PVN
+  class RevisionOption < Option
+    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" ,
+                           ]
+
+    POS_NEG_NUMERIC_RE = Regexp.new('^[\-\+]\d+$')
+    
+    def initialize revargs = Hash.new
+      @fromdate = nil
+      @todate = nil
+      super :revision, '-r', REVISION_DESCRIPTION, nil, revargs
+    end
+
+    def to_svn_revision_date date
+      '{' + date.to_s + '}'
+    end
+    
+    def value
+      val = nil
+      if @fromdate
+        val = to_svn_revision_date @fromdate
+      end
+
+      if @todate
+        val = val ? val + ':' : ''
+        val += to_svn_revision_date @todate
+      end
+
+      if val
+        val
+      else
+        super
+      end
+    end
+
+    def head?
+      value.nil? || value == 'HEAD'
+    end
+
+    def resolve_value optset, unprocessed
+      val = value
+      if POS_NEG_NUMERIC_RE.match val
+        @value = relative_to_absolute val, unprocessed[0]
+      end
+    end
+
+    def relative_to_absolute rel, path
+      logforrev = SVNx::LogCommandLine.new path
+      logforrev.execute
+
+      xmllines = logforrev.output
+
+      reventry = PVN::Revision::Entry.new :value => rel, :xmllines => xmllines
+      revval   = reventry.value.to_s
+      revval
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/subcommands/revision/revision_option'
+
+module PVN
+  # A revision that is also set by -N and +N.
+  class RevisionRegexpOption < PVN::RevisionOption
+    TAG_RE = Regexp.new('^(?:([\-\+]\d+)|(-r(.+)))$')
+
+    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
+      # info "revargs: #{revargs}"
+      revargs[:regexp] = TAG_RE
+      super
+    end
+
+    def resolve_value optset, unprocessed
+      val = value
+      # info "val: #{val}"
+
+      md = TAG_RE.match val
+      # info "md: #{md.inspect}"
+
+      if md && md[3]
+        # info "md[3]: #{md[3]}"
+        @value = md[3]
+      end
+      
+      super
+    end
+  end
+end

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

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

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

data/lib/pvn/svn/svnelement.rb

@@ -0,0 +1,89 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+require 'pvn/base/util'
+require 'pvn/svn/svninfo'
+
+module PVN
+  class SVNElement
+    include Loggable
+    attr_reader :name
+
+    require 'pvn/svn/svnroot'
+    
+    def initialize args
+      RIEL::Log.info "args: #{args}"
+
+      # $$$ this should handle local paths and full urls.
+      
+      # technically, name is what svn info calls "URL"
+      name = args[:name]
+      if name.nil? && (fname = args[:filename])
+        name = fname
+
+        if false
+          debug "fname  : #{fname}"
+
+          fullpath = Pathname.new(fname).expand_path
+          debug "fullpath: #{fullpath}".yellow
+
+          svnroot = SVNRootElement.new
+          debug "svnroot: #{svnroot}"
+          sri = svnroot.info
+          debug "svnroot.info[:url]: #{sri[:url]}"
+          debug "svnroot.info[:path]: #{sri[:path]}"
+          name = svnroot.info[:url] + '/' + fname
+          debug "name: #{name}"
+        end
+      end
+
+      @name = name
+      RIEL::Log.info "@name: #{@name}".green
+    end
+
+    def to_command subcmd, revcl, *args
+      cmd = "svn #{subcmd}"
+      debug "cmd: #{cmd}"
+      debug "args: #{args}"
+      args = args.flatten
+
+      # revcl is [ -r, 3484 ]
+      if revcl
+        cmd << " -r #{revcl}"
+      end
+      cmd << " " << Util::quote_list(args)
+      debug "cmd: #{cmd}".cyan
+      cmd
+    end
+
+    def info
+      SVN::Info.new :name => @name
+    end
+
+    def line_count revision = nil
+      lc = nil
+      
+      cmd = to_command "cat", revision, @name
+      ::IO.popen cmd do |io|
+        lc = io.readlines.size
+        debug "lc: #{lc.inspect}"
+      end
+
+      lc
+    end
+    
+    def to_s
+      @name.to_s
+    end
+
+    def inspect
+      @name
+    end
+
+    def <=>(other)
+      @name <=> other.name
+    end
+  end
+end