svn-command 0.2.12 → 0.2.15

data/ProjectInfo.rb

@@ -5,7 +5,7 @@ module Project
   PrettyName    = "Enhanced Subversion Command"
   Name          = "svn-command"
   RubyForgeName = "svn-command"
-  Version       = "0.2.12"
+  Version       = "0.2.15"
   Specification = Gem::Specification.new do |s|
     s.name    = Project::Name
     s.summary = "A nifty wrapper command for Subversion's command-line svn client"
@@ -18,7 +18,7 @@ module Project
     s.homepage = "http://#{Project::RubyForgeName}.rubyforge.org/"
     s.rubyforge_project = Project::Name
     s.platform = Gem::Platform::RUBY
-    s.add_dependency("termios")
+    #s.add_dependency("termios") # No longer _required_, but highly recommended.
     s.add_dependency("colored")
     s.add_dependency("escape")
     s.add_dependency("facets")
@@ -26,7 +26,9 @@ module Project
     s.add_dependency("rscm")
     s.post_install_message = <<-End
 ---------------------------------------------------------------------------------------------------
-Please run sudo /usr/bin/_svn_command_post_install to finalize the installation.
+IMPORTANT: Please run sudo /usr/bin/_svn_command_post_install to finalize the installation.
+
+Also, it is highly recommended that you install the termios gem, but it will work without it.
 ---------------------------------------------------------------------------------------------------
   End
 

data/Readme

@@ -16,13 +16,13 @@ This is a replacement <b><tt>svn</tt> command-line client</b> meant to be used i
 
 === Dependencies
 
-* termios
 * colored
 * escape
 * facets
 * extensions
 * qualitysmith_extensions
 * rscm
+* termios (recommended, but no longer required)
 
 === Installation: Once per _system_
 

data/lib/svn-command/subversion.rb

@@ -69,16 +69,25 @@ module Subversion
     raise NotImplementedError
   end
 
-  # Adds the given repo URL (http://svn.yourcompany.com/path/to/something) as an svn:externals.
+  # Adds the given repository URL (http://svn.yourcompany.com/path/to/something) as an svn:externals.
   #
   # Options may include:
   # * +:as+ - overrides the default behavior of naming the checkout based on the last component of the repo path
-  # * +:local_path+ - specifies where to set the externals property. Defaults to './'
+  # * +:local_path+ - specifies where to set the externals property. Defaults to '.' or the dirname of +as+ if +as+ is specified
+  #   (for example, <tt>vendor/plugins</tt> if +as+ is <tt>vendor/plugins/plugin_name</tt>).
   #
   def self.externalize(repo_url, options = {})
-    options[:local_path] ||= './'
+
     options[:as] ||= File.basename(repo_url)
-    options[:as] = options[:as].ljust(29)
+    #options[:as] = options[:as].ljust(29)
+
+    # You can't set the externals of './' to 'vendor/plugins/foo http://example.com/foo'
+    # Instead, you have to set the externals of 'vendor/plugins/' to 'foo http://example.com/foo'
+    # This will make that correction for you automatically.
+    options[:local_path] ||= File.dirname(options[:as])   # Will be '.' if options[:as] has no dirname component.
+                                                          # Will be 'vendor/plugins' if options[:as] is 'vendor/plugins/plugin_name'.
+    options[:as] = File.basename(options[:as])
+
     add_to_property 'externals', options[:local_path], "#{options[:as]} #{repo_url}"
   end
 
@@ -208,6 +217,11 @@ module Subversion
     DiffsParser.new(raw_diffs).parse
   end
 
+  def self.cat(*args)
+    args = ['./'] if args.empty?
+    execute("cat #{args.join ' '}")
+  end
+
   # It's easy to get/set properties, but less easy to add to a property. This method uses get/set to simulate add.
   # It will uniquify lines, removing duplicates. (:todo: what if we want to set a property to have some duplicate lines?)
   def self.add_to_property(property, path, *new_lines)
@@ -254,7 +268,7 @@ module Subversion
     execute("proplist --revprop -r #{rev}")
   end
   # Returns an array of the names of all revision properties currently set on the given +rev+
