[pull] master from ruby:master

spec/mspec/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem "rake", "~> 12.3"
+gem "rake"
 gem "rspec", "~> 3.0"

spec/mspec/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    rake (12.3.3)
+    rake (13.4.2)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -22,5 +22,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (~> 12.3)
+  rake
   rspec (~> 3.0)

spec/mspec/lib/mspec/matchers/base.rb

@@ -1,3 +1,5 @@
+require 'mspec/utils/deprecate'
+
 module MSpecMatchers
 end
 

spec/mspec/lib/mspec/matchers/be_an_instance_of.rb

@@ -21,6 +21,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_an_instance_of(expected)
+    MSpec.deprecate __method__, '.should.instance_of?'
     BeAnInstanceOfMatcher.new(expected)
   end
 end

spec/mspec/lib/mspec/matchers/be_ancestor_of.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_ancestor_of(expected)
+    MSpec.deprecate __method__, '.ancestors.should.include?'
     BeAncestorOfMatcher.new(expected)
   end
 end

spec/mspec/lib/mspec/matchers/be_empty.rb

@@ -15,6 +15,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_empty
+    MSpec.deprecate __method__, '.should.empty?'
     BeEmptyMatcher.new
   end
 end

spec/mspec/lib/mspec/matchers/be_false.rb

@@ -15,6 +15,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_false
+    MSpec.deprecate __method__, '.should == false'
     BeFalseMatcher.new
   end
 end

spec/mspec/lib/mspec/matchers/be_kind_of.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_kind_of(expected)
+    MSpec.deprecate __method__, '.should.is_a?'
     BeKindOfMatcher.new(expected)
   end
 end

spec/mspec/lib/mspec/matchers/be_nan.rb

@@ -15,6 +15,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_nan
+    MSpec.deprecate __method__, '.should.nan?'
     BeNaNMatcher.new
   end
 end

spec/mspec/lib/mspec/matchers/be_nil.rb

@@ -15,6 +15,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_nil
+    MSpec.deprecate __method__, '.should == nil'
     BeNilMatcher.new
   end
 end

spec/mspec/lib/mspec/matchers/be_true.rb

@@ -15,6 +15,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_true
+    MSpec.deprecate __method__, '.should == true'
     BeTrueMatcher.new
   end
 end

spec/mspec/lib/mspec/matchers/eql.rb

@@ -21,6 +21,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def eql(expected)
+    MSpec.deprecate __method__, '.should.eql?'
     EqlMatcher.new(expected)
   end
 end

spec/mspec/lib/mspec/matchers/equal.rb

@@ -21,6 +21,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def equal(expected)
+    MSpec.deprecate __method__, '.should.equal?'
     EqualMatcher.new(expected)
   end
 end

spec/mspec/lib/mspec/matchers/have_class_variable.rb

@@ -7,6 +7,7 @@ class HaveClassVariableMatcher < VariableMatcher
 
 module MSpecMatchers
   private def have_class_variable(variable)
+    MSpec.deprecate __method__, '.should.class_variable_defined?'
     HaveClassVariableMatcher.new(variable)
   end
 end

spec/mspec/lib/mspec/matchers/have_constant.rb

@@ -7,6 +7,7 @@ class HaveConstantMatcher < VariableMatcher
 
 module MSpecMatchers
   private def have_constant(variable)
+    MSpec.deprecate __method__, '.should.const_defined?'
     HaveConstantMatcher.new(variable)
   end
 end

spec/mspec/lib/mspec/matchers/have_instance_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_instance_method(method, include_super = true)
+    MSpec.deprecate __method__, '.should.method_defined?'
     HaveInstanceMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/have_instance_variable.rb

@@ -7,6 +7,7 @@ class HaveInstanceVariableMatcher < VariableMatcher
 
 module MSpecMatchers
   private def have_instance_variable(variable)
+    MSpec.deprecate __method__, '.should.instance_variable_defined?'
     HaveInstanceVariableMatcher.new(variable)
   end
 end

spec/mspec/lib/mspec/matchers/have_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_method(method, include_super = true)
+    MSpec.deprecate __method__, '.should.respond_to?'
     HaveMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/have_private_instance_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_private_instance_method(method, include_super = true)
