Update scripts (will extract to rspec-dev)

Author: pirj

script/functions.sh

@@ -44,31 +44,30 @@ 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
-      # For some reason JRuby doesn't like our improved bundler setup
-      RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
-         PATH="${PWD}/bin:$PATH" \
-         bin/cucumber --strict
+    if is_ruby_25_plus; then
+      echo "${PWD}/bin/cucumber"
+
+      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" \
+           bin/cucumber --strict
+      else
+        # Prepare RUBYOPT for scenarios that are shelling out to ruby,
+        # and PATH for those that are using `rspec` or `rake`.
+        RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
+           PATH="${PWD}/bin:$PATH" \
+           bin/cucumber --strict
+      fi
     else
-      # Prepare RUBYOPT for scenarios that are shelling out to ruby,
-      # and PATH for those that are using `rspec` or `rake`.
-      RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
-         PATH="${PWD}/bin:$PATH" \
-         bin/cucumber --strict
+      echo "skipping features"
     fi
   fi
 }