pvn 0.0.4 → 0.0.5

data/README.markdown

@@ -15,7 +15,7 @@ SUMMARY
 FEATURES
 --------
 
-**Relative revisions**: Pvn supports revisions being specified as being relative
+**Relative revisions**. Pvn supports revisions being specified as being relative
 to their "index" in the list of svn revision. "+n" means the nth revision in
 the list for a given path, and "-n" is the nth from the last revision, where
 -1 means the last revision.
@@ -36,3 +36,7 @@ except that output is colorized, differing for the elements (file, directory) an
 the status of the element (added, deleted, changed). The logging output also
 shows the relative revision.
 
+**Sorted names**. Pvn differs from Subversion in that for all subcommands, file names
+are printed in sorted order, improving legibility.
+
+

data/lib/pvn/app.rb

@@ -10,6 +10,7 @@ require 'svnx/log/entries'
 
 require 'pvn/subcommands/log/command'
 require 'pvn/subcommands/pct/command'
+require 'pvn/subcommands/status/command'
 
 # the old ones:
 require 'pvn/diff/diffcmd'
@@ -45,6 +46,8 @@ module PVN::App
           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
         else
           $stderr.puts "ERROR: subcommand not valid: #{arg}"
           exit(-1)

data/lib/pvn/io/element.rb

@@ -36,7 +36,8 @@ module PVN::IO
       # $$$ todo: map svnurl to SVNElement, and fname to FSElement
 
       @svn   = args[:svn] || (args[:file] && SVNElement.new(:filename => args[:file]))
-      @local = PVN::FSElement.new args[:local] || args[:file]
+      @local = args[:local] && PVN::FSElement.new(args[:local] || args[:file])
+      @path  = args[:path]
       
       info "local: #{@local}"
     end
@@ -62,8 +63,9 @@ module PVN::IO
       end
     end
 
-    def get_info
-      cmdargs = SVNx::InfoCommandArgs.new :path => @local
+    def get_info revision = nil
+      usepath = @local || @path
+      cmdargs = SVNx::InfoCommandArgs.new :path => usepath, :revision => revision
       infcmd  = SVNx::InfoCommand.new cmdargs
       output  = infcmd.execute
       
@@ -75,13 +77,27 @@ module PVN::IO
       get_info.root
     end
 
+    def has_revision? rev
+      # was there a revision then?
+      begin
+        svninfo = get_info rev
+        true
+      rescue => e
+        # skip it
+        false
+      end
+    end
+
     # returns a set of entries modified over the given revision
     def find_modified_entries revision
       cmdargs = Hash.new
 
-      cmdargs[:path] = @local
+      svninfo = get_info
 
-      info "cmdargs[:revision]: #{cmdargs[:revision]}"
+      filter = svninfo.url.dup
+      filter.slice! svninfo.root
+
+      cmdargs[:path] = @local
       
       # we can't cache this, because we don't know if there has been an svn
       # update since the previous run:
@@ -95,12 +111,11 @@ module PVN::IO
 
       modified = Set.new
 
-      info "entries: #{entries}"
       entries.each do |entry|
-        info "entry: #{entry}".on_blue
-        info entry.paths
         entry.paths.each do |epath|
-          modified << epath if epath.action == 'M'
+          if epath.action == 'M' && epath.name.start_with?(filter)
+            modified << epath
+          end
         end
       end
 
@@ -108,15 +123,22 @@ module PVN::IO
     end
 
     # returns a set of local files that are in the given status
-    def find_files_by_status status
-      cmdargs = SVNx::StatusCommandArgs.new :path => @local, :use_cache => false
+    def find_files
+    end
 
+    # returns a set of local files that are in the given status
+    def find_files_by_status status = nil
+      cmdargs = SVNx::StatusCommandArgs.new :path => @local, :use_cache => false
       cmd = SVNx::StatusCommand.new cmdargs
       xml = cmd.execute
       entries = SVNx::Status::Entries.new :xmllines => xml
-
-      entries.select do |entry|
-        entry.status == status
+      
+      if status
+        entries.select do |entry|
+          entry.status == status
+        end
+      else
+        entries
       end
     end
 
@@ -143,21 +165,6 @@ module PVN::IO
       entry.status
     end
 
