subwrap 0.3.12 → 0.4.0

data/ProjectInfo.rb

@@ -5,7 +5,7 @@ module Project
   PrettyName    = "Subwrap: Enhanced Subversion Command"
   Name          = "subwrap"
   RubyForgeName = "subwrap"
-  Version       = "0.3.12"
+  Version       = "0.4.0"
   Specification = Gem::Specification.new do |s|
     s.name    = Project::Name
     s.summary = "A nifty wrapper command for Subversion's command-line svn client"
@@ -19,7 +19,7 @@ module Project
     s.rubyforge_project = Project::Name
     s.platform = Gem::Platform::RUBY
     s.add_dependency("colored")
-    s.add_dependency("escape")
+    #s.add_dependency("escape")
     s.add_dependency("facets")
     s.add_dependency("quality_extensions")
     s.add_dependency("rscm")
@@ -27,8 +27,8 @@ module Project
 ---------------------------------------------------------------------------------------------------
 You should now be able to run the subwrap command.
 
-IMPORTANT: If you want to replace the normal svn command with subwrap, please run sudo
-_subwrap_post_install or check the Readme to find out how to manually add it to your path.
+IMPORTANT: If you want to replace the normal svn command with subwrap, please run 
+sudo `which _subwrap_post_install` or check the Readme to find out how to manually add it to your path.
 
 Also, it is recommended that you install the termios gem so that you don't have to press enter
 after selecting an option from the menu, but it will work without it.

data/Readme

@@ -3,8 +3,9 @@ link:include/subwrap.jpg
 
 [<b>Home page</b>:]        http://subwrap.rubyforge.org/
 [<b>Project site</b>:]     http://rubyforge.org/projects/subwrap
+[<b>Suggestions?</b>:]     http://subwrap.uservoice.com
 [<b>Gem install</b>:]      <tt>gem install subwrap</tt>
-[<b>Author</b>:]           Tyler Rick
+[<b>Author</b>:]           Tyler Rick (<rubyforge.org|tylerrick.com>)
 [<b>Copyright</b>:]        2007 QualitySmith, Inc.
 [<b>License</b>:]          {GNU General Public License}[http://www.gnu.org/copyleft/gpl.html]
 
@@ -12,6 +13,12 @@ link:include/subwrap.jpg
 
 This is a replacement <b><tt>svn</tt> command-line client</b> meant to be used instead of the standard +svn+ command. (Actually, it's a _wrapper_, not a strict replacement, because it still uses <tt>/usr/bin/svn</tt> to do all the dirty work.)
 
+== Who is it for?
+
+Anyone who feels like the standard svn command is missing some features and wants a slightly more powerful command-line svn tool...
+
+Anyone who wants to hack/extend the svn command but is afraid to/too lazy to mess with the actual C source code...
+
 == Installation
 
 === Dependencies
@@ -407,6 +414,22 @@ But... as with most things written in Ruby, it's all more about *productivity* t
 
 ==To do
 
+Drop dependency on colordiff and use a native ruby colorizer that works on top of standard diff output. That may be necessary to support following change:
+
+Make it do these by default:
+  -x [--extensions] arg    : Default: '-u'. When Subversion is invoking an
+                             external diff program, ARG is simply passed along
+                             to the program. But when Subversion is using its
+                             default internal diff implementation, or when
+                             Subversion is displaying blame annotations, ARG
+                             could be any of the following:
+                                -b (--ignore-space-change):
+                                   Ignore changes in the amount of white space.
+                                -w (--ignore-all-space):
+                                   Ignore all white space.
+                                --ignore-eol-style:
+                                   Ignore changes in EOL style
+
 Calling "Extensions.anything" is stupid. Can't we just merge/extend/include the methods from Extensions into the Subversion module itself?
 
 Say you just did `svn mv base-suffix base-new_suffix`. Now say you want to commit that move without committing anything else in that dir.
@@ -432,7 +455,7 @@ After you save/edit/set an svn:externals, it should try to automatically pretty
         my_info = YAML::load(svn(:info, File.join(dir, '..')))
         my_revision = YAML::load(svn(:info, my_info['URL']))['Revision']
 
-More at: http://wiki.qualitysmith.com/subwrap
+Get everything that was on http://wiki.qualitysmith.com/subwrap
 
 ===Ideas from TortoiseSvn
 
@@ -455,3 +478,7 @@ Word ideas to possibly incorporate:
 * more
 
 * 'subwrap'? Short for "Subversion wrapper". Also, a play on the words sub and wrap -- both of which are also food items.
+
+==Contact me!
+
+If you have any comments, suggestions, or patches, I would love to hear them! You'd be surprised how open I am to considering small or even massive changes to this project.

data/bin/subwrap

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-gem 'facets', '>=1.8.20'
-require 'facets/kernel/load'
-require_local '../lib/subwrap/svn_command.rb'
+#require 'rubygems'
+#gem 'facets', '>=2.4.1'
+#require 'facets/kernel/load'
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'subwrap/svn_command.rb'
 Subversion::SvnCommand.execute

data/bin/svn

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-
-require 'rubygems'
-gem 'facets', '>=1.8.20'
-require 'facets/kernel/load'
-require_local '../lib/subwrap/svn_command.rb'
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'subwrap/svn_command'
 Subversion::SvnCommand.execute

data/lib/subwrap.rb

@@ -1,6 +1,4 @@
-# This is the auto-require
-require 'rubygems'
-gem 'facets'
-require 'facets/kernel/load'
-require_local 'subwrap/subversion'
+# This is the auto-require, which I suppose never gets used any more thanks to RubyGems' annoying change
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__)))
+require 'subwrap/subversion'
 Subversion

data/lib/subwrap/pager.rb

@@ -0,0 +1,29 @@
+# http://nex-3.com/posts/73-git-style-automatic-paging-in-ruby
+
+def run_pager
+  return if PLATFORM =~ /win32/
+  return unless STDOUT.tty?
+
+  read, write = IO.pipe
+
+  unless Kernel.fork # Child process
+    STDOUT.reopen(write)
+    STDERR.reopen(write) if STDERR.tty?
+    read.close
+    write.close
+    return
+  end
+
+  # Parent process, become pager
+  STDIN.reopen(read)
+  read.close
+  write.close
+
+  ENV['LESS'] = 'FSRX' # Don't page if the input is short enough
+
+  Kernel.select [STDIN] # Wait until we have input before we start the pager
+  pager = ENV['PAGER'] || 'less'
+  exec pager rescue exec "/bin/sh", "-c", pager
+end
+
+

data/lib/subwrap/subversion.rb

@@ -8,9 +8,10 @@ require 'rexml/xpath'
 require 'rubygems'
 
 gem 'facets'
+require 'facets/kernel/silence'
 silence_warnings do
-  require 'facets/kernel/silence'
   require 'facets/kernel/load'
+  require 'facets/kernel/in'
   require 'facets/enumerable/uniq_by'
   require 'facets/fileutils/which'
   require 'facets/fileutils/whereis'
@@ -18,6 +19,7 @@ end
 
 gem 'quality_extensions'
 require 'quality_extensions/module/initializer'
+require 'quality_extensions/enumerable/map_with_index'
 require 'quality_extensions/kernel/windows_platform'
 
 
@@ -212,7 +214,24 @@ module Subversion
   # Returns the modifications to the working directory or URL specified in +args+.
   def self.diff(*args)
     args = ['./'] if args.empty?
-    execute("diff #{"--diff-cmd colordiff" if color?} #{args.join ' '}")
+    diff = execute("diff #{"--diff-cmd colordiff" if color?} #{args.join ' '}")
+
+    # Fix annoyance: You can't seem to do a diff on a file that was *added*. If you do -r 1:2 for a file that was *added* in 2, it will say it can't find the repository location for that file in r1.
+    if diff =~ /Unable to find repository location for '.*' in revision/ and @allow_diffs_for_added_files != false
+      args.map!(&:to_s)
+      args.map_with_index! do |arg, i| 
+        if args[i-1].in? ['--revision', '-r']
+          arg.gsub(/\d+:/, '') 
+        elsif arg.in? ['--change', '-c']
+          arg.gsub(/-c|--change/, '-r')
+        else
+          arg
+        end
+      end
+      diff = execute("cat #{args.join ' '}") #.enum(:each_line).map(&:chomp).map(&:green).join("\n")
+    end
+
+    diff
   end
   # Parses the output from diff and returns an array of Diff objects.
   def self.diffs(*args)
@@ -323,8 +342,8 @@ module Subversion
     #@rscm = ::RSCM::Subversion.new
     #@rscm.revisions
 
-    #log_output = Subversion.log('-v')
-    log_output = Subversion.log(*(['-v'] + args))
+    args = (['-v'] + args)
+    log_output = Subversion.log(*args)
     parser = ::RSCM::SubversionLogParser.new(io = StringIO.new(log_output), url = 'http://ignore.me.com')
     revisions = parser.parse_revisions
     revisions

data/lib/subwrap/subversion_extensions.rb

@@ -8,6 +8,7 @@ require 'facets/class_extension'
 
 require 'subwrap/svn_command'
 
+# :todo: move to quality_extensions
 class Array
   def to_regexp_char_class
     "[#{join('')}]"
@@ -57,8 +58,8 @@ class String
   end
   def colorize_svn_diff
     if Subversion.color
-      self.gsub(/^(Index: )(.*)$/) { $2.ljust(100).black_on_white}.
-           gsub(/^=+\n/, '') 
+      self.gsub(/^(Index: )(.*)$/) { $2.ljust(100).black_on_white}.   #
+           gsub(/^=+\n/, '')                                          # Get rid of the boring ========= lines
     else
       self
     end
@@ -77,26 +78,43 @@ module Subversion
 
     class_extension do  # These are actually class methods, but we have to do it this way so that the Subversion.extend(Subversion::Extensions) will also add these class methods to Subversion.
 
