mocha 0.12.7 → 0.13.0

data/lib/mocha/integration/test_unit/ruby_version_185_and_below.rb

@@ -1,51 +1,58 @@
-require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/integration/assertion_counter'
+require 'mocha/integration/monkey_patcher'
 require 'mocha/expectation_error'
 
 module Mocha
-
   module Integration
-
     module TestUnit
-
       module RubyVersion185AndBelow
+        def self.applicable_to?(test_unit_version, ruby_version)
+          Gem::Requirement.new('<= 1.2.3').satisfied_by?(test_unit_version) && Gem::Requirement.new('<= 1.8.5').satisfied_by?(ruby_version)
+        end
+
+        def self.description
+          "monkey patch for standard library in Ruby <= v1.8.5"
+        end
+
         def self.included(mod)
-          $stderr.puts "Monkey patching Test::Unit for Ruby <= v1.8.5" if $mocha_options['debug']
+          MonkeyPatcher.apply(mod, RunMethodPatch)
         end
-        def run(result)
-          assertion_counter = AssertionCounter.new(result)
-          yield(Test::Unit::TestCase::STARTED, name)
-          @_result = result
-          begin
+
+        module RunMethodPatch
+          def run(result)
+            assertion_counter = AssertionCounter.new(self)
+            yield(Test::Unit::TestCase::STARTED, name)
+            @_result = result
             begin
-              setup
-              __send__(@method_name)
-              mocha_verify(assertion_counter)
-            rescue Mocha::ExpectationError => e
-              add_failure(e.message, e.backtrace)
-            rescue Test::Unit::AssertionFailedError => e
-              add_failure(e.message, e.backtrace)
-            rescue StandardError, ScriptError
-              add_error($!)
-            ensure
               begin
-                teardown
+                setup
+                __send__(@method_name)
+                mocha_verify(assertion_counter)
+              rescue Mocha::ExpectationError => e
+                add_failure(e.message, e.backtrace)
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue StandardError, ScriptError
                 add_error($!)
+              ensure
+                begin
+                  teardown
+                rescue Mocha::ExpectationError => e
+                  add_failure(e.message, e.backtrace)
+                rescue Test::Unit::AssertionFailedError => e
+                  add_failure(e.message, e.backtrace)
+                rescue StandardError, ScriptError
+                  add_error($!)
+                end
               end
+            ensure
+              mocha_teardown
             end
-          ensure
-            mocha_teardown
+            result.add_run
+            yield(Test::Unit::TestCase::FINISHED, name)
           end
-          result.add_run
-          yield(Test::Unit::TestCase::FINISHED, name)
         end
       end
-
     end
-
   end
-
 end

data/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb

@@ -1,53 +1,60 @@
-require 'test/unit/testcase'
-require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/integration/assertion_counter'
+require 'mocha/integration/monkey_patcher'
 require 'mocha/expectation_error'
 
 module Mocha
-
   module Integration
-
     module TestUnit
-
       module RubyVersion186AndAbove
+        def self.applicable_to?(test_unit_version, ruby_version)
+          Gem::Requirement.new('<= 1.2.3').satisfied_by?(test_unit_version) && Gem::Requirement.new('>= 1.8.6').satisfied_by?(ruby_version)
+        end
+
+        def self.description
+          "monkey patch for standard library Test::Unit in Ruby >= v1.8.6"
+        end
+
         def self.included(mod)
-          $stderr.puts "Monkey patching Test::Unit for Ruby >= v1.8.6" if $mocha_options['debug']
+          MonkeyPatcher.apply(mod, RunMethodPatch)
         end
-        def run(result)
-          assertion_counter = AssertionCounter.new(result)
-          yield(Test::Unit::TestCase::STARTED, name)
-          @_result = result
-          begin
+
+        module RunMethodPatch
+          def run(result)
+            assertion_counter = AssertionCounter.new(self)
+            yield(Test::Unit::TestCase::STARTED, name)
+            @_result = result
             begin
-              setup
-              __send__(@method_name)
-              mocha_verify(assertion_counter)
-            rescue Mocha::ExpectationError => e
-              add_failure(e.message, e.backtrace)
-            rescue Test::Unit::AssertionFailedError => e
-              add_failure(e.message, e.backtrace)
-            rescue Exception
-              raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
-              add_error($!)
-            ensure
               begin
-                teardown
+                setup
+                __send__(@method_name)
+                mocha_verify(assertion_counter)
+              rescue Mocha::ExpectationError => e
+                add_failure(e.message, e.backtrace)
               rescue Test::Unit::AssertionFailedError => e
                 add_failure(e.message, e.backtrace)
               rescue Exception
                 raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
                 add_error($!)
