mocha 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d35f56fc0395b34a514c91a44a914ac782a500a4426db9e7c00aea8ae66c96
-  data.tar.gz: 2be9168ce81c71de23b3ba15593184274098938bdad1108226231c3a70fdb172
+  metadata.gz: 12216e23b807fb2f1fd151d8f68ddd8fbbad2927a444cc563b192fe560ba0433
+  data.tar.gz: f5c3575c50f7a16d94fbb2c29b65de160c29cb3a84b460d84b0244a721028628
 SHA512:
-  metadata.gz: d2fe09345542097c73fdc4594ed43d6d737b5927dd29672b79e1d94fce9550ab580c38d0855524eb193eed9b7969078e6e2ad62f11a78156e48288d27b907c78
-  data.tar.gz: f17bfeb0fdc2ba83a65e69f515094c00da41b25de979b5bd75767b235fd9cc0e086673a7807d0b895474792a4760e81283b3bc0ba980e67899870f84c9dd638c
+  metadata.gz: e13297ea4d191863ddd889c7d64dccf0cd652734b46cbd1d04fec4c09c896923aba9fe09f15ce0c50982eb0ef22d892086ad5b8f661283f54ee9913d6c2cfa1e
+  data.tar.gz: ef2a1fafc1af00f43033742ebf2aff3870495bac17e0347607606026d3fa5e9cce961921371601cc0752e11501a7fbbf083d65a1743a318b873d7e2455fb4d2c

data/RELEASE.md

@@ -1,5 +1,17 @@
 # Release Notes
 
