Merge pull request #52 from grosser/grosser/update

update

.travis.yml

@@ -10,7 +10,7 @@ before_install:
   - "ruby -e 'print(defined?(JRUBY_VERSION) ? %{jruby-#{JRUBY_VERSION}} : RUBY_VERSION)' > version"
   - rvm install 2.0.0
   - rvm install 2.1.5
-  - rvm install jruby-1.7.25
+  - rvm install jruby-9.1.16.0
   - rvm use $(cat version) # install switches versions, so restore
 
 rvm:
@@ -19,5 +19,9 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
-  - jruby-1.7.25
   - jruby
+
+matrix:
+  allow_failures:
+    - rvm: jruby
+  fast_finish: true

Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 gemspec
 
 gem "bump"
-gem "rake", "~> 12.2.1" # 12.3 wants ruby 2.0 and jruby 1.7 is ruby 1.9
+gem "rake"
 gem "rspec", "~>3"

Gemfile.lock

@@ -6,9 +6,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    bump (0.5.4)
+    bump (0.6.0)
     diff-lcs (1.3)
-    rake (12.2.1)
+    rake (12.3.1)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
@@ -21,15 +21,15 @@ GEM
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
+    rspec-support (3.7.1)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
   bump
-  rake (~> 12.2.1)
+  rake
   rspec (~> 3)
   wwtd!
 

spec/ruby_versions.rb

@@ -7,7 +7,7 @@ module RubyVersions
     ALL.size == 3 &&
     ALL[0] =~ /^\d+\.\d+\.\d+$/ &&
     ALL[1] =~ /^\d+\.\d+\.\d+$/ &&
-    ALL[2] =~ /^jruby-\d+\.\d+\.\d+$/
+    ALL[2] =~ /^jruby-\d+\.\d+\.\d+(\.\d+)?$/
 
   RUBY_1 = ALL[0]
   RUBY_2 = ALL[1]

spec/spec_helper.rb

@@ -4,11 +4,10 @@
 require "benchmark"
 require "ruby_versions"
 
-# having global BUNDLE_PATH=vendor/bundle breaks a few tests, but should still work fine on CO
-SHARED_GEMS_DISABLED = if ENV['CI']
-  false
-else
-  File.exist?(".bundle/config") && File.read(".bundle/config").include?("BUNDLE_DISABLE_SHARED_GEMS: '1'")
+# having global BUNDLE_PATH=vendor/bundle breaks a few tests
+# somehow it's not set in travis but it still always generates vendor/bundle
+BUNDLE_PATH_USED = !ENV["CI"] && [".bundle/config", File.expand_path("~/.bundle/config")].any? do |file|
+  File.exist?(file) && File.read(file).include?("BUNDLE_PATH")
 end
 
 RSpec.configure do |config|

spec/wwtd_spec.rb

@@ -196,7 +196,7 @@ def write_default_rakefile
       result = wwtd("")
       result.should include "bundle install --quiet"
       result.should include "\nRAKE: 0.9.2.2\n"
-      File.exist?("vendor/bundle").should == SHARED_GEMS_DISABLED
+      File.exist?("vendor/bundle").should == BUNDLE_PATH_USED
     end
 
     it "bundles with --deployment if lockfile is committed" do
@@ -308,7 +308,7 @@ def write_default_rakefile
         write_default_gemfile
         bundle
         wwtd("")
-        File.exist?(".bundle").should == SHARED_GEMS_DISABLED
+        File.exist?(".bundle").should == false
       end
 
       it "leaves .bundle alone" do
@@ -321,8 +321,7 @@ def write_default_rakefile
 
         wwtd("")
 
-        File.exist?(".bundle").should == true
-        sh("ls .bundle").should == (SHARED_GEMS_DISABLED ? "config\nfoo\n" : "foo\n")
+        sh("ls .bundle").should == "foo\n"
       end
 
       it "ignores .bundle settings" do
@@ -457,6 +456,9 @@ def write_default_rakefile
           require 'wwtd/tasks'
           task(:default) { puts 'YES-IT-WORKS' }
         RUBY
+        FileUtils.mkdir_p("vendor/cache")
+        FileUtils.cp("#{Bundler.root}/spec/rake-12.3.0.gem", "vendor/cache")
+        sh "bundle install --local"
       end
 
       it "runs normally" do