-  # Tested by: ../../test/subversion_test.rb:test_revision_properties_names
+  # Tessted by: ../../test/subversion_test.rb:test_revision_properties_names
   def self.revision_properties_names(rev)
     raw_list = proplist(rev)
     raw_list.scan(/^ +([^ ]+)$/).map { |matches|
@@ -262,7 +276,7 @@ module Subversion
     }
   end
   # Returns an array of RevisionProperty objects (name, value) for revisions currently set on the given +rev+
-  # Tested by: ../../test/subversion_test.rb:test_revision_properties
+  # Tessted by: ../../test/subversion_test.rb:test_revision_properties
   def self.revision_properties(rev)
     revision_properties_names(rev).map { |property_name|
       RevisionProperty.new(property_name, get_revision_property(property_name, rev))
@@ -502,7 +516,7 @@ module Subversion
         [
           entries_structs.map { |entry|
             entry.name.size
-          }.max,
+          }.max.to_i,
           25
         ].max
       

data/lib/svn-command/svn_command.rb

@@ -14,6 +14,7 @@ require 'facets/core/string/index_all'
 require 'facets/core/string/to_re'
 require 'facets/core/string/to_rx'
 require 'facets/core/symbol/to_proc'
+require 'facets/core/kernel/in'
 
 gem 'qualitysmith_extensions', '>=0.0.3'
 require 'qualitysmith_extensions/enumerable/enum'
@@ -27,8 +28,7 @@ require 'qualitysmith_extensions/module/attribute_accessors'
 require 'English'
 require 'pp'
 require 'stringio'
-gem 'termios'
-require 'termios'
+
 gem 'colored'
 require 'colored'  # Lets us do "a".white.bold instead of "\033[1ma\033[0m"
 
@@ -36,23 +36,33 @@ require_local '../../ProjectInfo'
 require_local 'subversion'
 require_local 'subversion_extensions'
 
+
 begin
-  # Set up termios so that it returns immediately when you press a key.
-  # (http://blog.rezra.com/articles/2005/12/05/single-character-input)
-  t = Termios.tcgetattr(STDIN)
-  save_terminal_attributes = t.dup
-  t.lflag &= ~Termios::ICANON
-  Termios.tcsetattr(STDIN, 0, t)
-rescue RuntimeError => exception    # Necessary for automated testing.
-  if exception.message =~ /can't get terminal parameters/
-    puts 'Warning: Terminal not found.'
-    $interactive = false
-  else
-    raise
+  gem 'termios'
+  require 'termios'
+  begin
+    # Set up termios so that it returns immediately when you press a key.
+    # (http://blog.rezra.com/articles/2005/12/05/single-character-input)
+    t = Termios.tcgetattr(STDIN)
+    save_terminal_attributes = t.dup
+    t.lflag &= ~Termios::ICANON
+    Termios.tcsetattr(STDIN, 0, t)
+
+    # Set terminal_attributes back to how we found them...
+    at_exit { Termios.tcsetattr(STDIN, 0, save_terminal_attributes) }
+  rescue RuntimeError => exception    # Necessary for automated testing.
+    if exception.message =~ /can't get terminal parameters/
+      puts 'Warning: Terminal not found.'
+      $interactive = false
+    else
+      raise
+    end
   end
+  $termios_loaded = true
+rescue Gem::LoadError
+  $termios_loaded = false
 end
 
-begin  # Reset terminal_attributes
 
 module Kernel
   # Simply to allow us to override it
@@ -66,6 +76,29 @@ class Object
   def nonnil?; !nil?; end
 end
 
+class IO
+  # Gets a single character, as a string.
+  # Adjusts for the different behavior of getc if we are using termios to get it to return immediately when you press a single key
+  # or if they are not using that behavior and thus have to press Enter after their single key.
+  def getch
+    response = getc
+    if !$termios_loaded
+      next_char = getc
+      new_line_characters_expected = ["\n"]
+      #new_line_characters_expected = ["\n", "\r"] if windows?
+      if next_char.chr.in?(new_line_characters_expected)
+        # Eat the newline character
+      else
+        # Don't eat it
+        # (This case is necessary, for escape sequences, for example, where they press only one key, but it produces multiple characters.)
+        $stdin.ungetc(next_char)
+      end
+    end
+    response.chr
+  end
+end
+
+
 class String
   # Makes the first character bold and underlined. Makes the whole string of the given color.
   # :todo: Move out to extensions/console/menu_item
@@ -96,7 +129,7 @@ def confirm(question, options = ['Yes', 'No'])
     " > "
   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 = $stdin.getch.downcase while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
   response
 end
 
@@ -367,14 +400,13 @@ module Subversion
       # http://svn.collab.net/repos/svn/trunk/doc/user/svn-best-practices.html:
       #   After every svn commit, your working copy has mixed revisions. The things you just committed are now at the HEAD revision, and everything else is at an older revision.
       #puts "Whenever you commit something, strangely, your working copy becomes out of date (as you can observe if you run svn info and look at the revision number). This is a problem for svn log, and piston, to name two applications. So we will now update '#{(args.every + '/..').join(' ').white.bold}' just to make sure they're not out of date..."
-      print ''.bold # Clear the bold flag that svn annoyingly sets
-      working_copy_root = Subversion.working_copy_root(directory).to_s
+      #print ''.bold # Clear the bold flag that svn annoyingly sets
+      #working_copy_root = Subversion.working_copy_root(directory).to_s
       #response = confirm("Do you want to update #{working_copy_root.bold} now? (Any key other than y to skip) ")
       #if response == 'y'
-        puts "Updating #{working_copy_root}..."
+        #puts "Updating #{working_copy_root} (non-recursively)..."
       #end
-
-      puts Subversion.update_lines_filter( Subversion.update(*args) )
+      #puts Subversion.update_lines_filter( Subversion.update(*args) )
     end
 
     # Ideas:
@@ -483,7 +515,6 @@ module Subversion
           puts output.string
         end
       end unless @ignore_externals || @non_recursive
-      # :todo: or @non_recursive (but that's currently a passthrough option that doesn't set @non_recursive)
     end
 
     #-----------------------------------------------------------------------------------------------------------------------------
@@ -615,10 +646,6 @@ End
       alias_method :_p, :__parents
     end
 
-    # Unlike the built-in move, this one lets you list multiple source files 
-    #   Source... DestinationDir
-    # or
-    #   Source Destination
     def move(*args)
       destination = args.pop
 
@@ -649,6 +676,13 @@ End
         puts "Creating parent directory '#{destination_dir}'..."
         self.mkdir destination_dir   # @create_parents flag will be reused there
       end
+
+      # Unlike the built-in move, this one lets you list multiple source files 
+      #   Source... DestinationDir
+      # or
+      #   Source Destination
+      # Useful when you have a long list of files you want to move, such as when you are using wild-cards. Makes commands like this possible:
+      #   svn mv source/* dest/
       if args.length >= 2
         sources = args
 
@@ -661,6 +695,39 @@ End
     end
     alias_subcommand :mv => :move
 
