Bundler 2

.circleci/config.yml

@@ -10,7 +10,7 @@ version: 2.1
 .install_bundler: &install_bundler
   run:
     name: Install a specific bundler version
-    command: gem install bundler -v 1.17.3
+    command: gem install bundler -v 2.0.1
 
 .copy_current_gemfile: &copy_current_gemfile
   run:
@@ -25,7 +25,7 @@ version: 2.1
 .install_dependencies: &install_dependencies
   run:
     name: Install dependencies
-    command: bin/bundle install --path /home/circleci/project/vendor/bundle --retry 3 --jobs 3
+    command: BUNDLER_VERSION=2.0.1 bundle install --path /home/circleci/project/vendor/bundle --retry 3 --jobs 3
 
 .install_chromedriver: &install_chromedriver
   run:
@@ -116,7 +116,7 @@ version: 2.1
 .run_bug_report_template: &run_bug_report_template
   run:
     name: Run bug report template
-    command: ACTIVE_ADMIN_PATH=. ruby tasks/bug_report_template.rb
+    command: BUNDLER_VERSION=2.0.1 ACTIVE_ADMIN_PATH=. ruby tasks/bug_report_template.rb
 
 .test_steps: &test_steps
   - checkout

CONTRIBUTING.md

@@ -32,7 +32,7 @@ scenarios.
 Now install the development dependencies:
 
 ```sh
-bin/bundle install
+bundle install
 ```
 
 Now you should be able to run the entire suite using:
@@ -49,7 +49,7 @@ because of some breaking change or problem with the latest version of some
 dependency. You should be able to reproduce the issue locally by:
 
 * Removing the `Gemfile.lock` file.
-* Running `bin/bundle install`.
+* Running `bundle install`.
 * Re-running the tests again like you did previously.
 
 This is not your fault though, so if this happens feel free to investigate, but

Gemfile.lock

@@ -431,4 +431,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

bin/cucumber

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLER_VERSION"] = "2.0.1"
 
 require "bundler/setup"
 

bin/parallel_cucumber

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLER_VERSION"] = "2.0.1"
 
 require "bundler/setup"
 

bin/parallel_rspec

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLER_VERSION"] = "2.0.1"
 
 require "bundler/setup"
 

bin/rake

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLER_VERSION"] = "2.0.1"
 
 require "bundler/setup"
 

bin/rspec

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-load File.expand_path("bundle", __dir__)
+ENV["BUNDLER_VERSION"] = "2.0.1"
 
 require "bundler/setup"
 

gemfiles/rails_50.gemfile.lock

@@ -351,4 +351,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

gemfiles/rails_51.gemfile.lock

@@ -351,4 +351,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

spec/gemfiles_spec.lint.rb

@@ -4,10 +4,10 @@
       current_lockfile = File.read("#{gemfile}.lock")
 
       new_lockfile = Bundler.with_original_env do
-        `BUNDLE_GEMFILE=#{gemfile} bin/bundle lock --print`
+        `BUNDLE_GEMFILE=#{gemfile} bundle lock --print`
       end
 
-      msg = "Please update #{gemfile}'s lock file with `BUNDLE_GEMFILE=#{gemfile} bin/bundle install` and commit the result"
+      msg = "Please update #{gemfile}'s lock file with `BUNDLE_GEMFILE=#{gemfile} bundle install` and commit the result"
 
       expect(current_lockfile).to eq(new_lockfile), msg
     end