Ensure a compatible version of slop is installed

3.6 will work with byebug (Installed by rails 4.2) and ldp
samvera · Dec 29, 2014 · 9c4e56a · 9c4e56a
1 parent 3b75414
commit 9c4e56a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,11 @@ rvm:
   - 2.1
 
 env:
-  - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=4.1.8"
+  matrix:
+    - "RAILS_VERSION=4.2.0"
+    - "RAILS_VERSION=4.1.8"
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
 notifications:
   irc: "irc.freenode.org#projecthydra"
diff --git a/Gemfile b/Gemfile
@@ -5,9 +5,7 @@ source "https://rubygems.org"
 # development dependencies will be added by default to the :development group.
 gemspec path: File.expand_path('..', __FILE__)
 
-# To use debugger
-# gem 'debugger'
-#
+gem 'slop', '~> 3.6.0' # This just helps us generate a valid Gemfile.lock when Rails 4.2 is installed (which requires byebug which has a dependency on slop)
 
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
 if File.exists?(file)