mocha 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3182f55b0e553eb0559fee7df5f5fd71f824e219480715de2f35e7bfacb5d9b2
-  data.tar.gz: 485677b5a3628ccee3730274697f27defb4fc087cc838d7c4ec8dac4e3cd589d
+  metadata.gz: 77366bffa410729ac6089097db85ded323e74d1ec7bc6eb0ea13ae4a18b44eac
+  data.tar.gz: f9f3c89bbc29393e99ec62e0d1395ed4fa4863d0f790d24bbe6be3537450e4c1
 SHA512:
-  metadata.gz: 1f782e0791e221f18081e35a298a039b96afd7a06caf4177a3d117e3803ee2165d9cd5dd6c19edde9334fda7dea973c105a5c3fe7070810dd0e7229901df056f
-  data.tar.gz: 8adf5cf18b21d7039c7c8f10b4c7a49ba4a215d9351cdd89a04d7a4371eda9863727b08e5bdbb240d92dd6cc93555306b13501370ecdadd4b6a74368213851c5
+  metadata.gz: 91e277be3c868ef2f6655016a53f040835b8e9d6390c789b6f047be72e9b96726865eefcb161b86d0f8e89ead1c58e9adbf1a1cbcdf9cba8a0f0b536de86222d
+  data.tar.gz: 4b7bf751e350762a5a3d9cd17fbe1a590ff5122a718417b75304fa86f8323b20652a24584cedabd859395aeef004402e57c70c15cd88746032659b0d9df4cccf

data/CONTRIBUTING.md

@@ -3,5 +3,5 @@
 * Make your changes in a branch.
 * Add/modify/remove tests as appropriate.
 * Open a pull request based on a branch on your fork.
