svn-command 0.2.4 → 0.2.5

data/ProjectInfo.rb

@@ -5,7 +5,7 @@ module Project
   PrettyName    = "Enhanced Subversion Command"
   Name          = "svn-command"
   RubyForgeName = "svn-command"
-  Version       = "0.2.4"
+  Version       = "0.2.5"
   Specification = Gem::Specification.new do |s|
     s.name    = Project::Name
     s.summary = "A nifty wrapper command for Subversion's command-line svn client"

data/Readme

@@ -10,7 +10,7 @@
 
 == Introduction
 
-This is a replacement <tt>svn</tt> <b>command-line client</b> meant to be used instead of the standard +svn+ command. Actually, it's a _wrapper_, not a replacement, because it still uses <tt>/usr/bin/svn</tt> to do all the dirty work.
+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 replacement, because it still uses <tt>/usr/bin/svn</tt> to do all the dirty work.)
 
 == Installation
 
@@ -46,33 +46,70 @@ You'll know it's working by way of two signs:
 == Features
 
 Changes to existing subcommands:
-* <tt>svn diff</tt>
+* <b><tt>svn diff</tt></b>
   * output is in _color_* (requires +colordiff+, see below)
   * <tt>svn diff</tt> includes the differences from your *externals* too (consistent with how <tt>svn status</tt> includes them) so that you don't forget to commit those changes too! (pass <tt>--ignore-externals</tt> if you _don't_ want a diff of externals)