+## 3.1.0
+
+### External changes
+
+* Format warnings consistently and include source location (#794)
+
+### Internal changes
+
+* Fix `Style/OneClassPerFile` violations (#796)
+* Remove `mise.toml` which was added accidentally (6c5f84db)
+* Add `.ruby-version` to `.gitignore` (8516ccc1)
+
 ## 3.0.2
 
 ### External changes

data/lib/mocha/backtrace_filter.rb

@@ -9,7 +9,17 @@ module Mocha
     end
 
     def filtered(backtrace)
-      backtrace.reject { |location| File.expand_path(location).start_with?(@lib_directory) }
+      backtrace.reject { |line| exclude?(line) }
+    end
+
+    def filtered_locations(locations)
+      locations.reject { |location| exclude?(location.path) }
+    end
+
+    private
+
+    def exclude?(path)
+      File.expand_path(path).start_with?(@lib_directory)
     end
   end
 end

data/lib/mocha/deprecation.rb

@@ -1,26 +1,12 @@
 # frozen_string_literal: true
 
-require 'mocha/backtrace_filter'
+require 'mocha/logger'
 
 module Mocha
   class Deprecation
-    class Logger
-      def call(message)
-        filter = BacktraceFilter.new
-        location = filter.filtered(caller)[0]
-        warn "Mocha deprecation warning at #{location}: #{message}"
-      end
-    end
-
     class << self
-      attr_writer :logger
-
       def warning(message)
-        logger.call(message)
-      end
-
-      def logger
-        @logger ||= Logger.new
+        Logger.warning(message, category: :deprecation)
       end
     end
   end

data/lib/mocha/expectation.rb

@@ -646,10 +646,10 @@ module Mocha
     end
 
     # @private
-    attr_reader :backtrace
+    attr_reader :backtrace_locations
 
     # @private
-    def initialize(mock, expected_method_name, backtrace = nil)
+    def initialize(mock, expected_method_name, backtrace_locations = nil)
       @mock = mock
       @method_matcher = MethodMatcher.new(expected_method_name.to_sym)
       @parameters_matcher = ParametersMatcher.new
@@ -659,7 +659,7 @@ module Mocha
       @cardinality = Cardinality.new.exactly(1)
       @return_values = ReturnValues.new
       @yield_parameters = YieldParameters.new
-      @backtrace = backtrace || caller
+      @backtrace_locations = backtrace_locations || caller_locations
     end
 
     # @private
@@ -760,10 +760,16 @@ module Mocha
       strings.join
     end
 
+    # @private
+    def backtrace
+      backtrace_locations.map(&:to_s)
+    end
+
     # @private
     def definition_location
       filter = BacktraceFilter.new
-      filter.filtered(backtrace)[0]
+      location = filter.filtered_locations(backtrace_locations)[0]
+      "#{location.path}:#{location.lineno}"
     end
   end
 end

data/lib/mocha/inspect.rb

@@ -52,22 +52,12 @@ module Mocha
   end
 end
 
-class Object
-  include Mocha::Inspect::ObjectMethods
-end
+Object.include(Mocha::Inspect::ObjectMethods)
 
-class Array
-  include Mocha::Inspect::ArrayMethods
-end
+Array.include(Mocha::Inspect::ArrayMethods)
 
-class Hash
-  include Mocha::Inspect::HashMethods
-end
+Hash.include(Mocha::Inspect::HashMethods)
 
-class Time
-  include Mocha::Inspect::TimeMethods
-end
+Time.include(Mocha::Inspect::TimeMethods)
 
-class Date
-  include Mocha::Inspect::DateMethods
-end
+Date.include(Mocha::Inspect::DateMethods)

data/lib/mocha/logger.rb

@@ -1,13 +1,26 @@
 # frozen_string_literal: true
 
+require 'mocha/backtrace_filter'
+
 module Mocha
   class Logger
-    def initialize(io)
-      @io = io
+    class << self
+      attr_writer :logger
+
+      def warning(*args, **kwargs)
+        logger.warning(*args, **kwargs)
+      end
+
+      def logger
+        @logger ||= new
+      end
     end
 
-    def warn(message)
-      @io.puts "WARNING: #{message}"
+    def warning(message, category: nil)
+      filter = BacktraceFilter.new
+      location = filter.filtered_locations(caller_locations)[0]
+      prefix = ['Mocha', category, 'warning'].compact.join(' ')
+      warn("#{prefix}: #{message} (at #{location.path}:#{location.lineno})")
     end
   end
 end

data/lib/mocha/mockery.rb

@@ -49,7 +49,6 @@ module Mocha
       def setup(assertion_counter)
         @instances ||= []
         mockery = new(assertion_counter)
-        mockery.logger = instance.logger unless @instances.empty?
         @instances.push(mockery)
       end
 
@@ -149,12 +148,6 @@ module Mocha
       check(:stubbing_method_on_non_mock_object, 'method on non-mock object', signature_proc)
     end
 
-    attr_writer :logger
-
-    def logger
-      @logger ||= Logger.new($stderr)
-    end
-
     private
 
     def check(action, description, signature_proc, backtrace = caller)
@@ -165,7 +158,7 @@ module Mocha
       message = "stubbing #{description}: #{method_signature}"
       raise StubbingError.new(message, backtrace) if treatment == :prevent
 
-      logger.warn(message) if treatment == :warn
+      Logger.warning(message) if treatment == :warn
     end
 
     def expectations

data/lib/mocha/parameter_matchers/instance_methods.rb

@@ -23,6 +23,6 @@ module Mocha
 end
 
 # @private
-class Object
+class Object # rubocop:disable Style/OneClassPerFile
   include Mocha::ParameterMatchers::InstanceMethods
 end

data/lib/mocha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mocha
-  VERSION = '3.0.2'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - James Mead
@@ -132,7 +132,6 @@ files:
 - lib/mocha/thrown_object.rb
 - lib/mocha/version.rb
 - lib/mocha/yield_parameters.rb
-- mise.toml
 - mocha.gemspec
 homepage: https://mocha.jamesmead.org
 licenses:

data/mise.toml

@@ -1,2 +0,0 @@
-[tools]
-ruby = "4.0.0"