mocha 1.5.0 → 1.10.0.alpha

data/lib/mocha/inspect.rb

@@ -1,57 +1,57 @@
 require 'date'
 
 module Mocha
-
-  module ObjectMethods
-    def mocha_inspect
-      address = self.__id__ * 2
-      address += 0x100000000 if address < 0
-      inspect =~ /#</ ? "#<#{self.class}:0x#{'%x' % address}>" : inspect
+  module Inspect
+    module ObjectMethods
+      def mocha_inspect
+        address = __id__ * 2
+        address += 0x100000000 if address < 0
+        inspect =~ /#</ ? "#<#{self.class}:0x#{Kernel.format('%x', address)}>" : inspect
+      end
     end
-  end
 
-  module ArrayMethods
-    def mocha_inspect
-      "[#{collect { |member| member.mocha_inspect }.join(', ')}]"
+    module ArrayMethods
+      def mocha_inspect
+        "[#{collect(&:mocha_inspect).join(', ')}]"
+      end
     end
-  end
 
-  module HashMethods
-    def mocha_inspect
-      "{#{collect { |key, value| "#{key.mocha_inspect} => #{value.mocha_inspect}" }.join(', ')}}"
+    module HashMethods
+      def mocha_inspect
+        "{#{collect { |key, value| "#{key.mocha_inspect} => #{value.mocha_inspect}" }.join(', ')}}"
+      end
     end
-  end
 
-  module TimeMethods
-    def mocha_inspect
-      "#{inspect} (#{to_f} secs)"
+    module TimeMethods
+      def mocha_inspect
+        "#{inspect} (#{to_f} secs)"
+      end
     end
-  end
 
-  module DateMethods
-    def mocha_inspect
-      to_s
+    module DateMethods
+      def mocha_inspect
+        to_s
+      end
     end
   end
-
 end
 
 class Object
-  include Mocha::ObjectMethods
+  include Mocha::Inspect::ObjectMethods
 end
 
 class Array
-  include Mocha::ArrayMethods
+  include Mocha::Inspect::ArrayMethods
 end
 
 class Hash
-  include Mocha::HashMethods
+  include Mocha::Inspect::HashMethods
 end
 
 class Time
-  include Mocha::TimeMethods
+  include Mocha::Inspect::TimeMethods
 end
 
 class Date
-  include Mocha::DateMethods
+  include Mocha::Inspect::DateMethods
 end

data/lib/mocha/instance_method.rb

@@ -1,8 +1,23 @@
-require 'mocha/class_method'
+require 'mocha/stubbed_method'
 
 module Mocha
+  class InstanceMethod < StubbedMethod
+    private
 
-  class InstanceMethod < ClassMethod
-  end
+    def mock_owner
+      stubbee
+    end
+
+    def method_body(method)
+      PRE_RUBY_V19 ? proc { |*args, &block| method.call(*args, &block) } : method
+    end
 
+    def stubbee_method(method_name)
+      stubbee._method(method_name)
+    end
+
+    def original_method_owner
+      stubbee.singleton_class
+    end
+  end
 end

data/lib/mocha/integration.rb

@@ -1,14 +1,11 @@
-require 'mocha/deprecation'
 require 'mocha/integration/test_unit'
 require 'mocha/integration/mini_test'
 
 module Mocha
   module Integration
     def self.activate
-      if [Integration::TestUnit, Integration::MiniTest].map(&:activate).none?
-        Deprecation.warning("Test::Unit or MiniTest must be loaded *before* `require 'mocha/setup'`.")
-        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/setup'`.")
-      end
+      return unless [Integration::TestUnit, Integration::MiniTest].map(&:activate).none?
+      raise "Test::Unit or Minitest must be loaded *before* `require 'mocha/setup'`."
     end
   end
 end

data/lib/mocha/integration/mini_test.rb

@@ -14,6 +14,8 @@ require 'mocha/integration/mini_test/version_2110_to_2111'
 require 'mocha/integration/mini_test/version_2112_to_320'
 require 'mocha/integration/mini_test/adapter'
 
+require 'mocha/deprecation'
+
 module Mocha
   module Integration
     module MiniTest
@@ -39,6 +41,11 @@ module Mocha
 
         target = Detection::MiniTest.testcase
         unless target < integration_module
+          unless integration_module == MiniTest::Adapter
+            Deprecation.warning(
+              'Versions of minitest earlier than v3.3.0 will not be supported in future versions of Mocha.'
+            )
+          end
           Debug.puts "Applying #{integration_module.description}"
           target.send(:include, integration_module)
         end

data/lib/mocha/integration/mini_test/adapter.rb

@@ -5,7 +5,6 @@ require 'mocha/expectation_error_factory'
 module Mocha
   module Integration
     module MiniTest
-
       # Integrates Mocha into recent versions of MiniTest.
       #
       # See the source code for an example of how to integrate Mocha into a test library.
