rscm 0.4.4 → 0.4.5

data/CHANGES

@@ -1,5 +1,10 @@
 = RSCM Changelog
 
+== 0.4.5
+This is a minor bugfix release that corrects the tests for command_line.rb to work on win32
+
+* made tests for command_line.rb pass on win32
+
 == 0.4.4
 This release introduces a new test suite that makes it a LOT easier to implement
 new RSCM adapters. The main difference is that implementations no longer have to

data/README

@@ -1,4 +1,4 @@
-= RSCM - Ruby Source Control Management (0.4.4)
+= RSCM - Ruby Source Control Management (0.4.5)
 
 RSCM is to SCM what DBI/JDBC/ODBC are to databases - an SCM-independent API for accessing different SCMs. The high level features are roughly:
 

data/lib/rscm/command_line.rb

@@ -2,6 +2,8 @@ require 'rscm/platform'
 
 module RSCM
   module CommandLine
+    QUOTE_REPLACEMENT = (Platform.family == "mswin32") ? "\"" : "\\\""
+    LESS_THAN_REPLACEMENT = (Platform.family == "mswin32") ? "<" : "\\<"
     class OptionError < StandardError; end
     class ExecutionError < StandardError
       attr_reader :cmd, :dir, :exitstatus, :stderr      
@@ -67,7 +69,7 @@ module RSCM
         capture_info_command = (block_given? && options[:stdout])? "echo [output captured and therefore not logged] >> #{options[:stdout]} && " : ""
 
         full_cmd = commands.collect do |c|
-          escaped_command = c.gsub(/"/, "\\\"").gsub(/</, "\\<")
+          escaped_command = c.gsub(/"/, QUOTE_REPLACEMENT).gsub(/</, LESS_THAN_REPLACEMENT)
           stdout_prompt_command = options[:stdout] ? "echo #{RSCM::Platform.prompt} #{escaped_command} >> #{options[:stdout]} && " : ""
           stderr_prompt_command = options[:stderr] ? "echo #{RSCM::Platform.prompt} #{escaped_command} >> #{options[:stderr]} && " : ""
           redirected_command = block_given? ? "#{c} #{stderr_opt}" : "#{c} #{stdout_opt} #{stderr_opt}"

data/lib/rscm/difftool.rb

@@ -33,7 +33,7 @@ module RSCM
       difftool = WINDOWS ? File.dirname(__FILE__) + "/../../bin/diff.exe" : "diff"
       e = RSCM::PathConverter.filepath_to_nativepath(expected_file, false)
       a = RSCM::PathConverter.filepath_to_nativepath(actual_file, false)
-      cmd = "#{difftool} --strip-trailing-cr #{e} #{a}"
+      cmd = "#{difftool} --ignore-space-change #{e} #{a}"
       IO.popen(cmd) do |io|
         yield io, cmd
       end

data/lib/rscm/scm/darcs.rb

@@ -4,6 +4,7 @@ require 'rscm'
 
 module RSCM
   class Darcs < Base
+    # See http://progetti.arstecnica.it/tailor/browser/vcpx/darcs.py
     attr_accessor :dir
 
     def initialize(dir=".")
@@ -102,16 +103,9 @@ module RSCM
 
   private
 
-    def darcs(darcs_cmd)
+    def darcs(darcs_cmd, options={}, &proc)
       cmd = "darcs #{darcs_cmd}"
-
-      Better.popen(cmd, "r+") do |io|
-        if(block_given?)
-          return(yield(io))
-        else
-          io.read
-        end
-      end
+      execute(cmd, options, &proc)
     end
   end
 end

data/lib/rscm/version.rb

@@ -2,7 +2,7 @@ module RSCM
   module VERSION
     MAJOR = 0
     MINOR = 4
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/rscm/command_line_test.rb

@@ -5,8 +5,8 @@ require 'rscm/command_line'
 module RSCM
 
   class DifftoolTest < Test::Unit::TestCase
-    def setup
-      @dir = RSCM.new_temp_dir("test_should_write_to_stdout")
+    def setup_dir(prefix)
+      @dir = RSCM.new_temp_dir(prefix)
       @stdout = "#{@dir}/stdout"
       @stderr = "#{@dir}/stderr"
       @prompt = "#{File.expand_path(@dir)} #{Platform.user}$"
@@ -15,23 +15,26 @@ module RSCM
     end
 
     def test_should_write_to_both_when_both_streams_specified_and_no_block
+      setup_dir(method_name)
       CommandLine.execute("echo \"<hello\" && echo world", {:dir => @dir, :stdout => @stdout, :stderr => @stderr})
-      assert_equal("#{@prompt} echo \"<hello\"\n<hello\n#{@prompt} echo world\nworld\n", File.open(@stdout).read)
-      assert_equal("#{@prompt} echo \"<hello\"\n#{@prompt} echo world\n", File.open(@stderr).read)
+      assert_match(/.* echo \"<hello\"\s*\n.?\<hello.?\s*\n.* echo world\s*\nworld/n, File.open(@stdout).read)
+      assert_match(/.* echo \"<hello\"\s*\n.* echo world\s*/n, File.open(@stderr).read)
     end
     
     def test_should_not_write_to_stdout_when_no_stdout_specified
+      setup_dir(method_name)
       CommandLine.execute("echo hello", {:dir => @dir, :stderr => @stderr})
       assert(!File.exist?(@stdout))
-      assert_equal("#{@prompt} echo hello\n", File.open(@stderr).read)
+      assert_equal("#{@prompt} echo hello", File.open(@stderr).read.strip)
     end
     
     def test_should_only_write_command_to_stdout_when_block_specified
+      setup_dir(method_name)
       CommandLine.execute("echo hello", {:dir => @dir, :stdout => @stdout, :stderr => @stderr}) do |io|
-        assert_equal("hello\n", io.read)
+        assert_equal("hello", io.read.strip)
       end
-      assert_equal("#{@prompt} echo hello\n[output captured and therefore not logged]\n", File.open(@stdout).read)
-      assert_equal("#{@prompt} echo hello\n", File.open(@stderr).read)
+      assert_match(/.* echo hello\s*\[output captured and therefore not logged\]/n, File.open(@stdout).read.strip)
+      assert_equal("#{@prompt} echo hello", File.open(@stderr).read.strip)
     end
     
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2006-03-04 00:00:00 -06:00
+  version: 0.4.5
+date: 2006-03-06 00:00:00 -06:00
 summary: RSCM - Ruby Source Control Management
 require_paths: 
 - lib