rscm 0.3.2 → 0.3.3

data/CHANGES

@@ -1,5 +1,11 @@
 = RSCM Changelog
 
+== Version 0.3.3
+
+This release makes some test utilities more reusable.
+
+* Added optional basedir parameter to assert_equal_with_diff
+
 == Version 0.3.2
 
 This is a bugfix release.

data/README

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

data/Rakefile

@@ -10,11 +10,11 @@ require 'meta_project'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'rscm'
-PKG_VERSION   = '0.3.2' + PKG_BUILD
+PKG_VERSION   = '0.3.3' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"
-task :default => [:gem]
+task :default => [:test, :gem]
 #task :gem => [:test]
 task :test => [:starteam]
 

data/lib/rscm.rb

@@ -1,5 +1,6 @@
 require 'rscm/annotations'
 require 'rscm/path_converter'
+require 'rscm/difftool'
 require 'rscm/logging'
 require 'rscm/better'
 require 'rscm/base'

data/lib/rscm/difftool.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+require 'rscm/tempdir'
+require 'rscm/path_converter'
+require 'rscm/difftool'
+
+module RSCM
+  module Difftool
+    # assertion method that reports differences as diff.
+    # useful when comparing big strings
+    def assert_equal_with_diff(expected, actual, temp_basedir=File.dirname(__FILE__) + "/../../target")
+      diff(expected, actual, temp_basedir) do |diff_io|
+        diff_string = diff_io.read
+        assert_equal("", diff_string, diff_string)
+      end
+    end
+    module_function :assert_equal_with_diff
+  
+    def diff(expected, actual, temp_basedir, &block)
+      dir = RSCM.new_temp_dir("diff", temp_basedir)
+    
+      expected_file = "#{dir}/expected"
+      actual_file = "#{dir}/actual"
+      File.open(expected_file, "w") {|io| io.write(expected)}
+      File.open(actual_file, "w") {|io| io.write(actual)}
+
+      difftool = WINDOWS ? File.dirname(__FILE__) + "/../../bin/diff.exe" : "diff"
+      IO.popen("#{difftool} #{RSCM::PathConverter.filepath_to_nativepath(expected_file, false)} #{RSCM::PathConverter.filepath_to_nativepath(actual_file, false)}") do |io|
+        yield io
+      end
+    end
+    module_function :diff
+
+  end
+end

data/lib/rscm/tempdir.rb

@@ -1,10 +1,10 @@
 require 'fileutils'
 
 module RSCM
-  def new_temp_dir(suffix="")
+  def new_temp_dir(suffix="", basedir=File.dirname(__FILE__) + "/../../target")
     identifier = identifier.to_s
     identifier.gsub!(/\(|:|\)/, '_')
-    dir = File.dirname(__FILE__) + "/../../target/temp_#{identifier}_#{Time.new.to_i}#{suffix}"
+    dir = "#{basedir}/temp_#{identifier}_#{Time.new.to_i}#{suffix}"
     FileUtils.mkdir_p(dir)
     dir
   end

data/test/rscm/difftool_test.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'rscm/tempdir'
+require 'rscm/difftool'
+require 'rscm/path_converter'
+
+module RSCM
+
+  class DifftoolTest < Test::Unit::TestCase
+    include Difftool
+
+    def test_diffing_fails_with_diff_when_different
+      assert_raises(Test::Unit::AssertionFailedError) {
+        assert_equal_with_diff("This is a\nmessage with\nsome text", "This is a\nmessage without\nsome text")
+      }
+    end
+
+    def test_diffing_passes_with_diff_when_equal
+      assert_equal_with_diff("This is a\nmessage with\nsome text", "This is a\nmessage with\nsome text")
+    end
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rscm
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
-date: 2005-09-06 00:00:00 -04:00
+  version: 0.3.3
+date: 2005-09-07 00:00:00 -04:00
 summary: "RSCM - Ruby Source Control Management"
 require_paths: 
   - lib
@@ -38,7 +38,7 @@ files:
   - lib/rscm/annotations.rb
   - lib/rscm/base.rb
   - lib/rscm/better.rb
-  - lib/rscm/difftool_test.rb
+  - lib/rscm/difftool.rb
   - lib/rscm/line_editor.rb
   - lib/rscm/logging.rb
   - lib/rscm/mockit.rb
@@ -68,6 +68,7 @@ files:
   - test/rscm/annotations_test.rb
   - test/rscm/apply_label_scm_tests.rb
   - test/rscm/base_test.rb
+  - test/rscm/difftool_test.rb
   - test/rscm/file_after_edit
   - test/rscm/file_ext.rb
   - test/rscm/file_to_edit

data/lib/rscm/difftool_test.rb

@@ -1,46 +0,0 @@
-require 'test/unit'
-require 'rscm/tempdir'
-require 'rscm/path_converter'
-
-module Test
-  module Unit
-    class TestCase
-      # assertion method that reports differences as diff.
-      # useful when comparing big strings
-      def assert_equal_with_diff(expected, actual)
-        diff(expected, actual) do |diff_io|
-          diff_string = diff_io.read
-          assert_equal("", diff_string, diff_string)
-        end
-      end
-      
-      def diff(expected, actual, &block)
-        dir = RSCM.new_temp_dir("diff")
-        
-        expected_file = "#{dir}/expected"
-        actual_file = "#{dir}/actual"
-        File.open(expected_file, "w") {|io| io.write(expected)}
-        File.open(actual_file, "w") {|io| io.write(actual)}
-
-        difftool = WINDOWS ? File.dirname(__FILE__) + "/../../bin/diff.exe" : "diff"
-        IO.popen("#{difftool} #{RSCM::PathConverter.filepath_to_nativepath(expected_file, false)} #{RSCM::PathConverter.filepath_to_nativepath(actual_file, false)}") do |io|
-          yield io
-        end
-      end
-    end
-  end
-end
-
-module RSCM
-  class DifftoolTest < Test::Unit::TestCase
-    def test_diffing_fails_with_diff_when_different
-      assert_raises(Test::Unit::AssertionFailedError) {
-        assert_equal_with_diff("This is a\nmessage with\nsome text", "This is a\nmessage without\nsome text")
-      }
-    end
-
-    def test_diffing_passes_with_diff_when_equal
-      assert_equal_with_diff("This is a\nmessage with\nsome text", "This is a\nmessage with\nsome text")
-    end
-  end
-end