-* <tt>svn status</tt>
+* <b><tt>svn status</tt></b>
   * filters out distracting, useless output about externals (don't worry -- it still shows which files were _modified_)
   * the flags (?, M, C, etc.) are in *color*!
-* <tt>svn move</tt> it will let you move multiple source files to a destination directory with a single command
+* <b><tt>svn move</tt></b> it will let you move multiple source files to a destination directory with a single command
 
 (* You can pass --no-color to disable colors for a single command...useful if you want to pipe the output to another command or something. Eventually maybe we could make this a per-user option via .svn-command?)
 
 New subcommands:
-* <tt>svn each_unadded</tt> (+eu+, +unadded+) -- goes through each unadded (<tt>?</tt>) file reported by <tt>svn status</tt> and asks you what to do with them (add, delete, ignore).
-* <tt>svn externals</tt> -- lists all externals
-* <tt>svn revisions</tt> -- lists all revisions with log messages and lets you browse through them interactively
-* <tt>svn edit_externals</tt> (+ee+)
-* <tt>svn externalize</tt>
-* <tt>svn set_message</tt> / <tt>svn get_message</tt> / <tt>svn edit_message</tt> -- shortcuts for accessing <tt>--revprop svn:log</tt>
-* <tt>svn ignore</tt> -- shortcut for accessing <tt>svn:ignore</tt> property
-* <tt>svn view_commits</tt> -- gives you output from both <tt>svn log</tt> and from <tt>svn diff</tt> for the given changesets (useful for code reviews)
-* <tt>svn repository_root</tt> -- prints out the root repository URL of the working copy you are in
-* <tt>svn delete_svn</tt> -- causes the current directory (recursively) to no longer be a working copy
+* <b><tt>svn each_unadded</tt></b> (+eu+, +unadded+) -- goes through each unadded (<tt>?</tt>) file reported by <tt>svn status</tt> and asks you what to do with them (add, delete, ignore).
+* <b><tt>svn revisions</tt></b> -- lists all revisions with log messages and lets you browse through them interactively
+* <b><tt>svn externals</tt></b> -- lists all externals
+* <b><tt>svn edit_externals</tt></b> (+ee+)
+* <b><tt>svn externalize</tt></b>
+* <b><tt>svn set_message</tt></b> / <tt>svn get_message</tt> / <tt>svn edit_message</tt> -- shortcuts for accessing <tt>--revprop svn:log</tt>
+* <b><tt>svn ignore</tt></b> -- shortcut for accessing <tt>svn:ignore</tt> property
+* <b><tt>svn view_commits</tt></b> -- gives you output from both <tt>svn log</tt> and from <tt>svn diff</tt> for the given changesets (useful for code reviews)
+* <b><tt>svn url</tt></b> -- prints out the URL of the given working copy path or the curretn working copy
+* <b><tt>svn repository_root</tt></b> -- prints out the root repository URL of the working copy you are in
+* <b><tt>svn delete_svn</tt></b> -- causes the current directory (recursively) to no longer be a working copy
 
 (RDoc question: how do I make the identifiers like Subversion::SvnCommand#externalize into links??)
 
 = Usage / Examples
 
-== <tt>svn st</tt>
+== <tt>svn each_unadded</tt>
+
+My personal favorite. This command is useful for keeping your working copies clean -- getting rid of all those accumulated temp files (or *ignoring* or *adding* them if they're something that _all_ users of this repository should be aware of).
+
+It simply goes through each "unadded" file (each file reporting a status of <tt>?</tt>) reported by <tt>svn status</tt> and asks you what you want to do with them -- *add*, *delete*, or *ignore*.
+
+  > svn each_unadded
+
+  What do you want to do with plugins/database_log4r/doc?
+    (shows preview)
+  (a)dd, (d)elete, add to svn:(i)ignore property, or [Enter] to do nothing > i
+  Ignoring...
+
+  What do you want to do with applications/underlord/db/schema.rb?
+    (shows preview)
+  (a)dd, (d)elete, add to svn:(i)ignore property, or [Enter] to do nothing > a
+  Adding...
+
+  What do you want to do with applications/underlord/vendor/plugins/exception_notification?
+    (shows preview)
+  (a)dd, (d)elete, add to svn:(i)ignore property, or [Enter] to do nothing > d
+  Are you pretty much *SURE* you want to 'rm -rf applications/underlord/vendor/plugins/exception_notification'? (y)es, (n)o > y
+  Deleting...
+
+For *files*, it will show a preview of the _contents_ of that file (limited to the first 55 lines); for *directories*, it will show a _directory_ _listing_. By looking at the preview, you should hopefully be able to decide whether you want to _keep_ the file or _junk_ it.
+
+== <tt>svn revisions</tt> (revisions browser)
+
+Lets you interactively step through all revisions of a file/directory/repository.
+
+Screenshot:
+link:include/svn_revisions.png
+
+Use the <tt>--forwards</tt> flag if you want to <i>start at the oldest revision</i> and step forwards through time rather than starting at the latest revision and stepping backwards (the default).
+
+
+== <tt>svn status</tt>
 
 _Without_ this gem installed (really long):
 
@@ -112,32 +149,6 @@ _Without_ this gem installed (really long):
   A      gemables/subversion/bin/svn
   M      applications/underlord/vendor/plugins/rails_smith/tasks/shared/base.rake
 
-== <tt>svn each_unadded</tt>
-
-My personal favorite. This command is useful for keeping your working copies clean -- getting rid of all those accumulated temp files (or *ignoring* or *adding* them if they're something that _all_ users of this repository should be aware of).
-
-It simply goes through each "unadded" file (each file reporting a status of <tt>?</tt>) reported by <tt>svn status</tt> and asks you what you want to do with them -- *add*, *delete*, or *ignore*.
-
-  > svn each_unadded
-
-  What do you want to do with plugins/database_log4r/doc?
-    (shows preview)
-  (a)dd, (d)elete, add to svn:(i)ignore property, or [Enter] to do nothing > i
-  Ignoring...
-
-  What do you want to do with applications/underlord/db/schema.rb?
-    (shows preview)
-  (a)dd, (d)elete, add to svn:(i)ignore property, or [Enter] to do nothing > a
-  Adding...
-
-  What do you want to do with applications/underlord/vendor/plugins/exception_notification?
-    (shows preview)
-  (a)dd, (d)elete, add to svn:(i)ignore property, or [Enter] to do nothing > d
-  Are you pretty much *SURE* you want to 'rm -rf applications/underlord/vendor/plugins/exception_notification'? (y)es, (n)o > y
-  Deleting...
-
-For *files*, it will show a preview of the _contents_ of that file (limited to the first 55 lines); for *directories*, it will show a _directory_ _listing_. By looking at the preview, you should hopefully be able to decide whether you want to _keep_ the file or _junk_ it.
-
 ==<tt>svn externalize</tt> / <tt>externals</tt> / <tt>edit_externals</tt>
 
 Shortcut for creating an svn:external...
@@ -202,17 +213,6 @@ You can now do commands like this:
 
 (The _standard_ +svn+ command only accepts a _single_ source and a _single_ destination!)
 
-== <tt>svn revisions</tt> (revisions browser)
-
-Lets you interactively step through all revisions of a file/directory/repository.
-
-
-Note: You may have to svn update your working copy in order for svn log (and hence svn revisions) to be able to see the revisions you just committed.
-
-
-Use the <tt>--forwards</tt> flag if you want to <u>start at the oldest revision</u> and step forwards through time rather than starting at the latest revision and stepping backwards (the default).
-
-
 == <tt>svn commit</tt>
 
 === --skip-notification / --covert
@@ -277,7 +277,7 @@ You can, of course, get a lits of the custom commands that have been added by us
 * --print-commands (prints out the /usr/bin/svn commands before executing them)
 * --debug    (sets $debug = true)
 
-==<tt>colordiff</tt>
+==Requirement: <tt>colordiff</tt>
 
 +colordiff+ is used to colorize <tt>svn diff</tt> commands (+ lines are blue; - lines are red)
 
@@ -292,6 +292,23 @@ Suggestion: change the colors in <tt>/etc/colordiffrc</tt> to be more readable:
   diffstuff=cyan
   cvsstuff=magenta
 
+==A workaround for the <tt>Commit failed; Your file or directory 'some file' is probably out-of-date</tt> problem==
+
+  svn: Commit failed (details follow):
+  svn: Your file or directory 'some file' is probably out-of-date
+  svn: The version resource does not correspond to the resource within the transaction.  Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).
+  Sending        some file
+  (Doesn't actually finish the commit)
+
+I'm still not sure what causes it (I didn't think I was doing anything _that_ out of the ordinary...) or how to _prevent_ it, because it keep happening to me (maybe I'm the only one?)... but I've at least automated the "fix" for this state somewhat.
+
+The only way I've found to resolve this problem is to delete the entire directory and restore it (with svn update).
+
+It must have something to do with something in the .svn directories not matching up the way that svn expects.
+
+Anyway, the <tt>svn fix_out_of_date_commit_state</tt> command attempts to automate most of that process for you.
+
+
 ==Bash command completion
 
 If you want command completion for the svn subcommands (and I don't blame you if you don't -- the default command completion is <i>much faster</i> and already gives you completion for filenames!), just add this line to your <tt>~/.bashrc</tt> :
@@ -351,27 +368,14 @@ But... as with most things written in Ruby, it's all more about *productivity* t
 
 Take the best ideas from these and incorporate:
 * /usr/lib/ruby/gems/1.8/gems/rscm-0.5.1/lib/rscm/scm/subversion.rb
-* /usr/lib/ruby/gems/1.8/gems/rscm-0.5.1/lib/rscm/scm/subversion_log_parser.rb
 * /usr/lib/ruby/gems/1.8/gems/lazysvn-0.1.3/lib/subversion.rb
 
 Possibly switch to LazySvn.
 
 After you save/edit/set an svn:externals, it should try to automatically pretty up the margins/alignment for you.
 
-Color menu_item for do you want to edit this external yes/no
-
-  ====================================================================================================
-  Diff of externals (**don't forget to commit these too!**):
-  ----------------------------------------------------------------------------------------------------
-to use ANSI underlines/colors
-
 Done, I think:
   Make sure to show errors! 
-  ~/svn st * wasn't showing an error it should have been
-  > /usr/bin/svn status change_all_externals.rb change_all_externals.sh devscripts frontend glass glass.net potluck shared
-  svn: 'change_all_externals.rb' is not a working copy
-
-  If wrapped svn ever exits with an error code (such as 1), we ought to throw a fit as well
 
   If there is an error during an update, such as this one:
     Fetching external item into 'glass/rails_backend/vendor/plugins/our_extensions'

data/lib/svn-command/subversion.rb

@@ -10,6 +10,7 @@ gem 'facets', '>=1.8.51'
 require 'facets/core/kernel/require_local'
 require 'facets/core/enumerable/uniq_by'
 require 'facets/core/kernel/silence_stream'
+require 'facets/core/module/initializer'
 
 gem 'qualitysmith_extensions', '>=0.0.7'
 
@@ -20,6 +21,7 @@ gem 'qualitysmith_extensions', '>=0.0.7'
 #require 'facets/core/class/cattr'
 gem 'qualitysmith_extensions'
 require 'qualitysmith_extensions/module/attribute_accessors'
+require 'qualitysmith_extensions/module/guard_method'
 
 # RSCM is used for some of the abstraction, such as for parsing log messages into nice data structures. It seems like overkill, though, to use RSCM for most things...
 gem 'rscm'
@@ -32,6 +34,7 @@ module Subversion
   # True if you want output from svn to be colorized (useful if output is for human eyes, but not useful if using the output programatically)
   @@color = false
   mattr_accessor :color
+  mguard_method :with_color!, :@@color
 
   # If true, will only output which command _would_ have been executed but will not actually execute it.
   @@dry_run = false
@@ -78,6 +81,10 @@ module Subversion
     add_to_property 'externals', options[:local_path], "#{options[:as]} #{repo_url}"
   end
 
+  def self.export(path_or_url, target)
+    execute "export #{path_or_url} #{target}"
+  end
+
   # Removes the given items from the repository and the disk. Items may contain wildcards.
   def self.remove(*args)
     execute "rm #{args.join ' '}"
@@ -143,6 +150,11 @@ module Subversion
     execute("update #{args.join ' '}")
   end
 
+  def self.commit(*args)
+    args = ['./'] if args.empty?
+    execute("commit #{args.join ' '}")
+  end
+
   # The output from `svn status` is nicely divided into two "sections": the section which pertains to the current working copy (not
   # counting externals as part of the working copy) and then the section with status of all of the externals.
   # This method returns the first section.
@@ -180,11 +192,19 @@ module Subversion
     }
   end
 
-  # Returns the local modifications to the working directory specified by +path+.
+  # Returns the modifications to the working directory or URL specified in +args+.
   def self.diff(*args)
     args = ['./'] if args.empty?
-    #puts("diff #{"--diff-cmd colordiff" if color} #{args.join ' '}")
-    execute("diff #{"--diff-cmd colordiff" if color} #{args.join ' '}")
+    execute("diff #{"--diff-cmd colordiff" if color?} #{args.join ' '}")
+  end
+  # Parses the output from diff and returns an array of Diff objects.
+  def self.diffs(*args)
+    args = ['./'] if args.empty?
+    raw_diffs = nil
+    with_color! false do
+      raw_diffs = diff(*args)
+    end
+    DiffsParser.new(raw_diffs).parse
   end
 
   # It's easy to get/set properties, but less easy to add to a property. This method uses get/set to simulate add.
@@ -264,9 +284,16 @@ module Subversion
   # Returns the revision number for head.
   def self.latest_revision(*args)
     args = ['./'] if args.empty?
+    # The revision returned by svn status -u seems to be a pretty reliable way to get this. Does anyone know of a better way?
     matches = /Status against revision:\s+(\d+)/m.match(status_against_server(args))
     matches && matches[1]
   end
+  # Returns the revision number for the working directory(/file?) specified by +path+
+  def self.latest_revision_for_path(path)
+    # The revision returned by svn info seems to be a pretty reliable way to get this. Does anyone know of a better way?
+    matches = info(path).match(/^Revision: (\d+)/)
+    matches && matches[1]
+  end
 
   # Returns an array of RSCM::Revision objects
   def self.revisions(*args)
@@ -287,10 +314,15 @@ module Subversion
     execute "info #{args.join(' ')}"
   end
 
+  def self.url(path_or_url = './')
+    matches = info(path_or_url).match(/^URL: (.+)/)
+    matches && matches[1]
+  end
+
   # :todo: needs some serious unit-testing love
   def self.base_url(path_or_url = './')
-     matches = info(path_or_url).match(/^Repository Root: (.+)/)
-     matches && matches[1]
+    matches = info(path_or_url).match(/^Repository Root: (.+)/)
+    matches && matches[1]
 
      # It appears that we might need to use this old way (which looks at 'URL'), since there is actually a 
 #    base_url = nil    # needed so that base_url variable isn't local to loop block (and reset during next iteration)!
@@ -407,10 +439,8 @@ end
 
 
 
-#Subversion.const_set(:RevisionProperty) = Struct.new(:name, :repository_path)
-
+#-----------------------------------------------------------------------------------------------------------------------------
 module Subversion
-
   RevisionProperty = Struct.new(:name, :value)
 
   # Represents an "externals container", which is a directory that has the <tt>svn:externals</tt> property set to something useful.
@@ -458,6 +488,62 @@ module Subversion
       self.container_dir == other.container_dir
     end
   end
-end
 
+  # A collection of Diff objects in in file_name => diff format.
+  class Diffs < Hash
+  end
+
+  class Diff
+    attr_reader :filename, :diff
+    initializer :filename do
+      @diff = ''
+    end
+    def filename_pretty
+      filename.ljust(100).black_on_white
+    end
+  end
+
+  class DiffsParser
+    class ParseError < Exception; end
+    initializer :raw_diffs
+    @state = nil
+    def parse
+      diffs = Diffs.new
+      current_diff = nil
+      @raw_diffs.each_line do |line|
+        if line =~ /^Index: (.*)$/
+          current_diff = Diff.new($1)
+          diffs[current_diff.filename] = current_diff #unless current_diff.nil?
+          @state = :immediately_after_filename
+          next
+        end
+
+        if current_diff.nil?
+          raise ParseError.new("The raw diff input didn't begin with 'Index:'!")
+        end
+
+        if @state == :immediately_after_filename
+          if line =~ /^===================================================================$/ ||
+             line =~ /^---.*\(revision \d+\)$/ ||
+             line =~ /^\+\+\+.*\(revision \d+\)$/ ||
+             line =~ /^@@ .* @@$/
+            # Skip
+            next
+          else
+            @state= :inside_the_actual_diff
+          end
+        end
+
+        if @state == :inside_the_actual_diff
+          current_diff.diff << line
+        else
+          raise ParseError.new("Expected to be in :inside_the_actual_diff state, but was not.")
+        end
+      end
+      diffs.freeze
+      diffs
+    end
+  end
+
+end
 end

data/lib/svn-command/subversion_extensions.rb

@@ -52,7 +52,7 @@ class String
   end
   def colorize_svn_diff
     if Subversion.color
-      self.gsub(/^(Index: )(.*)$/) { $2.underline}.
+      self.gsub(/^(Index: )(.*)$/) { $2.ljust(100).black_on_white}.
            gsub(/^=+\n/, '') 
     else
       self

data/lib/svn-command/svn_command.rb

@@ -8,6 +8,8 @@ require 'facets/core/array/select'      # select!
 require 'facets/core/kernel/with'       # returning
 require 'facets/core/string/lines'
 require 'facets/core/string/index_all'
+require 'facets/core/string/to_re'
+require 'facets/core/string/to_rx'
 
 gem 'qualitysmith_extensions', '>=0.0.3'
 require 'qualitysmith_extensions/enumerable/enum'
@@ -61,6 +63,19 @@ class String
   def relativize_path
     self.gsub(File.expand_path(FileUtils.getwd) + '/', '')   # Simplify the directory by removing the working directory from it, if possible
   end
+  def highlight_occurences(search_pattern, color = :red)
+    self.gsub(search_pattern) { $&.send(color).bold }
+  end
+end
+def confirm(question, options = ['Yes', 'No'])
+  print question + " " +
+    "Yes".menu_item(:red) + ", " +
+    "No".menu_item(:green) + 
+    " > "
+  response = ''
+  # Currently allow user to press Enter to accept the default.
+  response = $stdin.getc.chr.downcase while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
+  response
 end
 
 Subversion.extend(Subversion::Extensions)
@@ -234,19 +249,24 @@ module Subversion
       alias_method :__knowingly_committing_broken_code, :__broken
     end
     def commit(*args)
+      latest_rev_before_commit = Subversion.latest_revision if @broken || @skip_notification
+
       Subversion.print_commands_for do
-        puts svn(:capture, "propset svn:skip_commit_notification_for_next_commit true --revprop -r #{Subversion.latest_revision}", :prepare_args => false)
+        puts svn(:capture, "propset svn:skip_commit_notification_for_next_commit true --revprop -r #{latest_rev_before_commit}", :prepare_args => false)
       end if @skip_notification
       # :todo:
       # Add some logic to automatically skip the commit e-mail if the size of the files to be committed exceeds a threshold of __ MB.
       # (Performance idea: Only check the size of the files if svn st includes (bin)?)
 
-      puts output = svn(:capture, 'commit', *(['--force-log'] + args))
+      svn(:system, 'commit', *(['--force-log'] + args))
 
-      just_committed = (matches = output.match(/Committed revision (\d+)\./)) && matches[1]
+      # The following only works if we do :capture (`svn`), but that doesn't work so well (at all) if svn tries to open up an editor (vim),
+      # which is what happens if you don't specify a message.:
+      #   puts output = svn(:capture, 'commit', *(['--force-log'] + args))
+      #   just_committed = (matches = output.match(/Committed revision (\d+)\./)) && matches[1]
 
       Subversion.print_commands_for do
-        puts svn(:capture, "propset code:broken true --revprop -r #{just_committed}", :prepare_args => false)
+        puts svn(:capture, "propset code:broken true --revprop -r #{latest_rev_before_commit + 1}", :prepare_args => false)
       end if @broken
 
     end
@@ -255,6 +275,50 @@ module Subversion
     # * look for .svn-commit files within current tree and if one is found, show what's in it and ask 
     #   "Found a commit message from a previous failed commit. {preview} Do you want to (u)se this message for the current commit, or (d)elete it?"
 
+    # A fix for this annoying problem that I seem to come across all too frequentrly:
+    #   svn: Commit failed (details follow):
+    #   svn: Your file or directory 'whatever.rb' is probably out-of-date
+    def fix_out_of_date_commit_state(dir)
+      dir = $1 if dir =~ %r|^(.*)/$|                           # Strip trailing slash.
+
+      puts Subversion.export("#{dir}", "#{dir}.new").          # Exports (copies) the contents of working copy 'dir' (including your uncommitted changes, don't worry! ... and you'll get a chance to confirm before anything is deleted; but sometimes although it exports files that are scheduled for addition, they are no longer scheduled for addition in the new working copy, so you have to re-add them) to non-working-copy 'dir.new'
+        add_exit_code_error 
+      return if !$?.success?
+
+      system("mv #{dir} #{dir}.backup")                        # Just in case something goes ary
+      puts ''.add_exit_code_error
+      return if !$?.success?
+
+      puts "Restoring #{dir}..."
+      Subversion.update dir                                    # Restore the directory to a pristine state so we will no longer get that annoying error
+
+      # Assure the user that dir.new really does have your latest changes
+      #puts "Here's a diff. Your changes/additions will be in the *right* (>) file."
+      #system("diff #{dir}.backup #{dir}")
+
+      # Merge those latest changes back into the pristine working copy
+      system("cp -R #{dir}.new/. #{dir}/")
+
+      # Assure the user one more time
+      puts Extensions.diff(dir)
+
+      # Actually commit
+      puts
+      response = confirm("Are you ready to try the commit again now?")
+      puts
+      if response == 'y'
+        puts "Great. Go for it."
+        #Subversion.commit dir
+      end
+
+      # Clean up
+      #puts
+      #response = confirm("Do you want to delete array.backup array.new now?")
+      puts "Don't forget to delete array.backup array.new now!"
+      #rm_rf array.backup, array.new
+      puts
+    end
+
     #-----------------------------------------------------------------------------------------------------------------------------
     module Diff
       Console::Command.pass_through({
@@ -287,7 +351,7 @@ module Subversion
             unless diff_output == ""
               #output.puts '-'*100
               #output.puts item.ljust(100, ' ').black_on_white.bold.underline
-              output.puts item.black_on_white.bold
+              output.puts item.ljust(100).black_on_white.bold
               output.puts diff_output
             end
           end
@@ -449,6 +513,11 @@ End
     # Custom subcommands
     #-----------------------------------------------------------------------------------------------------------------------------
 
+    #-----------------------------------------------------------------------------------------------------------------------------
+    def url(*args)
+      puts Subversion.url(*args)
+    end
+
     #-----------------------------------------------------------------------------------------------------------------------------
     def repository_root(*args)
       puts Subversion.repository_root(*args)
@@ -574,15 +643,12 @@ End
 
                 response = ""
                 if File.directory?(file)
-                  print "Are you pretty much " + "SURE".bold + " you want to '" + "rm -rf #{file}".red.bold + "'? " +
-                    "Yes".menu_item(:red) + ", " +
-                    "No".menu_item(:green) + 
-                    " > "
-                  response = $stdin.getc.chr.downcase while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
+                  response = confirm("Are you pretty much " + "SURE".bold + " you want to '" + "rm -rf #{file}".red.bold + "'? ")
                 else
                   response = "y"
                 end
 
+                puts "response=#{response}"
                 if response == 'y'
                   print "\nDeleting... "
                   FileUtils.rm_rf file
@@ -697,9 +763,7 @@ End
             command = "#{Subversion.executable} propedit svn:externals #{external.container_dir}"
             #puts command
             begin
-              #print "Press Ctrl-C to skip, any other key to continue. (This will start up your default editor.) "
-              print "Do you want to edit svn:externals for this directory?".black_on_white + ' ' + 'yes'.menu_item(:white) + '/' + 'No'.menu_item(:white) + " > "
-              response = $stdin.getc.chr.downcase
+              response = confirm("Do you want to edit svn:externals for this directory?".black_on_white)
               system command if response == 'y'
             rescue Interrupt
               puts "\nGoodbye!"
@@ -816,12 +880,7 @@ End
       # we can use the empty string as a way to trigger a propdel...
       if value == ''
         puts
-        print "Are you sure you want to delete property #{property_name}".red.bold + "'? " +
-          "Yes".menu_item(:red) + ", " +
-          "No".menu_item(:green) + 
-          " > "
-        response = ''
-        response = $stdin.getc.chr.downcase while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
+        response = confirm("Are you sure you want to delete property #{property_name}".red.bold + "'? ")
         puts
         if response == 'y'
           Subversion.print_commands_for do
@@ -880,14 +939,32 @@ End
       # Only show revisions that are in need of a code review
       # :todo:
       def __unreviewed_only
-        @unreviewed_only
+        @unreviewed_only = true
+      end
+
+      # Only show revisions that were committed by a certain author.
+      # :todo:
+      def __by(author)
+        @author_filter = author
+      end
+      def __author(author)
+        @author_filter = author
       end
     end
-    # :todo: document in readme! test! release! annouce!
     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
+      # 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 < 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
+
       revisions = Subversion.revisions(directory)
 
       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'}..."
@@ -969,12 +1046,32 @@ End
               SvnCommand.execute("diff #{directory} --ignore-externals -r #{revs_to_compare.min}:#{revs_to_compare.max}")
 
             when 'g'  # Grep the changeset
+              # :todo; make it accept regexpes like /like.*this/im so you can make it case insensitive or multi-line
               revs_to_compare = [other_rev, rev]
               puts
+              print 'Grep for'.bold + ' (Regular expressions ' + 'like.*this'.bold.blue + ' are allowed, but not ' + '/like.*this/im'.bold.blue + '): '
+              search_pattern = $stdin.gets.chomp.to_rx
               puts((' '*100).green.underline)
-              print "Diffing #{revs_to_compare.min}:#{revs_to_compare.max}... ".bold
-              puts
-              puts Extensions.diff(directory, '-r', "#{revs_to_compare.min}:#{revs_to_compare.max}")
+              puts "Searching `svn diff #{revs_to_compare.min}:#{revs_to_compare.max}` for #{search_pattern.to_s}... ".bold
+              diffs = Subversion.diffs(directory, '-r', "#{revs_to_compare.min}:#{revs_to_compare.max}")
+
+              hits = 0
+              diffs.each do |filename, diff|
+                #.grep(search_pattern)
+                if diff.diff =~ search_pattern
+                  puts diff.filename_pretty
+                  puts( diff.diff.grep(search_pattern). # This will get us just the interesting *lines* (as an array). 
+                    map { |line|                        # Now, for each line...
+                      hits += 1
+                      line.highlight_occurences(search_pattern)
+                    }
+                  )
+                end
+              end
+              if hits == 0
+                puts "Search term not found!".red.bold
+              end
+              show_revision_again = false
 
             when 'l'  # List revision properties
               puts
@@ -997,6 +1094,14 @@ End
 
               show_revision_again = false
 
+            when 'c'  # Cat all files from revision
+              puts 'Not implemented yet'
+              show_revision_again = false
+
+            when 'a'  # Grep the cat
+              puts 'Not implemented yet'
+              show_revision_again = false
+
             when 'r'  # Mark as reviewed
               puts
               your_name = ENV['USER'] # I would use the same username that Subversion itself would use if you committed

data/test/subversion_test.rb

@@ -75,69 +75,56 @@ class SubversionTest < Test::Unit::TestCase
       FileUtils.rm_r tmpdir
     end
   end
+end
 
-  def test_revert
-    Subversion.revert 'foo', 'bar', 'hello/world'
-    assert_equal 'svn revert foo bar hello/world', Subversion.executed.first
-  end
-
-  def test_executable
-    Subversion.make_executable 'foo', 'bar', 'hello/world'
-    assert_equal "svn propset svn:executable '' foo", Subversion.executed[0]
-    assert_equal "svn propset svn:executable '' bar", Subversion.executed[1]
-    assert_equal "svn propset svn:executable '' hello/world", Subversion.executed[2]
-
-    Subversion.make_not_executable 'foo'
-    assert_equal "svn propdel svn:executable foo", Subversion.executed[3]
-  end
-
-  def test_status
-    Subversion.status 'foo'
-    assert_equal "svn status foo", Subversion.executed.first
+class DiffsParserTest < Test::Unit::TestCase
+#  def test_diff_class_acts_like_hash
+#    diff = Subversion::Diff['file.rb' => "some differences"]
+#    assert_equal 'some differences', diff['file.rb']
+#  end
+  def test_parser_error
+    assert_raise(Subversion::DiffsParser::ParseError) { Subversion::DiffsParser.new('what').parse }
   end
-
-  def test_revisions
-    Subversion.stubs(:log).returns(<<End)
-------------------------------------------------------------------------
-r407119 | moo | 2006-05-16 20:27:28 -0500 (Tue, 16 May 2006) | 5 lines
-Changed paths:
-   M /trunk/cow/black.rb
-   M /trunk/cow/brown.rb
-
-Commit message...
-------------------------------------------------------------------------
+  def test_parser
+    diffs = Subversion::DiffsParser.new(<<End).parse
+Index: lib/test_extensions.rb
+===================================================================
+--- lib/test_extensions.rb      (revision 2871)
++++ lib/test_extensions.rb      (revision 2872)
+@@ -6,6 +6,7 @@
+ require_local 'some_file'
+
+ gem 'qualitysmith_extensions'
++require 'qualitysmith_extensions/regexp/join'
+ require 'qualitysmith_extensions/kernel/capture_output.rb'
+ require 'qualitysmith_extensions/kernel/simulate_input.rb'
+
+Index: Readme
+===================================================================
+--- Readme      (revision 0)
++++ Readme      (revision 2872)
+@@ -0,0 +1,2 @@
++* Blah blah blah
++* Blah blah blah
 End
-    assert_equal 1, Subversion.revisions.length
-    assert_equal RSCM::Revision, Subversion.revisions[0].class
-    assert_equal RSCM::RevisionFile, Subversion.revisions[0][0].class
-    assert_equal 'modified', Subversion.revisions[0][0].status.downcase
-    assert_equal 'trunk/cow/black.rb', Subversion.revisions[0][0].path
-    assert_equal 'trunk/cow/brown.rb', Subversion.revisions[0][1].path
-    assert_equal 'Commit message...', Subversion.revisions[0].message
-  end
+    assert_equal Subversion::Diffs, diffs.class
+    assert       diffs.frozen?
+    assert_equal 2, diffs.keys.size
+    assert_equal 2, diffs.values.size
+    assert_equal <<End, diffs['lib/test_extensions.rb'].diff
+ require_local 'some_file'
+
+ gem 'qualitysmith_extensions'
++require 'qualitysmith_extensions/regexp/join'
+ require 'qualitysmith_extensions/kernel/capture_output.rb'
+ require 'qualitysmith_extensions/kernel/simulate_input.rb'
 
-  def test_revision_properties_names
-    Subversion.stubs(:proplist).returns(<<End)
-Unversioned properties on revision 2819:
-  svn:log
-  svn:author
-  svn:date
 End
-    assert_equal ['svn:log', 'svn:author', 'svn:date'], Subversion.revision_properties_names(rev = 14)
-  end
-  def test_revision_properties
-    Subversion.stubs(:proplist).returns(<<End)
-Unversioned properties on revision 2819:
-  svn:log
-  svn:author
-  svn:date
+    assert_equal <<End, diffs['Readme'].diff
++* Blah blah blah
++* Blah blah blah
 End
-    Subversion.stubs(:get_revision_property).returns('a value')
 
-    assert_equal [
-      Subversion::RevisionProperty.new('svn:log', 'a value'),
-      Subversion::RevisionProperty.new('svn:author', 'a value'),
-      Subversion::RevisionProperty.new('svn:date', 'a value'),
-    ], Subversion.revision_properties(rev = 14)
   end
+
 end

data/test/svn_command_test.rb

@@ -3,64 +3,15 @@ require File.dirname(__FILE__) + '/test_helper'
 require_local '../lib/svn-command/svn_command.rb'
 require 'facets/core/string/to_re'
 require 'yaml'
-
-
 require 'facets/core/module/alias_method_chain'
-require 'qualitysmith_extensions/string/each_char_with_index'
-module Test
-  module Unit
-    module Assertions
-      # Rather than showing the expected and the actual and asking the user to figure out the commonalities and differences
-      # himself, this method will highlight the differences for the user (in color), so that they can be spotted in less than
-      # an instant!
-      # Strings: show common characters in a plain color and highlight the characters that differ (at that index) in yellow.
-      # Strings: show common elements in a plain color and highlight the elements that differ (at that index) in yellow.
-      def assert_equal_with_difference_highlighting(expected, actual, message=nil)
-        String.class_eval do
-          alias_method :colorize, :colorize_without_no_color
-        end
-        if String===expected && String===actual
-          expected_with_highlighting = ''
-          actual_with_highlighting = ''
-          expected.each_char_with_index do |i, c|
-            if c != actual[i].chr
-              expected_with_highlighting << c.yellow
-              actual_with_highlighting   << actual[i].chr.yellow
-            else
-              expected_with_highlighting << c
-              actual_with_highlighting   << c
-            end
-
-          end
-          full_message = build_message(message, <<End, expected_with_highlighting, actual_with_highlighting)
-<?>
-expected but was
-<?>.
-End
-          puts actual_with_highlighting if expected != actual
-          assert_block(full_message) { expected == actual }
-        else
-          assert_equal_without_difference_highlighting(expected, actual, message)
-        end
-        String.class_eval do
-          alias_method :colorize, :colorize_with_no_color
-        end
-      end # def assert_equal_with_difference_highlighting
+require 'qualitysmith_extensions/colored/toggleability'
+require 'qualitysmith_extensions/regexp/join'
 
-      alias_method_chain :assert_equal, :difference_highlighting
-    end
-  end
-end
 
 
-Subversion.color = false
 # Makes testing simpler. We can test all the *colorization* features via *manual* testing (since they're not as critical).
-class String
-  def colorize_with_no_color(string, options = {})
-    string
-  end
-  alias_method_chain :colorize, :no_color
-end
+Subversion.color = false
+String.color_on! false
 
 module Subversion
 class BaseSvnCommandTest < Test::Unit::TestCase
@@ -147,11 +98,11 @@ end
 class SvnCommitTest < BaseSvnCommandTest
   def test_1
     SvnCommand.execute("commit -m 'just an ordinary commit message!'") 
-    assert_equal "svn commit -m 'just an ordinary commit message!' --force-log", Subversion.executed.join
+    assert_equal ["svn commit -m 'just an ordinary commit message!' --force-log"], Subversion.executed
   end
   def test_lots_of_options
     SvnCommand.execute("commit --non-recursive -q -m '' --targets some_file      ") 
-    assert_equal "svn commit --non-recursive -q -m '' --targets some_file --force-log", Subversion.executed.join
+    assert_equal ["svn commit --non-recursive -q -m '' --targets some_file --force-log"], Subversion.executed
   end
   def test_that_complex_quoting_doesnt_confuse_it
     original_message = "Can't decide how many \"'quotes'\" to use!"
@@ -565,7 +516,7 @@ end
 # Changeset/commit/log Browser
 
 class SvnRevisionsTest < BaseSvnCommandTest
-  def test_1
+  def set_up_stubs
     Subversion.stubs(:revisions).returns(
       begin
         RSCM::Revisions.class_eval do
@@ -600,8 +551,14 @@ class SvnRevisionsTest < BaseSvnCommandTest
         revisions.revisions = [revision1, revision2]
       end
     )
+    Subversion.stubs(:latest_revision).returns(42)
+    Subversion.stubs(:latest_revision_for_path).returns(42)
     Subversion.stubs(:diff).returns("the diff")
-    
+  end
+
+  def test_view_changeset
+    set_up_stubs
+
     output = simulate_input(
       'v' +     # View this changeset
       "\n" +    # Continue to revision 1800
@@ -609,52 +566,51 @@ class SvnRevisionsTest < BaseSvnCommandTest
     ) do
       capture_output { SvnCommand.execute('revisions') }
     end
-    puts output
-    require 'unroller'
+    #puts output
+    #require 'unroller'
     #Unroller::trace :exclude_classes => /PP|PrettyPrint/ do
 
-    assert_equal <<-End, output
-Getting list of revisions for './' ...
-2 revisions found. Starting with most recent revision and going backward in time...
-
-2. r1800 | tyler | 2007-12-01 00:00:00
+    assert_match Regexp.loose_join(
+      "Getting list of revisions for './' ...
+2 revisions found. Starting with most recent revision and going backward in time...",
+# Show 1800 again
+"2. r1800 | tyler | 2007-12-01 00:00:00
 I say! Quite the storm, what!
 
 A dir/file1
 M dir/file2
-View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files from revision, grep the cat,
-  mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >
-
-
-
-
-
-
-
-
-
-
-Diffing 1799:1800...
-the diff
-
-2. r1800 | tyler | 2007-12-01 00:00:00
+View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files from revision, grep the cat, 
+  mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >",
+# Show the diff
+"Diffing 1799:1800...",
+"the diff",
+# Show 1800 again
+"2. r1800 | tyler | 2007-12-01 00:00:00
 I say! Quite the storm, what!
 
 A dir/file1
 M dir/file2
-View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files from revision, grep the cat,
-  mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >  Next...
-
-1. r1801 | tyler | 2007-12-02 00:00:00
+View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files from revision, grep the cat, 
+  mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >  Next...",
+# Now show 1801
+"1. r1801 | tyler | 2007-12-02 00:00:00
 These Romans are crazy!
 
 M dir/file2
-View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files from revision, grep the cat,
-  mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >  Next...
-End
-    #end
+View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files from revision, grep the cat, 
+  mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >  Next...",
+:multi_line => true
+), output
+
+
+=begin
+/.*/
+}.*
+=end
+
+
     assert_equal [
-      "svn status -u ./"    # To find head
+      #"svn status -u ./"    # To find head
     ], Subversion.executed
   end
 end

data/test/test_helper.rb

@@ -4,12 +4,10 @@ require 'facets/core/kernel/require_local'
 require 'facets/core/kernel/load_local'
 require 'stubba'
 $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
-require_local "shared/test_helper"
 
-gem 'qualitysmith_extensions', '>=0.0.3'
-require 'qualitysmith_extensions/test/assert_exception.rb'
-require 'qualitysmith_extensions/kernel/capture_output.rb'
-require 'qualitysmith_extensions/kernel/simulate_input.rb'
+gem 'test_extensions'
+require 'test_extensions'
+gem 'qualitysmith_extensions'
 
 require_local '../lib/svn-command/subversion'
 if $mock_subversion

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2007-04-26 00:00:00 -07:00
+  version: 0.2.5
+date: 2007-05-01 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -41,8 +41,6 @@ files:
 - test/subversion_extensions_test.rb
 - test/subversion_test.rb
 - test/svn_command_test.rb
-- test/shared/test_helper.rb
-- test/shared/test_helpers/test_colorizer.rb
 - bin/rscm_test
 - bin/command_completion_for_svn_command
 - bin/svn

data/test/shared/test_helper.rb

@@ -1,5 +0,0 @@
-require 'test/unit'
-require 'rubygems'
-gem 'qualitysmith_extensions'
-require 'qualitysmith_extensions/test/all'
-require File.expand_path(File.dirname(__FILE__)+'/' + 'test_helpers/test_colorizer')

data/test/shared/test_helpers/test_colorizer.rb

@@ -1,109 +0,0 @@
-require 'rubygems'
-gem 'colored'
-require 'test/unit'
-require 'colored'
-
-module Test::Unit
-  
-  class Error
-    # the 'E' that is displayed as the tests are run
-    def single_character_display
-      "E".red.bold
-    end
-    
-    # the long message that is displayed after test is run
-    def long_display
-      backtrace = filter_backtrace(@exception.backtrace).join("\n    ")
-      [
-        "Error".red.bold, 
-        ":\n", 
-        "#@test_name:".white, 
-        "\n", "#{message}".red, 
-        "\n    #{backtrace}".gsub(/:(\d+):/,":#{'\1'.red}:")
-      ].join('')
-    end
-  end
-  
-  
-  class Failure
-    # the 'E' that is displayed as the tests are run
-    def single_character_display
-      "F".yellow.bold
-    end
-    
-    # the long message that is displayed after test is run
-    def long_display
-      location_display = if(location.size == 1)
-        location[0].sub(/\A(.+:\d+).*/, ' [\\1]')
-      else
-        "\n    [#{location.join("\n     ")}]"
-      end
-      [
-        "Failure".yellow.bold, 
-        ":\n","#@test_name".white, 
-        "#{location_display}".gsub(/:(\d+)/, ":#{'\1'.yellow}"), 
-        ":\n", "#@message".yellow
-      ].join('')
-    end
-  end
-  
-  # it is necessary to do a class_eval for the TestRunner class
-  # through the AutoRunner class, since the require in the AutoRunner
-  # class will overwrite what we do here otherwise.
-  # 
-  # We must do the same thing inside of the TestRunner class
-  # class_eval for the TestResult class.  We Modify the
-  # TestRunnerMediator class after the require is called,
-  # which will then modify the TestResult class.
-  #
-  # test_finished is the function that will output the
-  # '.' period during the test runs
-  #
-  # the to_s for TestResult class returns the string
-  # for the final tallied results
-  class AutoRunner
-    RUNNERS[:console] = proc do |r|
-      require 'test/unit/ui/console/testrunner'
-      Test::Unit::UI::Console::TestRunner.class_eval %q{
-        def test_finished(name)
-          output_single('.'.green, 1) unless (@already_outputted)
-          nl(3)
-          @already_outputted = false
-        end
-        
-        def create_mediator(suite)
-          require 'test/unit/ui/testrunnermediator'
-          Test::Unit::UI::TestRunnerMediator.class_eval %q{
-            def create_result
-              Test::Unit::TestResult.class_eval %q{
-                def to_s
-                  rc = [
-                      "#{run_count}".white.bold, 
-                      "tests".white
-                    ].join(' ')
-                  ac = [
-                      "#{assertion_count}".white.bold, 
-                      "assertions".white
-                    ].join(' ')
-                  fc = [
-                      "#{failure_count}".yellow.bold, 
-                      "failures".yellow
-                    ].join(' ')
-                  ec = [
-                      "#{error_count}".red.bold, 
-                      "errors".red
-                    ].join(' ')
-                  [rc, ac, fc, ec].join(', ')
-                end
-              }
-              TestResult.new
-            end
-          }
-          return Test::Unit::UI::TestRunnerMediator.new(suite)
-        end
-      }
-      Test::Unit::UI::Console::TestRunner
-    end
-  end
-  
-end