-* Wait for your pull request build to pass on [Travis CI](https://travis-ci.com/github/freerange/mocha/pull_requests).
+* Wait for your pull request build to pass on [Circle CI](https://app.circleci.com/pipelines/github/freerange/mocha).
 * Pull requests with failing tests will not be accepted.

data/README.md

@@ -1,4 +1,4 @@
-## Mocha [![Build Status](https://travis-ci.com/freerange/mocha.svg?branch=main)](https://travis-ci.com/github/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha) [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=mocha&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=mocha&package-manager=bundler&version-scheme=semver)
+## Mocha [![CircleCI status of freerange/mocha](https://circleci.com/gh/freerange/mocha.svg?style=shield&circle-token=bc1f6576c77da43ec58badde9273fa4eb1d7f53a)](https://app.circleci.com/pipelines/github/freerange/mocha) [![Gem Version](https://badge.fury.io/rb/mocha.svg)](http://badge.fury.io/rb/mocha) [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=mocha&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=mocha&package-manager=bundler&version-scheme=semver)
 
 ### Description
 
@@ -323,7 +323,7 @@ See this [list of contributors](https://github.com/freerange/mocha/graphs/contri
 * Update the RELEASE.md file with a summary of changes
 * Bump the version in `lib/mocha/version.rb`
 * Commit & push to GitHub
-* Check Travis CI build is passing - https://travis-ci.com/github/freerange/mocha
+* Check CircleCI build is passing - https://app.circleci.com/pipelines/github/freerange/mocha
 
 * Sign in to Google Analytics - https://analytics.google.com/analytics/web/
 * Find the web property ID for floehopper (625523) > Mocha Documentation (UA-625523-7)

data/RELEASE.md

@@ -1,5 +1,29 @@
 # Release Notes
 
+## 1.13.0
+
+### External changes
+
+* Add `ParameterMatchers#has_keys` - thanks to @cstyles for #512 (18d8104)
+* Fix misleading exception message in `ParameterMatchers#has_entry` - thanks to @cstyles for #513 (9c4ef13)
+* Only add dependency on rubocop if we're actually going to use it (f2f879f)
+* Fix rake dependency constraints for older Ruby versions (7ce5f29)
+
+### Internal changes
+
+* Check documentation can be generated as part of CircleCI build (b30d9a9)
+* Add --fail-on-warning option to yard rake task (53a6ee3)
+* Add a weekly scheduled build to the CircleCI build (fd2a4c6)
+* Add Ruby v1.8 to the CircleCI build matrix (818ca03)
+* Add API token to fix CircleCI badge in README (607c5aa)
+* Provide wrapped option for #mocha_inspect on hashes & arrays (d8f44bc)
+* Use CircleCI instead of TravisCI for automated builds (c98c6ec)
+* Switch to newer default Travis CI build env (c78f75c)
+* Use latest Ruby versions in Travis CI builds (9e0043a)
+* Use latest JRuby v9.2.18 in Travis CI builds (8c99a1b)
+* Use consistent JRuby versions in Travis CI builds (0f849aa)
+* Use more recent version of JRuby in Travis CI build matrix (58653db)
+
 ## 1.12.0
 
 ### External changes

data/Rakefile

@@ -138,7 +138,7 @@ 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}", '--fail-on-warning']
   end
 
   task 'checkout_docs_cname' do

data/lib/mocha/inspect.rb

@@ -11,14 +11,16 @@ module Mocha
     end
 
     module ArrayMethods
-      def mocha_inspect
-        "[#{collect(&:mocha_inspect).join(', ')}]"
+      def mocha_inspect(wrapped = true)
+        unwrapped = collect(&:mocha_inspect).join(', ')
+        wrapped ? "[#{unwrapped}]" : unwrapped
       end
     end
 
     module HashMethods
-      def mocha_inspect
-        "{#{collect { |key, value| "#{key.mocha_inspect} => #{value.mocha_inspect}" }.join(', ')}}"
+      def mocha_inspect(wrapped = true)
+        unwrapped = collect { |key, value| "#{key.mocha_inspect} => #{value.mocha_inspect}" }.join(', ')
+        wrapped ? "{#{unwrapped}}" : unwrapped
       end
     end
 

data/lib/mocha/parameter_matchers.rb

@@ -13,6 +13,7 @@ require 'mocha/parameter_matchers/equals'
 require 'mocha/parameter_matchers/has_entry'
 require 'mocha/parameter_matchers/has_entries'
 require 'mocha/parameter_matchers/has_key'
+require 'mocha/parameter_matchers/has_keys'
 require 'mocha/parameter_matchers/has_value'
 require 'mocha/parameter_matchers/includes'
 require 'mocha/parameter_matchers/instance_of'

data/lib/mocha/parameter_matchers/has_entry.rb

@@ -42,20 +42,10 @@ module Mocha
     #
     def has_entry(*options) # rubocop:disable Naming/PredicateName
       case options.length
+      when 0
+        raise ArgumentError, 'No arguments. Expecting at least one.'
       when 1
-        case options[0]
-        when Hash
-          case options[0].length
-          when 0
-            raise ArgumentError, 'Argument has no entries.'
-          when 1
-            key, value = options[0].first
-          else
-            raise ArgumentError, 'Argument has multiple entries. Use Mocha::ParameterMatchers#has_entries instead.'
-          end
-        else
-          raise ArgumentError, 'Argument is not a Hash.'
-        end
+        key, value = parse_option(options[0])
       when 2
         key, value = options
       else
@@ -85,5 +75,24 @@ module Mocha
         "has_entry(#{@key.mocha_inspect} => #{@value.mocha_inspect})"
       end
     end
+
+    private
+
+    # @private
+    def parse_option(option)
+      case option
+      when Hash
+        case option.length
+        when 0
+          raise ArgumentError, 'Argument has no entries.'
+        when 1
+          option.first
+        else
+          raise ArgumentError, 'Argument has multiple entries. Use Mocha::ParameterMatchers#has_entries instead.'
+        end
+      else
+        raise ArgumentError, 'Argument is not a Hash.'
+      end
+    end
   end
 end

data/lib/mocha/parameter_matchers/has_keys.rb

@@ -0,0 +1,53 @@
+require 'mocha/parameter_matchers/base'
+
+module Mocha
+  module ParameterMatchers
+    # Matches +Hash+ containing +keys+.
+    #
+    # @param [*Array<Object>] keys expected keys.
+    # @return [HasKeys] parameter matcher.
+    #
+    # @see Expectation#with
+    #
+    # @example Actual parameter contains entry with expected keys.
+    #   object = mock()
+    #   object.expects(:method_1).with(has_keys(:key_1, :key_2))
+    #   object.method_1(:key_1 => 1, :key_2 => 2, :key_3 => 3)
+    #   # no error raised
+    #
+    # @example Actual parameter does not contain all expected keys.
+    #   object = mock()
+    #   object.expects(:method_1).with(has_keys(:key_1, :key_2))
+    #   object.method_1(:key_2 => 2)
+    #   # error raised, because method_1 was not called with Hash containing key: :key_1
+    #
+    def has_keys(*keys) # rubocop:disable Naming/PredicateName
+      HasKeys.new(*keys)
+    end
+
+    # Parameter matcher which matches when actual parameter contains +Hash+ with all expected keys.
+    class HasKeys < Base
+      # @private
+      def initialize(*keys)
+        raise ArgumentError, 'No arguments. Expecting at least one.' if keys.empty?
+
+        @keys = keys
+      end
+
+      # @private
+      def matches?(available_parameters)
+        parameter = available_parameters.shift
+        return false unless parameter.respond_to?(:keys)
+
+        @keys.map(&:to_matcher).all? do |matcher|
+          parameter.keys.any? { |key| matcher.matches?([key]) }
+        end
+      end
+
+      # @private
+      def mocha_inspect
+        "has_keys(#{@keys.mocha_inspect(false)})"
+      end
+    end
+  end
+end

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = '1.12.0'.freeze
+  VERSION = '1.13.0'.freeze
 end

data/mocha.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
   s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(docs|test)/}) }
   end
-  s.files.delete('.travis.yml')
+  s.files.delete('.circleci/config.yml')
   s.files.delete('.gitignore')
 
   s.homepage = 'https://mocha.jamesmead.org'
@@ -30,18 +30,22 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
     end
   end
 
-  if RUBY_VERSION >= '1.9.3'
-    s.add_development_dependency('rake')
+  if RUBY_VERSION < '1.9.3'
+    s.add_development_dependency 'rake', '~> 10.0'
+  elsif RUBY_VERSION < '2'
+    s.add_development_dependency 'rake', '~> 12.2.1'
+  elsif RUBY_VERSION < '2.2'
+    s.add_development_dependency 'rake', '~> 12.3.3'
   else
-    # Rake >= v11 does not support Ruby < v1.9.3 so use
-    s.add_development_dependency('rake', '~> 10.0')
+    s.add_development_dependency 'rake'
   end
+
   s.add_development_dependency('introspection', '~> 0.0.1')
   if RUBY_VERSION >= '2.2.0'
     # No test libraries in standard library
     s.add_development_dependency('minitest')
   end
-  if RUBY_VERSION >= '1.9.2'
+  if RUBY_VERSION >= '2.2.0'
     s.add_development_dependency('rubocop', '<= 0.58.2')
   end
   if ENV['MOCHA_GENERATE_DOCS']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mocha
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - James Mead
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,21 +85,7 @@ files:
 - README.md
 - RELEASE.md
 - Rakefile
-- bin/build-matrix
-- gemfiles/Gemfile.minitest.1.3.0
-- gemfiles/Gemfile.minitest.1.4.0
-- gemfiles/Gemfile.minitest.1.4.1
-- gemfiles/Gemfile.minitest.1.4.2
-- gemfiles/Gemfile.minitest.2.0.0
-- gemfiles/Gemfile.minitest.2.0.1
-- gemfiles/Gemfile.minitest.2.11.0
-- gemfiles/Gemfile.minitest.2.11.2
-- gemfiles/Gemfile.minitest.2.3.0
-- gemfiles/Gemfile.minitest.5.11.3
 - gemfiles/Gemfile.minitest.latest
-- gemfiles/Gemfile.test-unit.2.0.0
-- gemfiles/Gemfile.test-unit.2.0.1
-- gemfiles/Gemfile.test-unit.2.0.3
 - gemfiles/Gemfile.test-unit.latest
 - init.rb
 - lib/mocha.rb
@@ -174,6 +160,7 @@ files:
 - lib/mocha/parameter_matchers/has_entries.rb
 - lib/mocha/parameter_matchers/has_entry.rb
 - lib/mocha/parameter_matchers/has_key.rb
+- lib/mocha/parameter_matchers/has_keys.rb
 - lib/mocha/parameter_matchers/has_value.rb
 - lib/mocha/parameter_matchers/includes.rb
 - lib/mocha/parameter_matchers/instance_methods.rb

data/bin/build-matrix

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'yaml'
-require 'set'
-require 'English'
-
-def execute(*commands)
-  commands.each do |command|
-    system(command)
-    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'
-  )
-end
-
-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'
-  reset_bundle
-  execute(
-    with_rbenv("bundle install --gemfile=#{gemfile}"),
-    with_rbenv("bundle exec rake #{task}")
-  )
-end
-
-AVAILABLE_RUBY_VERSIONS = `rbenv versions --bare`.split("\n")
-
-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|
-    travis_config['env'].each do |env|
-      build_configs << { 'rvm' => ruby_version, 'gemfile' => gemfile, 'env' => env }
-    end
-  end
-end
-
-missing_ruby_versions = Set.new
-
-build_configs.each do |config|
-  ruby_version = config['rvm']
-  gemfile = config['gemfile']
-  environment_variables = Hash[*config['env'].split.flat_map { |e| e.split('=') }]
-  original_environment_variables = {}
-  begin
-    environment_variables.each do |k, v|
-      original_environment_variables[k] = ENV[k]
-      ENV[k] = v
-    end
-    if AVAILABLE_RUBY_VERSIONS.include?(ruby_version)
-      puts
-      puts "Ruby v#{ruby_version}; Gemfile path: #{gemfile}; Environment: #{environment_variables}"
-      run(ruby_version, gemfile)
-    else
-      missing_ruby_versions << ruby_version
-    end
-  ensure
-    original_environment_variables.each do |k, v|
-      ENV[k] = v
-    end
-  end
-end
-
-puts "Missing Ruby versions: #{missing_ruby_versions.to_a.join(', ')}"

data/gemfiles/Gemfile.minitest.1.3.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.3.0"
-end

data/gemfiles/Gemfile.minitest.1.4.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.4.0"
-end

data/gemfiles/Gemfile.minitest.1.4.1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.4.1"
-end

data/gemfiles/Gemfile.minitest.1.4.2

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "1.4.2"
-end

data/gemfiles/Gemfile.minitest.2.0.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.0.0"
-end

data/gemfiles/Gemfile.minitest.2.0.1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.0.1"
-end

data/gemfiles/Gemfile.minitest.2.11.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.11.0"
-end

data/gemfiles/Gemfile.minitest.2.11.2

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.11.2"
-end

data/gemfiles/Gemfile.minitest.2.3.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "2.3.0"
-end

data/gemfiles/Gemfile.minitest.5.11.3

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "minitest", "5.11.3"
-end

data/gemfiles/Gemfile.test-unit.2.0.0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "test-unit", "2.0.0"
-end

data/gemfiles/Gemfile.test-unit.2.0.1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "test-unit", "2.0.1"
-end

data/gemfiles/Gemfile.test-unit.2.0.3

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path=>"../"
-
-group :development do
-  gem "test-unit", "2.0.3"
-end