+              ensure
+                begin
+                  teardown
+                rescue Mocha::ExpectationError => e
+                  add_failure(e.message, e.backtrace)
+                rescue Test::Unit::AssertionFailedError => e
+                  add_failure(e.message, e.backtrace)
+                rescue Exception
+                  raise if Test::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.include? $!.class
+                  add_error($!)
+                end
               end
+            ensure
+              mocha_teardown
             end
-          ensure
-            mocha_teardown
+            result.add_run
+            yield(Test::Unit::TestCase::FINISHED, name)
           end
-          result.add_run
-          yield(Test::Unit::TestCase::FINISHED, name)
         end
       end
-
     end
-
   end
-
 end

data/lib/mocha/integration/test_unit.rb

@@ -1,56 +1,49 @@
-require 'mocha/api'
-require 'mocha/options'
-
-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_252'
-  require 'mocha/integration/test_unit/ruby_version_185_and_below'
-  require 'mocha/integration/test_unit/ruby_version_186_and_above'
-
-  module Test
-    module Unit
-      class TestCase
-
-        include Mocha::API
-
-        alias_method :run_before_mocha, :run
-        remove_method :run
+require 'mocha/debug'
+
+require 'mocha/integration/test_unit/nothing'
+require 'mocha/integration/test_unit/ruby_version_185_and_below'
+require 'mocha/integration/test_unit/ruby_version_186_and_above'
+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/adapter'
+
+module Mocha
+  module Integration
+    module TestUnit
+      def self.activate
+        return false unless defined?(::Test::Unit::TestCase) && !(defined?(::MiniTest::Unit::TestCase) && (::Test::Unit::TestCase < ::MiniTest::Unit::TestCase))
 
         test_unit_version = begin
           load 'test/unit/version.rb'
-          Gem::Version.new(Test::Unit::VERSION)
+          Gem::Version.new(::Test::Unit::VERSION)
         rescue LoadError
-          Gem::Version.new('1.x')
+          Gem::Version.new('1.0.0')
         end
 
-        if $mocha_options['debug']
-          $stderr.puts "Detected Ruby version: #{RUBY_VERSION}"
-          $stderr.puts "Detected Test::Unit version: #{test_unit_version}"
+        ruby_version = Gem::Version.new(RUBY_VERSION.dup)
+
+        Debug.puts "Detected Ruby version: #{ruby_version}"
+        Debug.puts "Detected Test::Unit version: #{test_unit_version}"
+
+        integration_module = [
+          TestUnit::Adapter,
+          TestUnit::GemVersion230To250,
+          TestUnit::GemVersion203To220,
+          TestUnit::GemVersion201To202,
+          TestUnit::GemVersion200,
+          TestUnit::RubyVersion186AndAbove,
+          TestUnit::RubyVersion185AndBelow,
+          TestUnit::Nothing
+        ].detect { |m| m.applicable_to?(test_unit_version, ruby_version) }
+
+        unless ::Test::Unit::TestCase < integration_module
+          Debug.puts "Applying #{integration_module.description}"
+          ::Test::Unit::TestCase.send(:include, integration_module)
         end
-
-        if (test_unit_version == Gem::Version.new('1.x')) || (test_unit_version == Gem::Version.new('1.2.3'))
-          if RUBY_VERSION < '1.8.6'
-            include Mocha::Integration::TestUnit::RubyVersion185AndBelow
-          else
-            include Mocha::Integration::TestUnit::RubyVersion186AndAbove
-          end
-        elsif Gem::Requirement.new('2.0.0').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion200
-        elsif Gem::Requirement.new('>= 2.0.1', '<= 2.0.2').satisfied_by?(test_unit_version)
-          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.2').satisfied_by?(test_unit_version)
-          include Mocha::Integration::TestUnit::GemVersion230To252
-        else
-          raise "No Mocha monkey-patch for Test::Unit version"
-        end
-
+        true
       end
     end
   end
-
 end

data/lib/mocha/integration.rb

@@ -1,46 +1,14 @@
-require 'mocha/options'
 require 'mocha/deprecation'
+require 'mocha/integration/test_unit'
+require 'mocha/integration/mini_test'
 
 module Mocha
-
   module Integration
