mocha 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c4c3e82b675148ae87d3cb16bd97816bc04b04b3
-  data.tar.gz: 888491a9247d93053283fbfa0b7a59d073beb760
+SHA256:
+  metadata.gz: 6a4829127b1767afd658a5e520e345b8ec4fcef1dd34c3ca5fb719aea017d1a4
+  data.tar.gz: 2d37035d149af5d3bc3cfed12879ec4656cec21dd7145041be83df95ca86e694
 SHA512:
-  metadata.gz: dc6cbdc1710ee63e7d627fa2b73e62fc6a175d743a9d57c81d314a7c86d167ba4b719d7f5345438eb3b10d159b8b6a9e2a4126592919a7d057bf38e5118b9a62
-  data.tar.gz: 3745c02ad5e63009a05279b610a96fcfecb79b42b789c617d609ef38aaa30e54a3941e040c650a26e0179353dcd7ef6b48dc5401a1ea69a77a31585a0eac0c40
+  metadata.gz: 01b91e4eae791aea7ad59d9170ad532ce610f2abd038594347e125f29e8e25614f0036a90690b15a3ffbf7ef603ca379f07507238f3820e315b9cec72bd3a730
+  data.tar.gz: 7cc96b39e8d553c69afcf4fc9186b2c2fbe38006f4bd0cee621e00eae81ed8621a3aac2f2e2b977ab36d8fd328b7297957d861bba2ad2a02f27113a2539c5472

data/.rubocop.yml

@@ -0,0 +1,58 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.2 # closest to required_ruby_version of '>= 1.8.6'
+
+# Even the reference in the documentation suggests that you should prefer
+# `alias_method` vs `alias`, so I don't understand why that isn't the default.
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+# Enumerable#each_with_object only available since Ruby v1.9
+Style/EachWithObject:
+  Enabled: false
+
+# Kernel#__dir__ has only been available since Ruby v2.0
+Style/ExpandPathArguments:
+  Enabled: false
+
+# Kernel#format has only supported named references since Ruby v1.9
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
+# ruby19 style has only been supported since Ruby v1.9
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+# I'm not keen on this cop, because it's easy to miss the conditional
+# I think the results are particularly unhelpful when Metrics/LineLength is big
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Lambda literal syntax has only been supported since Ruby v2.0
+Style/Lambda:
+  EnforcedStyle: lambda
+
+# Symbol array literal syntax has only been supported since Ruby v2.0
+Style/SymbolArray:
+  Enabled: false
+
+# I'm not keen on this cop, because it's easy to miss the while/until
+Style/WhileUntilModifier:
+  Enabled: false
+
+# This recently introduced cop seems to have stirred up some controversy
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+# Enabling this cop results in an "Infinite loop detected" exception
+Layout/AccessModifierIndentation:
+  Enabled: false
+
+# Allow long comment lines, e.g. YARD documentation
+Metrics/LineLength:
+  IgnoredPatterns: ['\A\s*#']
+
+# It's not possible to set TargetRubyVersion to Ruby < v2.2
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,50 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-07-26 12:42:35 +0100 using RuboCop version 0.58.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 53
+Metrics/AbcSize:
+  Max: 39
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 48
+
+# Offense count: 22
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 368
+
+# Offense count: 4
+Metrics/CyclomaticComplexity:
+  Max: 9
+
+# Offense count: 173
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 31
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 158
+
+# Offense count: 5
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 105
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 501
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 180

