assert_value 1.4.1 → 1.5

data/.travis.yml

@@ -0,0 +1,59 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.2.2
+  - 2.2.3
+
+gemfile: Gemfile
+
+# Test for various gem versions we currently support
+matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/old-rubies.gemfile
+      script:
+        - bundle exec rake test
+        - bundle exec rspec test
+    - rvm: 1.8.7
+      gemfile: gemfiles/rspec.2.99.gemfile
+      script: bundle exec rspec test
+    - rvm: 1.9.3
+      gemfile: gemfiles/old-rubies.gemfile
+      script:
+        - bundle exec rake test
+        - bundle exec rspec test
+    - rvm: 1.9.3
+      gemfile: gemfiles/rspec.2.99.gemfile
+      script: bundle exec rspec test
+    - rvm: 2.2.2
+      gemfile: gemfiles/rspec.2.99.gemfile
+      script: bundle exec rspec test
+    - rvm: 2.2.2
+      gemfile: gemfiles/minitest.4.7.5.gemfile
+      script: bundle exec rake test
+    - rvm: 2.2.2
+      gemfile: gemfiles/minitest.gemfile
+      script: bundle exec rake test
+    - rvm: 2.2.2
+      gemfile: gemfiles/test-unit.gemfile
+      script: bundle exec rake test
+    - rvm: 2.2.2
+      gemfile: gemfiles/rspec.gemfile
+      script: bundle exec rake spec
+    - rvm: 2.2.3
+      gemfile: gemfiles/rspec.2.99.gemfile
+      script: bundle exec rspec test
+    - rvm: 2.2.3
+      gemfile: gemfiles/minitest.4.7.5.gemfile
+      script: bundle exec rake test
+    - rvm: 2.2.2
+      gemfile: gemfiles/minitest.gemfile
+      script: bundle exec rake test
+    - rvm: 2.2.3
+      gemfile: gemfiles/test-unit.gemfile
+      script: bundle exec rake test
+    - rvm: 2.2.3
+      gemfile: gemfiles/rspec.gemfile
+      script: bundle exec rake spec

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-# gem 'minitest', '~> 5.0'
 group :development, :test do
+  gem 'rake'
   gem 'rspec'
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Pluron, Inc.
+Copyright (c) 2010-2015 Pluron, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -121,6 +121,8 @@ In Ruby 1.9:
 
 ## Changelog
 
+- 1.5: Improve support for various testing frameworks and Ruby versions:
+       Ruby 2.2.2, 2.2.3, RSpec 2.x, 3.x, Test::Unit 2.x, 3.x, Minitest 4.x, 5.x
 - 1.4: Fix RSpec support
 - 1.3: Improve support for various testing frameworks, fix assertion counters
 - 1.2: Rails 4.1 and minitest gem support

data/Rakefile

@@ -1,14 +1,17 @@
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+begin
+  require 'rdoc/task'
+rescue LoadError
+end
+begin
+  require 'rspec/core/rake_task'
+rescue LoadError
+end
 require 'bundler/setup'
-require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-desc 'Default: run unit tests.'
-task :default => :test
-
 desc 'Test assert_value.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
@@ -16,16 +19,28 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc "Run the specs."
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = "test/**/*_spec.rb"
+if defined?(RSpec)
+  desc "Run the specs."
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = "test/**/*_spec.rb"
+  end
+end
+
+if defined?(RSpec) and RUBY_VERSION > '1.9.3'
+  desc 'Default: run specs.'
+  task :default => :spec
+else
+  desc 'Default: run unit tests.'
+  task :default => :test
 end
 
-desc 'Generate documentation for assert_value.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'assert_value'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+if defined?(Rake::RDocTask)
+  desc 'Generate documentation for assert_value.'
+  Rake::RDocTask.new(:rdoc) do |rdoc|
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title    = 'assert_value'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
 end

data/assert_value.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 SPEC = Gem::Specification.new do |s|
     s.name        = "assert_value"
-    s.version     = "1.4.1"
+    s.version     = "1.5"
     s.author      = "Pluron, Inc."
     s.email       = "support@pluron.com"
     s.homepage    = "http://github.com/acunote/assert_value"

data/gemfiles/minitest.4.7.5.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest', '4.7.5'
+  gem 'test-unit-minitest'
+end

data/gemfiles/minitest.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest'
+end

data/gemfiles/old-rubies.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec'
+end

data/gemfiles/rspec.2.99.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec', '~> 2.99.0'
+end

data/gemfiles/rspec.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec'
+end

data/gemfiles/test-unit.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'rake'
+  gem 'test-unit'
+end

data/lib/assert_value.rb

@@ -1,19 +1,24 @@
-# Copyright (c) 2010-2011 Pluron, Inc.
+# Copyright (c) 2010-2015 Pluron, Inc.
 