-    # def to_command subcmd, revcl, *args
-    #   cmd = "svn #{subcmd}"
-    #   info "cmd: #{cmd}".on_blue
-    #   info "args: #{args}".on_blue
-    #   args = args.flatten
-
-    #   # revcl is [ -r, 3484 ]
-    #   if revcl
-    #     cmd << " " << revcl.join(" ")
-    #   end
-    #   cmd << " " << Util::quote_list(args)
-    #   info "cmd: #{cmd}".on_blue
-    #   cmd
-    # end
-    
     # def line_counts
     #   [ @svnelement && @svnelement.line_count, @fselement && @fselement.line_count ]
     # end

data/lib/pvn/log/formatter/log_formatter.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/log/entry'
-require 'pvn/log/formatter/color_formatter'
+require 'pvn/base/color_formatter'
 
 module PVN; module Log; end; end
 
@@ -39,15 +39,6 @@ module PVN::Log
       # should also turn this off if not on a terminal that supports colors ...
     end
 
-    def write_entries entries, out = $stdout
-      entries.each_with_index do |entry, idx|
-        fmtlines = format entry, idx, entries.size
-        
-        out.puts fmtlines
-        out.puts '-' * 55
-      end
-    end
-
     def width field
       WIDTHS[field]
     end

data/lib/pvn/log/formatter/summary_formatter.rb

@@ -32,8 +32,6 @@ module PVN::Log
         lines << pad("", :neg_revision)
       end
 
-      # info "@total: #{total}"
-
       if from_tail
         posidx = "+#{total - idx - 1}"
         lines << add_field(posidx, :pos_revision)

data/lib/pvn/log/logcmd.rb

@@ -133,4 +133,3 @@ module PVN::Log
     end
   end
 end
-end

data/lib/pvn/revision/entry.rb

@@ -7,6 +7,9 @@ require 'svnx/log/entries'
 # replace lib/pvn/revision.rb as PVN::Revision.                                                                            
 
 module PVN::Revision
+  class RevisionError < RuntimeError
+  end
+
   DATE_REGEXP = Regexp.new '^\{(.*?)\}'
   SVN_REVISION_WORDS = %w{ HEAD BASE COMMITTED PREV }
   RELATIVE_REVISION_RE = Regexp.new '^([\+\-])(\d+)$'
@@ -77,7 +80,9 @@ module PVN::Revision
 
   class RelativeEntry < FixnumEntry
     def initialize value, xmllines
-      raise "cannot determine relative revision without xmllines" unless xmllines
+      unless xmllines
+        raise RevisionError.new "cannot determine relative revision without xmllines"
+      end
 
       logentries = SVNx::Log::Entries.new :xmllines => xmllines
 
@@ -86,7 +91,7 @@ module PVN::Revision
       # logentries are in descending order, so the most recent one is index 0
 
       if value.abs > nentries
-        raise "ERROR: no entry for revision: #{value.abs}; number of entries: #{nentries}"
+        raise RevisionError.new "ERROR: no entry for revision: #{value.abs}; number of entries: #{nentries}"
       else
         idx = value < 0 ? -1 + value.abs : nentries - value
         @log_entry = logentries[idx]

data/lib/pvn/status/formatter/entries_formatter.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/status/formatter/status_formatter'
+require 'pvn/status/formatter/entry_formatter'
+
+module PVN; module Status; end; end
+
+module PVN::Status
+  class EntriesFormatter < Formatter
+    def initialize use_color, entries
+      super use_color
+      @entries = entries
+    end
+
+    def format
+      lines = Array.new
+      total = @entries.size
+      @entries.each_with_index do |entry, idx|
+        ef = EntryFormatter.new use_colors, entry
+        lines.concat ef.format
+        # lines << '-' * 55
+      end
+      lines
+    end
+  end
+end

data/lib/pvn/status/formatter/entry_formatter.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'pvn/status/formatter/status_formatter'
+
+module PVN; module Status; end; end
+
+module PVN::Status
+  class EntryFormatter < Formatter
+    attr_reader :entry
+
+    def initialize use_colors, entry
+      super use_colors
+      @entry = entry
+    end
+    
+    def format
+      lines = Array.new
+      lines << if use_colors
+                 "    " + colorize(entry.path, entry.status.to_sym)
+               else
+                 "#{entry.status[0 .. 0].upcase}   #{entry.path}"
+               end
+      lines
+    end
+  end
+end

data/lib/pvn/status/formatter/status_formatter.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/status/entry'
+require 'pvn/base/color_formatter'
+
+module PVN; module Status; end; end
+
+module PVN::Status
+  # a format for status entries
+  class Formatter < PVN::ColorFormatter
+
+    COLORS = {
+      :added        => [ :green ],
+      :modified     => [ :yellow ],
+      :deleted      => [ :red ],
+      :renamed      => [ :magenta ],
+    }
+
+    attr_reader :use_colors
+
+    def initialize use_colors
+      # should also turn this off if not on a terminal that supports colors ...
+      @use_colors = use_colors
+    end
+
+    def colors field
+      use_colors ? COLORS[field] : nil
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'synoption/boolean_option'
+
+module PVN::Subcommands::Base
+  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
+    end
+  end
+end

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

@@ -32,20 +32,39 @@ module PVN::Subcommands::Base
         getdoc.summary = smry
       end
 
+      ### $$$ remove this:
       def options opts
         getdoc.options.concat opts
       end
 
       def optscls
-        optmodule = self.to_s.sub %r{::\w+$}, ''
+        getdoc.options.concat optset.options
+      end
+
+      def optset
+        optmodule = 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
+
+      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

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

@@ -4,6 +4,7 @@
 require 'synoption/set'
 require 'synoption/option'
 require 'synoption/boolean_option'
+require 'synoption/fixnum_option'
 
 module PVN; module Subcommands; end; end
 

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

@@ -3,7 +3,6 @@
 
 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'
 
@@ -24,22 +23,19 @@ module PVN::Subcommands::Log
 
     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."
-    example "pvn log -u barney",    "Prints log entries only for user 'barney'."
+    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 --no-color", "Prints the latest 10 entries, uncolorized."
+    example "pvn log -r 122 -v",        "Prints log entry for revision 122, with the files in that change."
+    example "pvn log -u barney",        "Prints log entries only for user 'barney', with the default limit."
     
-    def initialize args
-      options = PVN::Subcommands::Log::OptionSet.new 
-      options.process args
+    def initialize options = nil
+      return unless options
 
-      return show_help if options.help 
-
-      path      = options.paths[0] || "."
-      cmdargs   = Hash.new
+      path = options.paths[0] || "."
+      cmdargs = Hash.new
       cmdargs[:path] = path
       
       [ :limit, :verbose, :revision ].each do |field|
@@ -63,30 +59,30 @@ module PVN::Subcommands::Log
       from_head = !options.revision
       from_tail = !options.limit && !options.revision
 
-      info "options: #{options}".red
-      info "options.user: #{options.user}".red
+      info { "options: #{options}" }
+      info { "options.user: #{options.user}" }
 
       if options.user
-        info "entries: #{entries}".red
-
-        entries = entries.select { |entry| entry.author == options.user }
-
-        raise "ERROR: no matching log entries for '#{options.user}'"
-
-        info "entries: #{entries}".red
+        entries = find_entries_for_user entries, options.user, options.limit
+        info { "entries: #{entries}" }
 
         # don't show relative revisions, since we've got a slice out of the list:
         from_head = nil
         from_tail = nil
-
-        if options.limit
-          entries = entries[0 ... options.limit]
-          info "entries: #{entries}".red
-        end
       end        
       
-      ef = PVN::Log::EntriesFormatter.new options.format, entries, from_head, from_tail
+      ef = PVN::Log::EntriesFormatter.new options.color, entries, from_head, from_tail
       puts ef.format
     end
+
+    def find_entries_for_user entries, user, limit
+      entries = entries.select { |entry| entry.author == user }
+
+      raise "ERROR: no matching log entries for '#{user}'" if entries.empty?
+
+      info { "entries: #{entries}" }
+
+      limit ? entries[0 ... limit] : entries
+    end
   end
 end

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

@@ -7,6 +7,7 @@ require 'synoption/fixnum_option'
 require 'synoption/boolean_option'
 require 'pvn/subcommands/revision/multiple_revisions_option'
 require 'pvn/subcommands/base/options'
+require 'pvn/subcommands/base/color_option'
 
 module PVN::Subcommands::Log
   DEFAULT_LIMIT = 5
@@ -23,12 +24,6 @@ module PVN::Subcommands::Log
     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 UserOption < PVN::Option
     def initialize optargs = Hash.new
       super :user, '-u', "show only changes for the given user", nil, :as_cmdline_option => nil
@@ -37,7 +32,7 @@ module PVN::Subcommands::Log
 
   class OptionSet < PVN::Subcommands::Base::OptionSet
     has_option :revision, PVN::MultipleRevisionsRegexpOption, [ :unsets => :limit ]
-    has_option :format,   FormatOption
+    has_option :color,    PVN::Subcommands::Base::ColorOption
     has_option :help,     PVN::Subcommands::Base::HelpOption
     has_option :limit,    LimitOption
     has_option :user,     UserOption