data/RELEASE.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.7.0
+
+* Update Ruby & JRuby versions in Travis CI config (9bf55631 & 3883af7e)
+* Simplify gemspec (63744f86)
+* Add rubocop and fix most cop violations (#341)
+* Use Kernel#warn for deprecations - thanks to @etiennebarrie (#333, 196970a)
+
 ## 1.6.0
 
 * Fix subtle bug in setting correct visibility of stubbed module methods on `Kernel` or `Object` - thanks to @chrisroos (#295)

data/Rakefile

@@ -1,17 +1,17 @@
-require "bundler"
+require 'bundler'
 Bundler::GemHelper.install_tasks
-require "bundler/setup"
+require 'bundler/setup'
 
 MOCHA_DOCS_HOST = ENV['MOCHA_DOCS_HOST'] || 'gofreerange.com'
 
 require 'rake/testtask'
 
-desc "Run all tests"
+desc 'Run all tests'
 task 'default' => ['test', 'test:performance']
 
-desc "Run tests"
+desc 'Run tests'
 task 'test' do
-  if test_library = ENV['MOCHA_RUN_INTEGRATION_TESTS']
+  if (test_library = ENV['MOCHA_RUN_INTEGRATION_TESTS'])
     Rake::Task["test:integration:#{test_library}"].invoke
   else
     Rake::Task['test:units'].invoke
@@ -20,13 +20,12 @@ task 'test' do
 end
 
 namespace 'test' do
-
   unit_tests = FileList['test/unit/**/*_test.rb']
   all_acceptance_tests = FileList['test/acceptance/*_test.rb']
   ruby186_incompatible_acceptance_tests = FileList['test/acceptance/stub_class_method_defined_on_*_test.rb'] + FileList['test/acceptance/stub_instance_method_defined_on_*_test.rb']
   ruby186_compatible_acceptance_tests = all_acceptance_tests - ruby186_incompatible_acceptance_tests
 
-  desc "Run unit tests"
+  desc 'Run unit tests'
   Rake::TestTask.new('units') do |t|
     t.libs << 'test'
     t.test_files = unit_tests
@@ -34,20 +33,20 @@ namespace 'test' do
     t.warning = true
   end
 
-  desc "Run acceptance tests"
+  desc 'Run acceptance tests'
   Rake::TestTask.new('acceptance') do |t|
     t.libs << 'test'
-    if defined?(RUBY_VERSION) && (RUBY_VERSION >= "1.8.7")
-      t.test_files = all_acceptance_tests
-    else
-      t.test_files = ruby186_compatible_acceptance_tests
-    end
+    t.test_files = if defined?(RUBY_VERSION) && (RUBY_VERSION >= '1.8.7')
+                     all_acceptance_tests
+                   else
+                     ruby186_compatible_acceptance_tests
+                   end
     t.verbose = true
     t.warning = true
   end
 
   namespace 'integration' do
-    desc "Run MiniTest integration tests (intended to be run in its own process)"
+    desc 'Run MiniTest integration tests (intended to be run in its own process)'
     Rake::TestTask.new('minitest') do |t|
       t.libs << 'test'
       t.test_files = FileList['test/integration/mini_test_test.rb']
@@ -55,7 +54,7 @@ namespace 'test' do
       t.warning = true
     end
 
-    desc "Run Test::Unit integration tests (intended to be run in its own process)"
+    desc 'Run Test::Unit integration tests (intended to be run in its own process)'
     Rake::TestTask.new('test-unit') do |t|
       t.libs << 'test'
       t.test_files = FileList['test/integration/test_unit_test.rb']
@@ -74,7 +73,7 @@ namespace 'test' do
   #   t.rcov_opts << '--xref'
   # end
 
-  desc "Run performance tests"
+  desc 'Run performance tests'
   task 'performance' do
     require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'stubba_example_test')
     require File.join(File.dirname(__FILE__), 'test', 'acceptance', 'mocha_example_test')
@@ -84,7 +83,15 @@ namespace 'test' do
       puts "#{test_case}: #{benchmark_test_case(test_case, iterations)} seconds."
     end
   end
+end
 
+begin
+  require 'rubocop/rake_task'
+  if RUBY_VERSION >= '2.2.0'
+    RuboCop::RakeTask.new
+    task 'test' => 'rubocop'
+  end
+rescue LoadError # rubocop:disable Lint/HandleExceptions
 end
 
 def benchmark_test_case(klass, iterations)
@@ -94,28 +101,28 @@ def benchmark_test_case(klass, iterations)
   if defined?(MiniTest)
     minitest_version = Gem::Version.new(Mocha::Detection::MiniTest.version)
     if Gem::Requirement.new('>= 5.0.0').satisfied_by?(minitest_version)
-      result = Benchmark.realtime { iterations.times { |i| klass.run(MiniTest::CompositeReporter.new) } }
+      result = Benchmark.realtime { iterations.times { |_i| klass.run(MiniTest::CompositeReporter.new) } }
       MiniTest::Runnable.runnables.delete(klass)
       result
     else
       MiniTest::Unit.output = StringIO.new
-      Benchmark.realtime { iterations.times { |i| MiniTest::Unit.new.run([klass]) } }
+      Benchmark.realtime { iterations.times { |_i| MiniTest::Unit.new.run([klass]) } }
     end
   else
     load 'test/unit/ui/console/testrunner.rb' unless defined?(Test::Unit::UI::Console::TestRunner)
-    unless $silent_option
+    unless @silent_option
       begin
         load 'test/unit/ui/console/outputlevel.rb' unless defined?(Test::Unit::UI::Console::OutputLevel::SILENT)
-        $silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
+        @silent_option = { :output_level => Test::Unit::UI::Console::OutputLevel::SILENT }
       rescue LoadError
-        $silent_option = Test::Unit::UI::SILENT
+        @silent_option = Test::Unit::UI::SILENT
       end
     end
-    Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, $silent_option) } }
+    Benchmark.realtime { iterations.times { Test::Unit::UI::Console::TestRunner.run(klass, @silent_option) } }
   end
 end
 
