Merge pull request #203 from rspec/update_build_scripts

Update build scripts

Author: JonRowe

Rakefile

@@ -427,11 +427,12 @@ def confirm_branch_name(name)
   return name unless system("git show-branch #{name} > /dev/null 2>&1")
 
   puts "Branch #{name} already exists, delete? [Y/n] or rename new branch? [r[ename] <name>]"
-  case STDIN.gets.downcase
-  when /^y/
+  case input = STDIN.gets.downcase
+  when /^y/i
     `git branch -D #{name}`
   when /^r(?:ename)? (.*)$/
     name = $1
+  when /^n/i
   else
     abort "Unknown option: #{input}"
   end

travis/.travis.yml

@@ -6,11 +6,9 @@ cache:
     - ../bundle
 before_install:
   - gem update --system # https://github.com/travis-ci/travis-ci/issues/8978#issuecomment-354036443
+  - gem install bundler
   - unset _JAVA_OPTIONS
   - "script/clone_all_rspec_repos"
-  # Note this doesn't work on JRUBY 2.0.0 mode so we don't do it, the excluded versions are broken on Ruby 2.3
-  - if [ "jruby" != "$TRAVIS_RUBY_VERSION"  ]; then gem install bundler --version "1.11.2"; fi
-  - alias bundle="bundle _1.11.2_"
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "script/run_build"
 rvm:
@@ -19,10 +17,10 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
   - ree
   - rbx-3