-# make sure test/unit or minitest is loaded before assert_value
-# once Ruby 1.8 support is removed, we can replace this code
-# with .gemspec dependency on minitest
+# there're 4 types of test frameworks we support
+# 1) Test::Unit from Ruby <= 1.8.7 and Ruby >= 2.2.2
+# 2) Minitest 2.x-4.x, either bundled with Ruby 1.9 - 2.1 or installed via gem
+# 3) Minitest > 5.0 bundles with Ruby >= 2.2.2 or installed via gem
+# 4) RSpec
 begin
-    require 'minitest/unit'
+    require 'minitest/autorun' # Minitest 5.x
 rescue LoadError
-    require 'test/unit'
+    begin
+        require 'minitest/unit' # old Minitest
+    rescue LoadError
+        begin
+            require 'test/unit' # Test::Unit
+        rescue LoadError
+            # RSpec only
+        end
+    end
 end
 
-# there're 3 types of test frameworks we support
-# 1) test/unit from Ruby 1.8
-# 2) old minitest 2.x-4.x, either bundled with Ruby 1.9 - 2.1 or installed via gem
-# 3) new minitest 5.x from minitest gem (required for example by Rails 4.1)
-
 if defined?(Minitest) and Minitest.const_defined?("VERSION") and Minitest::VERSION >= "5.0.0"
     ASSERT_VALUE_TEST_FRAMEWORK = :new_minitest
 elsif defined?(MiniTest)
@@ -21,7 +26,7 @@ elsif defined?(MiniTest)
 elsif defined?(Test)
     ASSERT_VALUE_TEST_FRAMEWORK = :test_unit
 else
-    raise LoadError.new("Require assert_value after 'test/unit' or 'minitest/autorun'")
+    ASSERT_VALUE_TEST_FRAMEWORK = :rspec_only
 end
 
 require 'text_diff'
@@ -469,13 +474,17 @@ class BeSameValueAs
       end
     end
 
-    def failure_message_for_should
+    def failure_message
         "expected to be the same"
     end
 
-    def failure_message_for_should_not
+    def failure_message_when_negated
         "expected not to be the same"
     end
+
+    def supports_block_expectations?
+        true
+    end
 end
 
 

data/test/assert_value_test.rb

@@ -1,10 +1,16 @@
-# Copyright (c) 2011 Pluron, Inc.
+# Copyright (c) 2011-2015 Pluron, Inc.
 
-require 'test/unit'
-# require 'minitest/autorun'    # uncomment to test with minitest 5.x gem (enable it in Gemfile too)
 require 'assert_value'
 
-class AssertValueTest < ASSERT_VALUE_TEST_FRAMEWORK == :new_minitest ? Minitest::Test : Test::Unit::TestCase
+test_case_class = case ASSERT_VALUE_TEST_FRAMEWORK
+    when :new_minitest then Minitest::Test
+    when :old_minitest then MiniTest::Unit::TestCase
+    when :test_unit then Test::Unit::TestCase
+    when :rspec_only then raise "This test case requires either Minitest or Test::Unit"
+    else raise "Unknown test framework"
+end
+
+class AssertValueTest < test_case_class
 
     def test_basic_assert_value
         assert_value "foo", <<-END

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: assert_value
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: '1.5'
+  prerelease: 
 platform: ruby
 authors:
 - Pluron, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies: []
 description: assert_value assertion
 email: support@pluron.com
@@ -16,13 +17,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - assert_value.gemspec
 - assert_value.kdev4
+- gemfiles/minitest.4.7.5.gemfile
+- gemfiles/minitest.gemfile
+- gemfiles/old-rubies.gemfile
+- gemfiles/rspec.2.99.gemfile
+- gemfiles/rspec.gemfile
+- gemfiles/test-unit.gemfile
 - lib/array_diff.rb
 - lib/assert_value.rb
 - lib/minitest/assert_value_plugin.rb
@@ -34,26 +42,27 @@ files:
 homepage: http://github.com/acunote/assert_value
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Assert that checks that two values (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

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d4ee11a14d96bed2e62ba48a26b7f2824e3b1092
-  data.tar.gz: a7a8b98b575257c2e6bb514e47232fedaf98f8e9
-SHA512:
-  metadata.gz: f1d9b8185697c532c82f3d1b8dd50c7323b87759130a8a817c1e8e3ecd1ac718b6db78126125c08929e02d4795dd8b6c9bb57ef46e093619e6e67346c32945a7
-  data.tar.gz: a935f47a6ae4f8b3ad202c53b811ff9cd50fd162e2d49151063e691140a4c3e3efbe8489dd02ac900d56156465148bc02e9f4604f43913f3ed5c06463be1a9c2