-if ENV["MOCHA_GENERATE_DOCS"]
+if ENV['MOCHA_GENERATE_DOCS']
   require 'yard'
 
   desc 'Remove generated documentation'
@@ -131,16 +138,16 @@ if ENV["MOCHA_GENERATE_DOCS"]
 
   desc 'Generate documentation'
   YARD::Rake::YardocTask.new('yardoc' => 'docs_environment') do |task|
-    task.options = ["--title", "Mocha #{Mocha::VERSION}"]
+    task.options = ['--title', "Mocha #{Mocha::VERSION}"]
   end
 
-  desc "Generate documentation"
-  task 'generate_docs' => ['clobber_yardoc', 'yardoc']
+  desc 'Generate documentation'
+  task 'generate_docs' => %w[clobber_yardoc yardoc]
 
   desc "Publish docs to #{MOCHA_DOCS_HOST}/docs/mocha"
   task 'publish_docs' => 'generate_docs' do
-    path = "/home/freerange/docs/mocha"
-    system %{ssh #{MOCHA_DOCS_HOST} "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* #{MOCHA_DOCS_HOST}:#{path}}
+    path = '/home/freerange/docs/mocha'
+    system %(ssh #{MOCHA_DOCS_HOST} "sudo rm -fr #{path} && mkdir -p #{path}" && scp -r doc/* #{MOCHA_DOCS_HOST}:#{path})
   end
 end
 

data/bin/build-matrix

@@ -5,23 +5,22 @@ require 'yaml'
 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
+    next if $CHILD_STATUS.success?
+    message = [
+      'Executing shell command failed.',
+      "  Command: #{command}",
+      "  Status:  #{$CHILD_STATUS.exitstatus}"
+    ].join("\n")
+    raise message
   end
 end
 
 def reset_bundle
   execute(
-    "rm -rf .bundle/gems",
-    "rm -rf gemfiles/.bundle/gems",
-    "rm -f *.lock",
-    "rm -f gemfiles/*.lock"
+    'rm -rf .bundle/gems',
+    'rm -rf gemfiles/.bundle/gems',
+    'rm -f *.lock',
+    'rm -f gemfiles/*.lock'
   )
 end
 
@@ -29,18 +28,18 @@ def with_rbenv(command)
   %{export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; #{command}}
 end
 
-def run(ruby_version, gemfile, task = "test")
-  ENV["RBENV_VERSION"] = ruby_version
-  ENV["BUNDLE_GEMFILE"] = gemfile
-  ENV["MOCHA_OPTIONS"] = "debug"
+def run(ruby_version, gemfile, task = 'test')
+  ENV['RBENV_VERSION'] = ruby_version
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  ENV['MOCHA_OPTIONS'] = 'debug'
   reset_bundle
   execute(
     with_rbenv("bundle install --gemfile=#{gemfile}"),
-    with_rbenv("bundle exec rake #{task}"),
+    with_rbenv("bundle exec rake #{task}")
   )
 end
 
-travis_config = YAML.load(File.read('.travis.yml'))
+travis_config = YAML.safe_load(File.read('.travis.yml'))
 build_configs = travis_config['matrix']['include']
 travis_config['rvm'].each do |ruby_version|
   travis_config['gemfile'].each do |gemfile|

data/lib/mocha/any_instance_method.rb

@@ -2,9 +2,7 @@ require 'mocha/ruby_version'
 require 'mocha/class_method'
 
 module Mocha
-
   class AnyInstanceMethod < ClassMethod
-
     def mock
       stubbee.any_instance.mocha
     end
@@ -14,21 +12,22 @@ module Mocha
     end
 
     def hide_original_method
-      if @original_visibility = method_visibility(method)
-        begin
-          if RUBY_V2_PLUS
-            @definition_target = PrependedModule.new
-            stubbee.__send__ :prepend, @definition_target
-          else
-            @original_method = stubbee.instance_method(method)
-            if @original_method && @original_method.owner == stubbee
-              stubbee.send(:remove_method, method)
-            end
+      return unless (@original_visibility = method_visibility(method))
+      begin
+        if RUBY_V2_PLUS
+          @definition_target = PrependedModule.new
+          stubbee.__send__ :prepend, @definition_target
+        else
+          @original_method = stubbee.instance_method(method)
+          if @original_method && @original_method.owner == stubbee
+            stubbee.send(:remove_method, method)
           end
-        rescue NameError
-          # deal with nasties like ActiveRecord::Associations::AssociationProxy
         end
+      # rubocop:disable Lint/HandleExceptions
+      rescue NameError
+        # deal with nasties like ActiveRecord::Associations::AssociationProxy
       end
+      # rubocop:enable Lint/HandleExceptions
     end
 
     def define_new_method
@@ -37,9 +36,8 @@ module Mocha
           self.class.any_instance.mocha.method_missing(:#{method}, *args, &block)
         end
       CODE
-      if @original_visibility
-        Module.instance_method(@original_visibility).bind(definition_target).call(method)
-      end
+      return unless @original_visibility
+      Module.instance_method(@original_visibility).bind(definition_target).call(method)
     end
 
     def remove_new_method
@@ -47,12 +45,10 @@ module Mocha
     end
 
     def restore_original_method
-      unless RUBY_V2_PLUS
-        if @original_method && @original_method.owner == stubbee
-          stubbee.send(:define_method, method, @original_method)
-          Module.instance_method(@original_visibility).bind(stubbee).call(method)
-        end
-      end
+      return if RUBY_V2_PLUS
+      return unless @original_method && @original_method.owner == stubbee
+      stubbee.send(:define_method, method, @original_method)
+      Module.instance_method(@original_visibility).bind(stubbee).call(method)
     end
 
     def method_visibility(method)
@@ -66,7 +62,5 @@ module Mocha
     def definition_target
       @definition_target ||= stubbee
     end
-
   end
-
 end

data/lib/mocha/api.rb

@@ -7,15 +7,13 @@ require 'mocha/module_methods'
 require 'mocha/class_methods'
 
 module Mocha
-
   # Methods added to +Test::Unit::TestCase+, +MiniTest::Unit::TestCase+ or equivalent.
   module API
-
     include ParameterMatchers
     include Hooks
 
     # @private
-    def self.included(mod)
+    def self.included(_mod)
       Object.send(:include, Mocha::ObjectMethods)
       Module.send(:include, Mocha::ModuleMethods)
       Class.send(:include, Mocha::ClassMethods)
@@ -176,7 +174,5 @@ module Mocha
     def states(name)
       Mockery.instance.new_state_machine(name)
     end
-
   end
-
 end