temporaries 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.3.0 2012-06-26
+
+ * Fix support for gem distributions of MiniTest.
+ * MiniTest < 2.3.0 is no longer supported.
+
 == 0.2.0 2012-06-08
 
  * Methods to set temporary method definitions.

data/Rakefile

@@ -1,9 +1,20 @@
 require 'ritual'
 
 task :ci do
-  if RUBY_VERSION >= '1.9'
-    sh 'bundle exec rspec spec && bundle exec cucumber'
-  else
-    sh 'bundle exec rspec spec && bundle exec cucumber --tags=~@1.9'
+  sh 'rspec'
+
+  begin
+    require 'minitest/unit'
+    if (MiniTest::Unit::VERSION.scan(/\d+/).map { |s| s.to_i } <=> [2, 3, 0]) < 0
+      sh 'cucumber --tags=@minitest-2.2.2 features/mini_test_integration.feature'
+    else
+      sh 'cucumber --tags=@minitest --tags=~@minitest-2.2.2 features/mini_test_integration.feature'
+    end
+  rescue LoadError
+    # MiniTest may not be present on Ruby 1.8.
+  end
+
+  if $:.find { |dir| File.exist?("#{dir}/rspec.rb") }
+    sh 'cucumber features/rspec_integration.feature'
   end
 end

data/features/mini_test_integration.feature

@@ -1,10 +1,10 @@
-@1.9
 Feature: MiniTest Integration
 
   As a developer using MiniTest
   I want to define temporary values
   So I can run my tests in isolation
 
+  @minitest
   Scenario: Using temporary values with MiniTest::Unit
   Given I have a file "mini_test_unit.rb" containing:
     """
@@ -27,6 +27,7 @@ Feature: MiniTest Integration
   When I run "ruby mini_test_unit.rb"
   Then I should see "1 tests, 1 assertions, 0 failures, 0 errors"
 
+  @minitest
   Scenario: Using temporary values with MiniTest::Spec
   Given I have a file "mini_test_spec.rb" containing:
     """
@@ -48,3 +49,14 @@ Feature: MiniTest Integration
     """
   When I run "ruby mini_test_spec.rb"
   Then I should see "1 tests, 1 assertions, 0 failures, 0 errors"
+
+  @minitest @minitest-2.2.2
+  Scenario: Temporaries raises a compatibility error
+  Given I have a file "mini_test_spec.rb" containing:
+    """
+    require 'minitest/spec'
+    require 'temporaries'
+    puts MiniTest::Unit::VERSION
+    """
+  When I run "ruby mini_test_spec.rb"
+  Then I should see "Temporaries requires minitest 2.3.0 or higher."

data/features/support/env.rb

@@ -1,6 +1,6 @@
 ROOT = File.expand_path('../..', File.dirname(__FILE__))
 $:.unshift File.expand_path('../../lib', File.dirname(__FILE__))
-ENV['BUNDLE_GEMFILE'] = "#{ROOT}/Gemfile"
+ENV['BUNDLE_GEMFILE'] = File.expand_path(ENV['BUNDLE_GEMFILE'] || "#{ROOT}/Gemfile")
 
 $TEMPORARIES_TEST = true
 require 'temporaries'
@@ -14,6 +14,7 @@ original_pwd = nil
 
 Before do
   FileUtils.mkdir_p TMP
+  FileUtils.cp "#{ROOT}/Gemfile", "#{TMP}/Gemfile"
   original_pwd = Dir.pwd
   Dir.chdir TMP
 end

data/lib/temporaries.rb

@@ -7,14 +7,20 @@ end
 
 if defined?($TEMPORARIES_TEST)
   # Testing this library. Don't install anything.
-elsif defined?(RSpec)
-  Temporaries::Adapters::RSpec.install
-elsif defined?(MiniTest::Unit::TestCase)
-  if RUBY_VERSION >= '1.9.3'
-    Temporaries::Adapters::MiniTest.install
-  else
+else
+  defined?(RSpec) and
+    Temporaries::Adapters::RSpec.install
+
+  defined?(MiniTest::Spec) and
+    if (MiniTest::Unit::VERSION.scan(/\d+/).map { |s| s.to_i } <=> [2, 3, 0]) < 0
+      raise "Temporaries requires minitest 2.3.0 or higher. If you're using the version shipped with ruby, note that newer versions are available via gems."
+    else
+      Temporaries::Adapters::MiniTest.install
+    end
+
+  defined?(MiniTest::Unit) and
     Temporaries::Adapters::TestUnit.install(MiniTest::Unit)
-  end
-elsif defined?(Test::Unit)
-  Temporaries::Adapters::TestUnit.install(Test::Unit)
+
+  defined?(Test::Unit) and
+    Temporaries::Adapters::TestUnit.install(Test::Unit)
 end

data/lib/temporaries/adapters/mini_test.rb

@@ -1,10 +1,8 @@
 module Temporaries
   module Adapters
     class MiniTest < Base
-      # For ruby <= 1.9.2, MiniTest is actually adapted via the
-      # Test::Unit adapter.
       def self.install
-        ::MiniTest::Unit::TestCase.class_eval do
+        ::MiniTest::Spec.class_eval do
           extend Extension
           include Values
           include Directory

data/lib/temporaries/adapters/test_unit.rb

@@ -1,8 +1,6 @@
 module Temporaries
   module Adapters
     class TestUnit < Base
-      # This is used for both Test::Unit <= 1.9 and MiniTest::Unit
-      # <= 1.9.2.
       def self.install(mod)
         mod::TestCase.class_eval do
           extend Extension

data/lib/temporaries/version.rb

@@ -1,5 +1,5 @@
 module Temporaries
-  VERSION = [0, 2, 0]
+  VERSION = [0, 3, 0]
 
   class << VERSION
     include Comparable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temporaries
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ritual
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3674253645093316834
+      hash: -1732108296292991121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3674253645093316834
+      hash: -1732108296292991121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24