mocha 0.12.0 → 0.12.1

data/RELEASE.rdoc

@@ -1,3 +1,10 @@
+= 0.12.1
+* Deprecation warning (instead of fail fast) if neither Test::Unit nor MiniTest is loaded. Fixes #88.
+* Remove deprecated access to `Mocha::Standalone`.
+* Remove the deprecated file `stubba.rb`.
+* Officially support test-unit v2.5.1 (still monkey-patching).
+* Improve the API acceptance test.
+
 = 0.12.0
 * Fail fast if neither Test::Unit nor MiniTest is loaded. Fixes #40.
 * Officially support MiniTest up to v3.2.0 (still monkey-patching).

data/Rakefile

@@ -114,8 +114,8 @@ end
 desc "Generate documentation"
 task 'generate_docs' => ['clobber_yardoc', 'yardoc']
 
-desc "Publish docs to Github (relies on running 'generate_docs' task and committing changes to master branch)"
-task 'publish_docs' do
+desc "Publish docs to gofreerange.com/docs/mocha"
+task 'publish_docs' => 'generate_docs' do
   path = "/home/freerange/docs/mocha"
   system %{ssh gofreerange.com "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* gofreerange.com:#{path}}
 end

data/build-matrix.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+def execute(*commands)
+  commands.each do |command|
+    system(command)
+    unless $?.success?
+      message = [
+        "Executing shell command failed.",
+        "  Command: #{command}",
+        "  Status:  #{$?.exitstatus}"
+      ].join("\n")
+      raise message
+    end
+  end
+end
+
+def reset_bundle
+  execute(
+    "rm -rf .bundle/gems",
+    "rm -rf gemfiles/.bundle/gems",
+    "rm -f *.lock",
+    "rm -f gemfiles/*.lock"
+  )
+end
+
+def with_rbenv(command)
+  %{export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; #{command}}
+end
+
+def run(gemfile)
+  ENV["BUNDLE_GEMFILE"] = gemfile
+  ENV["MOCHA_OPTIONS"] = "debug"
+  reset_bundle
+  execute(
+    with_rbenv("bundle install --gemfile=#{gemfile}"),
+    with_rbenv("bundle exec rake test")
+  )
+end
+
+EXCLUDED_RUBY_193_GEMFILES = [
+  "gemfiles/Gemfile.minitest.1.3.0",
+  "gemfiles/Gemfile.minitest.1.4.0",
+  "gemfiles/Gemfile.minitest.1.4.1",
+  "gemfiles/Gemfile.minitest.1.4.2"
+]
+
+["1.8.7-p352", "1.9.3-p125-perf"].each do |ruby_version|
+  execute("rbenv local #{ruby_version}")
+  ["test-unit", "minitest"].each do |test_library|
+    reset_bundle
+    Dir["gemfiles/Gemfile.#{test_library}.*"].each do |gemfile|
+      ruby_version_without_patch = ruby_version.split("-")[0]
+      next if (ruby_version_without_patch == "1.9.3") && EXCLUDED_RUBY_193_GEMFILES.include?(gemfile)
+      p [ruby_version_without_patch, test_library, gemfile]
+      run(gemfile)
+    end
+  end
+  execute("rbenv local --unset")
+end

data/gemfiles/Gemfile.test-unit.2.0.0

@@ -4,5 +4,4 @@ gemspec :path=>"../"
 
 group :development do
   gem "test-unit", "2.0.0"
-  gem "hoe", "2.8.0" # later versions of hoe depend on Rubygems >= 1.4 which in turn depends on Ruby >= 1.8.7
 end

data/lib/mocha/api.rb

@@ -176,12 +176,4 @@ module Mocha
 
   end
 
-  # @private
-  def self.const_missing(name)
-    return super unless name == :Standalone
-    require 'mocha/deprecation'
-    Deprecation.warning "Mocha::Standalone has been renamed to Mocha::API"
-    return API
-  end
-
 end

data/lib/mocha/integration.rb

@@ -1,4 +1,5 @@
 require 'mocha/options'
+require 'mocha/deprecation'
 
 module Mocha
 
@@ -35,8 +36,9 @@ module Mocha
 
 end
 
-unless Mocha::Integration.monkey_patches.any? || $mocha_options["skip_integration"]
-  raise "Test::Unit or MiniTest must be loaded *before* Mocha (use MOCHA_OPTIONS=skip_integration if you know what you are doing)."
+unless Mocha::Integration.monkey_patches.any?
+  Mocha::Deprecation.warning("Test::Unit or MiniTest must be loaded *before* Mocha.")
+  Mocha::Deprecation.warning("If you're integrating with another test library, you should probably require 'mocha_standalone' instead of 'mocha'")
 end
 
 Mocha::Integration.monkey_patches.each do |patch|

data/lib/mocha/integration/test_unit.rb

@@ -6,7 +6,7 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
   require 'mocha/integration/test_unit/gem_version_200'
   require 'mocha/integration/test_unit/gem_version_201_to_202'
   require 'mocha/integration/test_unit/gem_version_203_to_220'
-  require 'mocha/integration/test_unit/gem_version_230_to_250'
+  require 'mocha/integration/test_unit/gem_version_230_to_251'
   require 'mocha/integration/test_unit/ruby_version_185_and_below'
   require 'mocha/integration/test_unit/ruby_version_186_and_above'
 
@@ -43,8 +43,8 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
           include Mocha::Integration::TestUnit::GemVersion201To202
         elsif Gem::Requirement.new('>= 2.0.3', '<= 2.2.0').satisfied_by?(test_unit_version)
           include Mocha::Integration::TestUnit::GemVersion203To220
-        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.5.0').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion230To250
+        elsif Gem::Requirement.new('>= 2.3.0', '<= 2.5.1').satisfied_by?(test_unit_version)
+          include Mocha::Integration::TestUnit::GemVersion230To251
         else
           $stderr.puts "*** No Mocha integration for Test::Unit version ***" if $mocha_options['debug']
         end

data/lib/mocha/integration/test_unit/{gem_version_230_to_250.rb → gem_version_230_to_251.rb}

@@ -8,9 +8,9 @@ module Mocha
 
     module TestUnit
 
-      module GemVersion230To250
+      module GemVersion230To251
         def self.included(mod)
-          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.5.0" if $mocha_options['debug']
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.5.1" if $mocha_options['debug']
         end
         def run(result)
           assertion_counter = AssertionCounter.new(result)

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/test/acceptance/api_test.rb

@@ -44,40 +44,40 @@ end
 
 class SampleTest < NotATestUnitTestCase
 
-  def mocha_with_fulfilled_expectation
+  def mock_object_with_fulfilled_expectation
     mockee = mock()
     mockee.expects(:blah)
     mockee.blah
   end
 
-  def mocha_with_unfulfilled_expectation
+  def mock_object_with_unfulfilled_expectation
     mockee = mock()
     mockee.expects(:blah)
   end
 
-  def mocha_with_unexpected_invocation
+  def mock_object_with_unexpected_invocation
     mockee = mock()
     mockee.blah
   end
 
-  def stubba_with_fulfilled_expectation
+  def real_object_with_fulfilled_expectation
     stubbee = Class.new { define_method(:blah) {} }.new
     stubbee.expects(:blah)
     stubbee.blah
   end
 
-  def stubba_with_unfulfilled_expectation
+  def real_object_with_unfulfilled_expectation
     stubbee = Class.new { define_method(:blah) {} }.new
     stubbee.expects(:blah)
   end
 
-  def mocha_with_matching_parameter
+  def mock_object_with_matching_parameter
     mockee = mock()
     mockee.expects(:blah).with(has_key(:wibble))
     mockee.blah(:wibble => 1)
   end
 
-  def mocha_with_non_matching_parameter
+  def mock_object_with_non_matching_parameter
     mockee = mock()
     mockee.expects(:blah).with(has_key(:wibble))
     mockee.blah(:wobble => 2)
@@ -102,38 +102,38 @@ class APITest < Test::Unit::TestCase
     teardown_acceptance_test
   end
 
-  def test_should_pass_mocha_test
-    assert_nothing_raised { sample_test.run(:mocha_with_fulfilled_expectation) }
+  def test_should_pass_mock_object_test
+    assert_nothing_raised { sample_test.run(:mock_object_with_fulfilled_expectation) }
     assert_equal 1, sample_test.assertion_counter.count
   end
 
-  def test_should_fail_mocha_test_due_to_unfulfilled_exception
-    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mocha_with_unfulfilled_expectation) }
+  def test_should_fail_mock_object_test_due_to_unfulfilled_exception
+    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mock_object_with_unfulfilled_expectation) }
     assert_equal 1, sample_test.assertion_counter.count
   end
 