-      def status_lines_filter(input)
+      def status_lines_filter(input, options)
+        uninteresting_status_flags = []
+        if options[:only_statuses].nonempty?
+          uninteresting_status_flags = Interesting_status_flags - options[:only_statuses]
+        end
+        uninteresting_status_flags += Uninteresting_status_flags
+
         input = (input || "").reject { |line|
           line =~ /^$/    # Blank lines
         }.reject { |line|
-          line =~ /^#{Uninteresting_status_flags.to_regexp_char_class}/
+          line =~ /^ ?#{uninteresting_status_flags.to_regexp_char_class}/
         }.join
 
+        #-------------------------------------------------------------------------------------------
         before_externals, *externals = input.split(/^Performing status on external item at.*$/)
 
         before_externals ||= ''
-        before_externals = before_externals.strip.colorize_svn_status_lines + "\n" if before_externals != ""
+        if before_externals != ""
+          if options[:files_only]
+            before_externals = before_externals.strip.
+              gsub(/^ ?#{Status_flags.to_regexp_char_class} */, '') \
+              + "\n" 
+          else
+            before_externals = before_externals.strip.colorize_svn_status_lines + "\n" 
+          end
+        end
 
         externals = externals.join.strip
-        externals = 
-          '_'*40 + ' externals '.underline + '_'*40 + "\n" +
-          externals.reject { |line|
-            line =~ /^Performing status on external item at/
-          }.reject { |line|
-            line =~ /^$/    # Blank lines
-          }.join.strip.colorize_svn_status_lines + "\n" if externals != ""
+        if externals != ""
+          externals = 
+            '_'*40 + ' externals '.underline + '_'*40 + "\n" +
+            externals.reject { |line|
+              line =~ /^Performing status on external item at/
+            }.reject { |line|
+              line =~ /^$/    # Blank lines
+            }.join.strip.colorize_svn_status_lines + "\n" 
+        end
           
         before_externals +
                externals

data/lib/subwrap/svn_command.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 
 require 'facets'
 #gem 'facets', '>=1.8.51'
-#require 'facets/more/command'    # Not until they include my changes
+#require 'facets/more/command'    # Not until Facets includes my changes
 #require 'facets/kernel/load'
 #require 'facets/kernel/with'       # returning
 #require 'facets/enumerable/every'
@@ -29,14 +29,15 @@ require 'quality_extensions/module/attribute_accessors'
 require 'English'
 require 'pp'
 require 'stringio'
+require 'subwrap/pager'
 
 gem 'colored'
 require 'colored'  # Lets us do "a".white.bold instead of "\033[1ma\033[0m"
 
 silence_warnings do
   require_local '../../ProjectInfo'
-  require_local 'subversion'
-  require_local 'subversion_extensions'
+  require 'subwrap/subversion'
+  require 'subwrap/subversion_extensions'
 end
 
 begin
@@ -54,6 +55,9 @@ begin
     at_exit { Termios.tcsetattr(STDIN, 0, save_terminal_attributes) }
   rescue RuntimeError => exception    # Necessary for automated testing.
     if exception.message =~ /can't get terminal parameters/
+      # :todo: Can we detect if they are piping/redirecting stdout? Don't show warning if they are simply piping stdout.
+      # On the other hand, when ELSE do we expect to not find a terminal? Is this message *ever* helpful?
+      # Only testing? Then maybe the tests should set an environment variable or *something* to communicate that they want non-interactive mode.
       puts 'Warning: Terminal not found.'
       $interactive = false
     else
@@ -74,8 +78,10 @@ module Kernel
   end
 end
 
+# :todo: move to quality_extensions
 class Object
   def nonnil?; !nil?; end
+  def nonempty?; !empty?; end
 end
 
 class IO
@@ -303,7 +309,7 @@ module Subversion
       #puts "add #{args.inspect}"
       svn :exec, 'add', *args
     end
-
+    
     #-----------------------------------------------------------------------------------------------------------------------------
     module Commit
       Console::Command.pass_through({
@@ -470,7 +476,8 @@ module Subversion
     #-----------------------------------------------------------------------------------------------------------------------------
     module Diff
       Console::Command.pass_through({
-          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_r, :__revision] => 1,
+          [:_c, :__change] => 1,
           [:__old] => 1,
           [:__new] => 0,
           #[:_N, :__non_recursive] => 0,
@@ -570,7 +577,7 @@ End
     #-----------------------------------------------------------------------------------------------------------------------------
     module Log
       Console::Command.pass_through({
-          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_r, :__revision] => 1,
           [:_q, :__quiet] => 0,
           [:_v, :__verbose] => 0,
           [:__targets] => 1,
@@ -632,7 +639,7 @@ End
     #-----------------------------------------------------------------------------------------------------------------------------
     module Move
       Console::Command.pass_through({
-          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_r, :__revision] => 1,
           [:_q, :__quiet] => 0,
           [:__force] => 0,
         }.
@@ -703,7 +710,7 @@ End
     #-----------------------------------------------------------------------------------------------------------------------------
     module Copy
       Console::Command.pass_through({
-          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_r, :__revision] => 1,
           [:_q, :__quiet] => 0,
           [:__force] => 0,
         }.
@@ -752,6 +759,15 @@ End
 
     #-----------------------------------------------------------------------------------------------------------------------------
     module Status
+      # Has no effect :(  :
+      def initialize
+        @only_statuses = []
+      end
+      # So we'll do this instead:
+      def self.extended(klass)
+        klass.instance_variable_set(:@only_statuses, [])
+      end
+
       Console::Command.pass_through({
           [:_u, :__show_updates] => 0,
           [:_v, :__verbose] => 0,
@@ -763,15 +779,41 @@ End
           [:__ignore_externals] => 0,
         }.merge(SvnCommand::C_standard_remote_command_options), self
       )
+      def __modified
+        @only_statuses << 'M'
+      end
+      alias_method :_M, :__modified
+
+      def __added
+        @only_statuses << 'A'
+      end
+      alias_method :_A, :__added
+
+      #document :__files_only do
+      "Only list filenames, not statuses"
+      "(also currently lists directories with property changes -- not sure if it should or not)"
+      "Useful if you want to pipe a list of files to xargs, for instance."
+      "Examples:"
+      "subwrap st -M -A --files-only | xargs svn diff"
+      "for f in `subwrap st -M -A --files-only` ; do diff $f new_path/$f ; done"
+      "for f in `subwrap st -M -A --files-only` ; do cp $f new_path/$f ; done"
+      #end
+      def __files_only
+        @files_only = true
+      end
+      alias_method :__files, :__files_only
     end
     def status(*args)
-      print Subversion.status_lines_filter( Subversion.status(*(prepare_args(args))) )
+      options = {}
+      options[:only_statuses] = @only_statuses
+      options[:files_only] = @files_only
+      print Subversion.status_lines_filter( Subversion.status(*(prepare_args(args))), options )
     end
 
     #-----------------------------------------------------------------------------------------------------------------------------
     module Update
       Console::Command.pass_through({
-          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_r, :__revision] => 1,
           [:_N, :__non_recursive] => 0,
           [:_q, :__quiet] => 0,
           [:__diff3_cmd] => 1,
@@ -1128,6 +1170,56 @@ End
     end
 
 
+
+
+    #-----------------------------------------------------------------------------------------------------------------------------
+    # It seems that if a file has been modified, it doesn't matter if you svn:ignore it -- it *still* shows up in svn st/diff and
+    # *still* will be committed if you commit the directory that contains it. That is bad.
+    #
+    # http://svn.haxx.se/users/archive-2006-11/0055.shtml
+    # > Is there a way to mark a file as local changes only so that
+    # > this file's changes will not be comitted? 
+    # No. The standard solution is to check in a template with a different filename and have your users copy it to the real 
+    # filename which is not under version control and on the ignore list.
+    #
+    # http://svnbook.red-bean.com/en/1.2/svn.advanced.props.html#svn.advanced.props.special.ignore
+    # http://svnbook.red-bean.com/en/1.2/svn.advanced.html#svn.advanced.confarea.opts.config (global-ignores)
+    #
+    # In short, it looks like svn:ignore can ONLY be used to make svn ignore unversioned files. It doesn't work at all with versioned
+    # files.
+    #
+    # But that's not an acceptable solution for some of us! Sometimes there are things in under version control that we want to make local changes to
+    # without committing them and we can't just force all users of the repository to rename this file to whatever.dist...
+    # At least not yet ... not without discussing it, etc. first. So in the meantime, we need something like this...
+    #
+    # So subwrap provides a higher-level mechanism for ignoring local changes to versioned files.
+    #
+    # We DON'T want to store local-ignores in an svn property, because then the property itself could accidentally get committed.
+    #
+    # But we need to store locally-ignored files SOMEWHERE persistent (in a file) ... how about in the .svn dir where svn keeps its
+    # metadata? (Being careful, of course, not to conflict with any of its files/conventions.)
+    
+    # To do:
+    # Have every command that needs to read ./.svn/local_ignores
+    # Commands that need to respect local ignores:
+    #   status
+    #   diff
+    #   commit!!
+    # Since built-in svn commit doesn't let you say "commit this directory except for these files in it"...
+    # Modify commit so that instead of passing dir name directly to svn, pass dir name with --non-recursive (to commit prop changes)
+    #   and calculate a list of all files to commit within the directory and pass the filenames too...
+    #   but reject from the file list everything listed in dir/.svn/local_ignores (for every subfolder too!)
+    # Add an --except option to commit, which will do the same thing, but with user-supplied list
+    
+    module LocalIgnore
+    end
+
+    def local_ignore
+      #...
+    end
+    alias_method :dont_commit,              :local_ignore
+    alias_method :pretend_isnt_versioned,   :local_ignore
+
     #-----------------------------------------------------------------------------------------------------------------------------
 
     def ignore(file)
@@ -1143,13 +1235,15 @@ End
       svn :system, "propedit svn:ignore #{directory}"
     end
 
+
     #-----------------------------------------------------------------------------------------------------------------------------
     # Commit message retrieving/editing
 
     module GetMessage
-      def _r(revision)
+      def __revision(revision)
         @revision = revision
       end
+      alias_method :_r,   :__revision
     end
     def get_message()
       #svn propget --revprop svn:log -r2325
@@ -1164,9 +1258,11 @@ End
     end
 
     module SetMessage
-      def _r(revision)
+      def __revision(revision)
         @revision = revision
       end
+      alias_method :_r,   :__revision
+
       def __file(filename)
         @filename = filename
       end
@@ -1191,9 +1287,10 @@ End
 
     # Lets you edit it with your default editor
     module EditRevisionProperty
-      def _r(revision)
+      def __revision(revision)
         @revision = revision
       end
+      alias_method :_r,   :__revision
     end
     def edit_revision_property(property_name, directory = './')
       args = ['propedit', '--revprop', property_name, directory]
@@ -1239,11 +1336,12 @@ End
     # Cause a working copy to cease being a working copy
     def delete_svn(directory = './')
       puts "If you continue, all of the following directories/files will be deleted:"
-      system("find #{directory} -name .svn | xargs -n1 echo")
+      system("find #{directory} -name .svn -type d | xargs -n1 echo")
       response = confirm("Do you wish to continue?")
       puts
+
       if response == 'y'
-        system("find #{directory} -name .svn | xargs -n1 rm -r")
+        system("find #{directory} -name .svn -type d | xargs -n1 rm -r")
       end
     end
 
@@ -1263,16 +1361,126 @@ End
     end
 
     #-----------------------------------------------------------------------------------------------------------------------------
+    # This is designed to be a convenient replacement to the svn update command for those who wish to not only see a *list* of 
+    # which files were updated as the update occurs but also wish to see *what changed* for each of those files.
+    # So this command will effectively do a diff on each updated file and show you what has changed (= "what's new").
+    module WhatsNew
+    end
+    def whats_new
+      SvnCommand.execute("revisions --whats-new --non-interactive")
+    end
+
+    #-----------------------------------------------------------------------------------------------------------------------------
+    # :todo: Pre-fetch svn diff in the background (fork the process) so you don't have to wait, in interactive mode.
+    # :todo: When calling this command on a single file, 
+    # * default to not showing all that annoying list of files (-v) but yes to automatically showing diffs.
+    # * currently defaults to showingly only changes to this file, but should be option for View this changeset to show the full changeset
+    # :todo: add number aliases (1) for view changeset, etc. so you can use numpad exclusively
+    # :todo: rename interactive mode to different name, s.a. browse_revisions
+    # Add --grep option to non-interactively search all changesets returned for a pattern.
     module Revisions
+      # We will pass all of these options through to 'svn log'
+      Console::Command.pass_through({
+          [:_q, :__quiet] => 0,
+          [:_v, :__verbose] => 0,
+          [:__targets] => 1,
+          [:__stop_on_copy] => 0,
+          [:__incremental] => 0,
+          [:__xml] => 0,
+          [:__limit] => 1,
+        }.merge(SvnCommand::C_standard_remote_command_options), self
+      )
+
+      #-------------------------------------------------------------------------
+      def documentation
+        "Examples:
+        > subwrap revisions --limit 5 -r {2008-06-10}:head .
+        "
+      end
+
+      #-------------------------------------------------------------------------
+      def __revision(revisions)
+        @revisions = revisions
+      end
+      alias_method :_r,   :__revision
+
+      #-------------------------------------------------------------------------
+      # :todo: Problem: I often forget to run this *before* doing an svn update. But as soon as I do an update, base is updated and now there is *nothing* new since last update.
+      # Possible solution: Keep a log of updates (at least all updates that use this wrapper) and let you go back to any previous update as your starting point if you've updated very recently and want to go back farther than that.
+      # (Or maybe .svn has a record of the previous update time somewhere that we can pick up?)
+      # Also, as soon as you do an svn revisions, it detects that it's out of date and forces an update, making it so that you can't repeat the command and get the same results.
+      #
+      def __since_last_update
+        @revisions = '%base%:head'
+        @newest_first_default = false
+      end
+      alias_method :__from_base,   :__since_last_update
+      alias_method :__since_base,  :__since_last_update
+      alias_method :__new,         :__since_last_update
+      alias_method :__whats_new,   :__since_last_update
+
+      #-------------------------------------------------------------------------
+      # revision can be revision number or date.
+      # :todo: allow 'yesterday', etc. or absolute time
+      #   Use chronic?
+      # :todo:
+      def __from(revision)
+        @revisions = "#{revision}:head"
+        @newest_first_default = false
+      end
+      alias_method :__since,   :__from
+
+      def __back_to(revision)
+        @revisions = "#{revision}:head"
+        @newest_first_default = true
+      end
+
+      #-------------------------------------------------------------------------
+      # Show diffs automatically for each revision without the user having to press v
+      def __show_diffs
+        @show_diffs = true
+      end
+      alias_method :__auto_diffs,   :__show_diffs
+
+      #-------------------------------------------------------------------------
+      def __show_file_list;      @show_file_list = true; end
+      def __no_file_list;        @show_file_list = false; end
+
+      #-------------------------------------------------------------------------
+      def __fetch_all_diffs_up_front
+        # :todo:
+        # So that when you're actually stepping through revisions, viewing a diff is instantaneous...
+      end
+
+      #-------------------------------------------------------------------------
       # Start at earlier revision and go forwards rather than starting at the latest revision
-      #def __reverse
-      def __forward
-        @reverse = true
+      def __oldest_first
+        @newest_first = false
+      end
+      alias_method :__forward,         :__oldest_first
+      alias_method :__forwards,        :__oldest_first
+      alias_method :__chronological,   :__oldest_first
+
+      def __newest_first
+        @newest_first = true
       end
-      def __forwards
-        @reverse = true
+      alias_method :__reverse,     :__newest_first
+      alias_method :__backwards,   :__newest_first
+
+      #-------------------------------------------------------------------------
+      # Automatically fetch and print all diffs, pipe to a pager.
+      # Great for catching up on what's new, skimming through recent commits.
+      # (Whereas intercative mode is better for investigating, searching for the right commit that corresponds to some change you noticed, etc.)
+      def __non_interactive
+        @interactive = false
       end
+      alias_method :__ni,     :__non_interactive
 
+      def __interactive
+        @interactive = true
+      end
+
+      #-------------------------------------------------------------------------
       # Only show revisions that are in need of a code review
       # :todo:
       def __unreviewed_only
@@ -1288,28 +1496,61 @@ End
         @author_filter = author
       end
     end
+    # :todo: what if they pass in *2* filenames?
     def revisions(directory = './')
       puts "Getting list of revisions for '#{directory.white.bold}' ..."
 
+      #-----------------------------
       head = Subversion.latest_revision
       revision_of_directory = Subversion.latest_revision_for_path(directory)
 
-      # It's possible for a working copy to get "out of date" (even if you were the last committer!), in which case svn log will
+      # It's possible for a working copy to get "out of date" (even if you were the last committer! at least, each *directory* seems to have a different concept of base rev), in which case svn log will
       # only list revisions up to that revision (actually looks like it only goes up to and including Last Changed Rev: 2838,
       # not Revision: 2839, as reported by svn info...)
       if revision_of_directory and head and revision_of_directory < head
         puts "The working copy '#{directory.white.bold}' appears to be out-of-date (#{revision_of_directory}) with respect to the head revision (#{head}). Updating..."
         Subversion.update(directory)
       end
+      #-----------------------------
+
+      args = [directory]
+      #@revisions ||= '1:head'  # this was messing with --limit 5, making it start at 1 instead of most recent
+      if @revisions
+        @revisions.gsub! /%base%/, revision_of_directory
+        args.concat ['-r', @revisions] 
+      end
+
+      @newest_first_default.nil? ? @newest_first_default = false : nil
+      @newest_first.nil? ? @newest_first = @newest_first_default : nil
+
+      @show_diffs ||= true if !@interactive
+      @show_diffs_default ||= false
+      @show_diffs ||= @show_diffs_default
 
-      revisions = Subversion.revisions(directory)
+      if @show_file_list.nil?
+        if directory != './' # They specified a (non-default) directory/file
+          @show_file_list = false
+        else
+          @show_file_list = true
+        end
+      end
 
-      puts "#{revisions.length.to_s.bold} revisions found. Starting with #{@reverse ? 'oldest' : 'most recent'} revision and #{@reverse ? 'going forward in time' : 'going backward in time'}..."
-      revisions.instance_variable_get(:@revisions).reverse! if @reverse
+      run_pager if !@interactive
+
+      #-----------------------------
+      #pp prepare_args(args)
+      revisions = Subversion.revisions(*prepare_args(args))
+
+      #puts "@newest_first=#{@newest_first}"
+      puts "#{revisions.length.to_s.bold} revisions found. Starting with #{(@newest_first ? 'most recent' : 'oldest').green.bold} revision and #{@newest_first ? 'going backward in time' :'going forward in time' }..."
+      revisions.instance_variable_get(:@revisions).reverse! if @newest_first
       revision_ids = revisions.map(&:identifier)
 
+      #-----------------------------------------------------------------------
+      # The main loop through the array of revisions
       target_rev = nil # revision_ids.first
-      show_revision_again = true
+      show_revision = true
+
       revisions.each do |revision|
         rev = revision.identifier
         other_rev = rev-1
@@ -1321,42 +1562,76 @@ End
           end
         end
 
-        # Display the revision
-        if show_revision_again
+        #-----------------------------------------------------------------------
+        show_diffs = proc {
+          revs_to_compare = [other_rev, rev]
+          #puts "\n"*10
+          puts
           puts((' '*100).green.underline)
+          print "Diffing #{revs_to_compare.min}:#{revs_to_compare.max}... ".bold
+          puts
+          #Subversion.repository_root
+          #Subversion.print_commands! do
+            SvnCommand.execute("diff #{directory} --ignore-externals -r #{revs_to_compare.min}:#{revs_to_compare.max}")
+          #end
+        }
+
+        #-----------------------------------------------------------------------
+        # Display the revision (number, date, description, files changed)
+        if show_revision
+
+          #puts((' '*100).green.underline)
+          puts
+          puts((' '*100).on_green)
+
           puts "#{revisions.length - revision_ids.index(rev)}. ".green.bold +
             "r#{rev}".magenta.bold + (rev == head ? ' (head)'.bold : '') + 
             " | #{revision.developer} | #{revision.time.strftime('%Y-%m-%d %H:%M:%S')}".magenta.bold
           puts revision.message
           puts
           #pp revision
-          puts revision.map {|a|
-            (a.status ? a.status[0..0].colorize_svn_status_code : ' ') +   # This check is necessary because RSCM doesn't recognize several Subversion status flags, including 'R', and status will return nil in these cases.
-              ' ' + a.path
-          }.join("\n")
+          if @show_file_list
+            puts revision.map {|a|
+              (a.status ? a.status[0..0].colorize_svn_status_code : ' ') +   # This check is necessary because RSCM doesn't recognize several Subversion status flags, including 'R', and status will return nil in these cases.
+                ' ' + a.path
+            }.join("\n")
+          end
         else
-          show_revision_again = true
+          show_revision = true
+        end
+
+        #-----------------------------------------------------------------------
+        if @show_diffs
+          show_diffs.call
         end
 
+        #-----------------------------------------------------------------------
         # Display the menu
-        print(
-          "r#{rev}".magenta.on_blue.bold + ': ' + 
-          'View this changeset'.menu_item(:cyan) + ', ' +
-          'Diff against specific revision'.menu_item(:cyan, 'D') + ', ' +
-          'Grep the changeset'.menu_item(:cyan, 'G') + ', ' +
-          'List or '.menu_item(:magenta, 'L') + '' +
-          'Edit revision properties'.menu_item(:magenta, 'E') + ', ' +
-          'svn Cat all files'.menu_item(:cyan, 'C') + ', ' +
-          'grep the cat'.menu_item(:cyan, 'a') + ', ' + "\n  " +
-          'mark as Reviewed'.menu_item(:green, 'R') + ', ' +
-          'edit log Message'.menu_item(:yellow, 'M') + ', ' +
-          'or ' + 'browse using ' + 'Up/Down/Enter'.white.bold + ' keys > '
-        )
+        if @interactive
+          print(
+            "r#{rev}".magenta.on_blue.bold + ': ' + 
+            'View this changeset'.menu_item(:cyan) + ', ' +
+            'Diff against specific revision'.menu_item(:cyan, 'D') + ', ' +
+            'Grep the changeset'.menu_item(:cyan, 'G') + ', ' +
+            'List or '.menu_item(:magenta, 'L') + '' +
+            'Edit revision properties'.menu_item(:magenta, 'E') + ', ' +
+            'svn Cat all files'.menu_item(:cyan, 'C') + ', ' +
+            'grep the cat'.menu_item(:cyan, 'a') + ', ' + "\n  " +
+            'mark as Reviewed'.menu_item(:green, 'R') + ', ' +
+            'edit log Message'.menu_item(:yellow, 'M') + ', ' +
+            'or ' + 'browse using ' + 'Up/Down/Space/Enter'.white.bold + ' keys > '
+          )
+        end
 
+        #-----------------------------------------------------------------------
         # Get response from user and then act on it
         begin # rescue
-          response = ""
-          response = $stdin.getch.downcase
+          if @interactive
+            response = ""
+            response = $stdin.getch.downcase
+          else
+            response = "\n"
+          end
 
           # Escape sequence such as the up arrow key ("\e[A")
           if response == "\e"
@@ -1374,17 +1649,9 @@ End
           end
 
           case response
-            when 'v'  # View this changeset
-              revs_to_compare = [other_rev, rev]
-              puts "\n"*10
-              puts((' '*100).green.underline)
-              print "Diffing #{revs_to_compare.min}:#{revs_to_compare.max}... ".bold
-              puts
-              #Subversion.repository_root
-              Subversion.print_commands! do
-                SvnCommand.execute("diff #{directory} --ignore-externals -r #{revs_to_compare.min}:#{revs_to_compare.max}")
-              end
-              show_revision_again = false
+            when '1', 'v'  # View this changeset
+              show_diffs.call
+              show_revision = false # only show the menu
 
             when 'g'  # Grep the changeset
               # :todo; make it accept regexpes like /like.*this/im so you can make it case insensitive or multi-line
@@ -1395,9 +1662,9 @@ End
               puts((' '*100).green.underline)
               puts "Searching `svn diff #{directory} -r #{revs_to_compare.min}:#{revs_to_compare.max}` for #{search_pattern.to_s}... ".bold
               diffs = nil
-              Subversion.print_commands! do
+              #Subversion.print_commands! do
                 diffs = Subversion.diffs(directory, '-r', "#{revs_to_compare.min}:#{revs_to_compare.max}")
-              end
+              #end
 
               hits = 0
               diffs.each do |filename, diff|
@@ -1415,7 +1682,7 @@ End
               if hits == 0
                 puts "Search term not found!".red.bold
               end
-              show_revision_again = false
+              show_revision = false
 
             when 'a'  # Grep the cat
               puts
@@ -1437,13 +1704,13 @@ End
               else
                 puts "Search term not found!".red.bold
               end
-              show_revision_again = false
+              show_revision = false
 
 
             when 'l'  # List revision properties
               puts
               puts Subversion::printable_revision_properties(rev)
-              show_revision_again = false
+              show_revision = false
 
             when 'e'  # Edit revision property
               puts
@@ -1459,14 +1726,14 @@ End
                 end
               end
 
-              show_revision_again = false
+              show_revision = false
 
             when 'c'  # Cat all files from revision
               puts
               Subversion.print_commands! do
                 puts Subversion.cat(directory, '-r', rev)
               end
-              show_revision_again = true
+              show_revision = true
 
             when 'r'  # Mark as reviewed
               puts
@@ -1479,14 +1746,14 @@ End
                 puts svn(:capture, "propset code:reviewed '#{your_name}' --revprop -r #{rev}", :prepare_args => false)
                 # :todo: Maybe *append* to code:reviewed (,-delimited) rather than overwriting it?, in case there is a policy of requiring 2 reviewers or something
               end
-              show_revision_again = false
+              show_revision = false
 
             when 'm'  # Edit log message
               puts
               Subversion.print_commands! do
                 SvnCommand.execute("edit_message -r #{rev}")
               end
-              show_revision_again = false
+              show_revision = false
 
             when "\e[A" # Up
               i = revision_ids.index(rev)
@@ -1495,16 +1762,17 @@ End
               retry
 
               
-            when /\n|\e\[B/ # Enter or Down
+            when /\n|\e\[B| / # Enter or Down or Space
               # Skip / Do nothing with this file
               puts " Next..."
+              #show_revision = false  #?
               next
 
             else
               # Invalid option. Do nothing.
               #puts response.inspect
               puts
-              show_revision_again = false
+              show_revision = false
 
           end # case response
 
@@ -1560,7 +1828,7 @@ End
     end
 
     # Removes nil elements, converts to strings, and adds any pass-through args that may have been provided.
-    def prepare_args(args)
+    def prepare_args(args=[])
       args.compact!       # nil elements spell trouble
       args.map!(&:to_s)   # shell_escape doesn't like Fixnums either
       @passthrough_options + args.shell_escape

data/test/svn_command_test.rb

@@ -1,6 +1,6 @@
 $mock_subversion = true
 require File.dirname(__FILE__) + '/test_helper'
-require_local '../lib/subwrap/svn_command.rb'
+require 'subwrap/svn_command.rb'
 require 'facets/string/to_re'
 require 'yaml'
 require 'facets/module/alias'

data/test/test_helper.rb

@@ -3,13 +3,13 @@ require 'rubygems'
 require 'facets/kernel/load'
 gem 'mocha'
 require 'stubba'
-$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 gem 'test_extensions'
 require 'test_extensions'
 gem 'quality_extensions'
 
-require_local '../lib/subwrap/subversion'
+require 'subwrap/subversion'
 if $mock_subversion
   module Subversion
     def self.executable

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: subwrap
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
-date: 2008-06-11 00:00:00 -07:00
+  version: 0.4.0
+date: 2008-06-19 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -29,8 +29,8 @@ post_install_message: |
   ---------------------------------------------------------------------------------------------------
   You should now be able to run the subwrap command.
   
-  IMPORTANT: If you want to replace the normal svn command with subwrap, please run sudo
-  _subwrap_post_install or check the Readme to find out how to manually add it to your path.
+  IMPORTANT: If you want to replace the normal svn command with subwrap, please run 
+  sudo `which _subwrap_post_install` or check the Readme to find out how to manually add it to your path.
   
   Also, it is recommended that you install the termios gem so that you don't have to press enter
   after selecting an option from the menu, but it will work without it.
@@ -42,6 +42,7 @@ files:
 - lib/subwrap/subversion_extensions.rb
 - lib/subwrap/subversion.rb
 - lib/subwrap/svn_command.rb
+- lib/subwrap/pager.rb
 - lib/subwrap.rb
 - test/subversion_extensions_test.rb
 - test/svn_command_test.rb
@@ -85,15 +86,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: escape
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: facets
   version_requirement: