mocha 0.12.10 → 0.13.0

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

@@ -0,0 +1,65 @@
+require 'mocha/integration/assertion_counter'
+require 'mocha/integration/monkey_patcher'
+require 'mocha/expectation_error'
+
+module Mocha
+  module Integration
+    module TestUnit
+      module GemVersion230To250
+        def self.applicable_to?(test_unit_version, ruby_version = nil)
+          Gem::Requirement.new('>= 2.3.0', '<= 2.5.0').satisfied_by?(test_unit_version)
+        end
+
+        def self.description
+          "monkey patch for Test::Unit gem >= v2.3.0 and <= v2.5.0"
+        end
+
+        def self.included(mod)
+          MonkeyPatcher.apply(mod, RunMethodPatch)
+        end
+
+        module RunMethodPatch
+          def run(result)
+            assertion_counter = AssertionCounter.new(self)
+            begin
+              @internal_data.test_started
+              @_result = result
+              yield(Test::Unit::TestCase::STARTED, name)
+              yield(Test::Unit::TestCase::STARTED_OBJECT, self)
+              begin
+                begin
+                  run_setup
+                  run_test
+                  run_cleanup
+                  mocha_verify(assertion_counter)
+                  add_pass
+                rescue Mocha::ExpectationError => e
+                  add_failure(e.message, e.backtrace)
+                rescue Exception
+                  @internal_data.interrupted
+                  raise unless handle_exception($!)
+                ensure
+                  begin
+                    run_teardown
+                  rescue Mocha::ExpectationError => e
+                    add_failure(e.message, e.backtrace)
+                  rescue Exception
+                    raise unless handle_exception($!)
+                  end
+                end
+              ensure
+                mocha_teardown
+              end
+              @internal_data.test_finished
+              result.add_run
+              yield(Test::Unit::TestCase::FINISHED, name)
+              yield(Test::Unit::TestCase::FINISHED_OBJECT, self)
+            ensure
+              # @_result = nil # For test-spec's after_all :<
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Mocha
+  module Integration
+    module TestUnit
+      module Nothing
+        def self.applicable_to?(test_unit_version, ruby_version = nil)
+          true
+        end
+
+        def self.description
+          "nothing (no Test::Unit integration available)"
+        end
+
+        def self.included(mod)
+          raise "No Test::Unit integration available"
+        end
+      end
+    end
+  end
+end

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/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.10"
+  VERSION = "0.13.0"
 end

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