-  def test_should_fail_mocha_test_due_to_unexpected_invocation
-    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mocha_with_unexpected_invocation) }
+  def test_should_fail_mock_object_test_due_to_unexpected_invocation
+    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mock_object_with_unexpected_invocation) }
     assert_equal 0, sample_test.assertion_counter.count
   end
 
-  def test_should_pass_stubba_test
-    assert_nothing_raised { sample_test.run(:stubba_with_fulfilled_expectation) }
+  def test_should_pass_real_object_test
+    assert_nothing_raised { sample_test.run(:real_object_with_fulfilled_expectation) }
     assert_equal 1, sample_test.assertion_counter.count
   end
 
-  def test_should_fail_stubba_test
-    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:stubba_with_unfulfilled_expectation) }
+  def test_should_fail_real_object_test
+    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:real_object_with_unfulfilled_expectation) }
     assert_equal 1, sample_test.assertion_counter.count
   end
 
-  def test_should_pass_mocha_test_with_matching_parameter
-    assert_nothing_raised { sample_test.run(:mocha_with_matching_parameter) }
+  def test_should_pass_mock_object_test_with_matching_parameter
+    assert_nothing_raised { sample_test.run(:mock_object_with_matching_parameter) }
     assert_equal 1, sample_test.assertion_counter.count
   end
 