@@ -19,11 +18,11 @@ module Mocha
 
         # @private
         def self.description
-          "adapter for MiniTest gem >= v3.3.0"
+          'adapter for MiniTest gem >= v3.3.0'
         end
 
         # @private
-        def self.included(mod)
+        def self.included(_mod)
           Mocha::ExpectationErrorFactory.exception_class = ::MiniTest::Assertion
         end
 
@@ -51,4 +50,3 @@ module Mocha
     end
   end
 end
-

data/lib/mocha/integration/mini_test/exception_translation.rb

@@ -4,7 +4,7 @@ module Mocha
   module Integration
     module MiniTest
       def self.translate(exception)
-        return exception unless exception.kind_of?(::Mocha::ExpectationError)
+        return exception unless exception.is_a?(::Mocha::ExpectationError)
         translated_exception = ::MiniTest::Assertion.new(exception.message)
         translated_exception.set_backtrace(exception.backtrace)
         translated_exception

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

@@ -2,16 +2,16 @@ module Mocha
   module Integration
     module MiniTest
       module Nothing
-        def self.applicable_to?(test_unit_version, ruby_version = nil)
+        def self.applicable_to?(_test_unit_version, _ruby_version = nil)
           true
         end
 
         def self.description
-          "nothing (no MiniTest integration available)"
+          'nothing (no MiniTest integration available)'
         end
 
-        def self.included(mod)
-          raise "No MiniTest integration available"
+        def self.included(_mod)
+          raise 'No MiniTest integration available'
         end
       end
     end

data/lib/mocha/integration/mini_test/version_13.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v1.3"
+          'monkey patch for MiniTest gem v1.3'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             assertion_counter = AssertionCounter.new(self)
             result = '.'
@@ -45,6 +46,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_140.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v1.4.0"
+          'monkey patch for MiniTest gem v1.4.0'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             assertion_counter = AssertionCounter.new(self)
             result = '.'
@@ -45,6 +46,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_141.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v1.4.1"
+          'monkey patch for MiniTest gem v1.4.1'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               warn '%s#%s %.2fs' % [self.class, self.__name__,
@@ -56,6 +57,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_142_to_172.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v1.4.2 and <= v1.7.2"
+          'monkey patch for MiniTest gem >= v1.4.2 and <= v1.7.2'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               warn '%s#%s %.2fs' % [self.class, self.__name__,
@@ -56,6 +57,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_200.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem v2.0.0"
+          'monkey patch for MiniTest gem v2.0.0'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = Time.now - runner.start_time
@@ -57,6 +58,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_201_to_222.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.0.1 <= v2.2.2"
+          'monkey patch for MiniTest gem >= v2.0.1 <= v2.2.2'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = runner.start_time ? Time.now - runner.start_time : 0
@@ -57,6 +58,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_2110_to_2111.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.11.0 <= v2.11.1"
+          'monkey patch for MiniTest gem >= v2.11.0 <= v2.11.1'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = runner.start_time ? Time.now - runner.start_time : 0
@@ -61,6 +62,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_2112_to_320.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.11.2 <= v3.2.0"
+          'monkey patch for MiniTest gem >= v2.11.2 <= v3.2.0'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap "INFO" do
               runner.report.each_with_index do |msg, i|
@@ -64,6 +65,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/mini_test/version_230_to_2101.rb

@@ -11,7 +11,7 @@ module Mocha
         end
 
         def self.description
-          "monkey patch for MiniTest gem >= v2.3.0 <= v2.10.1"
+          'monkey patch for MiniTest gem >= v2.3.0 <= v2.10.1'
         end
 
         def self.included(mod)
@@ -19,6 +19,7 @@ module Mocha
         end
 
         module RunMethodPatch
+          # rubocop:disable all
           def run runner
             trap 'INFO' do
               time = runner.start_time ? Time.now - runner.start_time : 0
@@ -59,6 +60,7 @@ module Mocha
             end
             result
           end
+          # rubocop:enable all
         end
       end
     end

data/lib/mocha/integration/monkey_patcher.rb

@@ -11,14 +11,12 @@ module Mocha
         end
         if mod.method_defined?(:run_before_mocha)
           Debug.puts "#{mod}#run_before_mocha method already defined"
+        elsif mod.method_defined?(:run)
+          mod.send(:alias_method, :run_before_mocha, :run)
+          mod.send(:remove_method, :run)
+          mod.send(:include, run_method_patch)
         else
-          if mod.method_defined?(:run)
-            mod.send(:alias_method, :run_before_mocha, :run)
-            mod.send(:remove_method, :run)
-            mod.send(:include, run_method_patch)
-          else
-            raise "Unable to monkey-patch #{mod}, because it does not define a `#run` method"
-          end
+          raise "Unable to monkey-patch #{mod}, because it does not define a `#run` method"
         end
       end
     end