pvn 0.0.7 → 0.0.8

data/bin/change.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+class LocalChange
+  TODIR = '/Projects/pvn/pvntestbed.pending'
+  RESDIR = 'test/resources'
+end
+
+class LocalChangeZero < LocalChange
+  attr_reader :fromdir
+  
+  def initialize 
+    @fromdir = 'change0'
+    
+    copyfiles = Array.new
+    copyfiles << 'FirstFile.txt'
+    copyfiles << 'src/ruby/dog.rb'
+    copyfiles << 'src/java/Charlie.java'
+    copyfiles << 'SeventhFile.txt'
+
+    deletefiles = Array.new
+    deletefiles << 'dirzero/SixthFile.txt'
+
+    origdir = Dir.pwd
+    Dir.chdir 'test/resources/' + fromdir
+
+    copyfiles.each do |cpfile|
+      copy_file cpfile
+    end
+
+    deletefiles.each do |delfile|
+      delete_file delfile
+    end
+
+    Dir.chdir origdir
+  end
+
+  def copy_file fname
+    puts "fname: #{fname}"
+  end
+
+  def delete_file fname
+    puts "fname: #{fname}"
+  end
+end
+
+LocalChangeZero.new

data/bin/pvn

@@ -1,12 +1,16 @@
 #!/usr/bin/env ruby
 #
 #  Created on 2011-11-9.
-#  Copyright (c) 2011. All rights reserved.
+#  Copyright (c) 2012. All rights reserved.
 
 require 'rubygems'
-require File.expand_path(File.dirname(__FILE__) + "/../lib/pvn")
+
+fdirname = File.expand_path(File.dirname(__FILE__) + '/../lib')
+unless $:.include?(fdirname) || $:.include?(File.expand_path(fdirname))
+  $:.unshift(fdirname)
+end
+
+require 'pvn'
 require "pvn/app"
 
 PVN::App::Runner.new STDOUT, ARGV
-
-# PVN::App.execute(STDOUT, ARGV)

data/bin/quote.rb

@@ -8,7 +8,8 @@ class Quotes < Hash
   def initialize 
     super { |h, k| h[k] = Array.new }
 
-    DATA.each do |line|
+    file = Pathname.new(__FILE__).parent + "quotes.txt"
+    file.each_line do |line|
       line.chomp!
       next if line.empty?
       who, quote = line.split(':', 2)
@@ -26,8 +27,21 @@ class Quotes < Hash
 
   def get_random
     who = keys.rand
-    puts who
-    [ who, self[who].rand.dup ]
+    quote = self[who].rand
+    self[who].delete quote
+    write
+    [ who, quote ]
+  end
+
+  def write
+    file = Pathname.new(__FILE__).parent + "quotes.txt"
+    File.open(file, "w") do |io|
+      self.sort.each do |who, quotes|
+        quotes.sort.each do |quote|
+          io.puts "#{who}: #{quote}"
+        end
+      end
+    end
   end
 end
 
@@ -37,13 +51,11 @@ if false
   quotes.print_random
 end
 
-if false
+if true
   quotes.sort.each do |who, qtes|
     printf "%4d %s\n", qtes.length, who
   end
-end
 
-if false
   printf "%4d %s\n", quotes.values.inject(0) { |s, n| s + n.length }, "total"
 end
 

data/bin/quotes.orig.txt

@@ -0,0 +1,145 @@
+Lyle:Come on, boys! The way you're lollygaggin' around here with them picks and them shovels, you'd think it was a hundert an' twenty degrees!... Can't be more than a hundert an' fourteen!
+Hedley Lamarr: There might be a legal precedent. Land snatching ... L-l-land. See snatch."
+Hedley Lamarr: If I could find a sheriff who so offends the people of Rock Ridge that his very appearance would drive them out of town! Wherever will I find such a man? ... Why am I asking you?
+Jim: No. Don't do that, don't do that. If you shoot him you'll just make him mad.
+Jim: What did you expect? "Welcome, sonny"? "Make yourself at home"? "Marry my daughter"? You've got to remember that these are just simple farmers. These are people of the land. The common clay of the new West. You know ... morons.
+Lili von Shtupp: Willkommen, Bienvenue, Welcome, C'mon in.
+Taggart: Ah'm werkin' fer Mel Brooks!
+Taggart: Le Petomane Thruway. Now what'll that asshole think of next? Does anybody got a dime? Somebody has to go back and get a shitload of dimes.
+Mongo: Mongo only pawn in the game of life.
+Mongo: Mongo like candy!
+
+Bart: Are we awake?
+Jim: We're not sure. Are we...black?
+Bart: Yes we are.
+Jim: Then we're awake. But we're very puzzled.
+
+Bart: What's your name?
+Jim: My name's Jim, but most people call me ... Jim.
+
+Bart: Well Jim, since you are my guest and I am your host, what are your pleasures. What do you like to do?
+Jim: Oh, I don't know. Play chess ...
+Bart: Well, let's play chess.
+
+Bart: By the power invested in me by the honorable William J. Le Petomane, I hereby assume the duties of sheriff in and for the township of Rock Ridge.
+
+Dr. Johnson: Hold it men! He's not bluffing!
+Dr. Samuel Johnson: Listen to him, men; he's just crazy enough to do it!
+Harriet Johnson: Isn't anyone going to help that poor man?
+Dr. Samuel Johnson: Hush, Harriet! That's a sure way to get him killed!
+Bart: Oh, baby, you are so talented, and they so dumb!
+
+Hedley Lamarr: My mind is aglow with whirling, transient nodes of thought careening through a cosmic vapor of invention.
+Taggart: Ditto!
+Hedley Lamarr: Ditto?! Ditto, you provincial putz?!
+
+Hedley Lamarr: My mind is a raging torrent, flooded with rivulets of thought, cascading into a waterfall of creative alternatives...
+
+Hedley Lamarr: I want rustlers, cut throats, murderers, bounty hunters, desperados, mugs, pugs, thugs, nitwits, halfwits, dimwits, vipers, snipers, con men, Indian agents, Mexican bandits, muggers, buggerers, bushwhackers, hornswogglers, horse thieves, bull dykes, train robbers, bank robbers, ass-kickers, shit-kickers, and Methodists!
+
+Taggart: What in the Wide World of Sports is a-goin' on here? I hired you people to get some track laid ... 
+
+Buddy Bizarre: CUT! What in the hell do you think you're doing here? This is a closed set.
+Buddy Bizarre: Not in the face.
+
+Hedley Lamarr: "Head them off at the pass?" I hate that cliche!
+
+Lyle: Don't pay no attention to that alky. He can't hold a gun, much less shoot it.
+
+Bart: Well, don't just stand there looking stupid, grasping your hands in pain. How about a round of applause for The Waco Kid? 
+
+Hedley Lamarr: Charming. Sign right here.
+
+Harriet Johnson: ... wish to express our extreme displeasure with your choice of sheriff. Please remove him immediately! The fact that you have sent him here just goes to prove that you are the leading asshole in the state!
+
+Lili von Shtupp: A wed wose. How womantic. 
+
+Bart: A man drink like that and he don't eat, he is going to DIE. 
+
+Mongo: Huh-huh, naw, Mongo straight. 
+
+Hedley Lamarr: Meeting adjourned. Oh, I am sorry, sir, I didn't mean to overstep my bounds. You say that. 
+Governor William J. Le Petomane: It is?
+Hedley Lamarr: Here, sir, play with this.
+
+Gabby Johnson: I wash born here, an I wash raished here, and dad gum it, I am gonna die here, an no sidewindin' bushwackin', hornswagglin' cracker croaker is gonna rouin me bishen cutter. 
+
+Taggart: Dang, that was lucky. Doggone near lost a four hundred dollar handcar. 
+
+Lyle: Send wire, main office, tell them I said "ow". Gotcha! 
+
+Bart: And they was right. 
+
+Dr. Samuel Johnson: He said the sheriff's near. 
+
+Howard Johnson: As honorary chairman of the welcoming committee, it's my privilege to present a laurel and hearty handshake to our new ... 
+
+Bart: No, thank you. Fifteen is my limit on schnitzengruben. 
+
+Bart: And now, for my next impression ... Jesse Owens. 
+
+
+Hedley Lamarr: Men, you are about to embark on a great crusade to stamp out runaway decency in the west. Now you men will only be risking your lives, whilst I will be risking an almost certain Academy Award nomination for Best Supporting Actor. 
+
+Jim: See? In another twenty-five years, you'll be able to shake their hands in broad daylight. 
+
+Howard Johnson: Y'know, Nietzsche says: "Out of chaos comes order." 
+
+Bart: Well, raise my rent. You are The Kid. 
+
+Bart: ... to tell the family secret, my grandmother was Dutch. 
+
+Bart: All right, you caught me. To speak the plain truth, it's getting pretty damn dull around here. 
+
+ Lili von Shtupp: Vhy don't you admit it? He's too much of man for you. I know. You're going to need an army to beat him! You're finished. Fertig! Verfallen! Verlumpt! Verblunget! Verkackt!
+
+Hedley Lamarr: Elementary, cactus head. 
+
+Governor William J. Le Petomane: Ha ha... wrong person. Forgive me. No offense intended. 
+
+Buddy Bizarre: Watch me! It's so simple! Give me the playback!
+
+Buddy Bizarre: Sounds like steam escaping. 
+
+Bart: Hey, Charlie? Let me ask you something: what is it that's not exactly water and it ain't exactly earth? 
+
+Bart: Well, can't you see that's the last act of a desperate man?
+
+Howard Johnson: We don't care if it's the first act of "Henry V," we're leaving! 
+
+Hedley Lamarr: Alright, I'm through being Mr. Goodbar, the time has come to act and act quickly. 
+
+Governor William J. Le Petomane: We've gotta protect our phoney baloney jobs, gentlemen! 
+
+Reverend Johnson: Gentlemen, gentlemen, allow not hatred to rule the day. 
+
+Olson Johnson: Now who can argue with that? I think we're all indebted to Gabby Johnson for clearly stating what needed to be said. I'm particulary glad that these lovely children were here today to hear that speech. Not only was it authentic frontier gibberish, it expressed a courage little seen in this day and age. 
+
+Olson Johnson: What are we made of? Our fathers came across the prairies, fought Indians, fought drought, fought locusts, fought Dix... remember when Richard Dix came in here and tried to take over this town? Well, we didn't give up then, and by gum, we're not going to give up now! 
+
+Governor William J. Le Petomane: I didn't get a "harrumph" out of that guy!
+Hedley Lamarr: Give the Governor harrumph!
+
+Governor William J. Le Petomane: You watch your ass. 
+
+Reverend Johnson: O Lord, do we have the strength to carry off this mighty task in one night?
+
+Hedley Lamarr: Ah, Haley vs. United States. Haley: 7, United States: nothing. You see, it can be done! 
+
+Hedley Lamarr: Chewing gum on line, eh? I hope you brought enough for everybody. 
+
+Jim: Boy, is he strict! 
+
+Hedley Lamarr: This is the bill that will convert the state hospital for the insane into the William J. Le Petomane memorial gambling casino for the insane.
+
+Governor William J. Le Petomane: Gentlemen, this bill will be a giant step forward in the treatment of the insane gambler. 
+
+
+Hedley Lamarr: Now go do... that voodoo... that YOU do... SO WELL...! 
+
+Van Johnson: Sheriff! Mongo's back! He's breaking up the whole town! You've got to help us, please!
+Bart: Did you hear that? Now it's "please". This morning, I couldn't get the time of day. Who is this Mongo, anyway?
+Jim: Well, Mongo ain't exactly a "who". He's more of a "what".
+Van Johnson: What he said.
+Van Johnson: Oh, thank you, Sheriff! Oh, thank you very much! Thank you!
+Van Johnson: The fool's going to... I mean, the sheriff's going to do it!

data/bin/quotes.txt

@@ -0,0 +1,64 @@
+Bart: ... to tell the family secret, my grandmother was Dutch.
+Bart: A man drink like that and he don't eat, he is going to DIE.
+Bart: All right, you caught me. To speak the plain truth, it's getting pretty damn dull around here.
+Bart: And now, for my next impression ... Jesse Owens.
+Bart: And they was right.
+Bart: Are we awake?
+Bart: By the power invested in me by the honorable William J. Le Petomane, I hereby assume the duties of sheriff in and for the township of Rock Ridge.
+Bart: Did you hear that? Now it's "please". This morning, I couldn't get the time of day. Who is this Mongo, anyway?
+Bart: Hey, Charlie? Let me ask you something: what is it that's not exactly water and it ain't exactly earth?
+Bart: No, thank you. Fifteen is my limit on schnitzengruben.
+Bart: Oh, baby, you are so talented, and they so dumb!
+Bart: Well Jim, since you are my guest and I am your host, what are your pleasures. What do you like to do?
+Bart: Well, can't you see that's the last act of a desperate man?
+Bart: Well, don't just stand there looking stupid, grasping your hands in pain. How about a round of applause for The Waco Kid?
+Bart: Well, let's play chess.
+Bart: Well, raise my rent. You are The Kid.
+Bart: What's your name?
+Bart: Yes we are.
+Buddy Bizarre: Not in the face.
+Buddy Bizarre: Sounds like steam escaping.
+Dr. Samuel Johnson: He said the sheriff's near.
+Dr. Samuel Johnson: Hush, Harriet! That's a sure way to get him killed!
+Dr. Samuel Johnson: Listen to him, men; he's just crazy enough to do it!
+Governor William J. Le Petomane: Gentlemen, this bill will be a giant step forward in the treatment of the insane gambler.
+Governor William J. Le Petomane: Ha ha... wrong person. Forgive me. No offense intended.
+Governor William J. Le Petomane: I didn't get a "harrumph" out of that guy!
+Governor William J. Le Petomane: You watch your ass.
+Hedley Lamarr: "Head them off at the pass?" I hate that cliche!
+Hedley Lamarr: Ah, Haley vs. United States. Haley: 7, United States: nothing. You see, it can be done!
+Hedley Lamarr: Alright, I'm through being Mr. Goodbar, the time has come to act and act quickly.
+Hedley Lamarr: Charming. Sign right here.
+Hedley Lamarr: Ditto?! Ditto, you provincial putz?!
+Hedley Lamarr: Elementary, cactus head.
+Hedley Lamarr: Give the Governor harrumph!
+Hedley Lamarr: I want rustlers, cut throats, murderers, bounty hunters, desperados, mugs, pugs, thugs, nitwits, halfwits, dimwits, vipers, snipers, con men, Indian agents, Mexican bandits, muggers, buggerers, bushwhackers, hornswogglers, horse thieves, bull dykes, train robbers, bank robbers, ass-kickers, shit-kickers, and Methodists!
+Hedley Lamarr: If I could find a sheriff who so offends the people of Rock Ridge that his very appearance would drive them out of town! Wherever will I find such a man? ... Why am I asking you?
+Hedley Lamarr: Meeting adjourned. Oh, I am sorry, sir, I didn't mean to overstep my bounds. You say that.
+Hedley Lamarr: Men, you are about to embark on a great crusade to stamp out runaway decency in the west. Now you men will only be risking your lives, whilst I will be risking an almost certain Academy Award nomination for Best Supporting Actor.
+Hedley Lamarr: My mind is a raging torrent, flooded with rivulets of thought, cascading into a waterfall of creative alternatives...
+Hedley Lamarr: My mind is aglow with whirling, transient nodes of thought careening through a cosmic vapor of invention.
+Hedley Lamarr: Now go do... that voodoo... that YOU do... SO WELL...!
+Hedley Lamarr: There might be a legal precedent. Land snatching ... L-l-land. See snatch."
+Hedley Lamarr: This is the bill that will convert the state hospital for the insane into the William J. Le Petomane memorial gambling casino for the insane.
+Howard Johnson: As honorary chairman of the welcoming committee, it's my privilege to present a laurel and hearty handshake to our new ...
+Howard Johnson: We don't care if it's the first act of "Henry V," we're leaving!
+Jim: My name's Jim, but most people call me ... Jim.
+Jim: No. Don't do that, don't do that. If you shoot him you'll just make him mad.
+Jim: Oh, I don't know. Play chess ...
+Jim: See? In another twenty-five years, you'll be able to shake their hands in broad daylight.
+Jim: Then we're awake. But we're very puzzled.
+Jim: Well, Mongo ain't exactly a "who". He's more of a "what".
+Jim: What did you expect? "Welcome, sonny"? "Make yourself at home"? "Marry my daughter"? You've got to remember that these are just simple farmers. These are people of the land. The common clay of the new West. You know ... morons.
+Lyle: Come on, boys! The way you're lollygaggin' around here with them picks and them shovels, you'd think it was a hundert an' twenty degrees!... Can't be more than a hundert an' fourteen!
+Mongo: Mongo like candy!
+Reverend Johnson: Gentlemen, gentlemen, allow not hatred to rule the day.
+Reverend Johnson: O Lord, do we have the strength to carry off this mighty task in one night?
+Taggart: Ah'm werkin' fer Mel Brooks!
+Taggart: Dang, that was lucky. Doggone near lost a four hundred dollar handcar.
+Taggart: Le Petomane Thruway. Now what'll that asshole think of next? Does anybody got a dime? Somebody has to go back and get a shitload of dimes.
+Taggart: What in the Wide World of Sports is a-goin' on here? I hired you people to get some track laid ...
+Van Johnson: Oh, thank you, Sheriff! Oh, thank you very much! Thank you!
+Van Johnson: Sheriff! Mongo's back! He's breaking up the whole town! You've got to help us, please!
+Van Johnson: The fool's going to... I mean, the sheriff's going to do it!
+Van Johnson: What he said.

data/lib/pvn/app/runner.rb

@@ -0,0 +1,103 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+require 'pvn'
+require 'pvn/io/element'
+
+require 'pvn/log/command'
+require 'pvn/pct/command'
+require 'pvn/status/command'
+require 'pvn/diff/command'
+
+# the old ones:
+# require 'pvn/diff/diffcmd'
+# require 'pvn/pct/pctcmd'
+
+# the new ones:
+# require 'pvn/describe'
+# require 'pvn/upp/uppcmd'
+# require 'pvn/wherecmd'
+
+module PVN; module App; end; end
+
+module PVN::App
+  class Runner
+    include Loggable
+
+    SUBCOMMANDS = [ PVN::Log::Command,
+                    PVN::Pct::Command,
+                    PVN::Status::Command,
+                    PVN::Diff::Command,
+                    # DescribeCommand, 
+                    # WhereCommand,
+                    # UndeleteCommand,
+                  ]
+
+    def initialize io, args
+      RIEL::Log.level = RIEL::Log::WARN
+      RIEL::Log.set_widths(-25, 5, -35)
+
+      if args.empty?
+        run_help args
+      end
+      
+      while args.size > 0
+        arg = args.shift
+        info "arg: #{arg}"
+
+        case arg
+        when "--verbose"
+          RIEL::Log.level = RIEL::Log::DEBUG
+        when "help", "--help", "-h"
+          run_help args
+        else
+          SUBCOMMANDS.each do |sc|
+            if sc.matches_subcommand? arg
+              # run command actually exits, but this makes it clearer
+              return run_command sc, args
+            end
+          end
+          $stderr.puts "ERROR: subcommand not valid: #{arg}"
+          exit(-1)
+        end
+      end
+
+      run_help args
+    end
+
+    def run_command cmdcls, args
+      begin
+        cmdcls.new args
+        exit(0)
+      rescue => e
+        puts e.backtrace
+        $stderr.puts e
+        exit(-1)
+      end
+    end
+    
+    def run_help args
+      forwhat = args[0]
+
+      cls = SUBCOMMANDS.find do |cls|
+        cls.getdoc.subcommands.include? forwhat
+      end
+
+      if cls
+        cls.to_doc
+      else
+        puts "usage: pvn [--verbose] <command> [<options>] [<args>]"
+        puts "PVN, version #{PVN::VERSION}"
+        puts
+        puts "PVN has the subcommands:"
+        SUBCOMMANDS.each do |sc|
+          printf "   %-10s %s\n", sc.getdoc.subcommands[0], sc.getdoc.description
+        end
+      end
+      exit(0)
+    end
+  end
+end

data/lib/pvn/app.rb

@@ -4,145 +4,4 @@
 require 'rubygems'
 require 'riel'
 
-require 'pvn/io/element'
-
-require 'svnx/log/entries'
-
-require 'pvn/subcommands/log/command'
-require 'pvn/subcommands/pct/command'
-require 'pvn/subcommands/status/command'
-require 'pvn/subcommands/diff/command'
-
-# the old ones:
-# require 'pvn/diff/diffcmd'
-# require 'pvn/pct/pctcmd'
-require 'pvn/describe'
-require 'pvn/upp/uppcmd'
-require 'pvn/wherecmd'
-
-module PVN; module App; end; end
-
-module PVN::App
-  class Runner
-    include Loggable
-
-    def initialize io, args
-      RIEL::Log.level = RIEL::Log::WARN
-      RIEL::Log.set_widths(-25, 5, -35)
-
-      if args.empty?
-        run_help args
-      end
-      
-      while args.size > 0
-        arg = args.shift
-        info "arg: #{arg}"
-
-        case arg
-        when "--verbose"
-          RIEL::Log.level = RIEL::Log::DEBUG
-        when "help", "--help", "-h"
-          run_help args
-        when "log"
-          run_command PVN::Subcommands::Log::Command, args
-        when "pct"
-          run_command PVN::Subcommands::Pct::Command, args
-        when "status"
-          run_command PVN::Subcommands::Status::Command, args
-        when "diff"
-          run_command PVN::Subcommands::Diff::Command, args
-        else
-          $stderr.puts "ERROR: subcommand not valid: #{arg}"
-          exit(-1)
-        end
-      end
-
-      run_help args
-    end
-
-    def run_command cmdcls, args
-      begin
-        cmdcls.new args
-        exit(0)
-      rescue => e
-        puts e.backtrace
-        $stderr.puts e
-        exit(-1)
-      end
-    end
-
-    # below is the old implementation. yes, I should have branched this.
-    # =======================================================
-
-    def self.run_command_with_output cmd
-      RIEL::Log.info "cmd: #{cmd}".on_black
-      puts cmd.output
-      true
-    end
-    
-    def self.run_command_as_entries cmd
-      RIEL::Log.info "cmd: #{cmd}".on_black
-      cmd.write_entries
-      true
-    end
-
-    SUBCOMMANDS = [ PVN::Subcommands::Log::Command,
-                    PVN::Subcommands::Pct::Command,
-#                    DiffCommand, 
-#                    DescribeCommand, 
-#                    PctCommand,
-#                    WhereCommand,
-#                    UndeleteCommand,
-                  ]
-    
-    def run_help args
-      forwhat = args[0]
-
-      cls = SUBCOMMANDS.find do |cls|
-        cls.getdoc.subcommands.include? forwhat
-      end
-
-      if cls
-        cls.to_doc
-      else
-        puts "usage: pvn [--verbose] <command> [<options>] [<args>]"
-        puts "PVN, version #{PVN::VERSION}"
-        puts
-        puts "PVN has the subcommands:"
-        SUBCOMMANDS.each do |sc|
-          printf "   %-10s %s\n", sc.getdoc.subcommands[0], sc.getdoc.description
-        end
-      end
-      exit(0)
-    end
-    
-    def self.execute stdout, args = Array.new
-      while args.size > 0
-        arg = args.shift
-        RIEL::Log.debug "arg: #{arg}"
-
-        if arg == "--verbose"
-          RIEL::Log.level = RIEL::Log::DEBUG
-          next
-        end
-
-        if arg == "help"
-          return run_help args
-        end
-
-        SUBCOMMANDS.each do |sc|
-          if sc.doc.subcommands.include?(arg)
-            cmd = sc.new :execute => true, :command_args => args
-            if cmd.has_entries?
-              return run_command_as_entries cmd
-            else
-              return run_command_with_output cmd
-            end
-          end
-        end
-        
-        $stderr.puts "ERROR: subcommand not valid: #{arg}"
-      end
-    end
-  end
-end
+require 'pvn/app/runner'

data/lib/pvn/{subcommands/base → command}/color_option.rb

@@ -3,7 +3,7 @@
 
 require 'synoption/boolean_option'
 
-module PVN::Subcommands::Base
+module PVN::Command
   class ColorOption < PVN::BooleanOption
     def initialize optargs = Hash.new
       super :color, '-f', "show colorized output", true, :negate => [ '-C', %r{^--no-?color} ], :as_cmdline_option => nil

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

@@ -1,15 +1,15 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'pvn/subcommands/base/doc'
+require 'pvn/command/doc'
 
-module PVN; module Subcommands; module Base; end; end; end
+module PVN; module Command; end; end
 
-module PVN::Subcommands::Base
+module PVN::Command
   class Command
     include Loggable
 
-    @@doc_for_class = Hash.new { |h, k| h[k] = PVN::Subcommands::Documentation.new }
+    @@doc_for_class = Hash.new { |h, k| h[k] = PVN::Command::Documentation.new }
     
     class << self
       def getdoc
@@ -50,8 +50,12 @@ module PVN::Subcommands::Base
       def example *ex
         getdoc.examples << ex
       end
-    end
 
+      def matches_subcommand? sc
+        getdoc.subcommands.include? sc
+      end
+    end
+    
     def to_doc io
       doc = self.class.getdoc
       doc.write io
@@ -66,7 +70,7 @@ module PVN::Subcommands::Base
       options.process args
       
       if options.help
-        cmd.show_help
+        show_help
       else
         init options
       end

data/lib/pvn/{subcommands/base → command}/doc.rb

@@ -4,11 +4,11 @@
 require 'rubygems'
 require 'riel'
 
-module PVN; module Subcommands; module Base; end; end; end
+module PVN; module Command; end; end
 
 # this is the same as in pvn/cmddoc.rb
 
-module PVN::Subcommands
+module PVN::Command
   class Documentation
     attr_accessor :description
     attr_accessor :usage

data/lib/pvn/{subcommands/base → command}/options.rb

@@ -6,9 +6,9 @@ require 'synoption/option'
 require 'synoption/boolean_option'
 require 'synoption/fixnum_option'
 
-module PVN; module Subcommands; end; end
+module PVN; module Command; end; end
 
-module PVN::Subcommands::Base
+module PVN::Command
   class HelpOption < PVN::BooleanOption
     def initialize args = Hash.new
       super :help, '-h', "display help", nil

data/lib/pvn/config.rb

@@ -59,7 +59,20 @@ module PVN
   end
 end
 
-
 if __FILE__ == $0
   cfg = PVN::Configuration.read
 end
+
+__END__
+# this is an example:
+PVN::Configuration.config do |config|
+  config.diff do |diff|
+    diff.java = '/home/jpace/Programs/diffj-1.2.1/bin/diffj --context -L "{0}" -L "{1}" "{2}" "{3}"'
+    diff.xmlorig  = "xmldiff --someopt=true --from-file '{0}' --to-file '{1}'"
+  end
+  
+  config.log do |log|
+    log.limit = 25
+    log.format = '#{revision.red}\t#{user.bold}\t#{time} #{date}\n#{list(comment, :green)}#{cr(files)}#{list(files, :bold, :cyan)}\n'
+  end
+end