-  def test_should_fail_mocha_test_with_non_matching_parameter
-    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mocha_with_non_matching_parameter) }
+  def test_should_fail_mock_object_test_with_non_matching_parameter
+    assert_raises(NotATestUnitAssertionFailedError) { sample_test.run(:mock_object_with_non_matching_parameter) }
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metaclass
-  requirement: &70238404164500 !ruby/object:Gem::Requirement
+  requirement: &70237796907960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70238404164500
+  version_requirements: *70237796907960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70238404163180 !ruby/object:Gem::Requirement
+  requirement: &70237796906640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238404163180
+  version_requirements: *70237796906640
 - !ruby/object:Gem::Dependency
   name: introspection
-  requirement: &70238404162720 !ruby/object:Gem::Requirement
+  requirement: &70237796906180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70238404162720
+  version_requirements: *70237796906180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70238404162340 !ruby/object:Gem::Requirement
+  requirement: &70237796905800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238404162340
+  version_requirements: *70237796905800
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows
   mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
@@ -71,6 +71,7 @@ files:
 - README.rdoc
 - RELEASE.rdoc
 - Rakefile
+- build-matrix.rb
 - examples/misc.rb
 - examples/mocha.rb
 - examples/stubba.rb
@@ -125,7 +126,7 @@ files:
 - lib/mocha/integration/test_unit/gem_version_200.rb
 - lib/mocha/integration/test_unit/gem_version_201_to_202.rb
 - lib/mocha/integration/test_unit/gem_version_203_to_220.rb
-- lib/mocha/integration/test_unit/gem_version_230_to_250.rb
+- lib/mocha/integration/test_unit/gem_version_230_to_251.rb
 - lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
 - lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/is_a.rb
@@ -175,7 +176,6 @@ files:
 - lib/mocha/version.rb
 - lib/mocha/yield_parameters.rb
 - lib/mocha_standalone.rb
-- lib/stubba.rb
 - mocha.gemspec
 - test/acceptance/acceptance_test_helper.rb
 - test/acceptance/api_test.rb
@@ -219,7 +219,6 @@ files:
 - test/acceptance/stub_module_method_test.rb
 - test/acceptance/stub_test.rb
 - test/acceptance/stubba_example_test.rb
-- test/acceptance/stubba_test.rb
 - test/acceptance/stubba_test_result_test.rb
 - test/acceptance/stubbing_error_backtrace_test.rb
 - test/acceptance/stubbing_frozen_object_test.rb
@@ -310,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -586468752341133139
+      hash: 512632440970329998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/stubba.rb

@@ -1,4 +0,0 @@
-# for backwards compatibility
-require 'mocha'
-require 'mocha/deprecation'
-Mocha::Deprecation.warning "require 'stubba' is no longer needed and stubba.rb will soon be removed"

data/test/acceptance/stubba_test.rb

@@ -1,15 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-require 'deprecation_disabler'
-
-class StubbaTest < Test::Unit::TestCase
-
-  include DeprecationDisabler
-
-  def test_should_report_deprecation_of_stubba_which_will_be_removed_in_a_future_release
-    disable_deprecations do
-      load 'stubba.rb'
-    end
-    assert Mocha::Deprecation.messages.include?("require 'stubba' is no longer needed and stubba.rb will soon be removed")
-  end
-
-end