assert_same 0.2 → 0.3

data/.gitignore

@@ -1,3 +1,4 @@
 *~
 *.gem
 pkg
+.kdev4

data/README

@@ -3,3 +3,8 @@ assert_same
 
 Please read the API docs in lib/assert_same.rb
 
+
+Changelog
+- 0.3: Ruby 1.9 is supported
+- 0.2: Make assert_same useful as a standalone gem. Bugfixes
+- 0.1: Initial release

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'bundler'
 
 Bundler::GemHelper.install_tasks

data/assert_same.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 SPEC = Gem::Specification.new do |s|
     s.name        = "assert_same"
-    s.version     = "0.2"
+    s.version     = "0.3"
     s.author      = "Pluron, Inc."
     s.email       = "support@pluron.com"
     s.homepage    = "http://github.com/acunote/assert_same"
@@ -10,8 +10,6 @@ SPEC = Gem::Specification.new do |s|
     s.description = "assert_same assertion"
     s.summary     = "Assert which checks that two strings (expected and actual) are same and which can magically replace expected value with the actual in case the new behavior (and new actual value) is correct"
 
-    s.add_development_dependency('bundler', '>= 1.0.0')
-
     s.files         = `git ls-files`.split("\n")
     s.test_files    = `git ls-files -- test/*`.split("\n")
 

data/assert_same.kdev4

@@ -0,0 +1,3 @@
+[Project]
+Manager=KDevGenericManager
+Name=assert_same

data/lib/assert_same.rb

@@ -3,7 +3,53 @@ require 'test/unit/testcase'
 require 'text_diff'
 require 'pathname'
 
-class Test::Unit::TestCase
+$assert_same_options = []
+
+if RUBY_VERSION >= "1.9.0"
+
+    # Test/Unit from Ruby 1.9 can't accept additional options like it did in 1.8:
+    #   ruby test.rb -- --foo
+    # Now it has a strict option parser that considers all additional options as files.
+    # The right way to have an option now is to explicitly add it to Test/Unit parser.
+    module Test::Unit
+
+        module AssertSameOption
+            def setup_options(parser, options)
+                super
+                parser.on '--no-interactive', 'assert_same: non-interactive mode' do |flag|
+                    $assert_same_options << "--no-interactive"
+                    puts $assert_same_options
+                end
+                parser.on '--no-canonicalize', 'assert_same: turn off canonicalization' do |flag|
+                    $assert_same_options << "--no-canonicalize"
+                end
+                parser.on '--autoaccept', 'assert_same: automatically accept new actual values' do |flag|
+                    $assert_same_options << "--autoaccept"
+                end
+            end
+
+            def non_options(files, options)
+                super
+            end
+        end
+
+        class Runner < MiniTest::Unit
+            include Test::Unit::AssertSameOption
+        end
+
+    end
+
+else
+
+    # In Ruby 1.8 additional test options are simply passed via ARGV
+    $assert_same_options << "--no-interactive" if ARGV.include?("--no-interactive")
+    $assert_same_options << "--no-canonicalize" if ARGV.include?("--no-canonicalize")
+    $assert_same_options << "--autoaccept" if ARGV.include?("--autoaccept")
+
+end
+
+
+module Test::Unit::Assertions
 
     #Hash[filename][line_number] = offset
     #For each line in the original file we store its offset (+N or -N lines)
@@ -38,12 +84,19 @@ class Test::Unit::TestCase
     # --no-canonicalize turns off expected and actual value canonicalization (see below for details)
     #
     # Additional options can be passed during both single test file run and rake test run:
+    #    In Ruby 1.8:
     #    ruby test/unit/foo_test.rb -- --autoaccept
     #    ruby test/unit/foo_test.rb -- --no-interactive
     #
     #    rake test TESTOPTS="-- --autoaccept"
     #    rake test:units TESTOPTS="-- --no-canonicalize --autoaccept"
     #
+    #    In Ruby 1.9:
+    #    ruby test/unit/foo_test.rb --autoaccept
+    #    ruby test/unit/foo_test.rb --no-interactive
+    #
+    #    rake test TESTOPTS="--autoaccept"
+    #    rake test:units TESTOPTS="--no-canonicalize --autoaccept"
     #
     #
     # == Canonicalization ==
@@ -59,7 +112,10 @@ class Test::Unit::TestCase
     # You can turn canonicalization off with --no-canonicalize option. This is useful
     # when you need to regenerate expected test strings.
     # To regenerate the whole test suite, run:
+    #    In Ruby 1.8:
     #    rake test TESTOPTS="-- --no-canonicalize --autoaccept"
+    #    In Ruby 1.9:
+    #    rake test TESTOPTS="--no-canonicalize --autoaccept"
     #
     # Example of assert_same with comments:
     #  assert_same something, <<-END
@@ -118,9 +174,9 @@ class Test::Unit::TestCase
         # interactive mode is turned on by default, except when
         # - --no-interactive is given
         # - STDIN is not a terminal device (i.e. we can't ask any questions)
-        interactive = !ARGV.include?("--no-interactive") && STDIN.tty?
-        canonicalize = !ARGV.include?("--no-canonicalize")
-        autoaccept = ARGV.include?("--autoaccept")
+        interactive = !$assert_same_options.include?("--no-interactive") && STDIN.tty?
+        canonicalize = !$assert_same_options.include?("--no-canonicalize")
+        autoaccept = $assert_same_options.include?("--autoaccept")
 
         is_same_canonicalized, is_same, diff_canonicalized, diff = compare_for_assert_same(expected, actual)
 
@@ -128,8 +184,7 @@ class Test::Unit::TestCase
             diff_to_report = canonicalize ? diff_canonicalized : diff
             if interactive
                 # print method name and short backtrace
-                failure = Test::Unit::Failure.new(name, filter_backtrace(caller(0)), diff_to_report)
-                puts "\n#{failure}"
+                soft_fail(diff_to_report)
 
                 if autoaccept
                     accept = true
@@ -138,8 +193,8 @@ class Test::Unit::TestCase
                     STDOUT.flush
                     response = STDIN.gets.strip
                     accept = ["", "y", "Y"].include? response
-                    ARGV << "--autoaccept" if response == "Y"
-                    ARGV << "--no-interactive" if response == "N"
+                    $assert_same_options << "--autoaccept" if response == "Y"
+                    $assert_same_options << "--no-interactive" if response == "N"
                 end
 
                 if accept
@@ -154,17 +209,43 @@ class Test::Unit::TestCase
                 # when change is accepted, we should not report it as a failure because
                 # we want the test method to continue executing (in case there're more
                 # assert_same's in the method)
-                add_assertion
+                succeed
             else
-                raise Test::Unit::AssertionFailedError.new(diff_to_report)
+                fail(diff)
             end
         else
-            add_assertion
+            succeed
         end
     end
 
 private
 
+    def succeed
+        if RUBY_VERSION < "1.9.0"
+            add_assertion
+        else
+            true
+        end
+    end
+
+    def soft_fail(diff)
+        if RUBY_VERSION < "1.9.0"
+            failure = Test::Unit::Failure.new(name, filter_backtrace(caller(0)), diff)
+            puts "\n#{failure}"
+        else
+            failure = MiniTest::Assertion.new(diff)
+            puts "\n#{failure}"
+        end
+    end
+
+    def fail(diff)
+        if RUBY_VERSION < "1.9.0"
+            raise Test::Unit::AssertionFailedError.new(diff)
+        else
+            raise MiniTest::Assertion.new(diff)
+        end
+    end
+
     def accept_string(actual, mode)
         file, method, line = get_caller_location(:depth => 3)
 
@@ -209,7 +290,7 @@ private
         @@file_offsets[file][line.to_i] = actual_length - expected_length
 
         source_file = File.open(file, "w+")
-        source_file.write(source)
+        source_file.write(source.join(''))
         source_file.fsync
         source_file.close
     end

data/test/assert_same_test.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2011 Pluron, Inc.
 
 require 'test/unit'
-require 'lib/assert_same'
+require 'assert_same'
 
 class AssertSameTest < Test::Unit::TestCase
 

metadata

@@ -1,51 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: assert_same
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: '0.3'
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
 platform: ruby
-authors: 
+authors:
 - Pluron, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id001
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies: []
 description: assert_same assertion
 email: support@pluron.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - LICENSE
 - README
 - Rakefile
 - assert_same.gemspec
+- assert_same.kdev4
 - init.rb
 - lib/array_diff.rb
 - lib/assert_same.rb
@@ -54,37 +31,30 @@ files:
 - test/logs/assert_same_with_files.log.ref
 homepage: http://github.com/acunote/assert_same
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Assert which checks that two strings (expected and actual) are same and which can magically replace expected value with the actual in case the new behavior (and new actual value) is correct
-test_files: 
+summary: Assert which checks that two strings (expected and actual) are same and which
+  can magically replace expected value with the actual in case the new behavior (and
+  new actual value) is correct
+test_files:
 - test/assert_same_test.rb
 - test/logs/assert_same_with_files.log.ref