-
-    class << self
-
-      def monkey_patches
-        patches = []
-        if test_unit_testcase_defined? && !test_unit_testcase_inherits_from_miniunit_testcase?
-          patches << 'mocha/integration/test_unit'
-        end
-        if mini_test_testcase_defined?
-          patches << 'mocha/integration/mini_test'
-        end
-        patches
-      end
-
-      def test_unit_testcase_defined?
-        defined?(Test::Unit::TestCase)
-      end
-
-      def mini_test_testcase_defined?
-        defined?(MiniTest::Unit::TestCase)
-      end
-
-      def test_unit_testcase_inherits_from_miniunit_testcase?
-        test_unit_testcase_defined? && mini_test_testcase_defined? && Test::Unit::TestCase.ancestors.include?(MiniTest::Unit::TestCase)
+    def self.activate
+      if [Integration::TestUnit, Integration::MiniTest].map(&:activate).none?
+        Deprecation.warning("Test::Unit or MiniTest must be loaded *before* Mocha.")
+        Deprecation.warning("If you're integrating with a test library other than Test::Unit or MiniTest, you should use `require 'mocha/api'` instead of `require 'mocha'`.")
       end
-
     end
-
   end
-
-end
-
-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|
-  require patch
 end

data/lib/mocha/method_matcher.rb

@@ -9,7 +9,7 @@ module Mocha
     end
 
     def match?(actual_method_name)
-      @expected_method_name == actual_method_name
+      @expected_method_name == actual_method_name.to_sym
     end
 
     def mocha_inspect

data/lib/mocha/module_methods.rb

@@ -0,0 +1,14 @@
+require 'mocha/module_method'
+
+module Mocha
+
+  # @private
+  module ModuleMethods
+
+    def stubba_method
+      Mocha::ModuleMethod
+    end
+
+  end
+
+end

data/lib/mocha/{object.rb → object_methods.rb}

@@ -1,8 +1,5 @@
 require 'mocha/mockery'
 require 'mocha/instance_method'
-require 'mocha/class_method'
-require 'mocha/module_method'
-require 'mocha/any_instance_method'
 require 'mocha/argument_iterator'
 require 'mocha/expectation_error_factory'
 
@@ -173,84 +170,4 @@ module Mocha
 
   end
 
-  # @private
-  module ModuleMethods
-
-    def stubba_method
-      Mocha::ModuleMethod
-    end
-
-  end
-
-  # Methods added to all classes to allow mocking and stubbing on real (i.e. non-mock) objects.
-  module ClassMethods
-
-    # @private
-    def stubba_method
-      Mocha::ClassMethod
-    end
-
-    # @private
-    class AnyInstance
-
-      def initialize(klass)
-        @stubba_object = klass
-      end
-
-      def mocha
-        @mocha ||= Mocha::Mockery.instance.mock_impersonating_any_instance_of(@stubba_object)
-      end
-
-      def stubba_method
-        Mocha::AnyInstanceMethod
-      end
-
-      def stubba_object
-        @stubba_object
-      end
-
-      def method_exists?(method, include_public_methods = true)
-        if include_public_methods
-          return true if @stubba_object.public_instance_methods(include_superclass_methods = true).include?(method)
-        end
-        return true if @stubba_object.protected_instance_methods(include_superclass_methods = true).include?(method)
-        return true if @stubba_object.private_instance_methods(include_superclass_methods = true).include?(method)
-        return false
-      end
-
-    end
-
-    # @return [Mock] a mock object which will detect calls to any instance of this class.
-    # @raise [StubbingError] if attempting to stub method which is not allowed.
-    #
-    # @example Return false to invocation of +Product#save+ for any instance of +Product+.
-    #   Product.any_instance.stubs(:save).returns(false)
-    #   product_1 = Product.new
-    #   assert_equal false, product_1.save
-    #   product_2 = Product.new
-    #   assert_equal false, product_2.save
-    def any_instance
-      if frozen?
-        raise StubbingError.new("can't stub method on frozen object: #{mocha_inspect}.any_instance", caller)
-      end
-      @any_instance ||= AnyInstance.new(self)
-    end
-
-  end
-
-end
-
-# @private
-class Object
-  include Mocha::ObjectMethods
-end
-
-# @private
-class Module
-  include Mocha::ModuleMethods
-end
-
-# @private
-class Class
-  include Mocha::ClassMethods
 end

data/lib/mocha/setup.rb

@@ -0,0 +1,10 @@
+require 'mocha/version'
+require 'mocha/integration'
+
+module Mocha
+  def self.activate
+    Integration.activate
+  end
+end
+
+Mocha.activate

data/lib/mocha/standalone.rb

@@ -1 +1,4 @@
 require 'mocha/api'
+require 'mocha/deprecation'
+
+Mocha::Deprecation.warning("`require 'mocha/standalone'` has been deprecated. Please use `require 'mocha/api' instead.")

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.12.7"
+  VERSION = "0.13.0"
 end