+    #-----------------------------------------------------------------------------------------------------------------------------
+    module Copy
+      Console::Command.pass_through({
+          [:_r, :__revision] => 1,        # :todo: support "{" DATE "}" format
+          [:_q, :__quiet] => 0,
+          [:__force] => 0,
+        }.
+          merge(SvnCommand::C_standard_remote_command_options).
+          merge(SvnCommand::C_standard_commitable_command_options), self
+      )
+    end
+
+    def copy(*args)
+      destination = args.pop
+
+      # Unlike the built-in copy, this one lets you list multiple source files 
+      #   Source... DestinationDir
+      # or
+      #   Source Destination
+      # Useful when you have a long list of files you want to copy, such as when you are using wild-cards. Makes commands like this possible:
+      #   svn cp source/* dest/
+      if args.length >= 2
+        sources = args
+
+        sources.each do |source|
+          puts filtered_svn('copy', source, destination)
+        end
+      else
+        svn :exec, 'copy', *(args + [destination])
+      end
+    end
+    alias_subcommand :cp => :copy
+
     #-----------------------------------------------------------------------------------------------------------------------------
     module Import
       Console::Command.pass_through({
@@ -710,17 +777,29 @@ End
       def __ignore_externals;  @ignore_externals = true; end
       def __include_externals; @ignore_externals = false; end
       def __with_externals;    @ignore_externals = false; end
+      alias_method :_ie,             :__ignore_externals
+      alias_method :_skip_externals, :__ignore_externals
 
       def ignore_externals?
         @ignore_externals.nonnil? ?
           @ignore_externals : 
           (user_preferences['update'] && user_preferences['update']['ignore_externals'])
       end
+
+      # Duplicated with Diff
+      def __non_recursive
+        @non_recursive = true
+        @passthrough_options << '--non-recursive'
+      end
+      alias_method :_N, :__non_recursive
+
     end
 
     def update(*args)
-      @passthrough_options << '--non-recursive' if ignore_externals?
-      puts Subversion.update_lines_filter( Subversion.update(*prepare_args(args)) )
+      @passthrough_options << '--ignore-externals' if ignore_externals?
+      Subversion.print_commands! do   # Print the commands and options used so they can be reminded that they're using user_preferences['update']['ignore_externals']...
+        puts Subversion.update_lines_filter( Subversion.update(*prepare_args(args)) )
+      end
     end
 
 
@@ -872,8 +951,7 @@ End
               "or " + "any other key".white.bold + " to do nothing > "
             )
             response = ""
-            response = $stdin.getc.chr.downcase # while !['a', 'd', 'i', "\n"].include?(begin response.downcase!; response end)
-
+            response = $stdin.getch.downcase # while !['a', 'd', 'i', "\n"].include?(begin response.downcase!; response end)
 
             case response
               when 'a'
@@ -890,7 +968,6 @@ End
                   response = "y"
                 end
 
-                puts "response=#{response}"
                 if response == 'y'
                   print "\nDeleting... "
                   FileUtils.rm_rf file
@@ -954,18 +1031,18 @@ End
               longest_path_name,
               entries_structs.map { |entry|
                 entry.path.size
-              }.max
+              }.max.to_i
             ].max
         end
       end
 
-      puts '(Use the -o/--omit-repository-path option if you just want the external paths/names without the repository paths)' unless @omit_repository_path
       puts externals_structs.map { |entries_structs|
         entries_structs.map { |entry|
           entry.path.ljust(longest_path_name + 1) +
             (@omit_repository_path ? '' : entry.repository_path)
         }
       }
+      puts "(Tip: Also consider using svn externals_outline. Or use the -o/--omit-repository-path option if you just want a list of the paths that are externalled (without the repository URLs that they come from)".magenta unless @omit_repository_path
     end
     alias_subcommand :ei             => :externals_items
     alias_subcommand :externals_list => :externals_items
@@ -1215,7 +1292,7 @@ End
       # 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
+      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
@@ -1274,13 +1351,13 @@ End
         # Get response from user and then act on it
         begin # rescue
           response = ""
-          response = $stdin.getc.chr.downcase
+          response = $stdin.getch.downcase
 
           # Escape sequence such as the up arrow key ("\e[A")
           if response == "\e"
-            response << (next_char = $stdin.getc.chr)
+            response << (next_char = $stdin.getch)
             if next_char == '['
-              response << (next_char = $stdin.getc.chr)
+              response << (next_char = $stdin.getch)
             end
           end
 
@@ -1311,8 +1388,11 @@ End
               print 'Grep for'.bold + ' (Case sensitive; Regular expressions ' + 'like.*this'.bold.blue + ' allowed, but not ' + '/like.*this/im'.bold.blue + ') (backspace not currently supported): '
               search_pattern = $stdin.gets.chomp.to_rx
               puts((' '*100).green.underline)
-              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}")
+              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
+                diffs = Subversion.diffs(directory, '-r', "#{revs_to_compare.min}:#{revs_to_compare.max}")
+              end
 
               hits = 0
               diffs.each do |filename, diff|
@@ -1332,6 +1412,29 @@ End
               end
               show_revision_again = false
 
+            when 'a'  # Grep the cat
+              puts
+              print 'Grep for'.bold + ' (Case sensitive; Regular expressions ' + 'like.*this'.bold.blue + ' allowed, but not ' + '/like.*this/im'.bold.blue + ') (backspace not currently supported): '
+              search_pattern = $stdin.gets.chomp.to_rx
+              puts((' '*100).green.underline)
+              puts "Searching `svn cat #{directory} -r #{rev}` for #{search_pattern.to_s}... ".bold
+              contents = nil
+              Subversion.print_commands! do
+                contents = Subversion.cat(directory, '-r', rev)
+              end
+
+              if contents =~ search_pattern
+                puts( contents.grep(search_pattern). # This will get us just the interesting *lines* (as an array). 
+                  map { |line|                       # Now, for each line...
+                    line.highlight_occurences(search_pattern)
+                  }
+                )
+              else
+                puts "Search term not found!".red.bold
+              end
+              show_revision_again = false
+
+
             when 'l'  # List revision properties
               puts
               puts Subversion::printable_revision_properties(rev)
@@ -1354,12 +1457,11 @@ 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
+              puts
+              Subversion.print_commands! do
+                puts Subversion.cat(directory, '-r', rev)
+              end
+              show_revision_again = true
 
             when 'r'  # Mark as reviewed
               puts
@@ -1464,8 +1566,3 @@ End
     end
   end
 end
-
-ensure
-  # Set terminal_attributes back to how we found them...
-  Termios.tcsetattr(STDIN, 0, save_terminal_attributes)
-end

data/test/subversion_test.rb

@@ -21,10 +21,12 @@ class SubversionTest < Test::Unit::TestCase
     Subversion.externalize('some/repo/path')
     Subversion.externalize('some/repo/path', :as => 'foo')
     Subversion.externalize('some/repo/path', :as => 'foo', :local_path => 'local/path')
+    Subversion.externalize('some/repo/path', :as => 'vendor/plugins/foo')
 
-    assert_equal "svn propset svn:externals '#{'path'.ljust(29)} some/repo/path' ./", Subversion.executed[1]
-    assert_equal "svn propset svn:externals '#{'foo'.ljust(29)} some/repo/path' ./", Subversion.executed[3]
-    assert_equal "svn propset svn:externals '#{'foo'.ljust(29)} some/repo/path' local/path", Subversion.executed[5]
+    assert_equal "svn propset svn:externals '#{'path'} some/repo/path' .", Subversion.executed[1]  # Used to be 'path'.ljust(29)
+    assert_equal "svn propset svn:externals '#{'foo'} some/repo/path' .", Subversion.executed[3]
+    assert_equal "svn propset svn:externals '#{'foo'} some/repo/path' local/path", Subversion.executed[5]
+    assert_equal "svn propset svn:externals '#{'foo'} some/repo/path' vendor/plugins", Subversion.executed[7]
   end
 
   def test_remove

data/test/svn_command_test.rb

@@ -232,7 +232,7 @@ end #class SvnStatusTest
 class SvnUpdateTest < BaseSvnCommandTest
   def test_1
     capture_output { SvnCommand.execute("up -q file1 file2 -r 17") }
-    assert_equal "svn update -q -r 17 --non-recursive file1 file2", Subversion.executed[0]
+    assert_equal "svn update -q -r 17 file1 file2", Subversion.executed[0]
   end
 end
 
@@ -382,8 +382,8 @@ class SvnExternalsTest < BaseSvnCommandTest
     output = capture_output { SvnCommand.execute('externalize http://imaginethat.com/a/repo') }
     assert_equal '', output
     assert_equal [
-      "svn propget svn:externals ./",
-      "svn propset svn:externals 'repo                          http://imaginethat.com/a/repo' ./"
+      "svn propget svn:externals .",
+      "svn propset svn:externals 'repo http://imaginethat.com/a/repo' ."
     ], Subversion.executed
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
-date: 2007-06-11 00:00:00 -07:00
+  version: 0.2.15
+date: 2007-07-17 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -27,7 +27,9 @@ signing_key:
 cert_chain: 
 post_install_message: |
   ---------------------------------------------------------------------------------------------------
-  Please run sudo /usr/bin/_svn_command_post_install to finalize the installation.
+  IMPORTANT: Please run sudo /usr/bin/_svn_command_post_install to finalize the installation.
+  
+  Also, it is highly recommended that you install the termios gem, but it will work without it.
   ---------------------------------------------------------------------------------------------------
 
 authors: 
@@ -68,15 +70,6 @@ extensions: []
 requirements: []
 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: termios
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: colored
   version_requirement: