Merge pull request #392 from rspec/update-travis-build-scripts-2019-12-26-for-master

Ruby 2.7 support

Author: JonRowe

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # In order to install old Rubies, we need to use old Ubuntu distibution.
@@ -22,9 +22,10 @@ rvm:
   - 2.1
   - 2.2.10
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
   - ruby-head
   - ree
   - rbx-3

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 version: "{build}"

lib/rspec/support/encoded_string.rb

@@ -112,11 +112,40 @@ def matching_encoding(string)
           string = remove_invalid_bytes(string)
           string.encode(@encoding)
         rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-          string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
+          encode_unconvertable_bytes(string)
         rescue Encoding::ConverterNotFoundError
-          string.dup.force_encoding(@encoding).encode(ENCODE_NO_CONVERTER)
+          encode_no_converter(string.dup.force_encoding(@encoding))
         end
 
+        private
+
+        # On Ruby 2.7.0 keyword arguments mixed with conventional cause a warning to
+        # be issued requiring us to be explicit by using a ** to pass the hash as
+        # keyword arguments. Any keyword argument supporting Ruby supports this.
+        if RubyFeatures.kw_args_supported?
+          # Note on non keyword supporting Ruby ** causes a syntax error hence
+          # we must use eval. To be removed in RSpec 4.
+          binding.eval(<<-CODE, __FILE__, __LINE__)
+          def encode_unconvertable_bytes(string)
+            string.encode(@encoding, **ENCODE_UNCONVERTABLE_BYTES)
+          end
+
+          def encode_no_converter(string)
+            string.encode(**ENCODE_NO_CONVERTER)
+          end
+          CODE
+        else
+          def encode_unconvertable_bytes(string)
+            string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
+          end
+
+          def encode_no_converter(string)
+            string.encode(ENCODE_NO_CONVERTER)
+          end
+        end
+
+        public
+
         # Prevents raising ArgumentError
         if String.method_defined?(:scrub)
           # https://github.com/ruby/ruby/blob/eeb05e8c11/doc/NEWS-2.1.0#L120-L123

lib/rspec/support/ruby_features.rb

@@ -90,6 +90,15 @@ def supports_exception_cause?
         end
       end
 
+      if RUBY_VERSION.to_f >= 2.7
+        def supports_taint?
+          false
+        end
+      else
+        def supports_taint?
+          true
+        end
+      end
       ripper_requirements = [ComparableVersion.new(RUBY_VERSION) >= '1.9.2']
 
       ripper_requirements.push(false) if Ruby.rbx?

lib/rspec/support/spec/stderr_splitter.rb

@@ -38,6 +38,10 @@ def to_io
       def write(line)
         return if line =~ %r{^\S+/gems/\S+:\d+: warning:} # http://rubular.com/r/kqeUIZOfPG
 
+        # Ruby 2.7.0 complains about hashes used in place of keyword arguments
+        # Aruba 0.14.2 uses this internally triggering that here
+        return if line =~ %r{lib/ruby/2\.7\.0/fileutils\.rb:622: warning:}
+
         @orig_stderr.write(line)
         @output_tracker.write(line)
       end

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/travis_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from:

script/update_rubygems_and_install_bundler

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
+# This file was generated on 2019-12-26T17:20:33+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

spec/rspec/support/ruby_features_spec.rb

@@ -95,6 +95,10 @@ module Support
         RubyFeatures.supports_rebinding_module_methods?
       end
 
+      specify "#supports_taint?" do
+        RubyFeatures.supports_taint?
+      end
+
       specify "#caller_locations_supported? exists" do
         RubyFeatures.caller_locations_supported?
         if Ruby.mri?