data/lib/mocha.rb

@@ -1,4 +1,8 @@
 require 'mocha/version'
 require 'mocha/integration'
-require 'mocha_standalone'
-require 'mocha/configuration'
+require 'mocha/deprecation'
+
+Mocha::Deprecation.warning("Change `require 'mocha'` to `require 'mocha/setup'`.")
+
+require 'mocha/setup'
+

data/lib/mocha_standalone.rb

@@ -1,2 +1,4 @@
 require 'mocha/api'
-require 'mocha/object'
+require 'mocha/deprecation'
+
+Mocha::Deprecation.warning("`require 'mocha_standalone'` has been deprecated. Please use `require 'mocha/api' instead.")

data/mocha.gemspec

@@ -11,15 +11,16 @@ Gem::Specification.new do |s|
   s.authors = ["James Mead"]
   s.description = "Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes."
   s.email = "mocha-developer@googlegroups.com"
-  s.extra_rdoc_files = ["README.rdoc", "COPYING.rdoc"]
 
-  s.files = `git ls-files`.split("\n") - ["TODO", ".travis.yml", ".gitignore"]
+  s.files = `git ls-files`.split("\n")
+  s.files.delete(".travis.yml")
+  s.files.delete(".gitignore")
 
   s.homepage = "http://gofreerange.com/mocha/docs"
-  s.rdoc_options = ["--title", "Mocha", "--main", "README.rdoc", "--line-numbers"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "mocha"
   s.summary = "Mocking and stubbing library"
+  s.has_rdoc = "yard"
 
   s.add_dependency("metaclass", "~> 0.0.1")
   if s.respond_to? :specification_version then
@@ -29,18 +30,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency("rake", ">= 0")
       s.add_development_dependency("introspection", "~> 0.0.1")
-      s.add_development_dependency("yard")
-      s.add_development_dependency("rdoc")
+      unless ENV["MOCHA_NO_DOCS"]
+        s.add_development_dependency("yard")
+        s.add_development_dependency("redcarpet", "~> 1")
+      end
     else
       s.add_dependency("rake", ">= 0")
       s.add_dependency("introspection", "~> 0.0.1")
-      s.add_dependency("yard")
-      s.add_dependency("rdoc")
+      unless ENV["MOCHA_NO_DOCS"]
+        s.add_dependency("yard")
+        s.add_dependency("redcarpet", "~> 1")
+      end
     end
   else
     s.add_dependency("rake", ">= 0")
     s.add_dependency("introspection", "~> 0.0.1")
-    s.add_dependency("yard")
-    s.add_dependency("rdoc")
+    unless ENV["MOCHA_NO_DOCS"]
+      s.add_dependency("yard")
+      s.add_dependency("redcarpet", "~> 1")
+    end
   end
 end

data/test/acceptance/bug_18914_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Bug18914Test < Test::Unit::TestCase
 

data/test/acceptance/bug_21465_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Bug21465Test < Test::Unit::TestCase
 

data/test/acceptance/bug_21563_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Bug21563Test < Test::Unit::TestCase
 

data/test/acceptance/exception_rescue_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class ExceptionRescueTest < Test::Unit::TestCase
 

data/test/acceptance/expectations_on_multiple_methods_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class ExpectationsOnMultipleMethodsTest < Test::Unit::TestCase
 

data/test/acceptance/expected_invocation_count_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class ExpectedInvocationCountTest < Test::Unit::TestCase
 

data/test/acceptance/failure_messages_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class FailureMessagesTest < Test::Unit::TestCase
 

data/test/acceptance/issue_65_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Issue65Test < Test::Unit::TestCase
 

data/test/acceptance/issue_70_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class Issue70Test < Test::Unit::TestCase
 

data/test/acceptance/mocha_example_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../../test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class MochaExampleTest < Test::Unit::TestCase
 

data/test/acceptance/mocha_test_result_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 require 'execution_point'
 
 class MochaTestResultTest < Test::Unit::TestCase

data/test/acceptance/mock_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class MockTest < Test::Unit::TestCase
 

data/test/acceptance/mock_with_initializer_block_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class MockWithInitializerBlockTest < Test::Unit::TestCase
 

data/test/acceptance/mocked_methods_dispatch_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class MockedMethodDispatchTest < Test::Unit::TestCase
 

data/test/acceptance/multiple_expectations_failure_message_test.rb

@@ -1,5 +1,5 @@
 require File.expand_path('../acceptance_test_helper', __FILE__)
-require 'mocha'
+require 'mocha/setup'
 
 class FailureMessageTest < Test::Unit::TestCase