Merge pull request #2680 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-07-24T15:33:48+02: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-07-24T15:33:48+02: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-07-24T15:33:48+02: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/core/filter_manager.rb

@@ -113,7 +113,7 @@ def file_scoped_include?(ex_metadata, ids, locations)
 
     # @private
     class FilterRules
-      PROC_HEX_NUMBER = /0x[0-9a-f]+@/
+      PROC_HEX_NUMBER = /0x[0-9a-f]+@?/
       PROJECT_DIR = File.expand_path('.')
 
       attr_accessor :opposite

lib/rspec/core/option_parser.rb

@@ -22,9 +22,8 @@ def parse(source=nil)
       begin
         parser(options).parse!(args)
       rescue OptionParser::InvalidOption => e
-        failure = e.message
-        failure << " (defined in #{source})" if source
-        abort "#{failure}\n\nPlease use --help for a listing of valid options"
+        abort "#{e.message}#{" (defined in #{source})" if source}\n\n" \
+              "Please use --help for a listing of valid options"
       end
 
       options[:files_or_directories_to_run] = args

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-24T15:33:48+02: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-07-24T15:33:48+02: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-07-24T15:33:48+02: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 {
@@ -57,6 +57,18 @@ function is_mri_2plus {
   fi
 }
 
+function is_mri_27 {
+  if is_mri; then
+    if ruby -e "exit(RUBY_VERSION.to_f == 2.7)"; then
+      return 0
+    else
+      return 1
+    fi
+  else
+    return 1
+  fi
+}
+
 function is_ruby_23_plus {
   if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
     return 0
@@ -81,7 +93,11 @@ function additional_specs_available {
 function documentation_enforced {
   if [ -x ./bin/yard ]; then
     if is_mri_2plus; then
-      return 0
+      if is_mri_27; then
+        return 1
+      else
+        return 0
+      fi
     else
       return 1
     fi

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-24T15:33:48+02: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-07-24T15:33:48+02: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-07-24T15:33:48+02: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/core/formatters/html_snippet_extractor_spec.rb

@@ -12,11 +12,13 @@ module Formatters
           expect(RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech", 8)).to eq("# Couldn't get snippet for blech")
         end
 
-        it "falls back on a default message when it gets a security error" do
-          message = with_safe_set_to_level_that_triggers_security_errors do
-            RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech".dup.taint, 8)
+        if RSpec::Support::RubyFeatures.supports_taint?
+          it "falls back on a default message when it gets a security error" do
+            message = with_safe_set_to_level_that_triggers_security_errors do
+              RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech".dup.taint, 8)
+            end
+            expect(message).to eq("# Couldn't get snippet for blech")
           end
-          expect(message).to eq("# Couldn't get snippet for blech")
         end
 
         describe "snippet extraction" do

spec/support/helper_methods.rb

@@ -14,24 +14,32 @@ def ignoring_warnings
     result
   end
 
-  def with_safe_set_to_level_that_triggers_security_errors
-    result = nil
+  # In Ruby 2.7 taint was removed and has no effect, whilst SAFE warns that it
+  # has no effect and will become a normal varible in 3.0.
+  if RUBY_VERSION >= '2.7'
+    def with_safe_set_to_level_that_triggers_security_errors
+      yield
+    end
+  else
+    def with_safe_set_to_level_that_triggers_security_errors
+      result = nil
 
-    orig_safe = $SAFE
-    Thread.new do
-      ignoring_warnings { $SAFE = SAFE_LEVEL_THAT_TRIGGERS_SECURITY_ERRORS }
-      result = yield
-    end.join
+      orig_safe = $SAFE
+      Thread.new do
+        ignoring_warnings { $SAFE = SAFE_LEVEL_THAT_TRIGGERS_SECURITY_ERRORS }
+        result = yield
+      end.join
 
-    # $SAFE is not supported on Rubinius
-    # In Ruby 2.6, $SAFE became a global variable; previously it was local to a thread.
-    unless defined?(Rubinius) || SAFE_IS_GLOBAL_VARIABLE
-      # $SAFE should not have changed in this thread.
-      expect($SAFE).to eql orig_safe
-    end
+      # $SAFE is not supported on Rubinius
+      # In Ruby 2.6, $SAFE became a global variable; previously it was local to a thread.
+      unless defined?(Rubinius) || SAFE_IS_GLOBAL_VARIABLE
+        # $SAFE should not have changed in this thread.
+        expect($SAFE).to eql orig_safe
+      end
 
-    result
-  ensure
-    $SAFE = orig_safe if orig_safe && SAFE_IS_GLOBAL_VARIABLE
+      result
+    ensure
+      $SAFE = orig_safe if orig_safe && SAFE_IS_GLOBAL_VARIABLE
+    end
   end
 end