svn-command 0.2.7 → 0.2.12

data/test/svn_command_test.rb

@@ -13,6 +13,33 @@ require 'qualitysmith_extensions/regexp/join'
 Subversion.color = false
 String.color_on! false
 
+#pp Subversion::SvnCommand.instance_methods.sort
+
+# Since this doesn't work: Subversion::SvnCommand.any_instance.stubs(:system).returns(Proc.new {|a| p a; puts "Tried to call system(#{a})" })
+class Subversion::SvnCommand
+  def system(*args)
+    Subversion::SvnCommand.executed_system << args.join(' ')
+  end
+  def self.executed_system
+    @@executed_system ||= []
+  end
+  def self.reset_executed_system(as = [])
+    @@executed_system = as
+  end
+end
+module Kernel
+  def exit_code
+    o = Object.new
+    class << o
+      def success?
+        true
+      end
+    end
+    o
+  end
+end
+
+
 module Subversion
 class BaseSvnCommandTest < Test::Unit::TestCase
   def setup
@@ -21,8 +48,14 @@ class BaseSvnCommandTest < Test::Unit::TestCase
   def test_dummy_test
     # Because it tries to run this base class too!
   end
+  # When we don't care what the output is -- we just don't want to see it while running the test!
+  def silence(&block)
+    capture_output(&block)
+    nil
+  end
 end
 
+
 class SvnCommandTest < BaseSvnCommandTest
   def test_invalid_quotes_gives_informative_error
     assert_exception(ArgumentError, lambda { |exception|
@@ -44,13 +77,14 @@ end
 
 class ArgEscapingTest < BaseSvnCommandTest
   def test_argument_escaping
-    SvnCommand.execute( args = %q{commit -m 'a message with lots of !&`$0 |()<> garbage'} ) 
-    assert_equal "svn #{args} --force-log", Subversion.executed.join
+    args = nil
+    silence { SvnCommand.execute( args = %q{commit -m 'a message with lots of !&`$0 |()<> garbage'} ) }
+    assert_equal "svn #{args} --force-log", Subversion.executed[0]
   end
   def test_asterisk
     # 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
+    assert_equal "svn add --non-recursive 'dir/*'", Subversion.executed[0]
     # Actually, I lied... The * will *not* be expanded in the (rather uncommon) case that there are *no files matching the glob*. But that seems like a bash/shell problem, not our concern. Demo:
     # > mkdir foo
     # > echo foo/*
@@ -60,10 +94,17 @@ class ArgEscapingTest < BaseSvnCommandTest
     # foo/file
   end
   def test_multiline
-    SvnCommand.execute(args = "commit -m 'This is a
+    args = nil
+    silence { SvnCommand.execute(args = "commit -m 'This is a
       |multi-line
-      |message'".margin)
-    assert_equal "svn #{args} --force-log", Subversion.executed.join
+      |message'".margin) }
+    assert_equal "svn #{args} --force-log", Subversion.executed[0]
+  end
+  def test_multiword_arg_preserved_even_for_passthrough_subcommands
+    # foo, for instance is entirely a passthrough subcommand; no 'def foo' exists, so it's handled entirely through method_missing.
+    args = nil
+    silence { SvnCommand.execute( args = %q{foo -m 'a multi-word message' --something-else 'something else'} ) }
+    assert_equal "svn #{args}", Subversion.executed[0]
   end
 end
 
@@ -74,11 +115,11 @@ end
 class SubcommandPassThroughTest < BaseSvnCommandTest
   def test_1
     SvnCommand.execute("rm -q file1 file2 --force")
-    assert_equal "svn rm -q file1 file2 --force", Subversion.executed.join
+    assert_equal "svn rm -q file1 file2 --force", Subversion.executed[0]
   end
   def test_2
     SvnCommand.execute("info -q file1 file2 --force")
-    assert_equal "svn info -q file1 file2 --force", Subversion.executed.join
+    assert_equal "svn info -q file1 file2 --force", Subversion.executed[0]
   end
 end
 
@@ -87,29 +128,29 @@ class SvnAddTest < BaseSvnCommandTest
   end
   def test_2
     SvnCommand.execute('add "a b"') 
-    assert_equal "svn add 'a b'", Subversion.executed.join
+    assert_equal "svn add 'a b'", Subversion.executed[0]
   end
   def test_3
     SvnCommand.execute('add a b') 
-    assert_equal "svn add a b", Subversion.executed.join
+    assert_equal "svn add a b", Subversion.executed[0]
   end
 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
+    silence { SvnCommand.execute("commit -m 'just an ordinary commit message!'") }
+    assert_equal "svn commit -m 'just an ordinary commit message!' --force-log", Subversion.executed[0]
   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
+    silence { 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[0]
   end
   def test_that_complex_quoting_doesnt_confuse_it
     original_message = "Can't decide how many \"'quotes'\" to use!"
-    SvnCommand.execute(%Q{commit -m "#{original_message.gsub('"', '\"')}"}) 
+    silence { SvnCommand.execute(%Q{commit -m "#{original_message.gsub('"', '\"')}"}) }
 
     expected_escaped_part = %q{'Can'\\''t decide how many "'\\''quotes'\\''" to use!'}
-    assert_equal "svn commit -m #{expected_escaped_part} --force-log", Subversion.executed.join
+    assert_equal "svn commit -m #{expected_escaped_part} --force-log", Subversion.executed[0]
     assert_equal original_message, `echo #{expected_escaped_part}`.chomp    # We should have gotten back exactly what we put in originally
   end
 end
@@ -118,7 +159,7 @@ class SvnDiffTest < BaseSvnCommandTest
   def test_1
     SvnCommand.execute("diff -r 123:125") 
     assert_equal [
-      "svn diff  ./ -r 123:125",
+      "svn diff  -r 123:125 ./",
       "svn status ./"
     ], Subversion.executed
   end
@@ -127,14 +168,14 @@ class SvnDiffTest < BaseSvnCommandTest
     #capture_output { SvnCommand.execute("diff -r { 2006-07-01 }") }
     #p Subversion.executed
     # Currently does this, since it thinks the arity is 1: 2006-07-01 } -r '{'
-    #assert_equal "svn diff -r { 2006-07-01 }", Subversion.executed.join
+    #assert_equal "svn diff -r { 2006-07-01 }", Subversion.executed[0]
   end
 end
 
 class SvnHelpTest < BaseSvnCommandTest
   def test_1
     output = capture_output { SvnCommand.execute("help") }
-    assert_equal "svn help ", Subversion.executed.join
+    assert_equal "svn help ", Subversion.executed[0]
     assert_match /wrapper/, output
   end
 end
@@ -142,7 +183,7 @@ end
 class SvnLogTest < BaseSvnCommandTest
   def test_1
     capture_output { SvnCommand.execute("log") }
-    assert_equal "svn log ", Subversion.executed.join
+    assert_equal "svn log ", Subversion.executed[0]
   end
 end
 
@@ -178,12 +219,12 @@ End
 
   def test_status_accepts_arguments
     SvnCommand.execute('st -u /path/to/file1 file2')
-    assert_equal "svn status -u /path/to/file1 file2", Subversion.executed.join
+    assert_equal "svn status -u /path/to/file1 file2", Subversion.executed[0]
 
     Subversion.reset_executed
     SvnCommand.execute('st dir --no-ignore')
     # It will reorder some of the args (it puts all pass-through options and their args at the *beginning*), but that's okay...
-    assert_equal "svn status --no-ignore dir", Subversion.executed.join
+    assert_equal "svn status --no-ignore dir", Subversion.executed[0]
     
   end
 end #class SvnStatusTest
@@ -191,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 file1 file2", Subversion.executed.join
+    assert_equal "svn update -q -r 17 --non-recursive file1 file2", Subversion.executed[0]
   end
 end
 
@@ -231,7 +272,7 @@ X      temp_dir/calculator/tasks/shared
     end
     assert_match /What do you want to do with .*unused\.rb/, output
     assert_match /Adding/, output
-    assert_equal "svn add temp_dir/calculator/lib/unused.rb", Subversion.executed.join
+    assert_equal "svn add temp_dir/calculator/lib/unused.rb", Subversion.executed[0]
   end
   def test_ignore
     stub_status_1
@@ -310,19 +351,6 @@ end
 #-----------------------------------------------------------------------------------------------------------------------------
 # Externals
 
-# Since this doesn't work: Subversion::SvnCommand.any_instance.stubs(:system).returns(Proc.new {|a| p a; puts "Tried to call system(#{a})" })
-class Subversion::SvnCommand
-  def system(*args)
-    Subversion::SvnCommand.executed_system << args.join(' ')
-  end
-  def self.executed_system
-    @@executed_system ||= []
-  end
-  def self.reset_executed_system(as = [])
-    @@executed_system = as
-  end
-end
-
 class SvnExternalsTest < BaseSvnCommandTest
 
   # Causes .stub to break??
@@ -408,7 +436,7 @@ class SvnExternalsTest < BaseSvnCommandTest
       "svn propedit svn:externals /home/tyler/code/gemables/svn-command/test",
       "svn propedit svn:externals /home/tyler/code/gemables/svn-command/tasks",
       "svn propedit svn:externals /home/tyler/code/gemables/svn-command/doc_include"
-    ], Subversion::SvnCommand.executed_system
+    ], Subversion.executed
   end
 end
 
@@ -573,31 +601,30 @@ class SvnRevisionsTest < BaseSvnCommandTest
     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
+
+# Show 1800
 "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, 
+r1800: View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files, 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, 
+# Show 1800 again
+"r1800: View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files, 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, 
+r1801: View this changeset, Diff against specific revision, Grep the changeset, List or Edit revision properties, svn Cat all files, grep the cat, 
   mark as Reviewed, edit log Message, or browse using Up/Down/Enter keys >  Next...",
 :multi_line => true
 ), output

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: svn-command
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
-date: 2007-05-01 00:00:00 -07:00
+  version: 0.2.12
+date: 2007-06-11 00:00:00 -07:00
 summary: A nifty wrapper command for Subversion's command-line svn client
 require_paths: 
 - lib
@@ -104,15 +104,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: extensions
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: qualitysmith_extensions
   version_requirement: