svn-command 0.0.4 → 0.0.5

data/lib/subversion_extensions.rb

@@ -46,7 +46,7 @@ module Subversion
       before_externals ||= ''
       before_externals = before_externals.strip.colorize_svn_status_lines + "\n" if before_externals != ""
 
-      externals = externals.join
+      externals = externals.join.strip
       externals = 
         '_'*40 + ' externals '.underline + '_'*40 + "\n" +
         externals.reject { |line|

data/lib/svn_command.rb

@@ -241,7 +241,7 @@ module Subversion
         when nil
           puts "You are using svn-command, a replacement/wrapper for the standard svn command."
           puts "svn-command is installed at: #{$0}"
-          puts "Wrapping svn executable at: #{Subversion.executable} (use the full path to bypass this wrapper)"
+          puts "Use the full path to bypass this wrapper: #{Subversion.executable}"
           puts
           puts Subversion.help(subcommand).gsub(<<End, '')
 
@@ -402,16 +402,23 @@ End
               puts( ('-'*100).green )
               puts "What do you want to do with '#{file.white.underline}'?".white.bold
               begin
+                if !File.exist?(file)
+                  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...
-                  puts File.read(file, 3000) || ''
+                  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
                 elsif File.directory?(file)
                   puts "Directory contains:"
                   Dir.new(file).reject {|f| ['.','..'].include? f}.each do |f|
                     puts f
                   end
                 else
-                  raise "#{file} is not a file or directory -- what *is* it??"
+                  raise "#{file} is not a file or directory -- what *is* it then???"
                 end
               end
               print(
@@ -434,9 +441,13 @@ End
               when 'd'
                 puts
 
-                print "Are you pretty much *SURE* you want to 'rm -rf #{file}'? (y)es, (n)o > "
                 response = ""
-                response = $stdin.getc.chr while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
+                if File.directory?(file)
+                  print "Are you pretty much *SURE* you want to 'rm -rf #{file}'? (y)es, (n)o > "
+                  response = $stdin.getc.chr while !['y', 'n', "\n"].include?(begin response.downcase!; response end)
+                else
+                  response = "y"
+                end
 
                 if response == 'y'
                   print "\nDeleting... "

data/test/svn_command_test.rb

@@ -44,6 +44,13 @@ class ArgEscapingTest < BaseSvnCommandTest
     # Don't worry, this'll never happen, because the shell will expand the * *before* it gets to SvnCommand. But if you *did* sneak in an asterisk to SvnCommand.execute somehow, this is what would happen...
     SvnCommand.execute("add dir/* --non-recursive") 
     assert_equal "svn add --non-recursive 'dir/*'", Subversion.executed.join
+    # Actually, I lied... The * will *not* be expanded if there are no matching files. But that seems like a bash/shell problem, not our concern. Demo:
+    # > mkdir foo
+    # > echo foo/*
+    # foo/*
+    # > touch foo/file
+    # > echo foo/*
+    # foo/file
   end
   def test_multiline
     SvnCommand.execute(args = "commit -m 'This is a
@@ -185,21 +192,30 @@ end
 # Custom subcommands
 
 #-----------------------------------------------------------------------------------------------------------------------------
+
+# Notes about this test:
+# If you start seeing errors like this:
+#   NoMethodError: undefined method `chr' for nil:NilClass
+# coming from one of the $stdin.getc.chr lines, it means that you didn't feed it enough simulated input! It was expectin to get
+# another character from stdin but you didn't supply one!
+
 class SvnEachUnaddedTest < BaseSvnCommandTest
-  def setup
-    super
+  def stub_status_1
     Subversion.stubs(:status).returns("
 M      gemables/calculator/test/calculator_test.rb
 X      gemables/calculator/tasks/shared
-?      gemables/calculator/lib/calculator.rb
+?      gemables/calculator/lib/unused.rb
 ")
+  end
+  def setup
+    super
     FileUtils.mkdir_p('gemables/calculator/lib/')
-    File.open(@filename = 'gemables/calculator/lib/calculator.rb', 'w') do |file|
-      file.puts "line 1 of calculator.rb"
-    end
+#    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" }
   end
   def teardown
-    file = 'gemables/calculator/lib/calculator.rb'
+    file = 'gemables/calculator/lib/unused.rb'
     FileUtils.rm(file) if File.exist?(file)
     FileUtils.rmdir('gemables/calculator/lib/')
     FileUtils.rmdir('gemables/calculator/')
@@ -207,47 +223,64 @@ X      gemables/calculator/tasks/shared
   end
 
   def test_add
+    stub_status_1
     output = simulate_input('a') do
       capture_output { SvnCommand.execute('each_unadded dir') }
     end
-    assert_match /What do you want to do with .*calculator\.rb/, output
+    assert_match /What do you want to do with .*unused\.rb/, output
     assert_match /Adding/, output
-    assert_equal "svn add gemables/calculator/lib/calculator.rb", Subversion.executed.join
+    assert_equal "svn add gemables/calculator/lib/unused.rb", Subversion.executed.join
   end
   def test_ignore
+    stub_status_1
     output = simulate_input('i') do
       capture_output { SvnCommand.execute('each_unadded dir') }
     end
-    assert_match /What do you want to do with .*calculator\.rb/, output
+    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 'calculator.rb' gemables/calculator/lib"
+        "svn propset svn:ignore 'unused.rb' gemables/calculator/lib"
       ], Subversion.executed
   end
   def test_preview_is_now_automatic
+    stub_status_1
     output = simulate_input(
       #"p" +     # Preview
+      "\n" +     # Blank line to do nothing (and exit loop)
       "\n"      # Blank line to do nothing (and exit loop)
     ) do
       capture_output { SvnCommand.execute('each_unadded dir') }
     end
-    assert_match /What do you want to do with .*calculator\.rb/, output
-    assert_match "line 1 of calculator.rb".to_re, output
+    assert_match /What do you want to do with .*unused\.rb/, output
+    assert_match "line 1 of unused.rb".to_re, output
   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
+")
+    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" }
+
+    assert File.exist?( @dirname ) 
     assert File.exist?( @filename ) 
     output = simulate_input(
       'd' +    # Delete
-      'y'     # Yes I'm sure
+               # (The file doesn't require confirmation.)
+      'd' +    # Delete
+      'y'      # Yes I'm sure (The non-empty directory does.)
     ) do
       capture_output { SvnCommand.execute('each_unadded dir') }
     end
-    assert_match /What do you want to do with .*calculator\.rb/, output
-    assert_match "Are you pretty much".to_re, output
-    assert_match /Deleting/, output
-    #print output
+    assert_match /What do you want to do with .*unused\.rb/, output
+    assert_match /What do you want to do with .*useless_directory/, output
+    assert_match /Are you .*SURE/, output
+    assert_match /Deleting.*Deleting/m, output
     assert !File.exist?( @filename ) 
+    assert !File.exist?( @dirname ) 
   end
 end #class
 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 date: 2007-03-15 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: