pvn 0.0.11 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8783d050b1dd5c8455f7207f9a1933b00ac080b3
+  data.tar.gz: 74df918bdd23b67089dddad91d5736162e72e49f
+SHA512:
+  metadata.gz: a84f65d9a725d0f1d45127836d079f2e6bd7d359664f66f828f6c051ca6ed7092757cdfd5654a48eb96a5a0e90c65fdeae3f23bb488c73b83b0044678301457a
+  data.tar.gz: c3520d5756c9d08280cf979ec9fbafcda60ca4f366973a9132c10cff1da5a956d4de78a79a1ef37c56558c02a0a5672cc2d7800250ea53a8a1764534a13f2f5f

data/bin/pvn

@@ -11,6 +11,6 @@ unless $:.include?(fdirname) || $:.include?(File.expand_path(fdirname))
 end
 
 require 'pvn'
-require "pvn/app"
+require "pvn/app/runner"
 
 PVN::App::Runner.new STDOUT, ARGV

data/lib/pvn/app/runner.rb

@@ -2,7 +2,8 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'riel'
+require 'logue/loggable'
+require 'logue/log'
 
 require 'pvn'
 require 'pvn/io/element'
@@ -13,20 +14,11 @@ require 'pvn/status/command'
 require 'pvn/diff/command'
 require 'pvn/seek/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
+    include Logue::Loggable
 
     SUBCOMMANDS = [ PVN::Log::Command,
                     PVN::Pct::Command,
@@ -39,8 +31,8 @@ module PVN::App
                   ]
 
     def initialize io, args
-      RIEL::Log.level = RIEL::Log::WARN
-      RIEL::Log.set_widths(-25, 5, -35)
+      Logue::Log.level = Logue::Log::WARN
+      Logue::Log.set_widths(-25, 5, -35)
 
       if args.empty?
         run_help args
@@ -51,8 +43,10 @@ module PVN::App
         info "arg: #{arg}"
 
         case arg
+        when "-v", "--version"
+          show_version
         when "--verbose"
-          RIEL::Log.level = RIEL::Log::DEBUG
+          Logue::Log.level = Logue::Log::DEBUG
         when "help", "--help", "-h"
           run_help args
         else
@@ -70,10 +64,17 @@ module PVN::App
       run_help args
     end
 
+    def show_version
+      puts "pvn, version #{PVN::VERSION}"
+      puts "Written by Jeff Pace (jeugenepace@gmail.com)."
+      puts "Released under the I Haven't Decided Yet License."
+      exit 0
+    end
+
     def run_command cmdcls, args
       begin
         cmdcls.new args
-        exit(0)
+        exit 0
       rescue => e
         puts e.backtrace
         $stderr.puts e
@@ -84,8 +85,8 @@ module PVN::App
     def run_help args
       forwhat = args[0]
 
-     SUBCOMMANDS.each do |sc|
-        puts sc
+      SUBCOMMANDS.each do |sc|
+        info "sc: #{sc}"
         if sc.matches_subcommand? forwhat
           sc.new(%w{ --help })
           exit 0

data/lib/pvn/command/clargs.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
+require 'logue/loggable'
+
 module PVN; module App; end; end
 
 module PVN::App::Base
   class CmdLineArgs
-    include Loggable
+    include Logue::Loggable
 
     class << self
       def has_option name

data/lib/pvn/command/color_option.rb

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

data/lib/pvn/command/command.rb

@@ -2,12 +2,13 @@
 # -*- ruby -*-
 
 require 'pvn/command/doc'
+require 'logue/loggable'
 
 module PVN; module Command; end; end
 
 module PVN::Command
   class Command
-    include Loggable
+    include Logue::Loggable
 
     @@doc_for_class = Hash.new { |h, k| h[k] = PVN::Command::Documentation.new }
     
@@ -39,7 +40,7 @@ module PVN::Command
       def optset
         optmodule = to_s.sub %r{::\w+$}, ''
         optcls = optmodule + '::OptionSet'
-        optset = instance_eval optcls + '.new'
+        instance_eval optcls + '.new'
       end
 
       def example *ex
@@ -51,13 +52,13 @@ module PVN::Command
       end
     end
     
-    def to_doc io
+    def to_doc
       doc = self.class.getdoc
-      doc.write io
+      doc.write
     end
 
     def show_help
-      to_doc $stdout
+      to_doc
     end
 
     def initialize args

data/lib/pvn/command/doc.rb

@@ -2,14 +2,16 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'riel'
+require 'rubygems/text'
 
 module PVN; module Command; end; end
 
-# this is the same as in pvn/cmddoc.rb
-
 module PVN::Command
   class Documentation
+    include Gem::Text
+
+    SUMMARY_RE = Regexp.new '^(?:(.*)(?:NOWRAP(.*)/NOWRAP)|(.*))(.*)$', Regexp::MULTILINE
+    
     attr_accessor :description
     attr_accessor :usage
     attr_accessor :summary
@@ -40,9 +42,27 @@ module PVN::Command
       @subcommands = args
     end
 
-    def write io = $stdout
-      doc = Array.new
+    def wrap out, str
+      # I could use tput cols; ENV['COLUMNS'] works in irb, not in Ruby scripts.
+      out.puts format_text str.gsub("\n", ''), 78, 2
+    end
+
+    def write_summary out
+      summary.join("\n").scan(SUMMARY_RE) do |md|
+        if md[2]
+          wrap out, md[2]
+          next
+        end
 
+        wrap out, md[0]
+        out.puts md[1].collect { |x| "  " + x }
+        
+        out.puts
+        wrap out, md[3]
+      end
+    end
+
+    def write out = $io
       subcmds = @subcommands
 
       subcmdstr = subcmds[0].dup
@@ -50,45 +70,45 @@ module PVN::Command
         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|
+      out.puts subcmdstr + ": " + @description
+      out.puts "usage: " + subcmds[0] + " " + @usage
+      out.puts ""
+      write_summary out
+      
+      write_section "options", @options, out do |opt, io|
         option_to_doc opt, io
       end
 
-      write_section "examples", @examples, io do |ex, io|
+      write_section "examples", @examples, out do |ex, io|
         example_to_doc ex, io
       end
     end
 
-    def write_section name, section, io
+    def write_section name, section, out
       if section.length > 0
-        io.puts ""
-        io.puts "#{name.capitalize}:"
-        io.puts ""
+        out.puts ""
+        out.puts "#{name.capitalize}:"
+        out.puts ""
         
         section.each do |opt|
-          yield opt, io
+          yield opt, out
         end
       end
     end
 
-    def example_to_doc ex, io
+    def example_to_doc ex, out
       ex.each_with_index do |line, idx|
         if idx == 0
-          io.puts "  % #{line}"
+          out.puts "  % #{line}"
         else
-          io.puts "    #{line}"
+          out.puts "    #{line}"
         end
       end
-      io.puts
+      out.puts
     end
 
-    def option_to_doc opt, io
-      opt.to_doc io
+    def option_to_doc opt, out
+      opt.to_doc out
     end
   end
 end

data/lib/pvn/command/options.rb

@@ -9,23 +9,23 @@ require 'synoption/fixnum_option'
 module PVN; module Command; end; end
 
 module PVN::Command
-  class HelpOption < PVN::BooleanOption
+  class HelpOption < Synoption::BooleanOption
     def initialize args = Hash.new
       super :help, '-h', "display help", nil
     end
   end
 
-  class VerboseOption < PVN::BooleanOption
+  class VerboseOption < Synoption::BooleanOption
     def initialize optargs = Hash.new
       super :verbose, '-v', [ "display verbose output" ], false
     end
 
     def set_value val
-      RIEL::Log.level = RIEL::Log::DEBUG
+      Logue::Log.level = Logue::Log::DEBUG
     end
   end
 
-  class OptionSet < PVN::OptionSet
+  class OptionSet < Synoption::OptionSet
     has_option :help,       HelpOption
     has_option :verbose,    VerboseOption
 

data/lib/pvn/diff/change.rb

@@ -2,13 +2,14 @@
 # -*- ruby -*-
 
 require 'svnx/action'
+require 'logue/loggable'
 
 module PVN; module Diff; end; end
 
 # A Path Revision is the change to a path within a changelist. 
 module PVN::Diff
   class Change
-    include Loggable
+    include Logue::Loggable
     
     attr_reader :revision
     attr_reader :action
@@ -23,9 +24,5 @@ module PVN::Diff
       # Revision::Range?
       rev.kind_of?(Fixnum) ? rev.to_s : rev
     end
-
-    def to_s
-      inspect
-    end
   end
 end

data/lib/pvn/diff/changed_paths.rb

@@ -5,22 +5,23 @@ require 'pvn/diff/log_paths'
 require 'pvn/diff/status_paths'
 require 'pvn/diff/local_path'
 require 'pvn/revision/range'
+require 'logue/loggable'
 
 module PVN::Diff
   # represents both LogPaths and StatusPaths
   class ChangedPaths
-    include Loggable
+    include Logue::Loggable
 
     def initialize paths
       @paths = paths
     end
 
     def diff_revision_to_working_copy revision, whitespace
-      fromrev = revision.from.value
+      # fromrev = revision.from.value
 
-      info "revision: #{revision}".cyan
+      info "revision: #{revision}".color(:cyan)
       rev = PVN::Revision::Range.new revision.to_s, 'HEAD'
-      info "rev: #{rev}".cyan
+      info "rev: #{rev}".color(:cyan)
 
       logpaths = LogPaths.new rev, @paths
       name_to_logpath = logpaths.to_map
@@ -49,10 +50,10 @@ module PVN::Diff
         stpath = name_to_statuspath[name]
         info "stpath: #{stpath}"
 
-        frrev = nil
+        # frrev = nil
 
         if logpath
-          chgrevs = logpath.revisions_later_than fromrev
+          # chgrevs = logpath.revisions_later_than fromrev
           logpath.diff_revision_to_working_copy revision, whitespace
         else
           # it's a local file only

data/lib/pvn/diff/command.rb

@@ -15,17 +15,21 @@ module PVN::Diff
     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 ",
+    # 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 diff' accepts relative ",
+    #               "revisions."
+    #             ]
+    summary     [ "Compare two revisions. ",
+                  "As with other pvn subcommands, 'pvn diff' 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 -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)."

data/lib/pvn/diff/diffcmd.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+
+# the command-line diff program.
+module PVN::Diff
+  class Cmd
+    include Logue::Loggable
+
+    def initialize displaypath, fromrev, torev, fromlines, tolines, whitespace
+      open_temp_file(fromlines) do |from|
+        open_temp_file(tolines) do |to|
+          cmd = "diff -u"
+          if whitespace
+            cmd << " -w"
+          end
+
+          [ fromrev, torev ].each do |rev|
+            revstr = to_revision_string rev
+            cmd << " -L '#{displaypath}\t(#{revstr})'"
+          end
+          cmd << " #{from.path}"
+          cmd << " #{to.path}"
+
+          info "cmd: #{cmd}"
+
+          $io.puts "Index: #{displaypath}"
+          $io.puts "==================================================================="
+          IO.popen(cmd) do |io|
+            $io.puts io.readlines
+          end
+        end
+      end
+    end
+
+    def open_temp_file lines, &blk
+      Tempfile.open('pvn') do |tmpfile|
+        if lines
+          tmpfile.puts lines
+        end
+        tmpfile.close
+
+        blk.call tmpfile
+      end
+    end
+
+    def to_revision_string rev
+      rev ? "revision #{rev}" : "working copy"
+    end
+  end
+end

data/lib/pvn/diff/differ.rb

@@ -4,13 +4,14 @@
 require 'pvn/io/element'
 require 'pvn/diff/options'
 require 'pvn/command/command'
+require 'logue/loggable'
 require 'tempfile'
 
 $io = $stdout
 
 module PVN::Diff
   class Differ
-    include Loggable
+    include Logue::Loggable
 
     attr_reader :whitespace
     attr_reader :revision

data/lib/pvn/diff/diffset.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+require 'riel/pathname'
+require 'pvn/diff/diffcmd'
+
+module PVN::Diff
+  class DiffSet
+    include Logue::Loggable
+    
+    attr_reader :display_path
+    attr_reader :from_lines
+    attr_reader :from_revision
+    attr_reader :to_lines
+    attr_reader :to_revision
+    attr_reader :whitespace
+
+    def initialize display_path, from_lines, from_revision, to_lines, to_revision, whitespace
+      @display_path = display_path
+      @from_lines = from_lines
+      @from_revision = from_revision
+      @to_lines = to_lines
+      @to_revision = to_revision
+      @whitespace = whitespace
+    end
+
+    def run_diff
+      info "display_path: #{@display_path}".color("fafa33")
+      ext = Pathname.new(@display_path).extname
+      info "ext: #{ext}".color("fafa11")
+
+      Cmd.new @display_path, @from_revision, @to_revision, @from_lines, @to_lines, @whitespace
+    end
+  end
+end

data/lib/pvn/diff/local_path.rb

@@ -9,7 +9,7 @@ module PVN::Diff
     # that's a Status::Entry
     def initialize entry
       @entry = entry
-      @elmt = create_element
+      @elmt = PVN::IO::Element.new :local => @entry.path
       name = entry.path
       action = SVNx::Action.new @entry.status
       revision = action.added? ? 0 : @elmt.get_info.revision
@@ -37,33 +37,32 @@ module PVN::Diff
       pn.readlines
     end
 
-    def create_element
-      PVN::IO::Element.new :local => @entry.path
-    end
-
     def get_latest_revision
       svninfo = @elmt.get_info
       svninfo.revision
     end
 
+    def get_remote_lines
+      # revision = nil; use_cache = false
+      @elmt.cat nil, false
+    end
+
+    def run_diff from_lines, from_rev, to_lines, to_rev, whitespace
+      super @entry.path, from_lines, from_rev, to_lines, to_rev, whitespace
+    end
+
     def show_as_added
-      fromlines = nil
-      tolines = read_working_copy
-      run_diff @entry.path, fromlines, 0, tolines, 0, nil
+      run_diff nil, 0, read_working_copy, 0, nil
     end
 
     def show_as_deleted
       fromrev = changes[0].revision
-      # revision = nil; use_cache = false
-      lines = @elmt.cat nil, false
-      run_diff @entry.path, lines, fromrev, nil, nil, nil
+      run_diff get_remote_lines, fromrev, nil, nil, nil
     end
     
     def show_as_modified whitespace
-      remotelines = @elmt.cat nil, false
       fromrev = changes[0].revision
-      wclines = read_working_copy
-      run_diff @entry.path, remotelines, fromrev, wclines, nil, whitespace
+      run_diff get_remote_lines, fromrev, read_working_copy, nil, whitespace
     end
   end
 end