svn-command 0.0.5 → 0.0.6

data/Readme

@@ -1,8 +1,8 @@
 = <i>Enhanced Subversion command</i> -- an +svn+ command wrapper
 
 [*Environment*:]           Command line 
-[<b>Home page</b>:]        http://svncommand.rubyforge.org/
-[<b>Project site</b>:]     http://rubyforge.org/projects/svncommand
+[<b>Home page</b>:]        http://svn-command.rubyforge.org/
+[<b>Project site</b>:]     http://rubyforge.org/projects/svn-command
 [<b>Wiki</b>:]             http://wiki.qualitysmith.com/svn-command
 [<b>Author</b>:]           Tyler Rick
 
@@ -26,7 +26,7 @@ Currently a _patched_ version of Console::Command is required. The patched vesio
 
 You also need to make those files *executable* (once per _system_):
 
-  sudo chmod a+x /usr/lib/ruby/gems/1.8/gems/svn-command-0.0.3/bin/*
+  sudo chmod a+x /usr/lib/ruby/gems/1.8/gems/svn-command*/bin/*
 
 (We can't just set <tt>executables = "svn"</tt> and have it automatically install it to /usr/bin because that would cause it to <b>wipe out</b> the existing executable at <tt>/usr/bin/svn</tt>! If you know of a better, more automatic solution to this, please let the developers know!)
 
@@ -38,9 +38,9 @@ And for some reason I seem to have to restart my terminal after doing the chmod
 
   export PATH=`ls -d /usr/lib/ruby/gems/1.8/gems/svn-command* | tail -n1`/bin:$PATH
  
-Or hard-code the path, if you really want to:
+Or hard-code the path, if you _really_ want to:
 
-  export PATH=/usr/lib/ruby/gems/1.8/gems/svn-command-0.0.4/bin:$PATH
+  export PATH=/usr/lib/ruby/gems/1.8/gems/svn-command-Version/bin:$PATH
 
 (I'm not sure if this is possible to automate with the <tt>gem install</tt> process or not. But in the meantime you need to do it manually.)
 
@@ -57,6 +57,7 @@ Changes to existing subcommands:
 * <tt>svn status</tt>
 ** 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
 
 (* 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?)
 
@@ -73,7 +74,7 @@ New subcommands:
 
 == Usage
 
-=== <tt>svn st</tt>
+=== <tt>st</tt>
 
 _Without_ this gem installed (really long):
 
@@ -113,7 +114,7 @@ _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>
+=== <tt>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).
 
@@ -139,7 +140,7 @@ It simply goes through each "unadded" file (each file reporting a status of <tt>
 
 For *files*, it will show a preview of the _contents_ of that file (limited to the first 3000 characters); 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.
 
-===externalize / externals / edit_externals
+===<tt>externalize</tt> / <tt>externals</tt> / <tt>edit_externals</tt>
 
 Shortcut for creating an svn:external...
 
@@ -175,7 +176,7 @@ You can also pass a directory name to edit_externals to edit the svn:externals p
 
   > svn edit-externals vendor/plugins
 
-===get_message / set_message / edit_message
+===<tt>get_message</tt> / <tt>set_message</tt> / <tt>edit_message</tt>
 
 <b>Pre-requisite for set_message/edit_message</b>: Your repository must have a <tt>pre-revprop-change</tt> hook file.
 
@@ -194,6 +195,15 @@ You can do this:
 or just this:
   svn edit_message
 
+=== <tt>move</tt>
+
+You can now do commands like this:
+
+  svn mv file1 file2 dir
+  svn mv dir1/* dir
+
+(The standard svn command only accepts a single source and a single destination.)
+
 ===Help
 
 You can, of course, get a lits of the custom commands that have been added by using <tt>svn help</tt>. They will be listed at the end.
@@ -205,7 +215,7 @@ You can, of course, get a lits of the custom commands that have been added by us
 * --show-commands (prints out the /usr/bin/svn commands before executing them)
 * --debug    (sets $debug = true)
 
-==colordiff
+==<tt>colordiff</tt>
 
 +colordiff+ is used to colorize <tt>svn diff</tt> commands (+ lines are blue; - lines are red)
 

data/lib/subversion.rb

@@ -11,7 +11,7 @@ require 'facets/core/kernel/require_local'
 require 'facets/core/enumerable/uniq_by'
 require 'facets/core/kernel/silence_stream'
 
-require_gem 'our_extensions', '>=0.0.2'
+require_gem 'qualitysmith_extensions', '>=0.0.3'
 require 'capture_output'
 
 # Had a lot of trouble getting ActiveSupport to load without giving errors! Eventually gave up on that idea since I only needed it for mattr_accessor and Facets supplies that.
@@ -144,8 +144,8 @@ module Subversion
 
   # Returns an array of external *items*
   # Example:
-  #   gemables/our_extensions/tasks/shared
-  #   gemables/our_extensions/doc_include/template
+  #   gemables/extensions/tasks/shared
+  #   gemables/extensions/doc_include/template
   def self.externals_items(path = './')
     status = status_the_section_before_externals(path)
     return [] if status.nil?

data/lib/subversion_extensions.rb

@@ -15,6 +15,7 @@ class String
       self.gsub(/^ *\?/) { $&.yellow.bold}.
            gsub(/^ *A/) { $&.green.bold}.
            gsub(/^ *M/) { $&.green.bold}.
+           gsub(/^ *D/) { $&.magenta.bold}.
            gsub(/^ *C/) { $&.red.bold}.
            gsub(/^ *~/) { $&.red.bold}.
            gsub(/^ *!/) { $&.red.bold}

data/lib/svn_command.rb

@@ -6,10 +6,11 @@ require 'facets/core/string/margin'
 require 'facets/core/kernel/require_local'
 require 'facets/core/array/select'      # select!
 
-require_gem 'our_extensions', '>=0.0.2'
-require 'enumerable/enum'
-require 'array/expand_ranges'
-require 'array/shell_escape'
+require_gem 'qualitysmith_extensions', '>=0.0.3'
+require 'qualitysmith_extensions/enumerable/enum'
+require 'qualitysmith_extensions/array/expand_ranges'
+require 'qualitysmith_extensions/array/shell_escape'
+require 'qualitysmith_extensions/file_test/binary_file'
 
 require 'extensions/symbol'   # to_proc
 require 'pp'
@@ -37,6 +38,13 @@ rescue RuntimeError => exception    # Necessary for automated testing.
   end
 end
 
+class String
+  # Makes the first character bold and underlined. Makes the whole string of the given color.
+  def menu_item(color = :white)
+    self[0..0].send(color).bold.underline + self[1..-1].send(color)
+  end
+end
+
 Subversion.extend(Subversion::Extensions)
 Subversion::color = true
 
@@ -285,6 +293,39 @@ End
     # Ideas:
     #   Just pass a number (5) and it will be treated as --limit 5 (unless File.exists?('5'))
 
+    #-----------------------------------------------------------------------------------------------------------------------------
+    module Move
+      Console::Command.pass_through({
+          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_q, :__quiet] => 0,
+          [:__force] => 0,
+          [:_m, :__message] => 1,
+          [:_F, :__file] => 1,
+          [:__force_log] => 0,
+          [:__editor_cmd] => 1,
+          [:__encoding] => 1,
+        }.merge(SvnCommand::standard_remote_command_options), self
+      )
+    end
+
+    # Unlike the built-in move, this one lets you list multiple source files 
+    #   Source... DestinationDir
+    # or
+    #   Source Destination
+    def move(*args)
+      if args.length >= 3
+        destination = args.pop
+        sources = args
+
+        sources.each do |source|
+          puts svn(:capture, 'move', source, destination)
+        end
+      else
+        svn :exec, 'move', *args
+      end
+    end
+    alias_subcommand :mv => :move
+
     #-----------------------------------------------------------------------------------------------------------------------------
     module Status
       Console::Command.pass_through({
@@ -406,12 +447,16 @@ End
                   raise "#{file} doesn't seem to exist -- even though it was reported by svn status"
                 end
                 if File.file?(file)
-                  puts "File contents:"
-                  # Only show the first x bytes so that we don't accidentally dump the contens of some 20 GB log file to screen...
-                  contents = File.read(file, 3000) || ''
-                  print contents
-                  puts if contents[-1] && contents[-1].chr != "\n"    # Make sure we end with a newline character
-                  puts "..." if contents.length >= 3000               # So they know that there may be more to the file than what's shown
+                  if FileTest.binary_file?(file)
+                    puts "(Binary file -- cannot show preview)".bold
+                  else
+                    puts "File contents:"
+                    # Only show the first x bytes so that we don't accidentally dump the contens of some 20 GB log file to screen...
+                    contents = File.read(file, 3000) || ''
+                    print contents
+                    puts if contents[-1] && contents[-1].chr != "\n"    # Make sure we end with a newline character
+                    puts "..." if contents.length >= 3000               # So they know that there may be *more* to the file than what's shown
+                  end
                 elsif File.directory?(file)
                   puts "Directory contains:"
                   Dir.new(file).reject {|f| ['.','..'].include? f}.each do |f|
@@ -422,9 +467,9 @@ End
                 end
               end
               print(
-                "" + "A".green.bold.underline + "dd, ".green +
-                "".red + "D".red.bold.underline + "elete".red + ", " +
-                "add to " + "svn:".yellow + "I".yellow.bold.underline + "gnore".yellow + " property, " + 
+                "Add".menu_item(:green) + ", " +
+                "Delete".menu_item(:red) + ", " +
+                "add to " + "svn:".yellow + "Ignore".menu_item(:yellow) + " property, " + 
                 "or [" + "Enter".white.bold + "] to do nothing > "
               )
               response = ""
@@ -443,7 +488,10 @@ End
 
                 response = ""
                 if File.directory?(file)
-                  print "Are you pretty much *SURE* you want to 'rm -rf #{file}'? (y)es, (n)o > "
+                  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 while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
                 else
                   response = "y"

data/test/svn_command_test.rb

@@ -4,7 +4,7 @@ require_local '../lib/svn_command.rb'
 require 'facets/core/string/to_re'
 require 'yaml'
 
-Subversion.color = false    # Makes testing simpler. We can just test that the *colorization* features are working via *manual* tests.
+Subversion.color = false    # Makes testing simpler. We can test that the *colorization* features are working via *manual* testing (they're not as critical).
 
 module Subversion
 class BaseSvnCommandTest < Test::Unit::TestCase
@@ -200,28 +200,23 @@ end
 # another character from stdin but you didn't supply one!
 
 class SvnEachUnaddedTest < BaseSvnCommandTest
-  def stub_status_1
-    Subversion.stubs(:status).returns("
-M      gemables/calculator/test/calculator_test.rb
-X      gemables/calculator/tasks/shared
-?      gemables/calculator/lib/unused.rb
-")
-  end
   def setup
     super
-    FileUtils.mkdir_p('gemables/calculator/lib/')
-#    file = 'gemables/calculator/lib/useless_directory'
-#    FileUtils.rmdir(file) if File.exist?(file)
-    File.open(@filename = 'gemables/calculator/lib/unused.rb', 'w') { |file| file.puts "line 1 of unused.rb" }
+    FileUtils.rm_rf('temp_dir/')
+    FileUtils.mkdir_p('temp_dir/calculator/lib/')
+    File.open(@filename = 'temp_dir/calculator/lib/unused.rb', 'w') { |file| file.puts "line 1 of unused.rb" }
   end
   def teardown
-    file = 'gemables/calculator/lib/unused.rb'
-    FileUtils.rm(file) if File.exist?(file)
-    FileUtils.rmdir('gemables/calculator/lib/')
-    FileUtils.rmdir('gemables/calculator/')
-    FileUtils.rmdir('gemables/')
+    FileUtils.rm_rf('temp_dir/')
   end
 
+  def stub_status_1
+    Subversion.stubs(:status).returns("
+M      temp_dir/calculator/test/calculator_test.rb
+X      temp_dir/calculator/tasks/shared
+?      temp_dir/calculator/lib/unused.rb
+")
+  end
   def test_add
     stub_status_1
     output = simulate_input('a') do
@@ -229,7 +224,7 @@ X      gemables/calculator/tasks/shared
     end
     assert_match /What do you want to do with .*unused\.rb/, output
     assert_match /Adding/, output
-    assert_equal "svn add gemables/calculator/lib/unused.rb", Subversion.executed.join
+    assert_equal "svn add temp_dir/calculator/lib/unused.rb", Subversion.executed.join
   end
   def test_ignore
     stub_status_1
@@ -239,8 +234,8 @@ X      gemables/calculator/tasks/shared
     assert_match /What do you want to do with .*unused\.rb/, output
     assert_match /Ignoring/, output
     assert_equal [
-        "svn propget svn:ignore gemables/calculator/lib",
-        "svn propset svn:ignore 'unused.rb' gemables/calculator/lib"
+        "svn propget svn:ignore temp_dir/calculator/lib",
+        "svn propset svn:ignore 'unused.rb' temp_dir/calculator/lib"
       ], Subversion.executed
   end
   def test_preview_is_now_automatic
@@ -257,13 +252,13 @@ X      gemables/calculator/tasks/shared
   end
   def test_delete
     Subversion.stubs(:status).returns("
-M      gemables/calculator/test/calculator_test.rb
-X      gemables/calculator/tasks/shared
-?      gemables/calculator/lib/unused.rb
-?      gemables/calculator/lib/useless_directory
+M      temp_dir/calculator/test/calculator_test.rb
+X      temp_dir/calculator/tasks/shared
+?      temp_dir/calculator/lib/unused.rb
+?      temp_dir/calculator/lib/useless_directory
 ")
-    FileUtils.mkdir_p(@dirname = 'gemables/calculator/lib/useless_directory')
-    File.open(                   'gemables/calculator/lib/useless_directory/foo', 'w') { |file| file.puts "line 1 of foo" }
+    FileUtils.mkdir_p(@dirname = 'temp_dir/calculator/lib/useless_directory')
+    File.open(                   'temp_dir/calculator/lib/useless_directory/foo', 'w') { |file| file.puts "line 1 of foo" }
 
     assert File.exist?( @dirname ) 
     assert File.exist?( @filename ) 

data/test/test_helper.rb

@@ -6,9 +6,11 @@ require 'facets/core/kernel/load_local'
 require 'stubba'
 $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require_local "shared/test_helper"
-require_local '../../our_extensions/lib/test/assert_exception.rb'
-require_local '../../our_extensions/lib/capture_output.rb'
-require_local '../../our_extensions/lib/simulate_input.rb'
+
+require_gem 'qualitysmith_extensions', '>=0.0.3'
+require 'test/assert_exception.rb'
+require 'capture_output.rb'
+require 'simulate_input.rb'
 
 require 'subversion'
 if $mock_subversion

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 date: 2007-03-15 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
 email: rubyforge.org@tylerrick.com
-homepage: http://svncommand.rubyforge.org/
+homepage: http://svn-command.rubyforge.org/
 rubyforge_project: svn-command
 description: This is a wrapper command for Subversion's command-line svn client that adds a few new subcommands.
 autorequire: 
@@ -32,7 +32,6 @@ files:
 - lib/subversion.rb
 - lib/attribute_accessors.rb
 - lib/subversion_extensions.rb
-- lib/my_wrapper.rb
 - test/test_helper.rb
 - test/subversion_extensions_test.rb
 - test/subversion_test.rb
@@ -78,7 +77,25 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: facets
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.51
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: qualitysmith_extensions
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
     version: 

data/lib/my_wrapper.rb

@@ -1,72 +0,0 @@
-require 'rubygems'
-require_gem 'facets', '>=1.8.51'
-require 'facets/more/command'
-require 'pp'
-require 'stringio'
-
-class MyWrapperCommand < Console::Command
-
-  def initialize(*args)
-    @missing_options = []
-    super
-  end
-
-  #-----------------------------------------------------------------------------------------------------------------------------
-  # Default/dynamic behavior
-  
-  # Any subcommands that we haven't implemented here will simply be passed on to the built-in svn command.
-#  def method_missing(subcommand, *args)
-#    puts "in method_missing(#{subcommand}, #{args.inspect})"
-#    p options
-#    exec subcommand, *args 
-#  end
-
-  def option_missing(option_name, args)
-    puts "in option_missing (#{option_name.inspect}, #{args.inspect})"
-
-    # The following hackery is necessary because we really don't know the arity (how many subsequent tokens it should eat) of the option -- we don't know anything about the options, in fact; that's why we've landed in option_missing.
-    # This is kind of a hokey solution, but for any unrecognized options/args (which will be *all* of them unless we list the available options in the subcommand module), we just eat all of the args, store them in @missing_options, and later we will add them back on.
-    # What's annoying about it this solution is that *everything* after the first unrecognized option comes in as args, even if they are args for the subcommand and not for the *option*!
-    # But...it seems to work to just pretend they're options.
-    # It seems like this is mostly a problem for *wrappers* that try to use Console::Command. Sometimes you just want to *pass through all args and options* unchanged and just filter the output somehow.
-    # Command doesn't make that super-easy though. If an option (--whatever) isn't defined, then the only way to catch it is in option_missing. And since we can't the arity unless we enumerate all options, we have to hokily treat the first option as having unlimited arity.
-    #   Alternatives considered: 
-    #     * Assume arity of 0. Then I'm afraid it would extract out all the option flags and leave the args that were meant for the args dangling there out of order ("-r 1 -m 'hi'" => "-r -m", "1 'hi'")
-    #     * Assume arity of 1. Then if it was really 0, it would pick up an extra arg that really wasn't supposed to be an arg for the *option*.
-    # Solution for wrappers:?
-    #   pass_through :some_built_in_subcommand
-    #   Tells Command to not parse options out of args -- just pass *all* args (options and all) on to the subcommand's method(*args).
-    # Ideally, we wouldn't be using option_missing at all because all options would be listed in the respective subcommand module...but we're too lazy to list them all out, so this is just seemed like the easiest way to do things....
-
-    @missing_options << "#{option_name}" << args
-    @missing_options.flatten!
-
-    return arity = args.size
-  end
-
-  #-----------------------------------------------------------------------------------------------------------------------------
-  module Diff
-    def __color
-      @diff_command = 'colordiff'
-    end
-  end
-  def diff(*args)
-    puts "in diff (#{args.inspect})"
-    args << '--diff-cmd' << @diff_command if @diff_command
-    exec 'diff', *args
-  end
-
-  #-----------------------------------------------------------------------------------------------------------------------------
-  # Helpers
-
-private
-  def exec(*args)
-    args = ['svn'] + args + @missing_options
-    # options comes last because once the options parsing starts, it eats all args up to the very end
-    puts "This is the command we would execute at this point, if this weren't just a demonstration"
-    p args
-  end
-
-
-end
-MyWrapperCommand.execute