pvn 0.0.5 → 0.0.6

data/README.markdown

@@ -10,7 +10,7 @@ everything svn does, but better. Maybe some day that will happen.
 SUMMARY
 -------
 
-    svn [ options ] file ...
+    pvn [ options ] file ...
 
 FEATURES
 --------
@@ -31,7 +31,7 @@ Thus for the following list of revisions for a path:
 
 Relative revision +0 is r1049, -1 is r1947, +1 is r1143, and so on.
 
-**Colorized logging**. The "log" subcommand works in pvn as it does with svn,
+**Colorized logging**. The *log* subcommand works in pvn as it does with svn,
 except that output is colorized, differing for the elements (file, directory) and
 the status of the element (added, deleted, changed). The logging output also
 shows the relative revision.
@@ -39,4 +39,5 @@ shows the relative revision.
 **Sorted names**. Pvn differs from Subversion in that for all subcommands, file names
 are printed in sorted order, improving legibility.
 
+**Caching**. Output from some commands is cached, for speed.
 

data/bin/modify_timestamps.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+# read a Subversion dump file, modifying its dates from now - 1 hour to target date
+
+earliest = Time.local(2009)
+latest = Time.new - 3600
+
+puts "earliest: #{earliest}"
+puts "latest  : #{latest}"
+
+interval = latest.to_i - earliest.to_i
+
+puts "interval: #{interval}"
+
+ndates = 3
+
+0.upto(ndates) do |n|
+  time = Time.at(earliest + (interval / (1 + n)))
+  puts "time    : #{time}"
+  # fake microseconds (available in Ruby 1.9, but not in 1.8)
+  ms = rand(1000000)
+  str = time.strftime "%FT%T." + sprintf("%06d", ms) + "Z"
+  puts "str     : #{str}"
+end
+
+# svn format:
+# 2011-12-25T00:18:34.971497Z

data/bin/populate.rb

@@ -0,0 +1,231 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+Log.level = Log::DEBUG
+
+# for diff (diffj, xmldiff):
+#    multiple revisions of those file types (.java, .xml)
+
+# for pct, diff, etc.
+#    locally changed files
+#    revisions
+
+# checkins of one file, multiple files
+
+# add, change and delete in one checkin
+
+class Change
+  def initialize user, comment, files = Hash.new
+    
+  end
+end
+
+
+module SVN
+  FROMREPO = '/Programs/Subversion/Repositories/pvntestbed.from'
+  TOREPO = '/Programs/Subversion/Repositories/pvntestbed.to'
+  CHECKOUT_DIR = '/Programs/pvn'
+  DUMPFILE = '/tmp/pvntestbed.dump'
+
+  COMPRESSED_FILES = %w{ zip gzip tar tar.gz bz2 tar.bz2 jar }
+  BINARY_FILES = %w{ jpg png pdf class }
+  TEXT_FILES = %w{ rb rake java txt class pl pm xml html css gradle }
+
+  module ClassMethods
+  end
+
+  def self.included base
+    base.extend ClassMethods
+  end
+end
+
+class SVN::Base
+  include Loggable
+  
+  def run_command *cmd
+    cmdstr = cmd.join(' ')
+    info "cmdstr: #{cmdstr}".red
+    # return if true
+
+    IO.popen(cmd.join(' ')) do |io|
+      puts io.readlines
+    end
+  end
+
+  def remove dir
+    pn = Pathname.new dir
+    if pn.exist?
+      dest = "/tmp/#{pn.basename}." + Time.new.to_i.to_s
+      info "copying #{dir} to #{dest}"
+      FileUtils.cp_r dir, dest
+
+      info "removing #{pn}".red
+      pn.rmtree if pn.exist?
+    end
+  end
+end
+
+module SVN
+  class Repository < Base
+    attr_reader :dir
+
+    def initialize dir
+      @dir = dir
+    end
+
+    def create
+      remove dir
+      
+      run_command 'svnadmin', 'create', dir
+      run_command 'chgrp', 'lusers', '-R', dir
+    end
+
+    def dump
+      run_command 'svnadmin', 'dump', @dir, '>', DUMPFILE
+    end
+
+    def load
+      run_command 'svnadmin', 'load', @dir, '<', DUMPFILE
+    end
+
+    def checkout
+      remove CHECKOUT_DIR
+
+      run_command 'svn', 'co', 'file://' + @dir, CHECKOUT_DIR + '/' + Pathname.new(@dir).basename
+    end
+  end
+end
+
+
+class SvnRepoCreator
+  
+end
+
+module SVN
+  class Populator < Base
+
+    # text files are by different versions:
+    # Foo.0.add.java == add
+    # Foo.1.mod.java == modify
+    # Foo.2.mod.java == modify
+    # Foo.3.del.java == delete
+
+    # Foo.4.add.java == add (second time)
+    # Foo.5.mod.java == modify
+    # Foo.6.chg.java == change, but do not check in
+
+    # path/to/something/Bar.txt
+
+    # Name.0.add.zip = { Foo.0.add.java, Bar.1.mod.txt, Baz.0.png }:
+    #   change to Foo.java, Bar.txt, Baz.png
+    #   create zipfile
+    #   add zipfile
+
+    # Name.1.chg.zip = { Foo.1.java, Bar.3.txt, Baz.1.png }:
+    #   change to Foo.java, Bar.txt, Baz.png
+    #   delete zipfile
+    #   create zipfile
+    #   modify zipfile
+
+    USERS = [ 
+             'Bart',
+             'Jim', 
+             'Taggart',
+             'Hedley Lamarr', 
+             'Lili Von Shtupp', 
+             'Governor William J. Lepetomane',
+             'Lyle',
+             'Mongo',
+             'Buddy Bizarre',
+             'Miss Stein'
+            ]
+
+    DOMAIN = 'rockridge.com'
+
+    def initialize 
+      create_src_repo
+
+      generate
+
+      modify_dates
+
+      create_dest_repo
+
+      cleanup
+
+      # svn co 'file://' + TOREPO /Programs/pvntestbed
+    end
+
+    def create_src_repo
+      pn = Pathname.new TOREPO
+      pn.rmtree if pn.exist?
+
+      run_command 'svnadmin', 'create', FROMREPO
+      run_command 'chgrp', 'lusers', '-R', FROMREPO
+    end
+
+    def generate
+      # add subdirectories
+      # add files
+
+      dir = Pathname.new TMPDIR
+      info "dir: #{dir}".cyan
+      dir.rmtree if dir.exist?
+
+      run_command 'svn', 'co', 'file://' + FROMREPO, TMPDIR
+      Dir.chdir dir
+      
+      # ln -s deleted FileToDelete.txt
+    end
+
+    def modify_dates
+      # modify dates in DUMPFILE
+      # start with 2011-12-10, increment randomly, not going past present date
+    end
+
+    def create_dest_repo
+      run_command 'svnadmin', 'dump', FROMREPO, '>', DUMPFILE
+      run_command 'svnadmin', 'create', TOREPO
+      run_command 'svnadmin', 'load', TOREPO, '<', DUMPFILE
+    end
+
+    def cleanup
+      pn = Pathname.new FROMREPO
+      info "pn: #{pn}".yellow
+      pn.rmtree
+    end
+
+    def add_file dir, fname, username, password = nil # password evidently not used.
+    end
+
+    def delete_file dir, fname, username
+    end
+
+    def change_file dir, fname, username
+    end
+  end
+end
+
+repo = nil
+
+ARGV.each do |arg|
+  case arg
+  when "from"
+    repo = SVN::Repository.new SVN::FROMREPO
+  when "to"
+    repo = SVN::Repository.new SVN::TOREPO
+  when "create"
+    repo.create
+  when "dump"
+    repo.dump
+  when "checkout"
+    repo.checkout
+  when "load"
+    repo.load
+  else
+    raise "invalid argument: #{arg}"
+  end
+end

data/bin/quote.rb

@@ -0,0 +1,206 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'rubygems'
+require 'riel'
+
+class Quotes < Hash
+  def initialize 
+    super { |h, k| h[k] = Array.new }
+
+    DATA.each do |line|
+      line.chomp!
+      next if line.empty?
+      who, quote = line.split(':', 2)
+      # puts "who: #{who}"
+      # puts "quote: #{quote}"
+      self[who.strip] << quote.strip
+    end
+  end
+
+  def print_random
+    who, quote = get_random
+    puts who
+    puts quote
+  end
+
+  def get_random
+    who = keys.rand
+    puts who
+    [ who, self[who].rand.dup ]
+  end
+end
+
+quotes = Quotes.new
+
+if false
+  quotes.print_random
+end
+
+if false
+  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
+
+# as svn commit:
+user, comment = quotes.get_random
+comment.gsub! '"', '\\"'
+comment.gsub! '!', '\\!'
+if comment.length > 80
+  # reformat
+  comment.gsub! %r{(\w+.{70,90}) +}, '\1' + "\n"
+end
+puts "svn commit -m \"#{comment}\" --username '#{user}' ." 
+
+__END__
+
+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/lib/pvn/app.rb

@@ -11,9 +11,10 @@ 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/diff/diffcmd'
 # require 'pvn/pct/pctcmd'
 require 'pvn/describe'
 require 'pvn/upp/uppcmd'
@@ -48,6 +49,8 @@ module PVN::App
           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)

data/lib/pvn/io/element.rb

@@ -14,6 +14,8 @@ require 'svnx/status/entries'
 require 'svnx/info/command'
 require 'svnx/info/entries'
 
+require 'svnx/cat/command'
+
 require 'pvn/io/fselement'
 
 module PVN; module IO; end; end
@@ -122,6 +124,13 @@ 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
+      cmd = SVNx::CatCommand.new catargs
+      cmd.execute
+    end
+
     # returns a set of local files that are in the given status
     def find_files
     end

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

@@ -50,21 +50,6 @@ module PVN::Subcommands::Base
       def example *ex
         getdoc.examples << ex
       end
-
-      alias_method :init, :new
-      alias_method :new_for_help, :new
-
-      def new args
-        options = optset
-        options.process args
-
-        if options.help
-          cmd = new_for_help nil
-          cmd.show_help
-        else
-          init options
-        end
-      end
     end
 
     def to_doc io
@@ -75,5 +60,20 @@ module PVN::Subcommands::Base
     def show_help
       to_doc $stdout
     end
+
+    def initialize args
+      options = self.class.optset
+      options.process args
+      
+      if options.help
+        cmd.show_help
+      else
+        init options
+      end
+    end
+
+    def init options
+      raise "implement this to handle non-help options"
+    end
   end
 end

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

@@ -16,6 +16,10 @@ module PVN::Subcommands::Base
   end
 
   class OptionSet < PVN::OptionSet
+    def name
+      self.class.to_s.split('::')[-2].downcase
+    end
+
     def paths
       unprocessed
     end

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

@@ -0,0 +1,46 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/io/element'
+require 'pvn/subcommands/diff/options'
+require 'pvn/subcommands/base/command'
+require 'pvn/subcommands/diff/local_differ'
+require 'pvn/subcommands/diff/repository_differ'
+require 'tempfile'
+require 'synoption/exception'
+
+module PVN::Subcommands::Diff
+  class Command < PVN::Subcommands::Base::Command
+
+    subcommands [ "diff" ]
+    description "Shows the changes to files."
+    usage       "[OPTIONS] FILE..."
+    summary     [ "Compare two revisions, filtering through external programs.",
+                  "For each file compared, the file extension is used to find",
+                  "a diff program.",
+                  "As with other pvn subcommands, 'pvn log' accepts relative ",
+                  "revisions."
+                ]
+
+    optscls
+
+    example "pvn diff foo.rb", "Compares foo.rb against the last updated version."
+    example "pvn diff -3 StringExt.java", "Compares StringExt.java at change (HEAD - 3), using a Java-specific program such as DiffJ."
+    example "pvn diff -r +4 -w", "Compares the 4th revision against the working copy, ignoring whitespace."
+    example "pvn diff -c 1948", "Compares revision 1948 against 1947."
+    example "pvn diff -c -8", "Compares revision (HEAD - 8) against (HEAD - 9)."
+    example "pvn diff -c +7", "Compares revision (BASE + 7) against (BASE + 6)."
+    
+    def init options
+      if options.revision && options.change
+        raise PVN::OptionException.new "diff does not accept both revision '#{options.revision}' and change '#{options.change}' values"
+      end
+
+      if options.revision || options.change
+        differ = RepositoryDiffer.new options
+      else
+        differ = LocalDiffer.new options
+      end
+    end
+  end
+end