EXPERIMENTAL: Prototype rspec-dev changes

Author: pirj

script/clone_all_rspec_repos

@@ -13,10 +13,7 @@ if is_mri; then
   clone_repo "rspec-expectations"
   clone_repo "rspec-mocks"
   clone_repo "rspec-rails"
-
-  if rspec_support_compatible; then
-    clone_repo "rspec-support"
-  fi
+  clone_repo "rspec-support"
 
   popd
 else

script/functions.sh

@@ -12,10 +12,8 @@ SPECS_HAVE_RUN_FILE=specs.out
 MAINTENANCE_BRANCH=`cat maintenance-branch`
 
 # Don't allow rubygems to pollute what's loaded. Also, things boot faster
-# without the extra load time of rubygems. Only works on MRI Ruby 1.9+
-if is_mri_192_plus; then
-  export RUBYOPT="--disable=gem"
-fi
+# without the extra load time of rubygems.
+export RUBYOPT="--disable=gem"
 
 function clone_repo {
   if [ ! -d $1 ]; then # don't clone if the dir is already there
@@ -38,21 +36,16 @@ function run_specs_and_record_done {
 
 function run_cukes {
   if [ -d features ]; then
-    # force jRuby to use client mode JVM or a compilation mode thats as close as possible,
-    # idea taken from https://github.com/jruby/jruby/wiki/Improving-startup-time
-    #
-    # Note that we delay setting this until we run the cukes because we've seen
-    # spec failures in our spec suite due to problems with this mode.
-    export JAVA_OPTS='-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1'
-
     echo "${PWD}/bin/cucumber"
 
-    if is_mri_192; then
-      # For some reason we get SystemStackError on 1.9.2 when using
-      # the bin/cucumber approach below. That approach is faster
-      # (as it avoids the bundler tax), so we use it on rubies where we can.
-      bundle exec cucumber --strict
-    elif is_jruby; then
+    if is_jruby; then
+      # Force JRuby to use client mode JVM or a compilation mode thats as close as possible,
+      # idea taken from https://github.com/jruby/jruby/wiki/Improving-startup-time
+      #
+      # Note that we delay setting this until we run the cukes because we've seen
+      # spec failures in our spec suite due to problems with this mode.
+      export JAVA_OPTS='-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1'
+
       # For some reason JRuby doesn't like our improved bundler setup
       RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
          PATH="${PWD}/bin:$PATH" \
@@ -191,7 +184,5 @@ function run_all_spec_suites {
     fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
   fi
 
-  if rspec_support_compatible; then
-    fold "rspec-support specs" run_spec_suite_for "rspec-support"
-  fi
+  fold "rspec-support specs" run_spec_suite_for "rspec-support"
 }

script/predicate_functions.sh

@@ -2,69 +2,23 @@
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {
-  if ruby -e "exit(!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')"; then
-    # RUBY_ENGINE only returns 'ruby' on MRI.
-    # MRI 1.8.7 lacks the constant but all other rubies have it (including JRuby in 1.8 mode)
+  # RUBY_ENGINE only returns 'ruby' on MRI.
+  if ruby -e "exit(RUBY_ENGINE == 'ruby')"; then
     return 0
   else
     return 1
   fi;
 }
 
 function is_jruby {
+  # RUBY_ENGINE only returns 'java' on JRuby. - does it? How about TruffleRuby?
   if ruby -e "exit(defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java')"; then
-    # RUBY_ENGINE only returns 'ruby' on MRI.
-    # MRI 1.8.7 lacks the constant but all other rubies have it (including JRuby in 1.8 mode)
     return 0
   else
     return 1
   fi;
 }
 
-function is_mri_192 {
-  if is_mri; then
-    if ruby -e "exit(RUBY_VERSION == '1.9.2')"; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-function is_mri_192_plus {
-  if is_mri; then
-    if ruby -e "exit(RUBY_VERSION.to_f > 1.8)"; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-function is_mri_2plus {
-  if is_mri; then
-    if ruby -e "exit(RUBY_VERSION.to_f > 2.0)"; 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
-  else
-    return 1
-  fi
-}
-
 function is_ruby_25_plus {
   if ruby -e "exit(RUBY_VERSION.to_f >= 2.5)"; then
     return 0
@@ -81,26 +35,14 @@ function rspec_rails_compatible {
   fi
 }
 
-function rspec_support_compatible {
-  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ] && [ "$MAINTENANCE_BRANCH" != "2-14-maintenance" ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
 function additional_specs_available {
   type run_additional_specs > /dev/null 2>&1
   return $?
 }
 
 function documentation_enforced {
   if [ -x ./bin/yard ]; then
-    if is_mri_2plus; then
-      return 0
-    else
-      return 1
-    fi
+    return 0
   else
     return 1
   fi