WIPadd_gemfile

8 files changed, 48 insertions, 69 deletions

diff --git a/.azure-pipelines/steps.yml b/.azure-pipelines/steps.yml
index 50e13fb499..93a7a8ca0c 100644
--- a/.azure-pipelines/steps.yml
+++ b/.azure-pipelines/steps.yml
@@ -15,11 +15,7 @@ steps:
 
 - script: |
     ruby bin/rake spec:deps
-  displayName: 'ruby bin/rake spec:deps'
-
-- script: |
-    gem install --no-document --conservative rspec_junit_formatter
-  displayName: 'gem install rspec_junit_formatter'
+  displayName: 'ruby bin/bundle install'
 
 - script: |
     ruby -r rspec_junit_formatter bin/rspec --format RspecJunitFormatter -o rspec/bundler-junit-results.xml || exit 0
diff --git a/.travis.yml b/.travis.yml
index 47e775cba7..50125fa236 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ branches:
     - trying
     - /.+-dev$/
     - /.+-stable$/
+    - add_gemfile
 
 cache:
   directories:
diff --git a/Gemfile b/Gemfile
index 7dd6858a31..6eee7fdc0e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,11 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "automatiek", "~> 0.1.0"
+gem "automatiek", "~> 0.3.0"
+gem "parallel_tests", "~> 2.29"
 gem "rake", "~> 12.0"
-gem "ronn", "~> 0.7.3"
-gem "rspec", "~> 3.6"
-gem "rubocop", "= 0.68.0"
-gem "rubocop-performance", "~> 1.1"
+gem "ronn", "~> 0.7.3", :platform => :mri
+gem "rspec", "~> 3.8"
+gem "rubocop", "= 0.76.0"
+gem "rubocop-performance", "= 1.5.1"
+gem "rspec_junit_formatter", :platforms => [:mingw, :mswin, :x64_mingw]
diff --git a/Gemfile.lock b/Gemfile.lock
index 0eccd4fb79..337e94bfc4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,57 +6,60 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    automatiek (0.1.2)
+    automatiek (0.3.0)
     diff-lcs (1.3)
     hpricot (0.8.6)
-    jaro_winkler (1.5.2)
-    mustache (1.1.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    jaro_winkler (1.5.4)
+    mustache (1.1.1)
+    parallel (1.19.1)
+    parallel_tests (2.29.2)
+      parallel
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     rdiscount (2.2.0.1)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.68.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
-    ruby-progressbar (1.10.0)
-    unicode-display_width (1.5.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.1)
+      rubocop (>= 0.71.0)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  automatiek (~> 0.1.0)
+  automatiek (~> 0.3.0)
   bundler!
+  parallel_tests (~> 2.29)
   rake (~> 12.0)
   ronn (~> 0.7.3)
-  rspec (~> 3.6)
-  rubocop (= 0.68.0)
-  rubocop-performance (~> 1.1)
+  rspec (~> 3.8)
+  rubocop (= 0.76.0)
+  rubocop-performance (= 1.5.1)
 
 BUNDLED WITH
-   2.1.0.pre.1
+   2.1.0.pre.3
diff --git a/Rakefile b/Rakefile
index a00d1ee0ec..ed187cdc6e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -32,11 +32,6 @@ namespace :spec do
     false
   end
 
-  desc "Ensure spec dependencies are installed"
-  task :deps do
-    Spec::Rubygems.dev_setup
-  end
-
   namespace :travis do
     task :deps do
       # Give the travis user a name so that git won't fatally error
@@ -51,7 +46,7 @@ namespace :spec do
       sh "sudo apt-get install graphviz -y"
 
       # Install the other gem deps, etc
-      Rake::Task["spec:deps"].invoke
+      sh "bin/bundle install"
     end
   end
 
diff --git a/doc/development/SETUP.md b/doc/development/SETUP.md
index 6af7c07145..36b9783820 100644
--- a/doc/development/SETUP.md
+++ b/doc/development/SETUP.md
@@ -18,7 +18,7 @@ Bundler doesn't use a Gemfile to list development dependencies, because when we
 
 4. Install Bundler's development dependencies:
 
-        $ bin/rake spec:deps
+        $ bin/bundle install
 
 5. Run the test suite, to make sure things are working:
 
diff --git a/doc/documentation/WRITING.md b/doc/documentation/WRITING.md
index 3975b57043..211d97da98 100644
--- a/doc/documentation/WRITING.md
+++ b/doc/documentation/WRITING.md
@@ -37,8 +37,8 @@ If you're not sure if the formatting looks right, that's ok! Make a pull request
 To preview your changes as they will print out for Bundler users, you'll need to run a series of commands:
 
 ```
-$ rake spec:deps
-$ rake man:build
+$ bin/bundle install
+$ bin/rake man:build
 $ man man/bundle-cookies.1
 ```
 
diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index 3914465371..542f5c71fb 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/support/rubygems_ext.rb
@@ -4,16 +4,6 @@ require_relative "path"
 
 module Spec
   module Rubygems
-    DEV_DEPS = {
-      "automatiek" => "~> 0.3.0",
-      "parallel_tests" => "~> 2.29",
-      "rake" => "~> 12.0",
-      "ronn" => "~> 0.7.3",
-      "rspec" => "~> 3.8",
-      "rubocop" => "= 0.76.0",
-      "rubocop-performance" => "= 1.5.1",
-    }.freeze
-
     DEPS = {
       "rack" => "~> 2.0",
       "rack-test" => "~> 1.1",
@@ -29,15 +19,6 @@ module Spec
 
     extend self
 
-    def dev_setup
-      deps = DEV_DEPS
-
-      # JRuby can't build ronn, so we skip that
-      deps.delete("ronn") if RUBY_ENGINE == "jruby"
-
-      install_gems(deps)
-    end
-
     def gem_load(gem_name, bin_container)
       require_relative "rubygems_version_manager"
       RubygemsVersionManager.new(ENV["RGV"]).switch
@@ -90,8 +71,9 @@ module Spec
     end
 
     def gem_activate(gem_name)
-      gem_requirement = DEV_DEPS[gem_name]
-      gem gem_name, gem_requirement
+      require_relative "../../lib/bundler"
+      gem_version = Bundler.definition.locked_gems.specs.find{|d| d.name == "rspec-core"}.version.to_s
+      gem gem_name, gem_version
     end
 
     def install_gems(gems)