+    MSpec.deprecate __method__, '.private_instance_methods(false).should.include?'
     HavePrivateInstanceMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/have_private_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_private_method(method, include_super = true)
+    MSpec.deprecate __method__, '.private_methods(false).should.include?'
     HavePrivateMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/have_protected_instance_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_protected_instance_method(method, include_super = true)
+    MSpec.deprecate __method__, '.protected_instance_methods(false).should.include?'
     HaveProtectedInstanceMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/have_public_instance_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_public_instance_method(method, include_super = true)
+    MSpec.deprecate __method__, '.public_instance_methods(false).should.include?'
     HavePublicInstanceMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/have_singleton_method.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def have_singleton_method(method, include_super = true)
+    MSpec.deprecate __method__, '.singleton_methods(false).should.include?'
     HaveSingletonMethodMatcher.new method, include_super
   end
 end

spec/mspec/lib/mspec/matchers/include.rb

@@ -26,6 +26,7 @@ def negative_failure_message
 # Cannot override #include at the toplevel in MRI
 module MSpecMatchers
   private def include(*expected)
+    MSpec.deprecate __method__, '.should.include?'
     IncludeMatcher.new(*expected)
   end
 end

spec/mspec/lib/mspec/matchers/infinity.rb

@@ -19,10 +19,12 @@ def negative_failure_message
 
 module MSpecMatchers
   private def be_positive_infinity
+    MSpec.deprecate __method__, '.should.infinite? == 1'
     InfinityMatcher.new(1)
   end
 
   private def be_negative_infinity
+    MSpec.deprecate __method__, '.should.infinite? == -1'
     InfinityMatcher.new(-1)
   end
 end

spec/mspec/lib/mspec/matchers/raise_error.rb

@@ -116,6 +116,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def raise_error(exception = Exception, message = nil, options = nil, &block)
+    MSpec.deprecate __method__, '.should.raise'
     RaiseErrorMatcher.new(exception, message, options, &block)
   end
 

spec/mspec/lib/mspec/matchers/respond_to.rb

@@ -19,6 +19,7 @@ def negative_failure_message
 
 module MSpecMatchers
   private def respond_to(expected)
+    MSpec.deprecate __method__, '.should.respond_to?'
     RespondToMatcher.new(expected)
   end
 end

spec/mspec/spec/fixtures/should.rb

@@ -40,7 +40,7 @@ def finish
 # Specs
 describe "MSpec expectation method #should" do
   it "accepts a matcher" do
-    :sym.should be_kind_of(Symbol)
+    0.4.should be_close(0.5, 0.2)
   end
 
   it "causes a failure to be recorded" do
@@ -59,7 +59,7 @@ def finish
 
 describe "MSpec expectation method #should_not" do
   it "accepts a matcher" do
-    "sym".should_not be_kind_of(Symbol)
+    0.1.should_not be_close(0.5, 0.2)
   end
 
   it "causes a failure to be recorded" do

spec/mspec/spec/matchers/raise_error_spec.rb

@@ -19,7 +19,7 @@ class UnexpectedException < Exception; end
     ensure_mspec_method(-> {}.method(:should))
 
     run = false
-    -> { raise ExpectedException }.should PublicMSpecMatchers.raise_error { |error|
+    -> { raise ExpectedException }.should.raise { |error|
       expect(error.class).to eq(ExpectedException)
       run = true
     }
@@ -30,7 +30,7 @@ class UnexpectedException < Exception; end
     ensure_mspec_method(-> {}.method(:should))
 
     run = false
-    -> { raise ExpectedException }.should PublicMSpecMatchers.raise_error do |error|
+    -> { raise ExpectedException }.should.raise do |error|
       expect(error.class).to eq(ExpectedException)
       run = true
     end

spec/mspec/spec/spec_helper.rb

@@ -62,9 +62,4 @@ def ensure_mspec_method(method)
   expect(file).to start_with(File.expand_path('../../lib/mspec', __FILE__ ))
 end
 
-PublicMSpecMatchers = Class.new {
-  include MSpecMatchers
-  public :raise_error
-}.new
-
 BACKTRACE_QUOTE = RUBY_VERSION >= "3.4" ? "'" : "`"