Update to engine_cart 2.2.0 & work around for rails/rails#35153

- Update engine_cart to 2.2.0 - Work around add to test_app_generator for rails/rails#35153 - Update rubocop to 0.66.0 - Update TravisCI config to test 2.6.2
archivesunleashed · Mar 25, 2019 · 9e0eef52645bf6379a27fc4ffcb580f72db9d687 · 9e0eef5
1 parent 3e4ef66
commit 9e0eef52645bf6379a27fc4ffcb580f72db9d687
Unified Split

Showing with 9 additions and 8 deletions.

+1 −0 .gitignore

+1 −1 .travis.yml

+1 −1 Gemfile

+1 −2 spec/test_app_templates/lib/generators/test_app_generator.rb

+5 −4 warclight.gemspec
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 /tmp/
 log/*.log
 pkg/
+tags
 
 # rspec failure tracking
 .rspec_status

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ branches:
   only:
     - master
 rvm:
-  - 2.6.0
+  - 2.6.2
   - 2.5.3
   - 2.4.5
   - 2.3.8

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'codecov', require: false, group: :test
 # Declare your gem's dependencies in warclight.gemspec.
 gemspec
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 1.1.0
+# engine_cart: 2.2.0
 # engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))

diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -10,8 +10,7 @@ class TestAppGenerator < Rails::Generators::Base
   # after setting up the application
 
   def add_gems
-    # gem 'blacklight', '~> 6.0' # Leave commented out until Blacklight 7 drops
-
+    gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.13"'
     Bundler.with_clean_env do
       run 'bundle install'
     end

diff --git a/warclight.gemspec b/warclight.gemspec
@@ -23,17 +23,18 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'blacklight', '7.0.1'
   s.add_dependency 'blacklight_range_limit', '7.0.0'
-  s.add_dependency 'rails', '~> 5.0'
+  s.add_dependency 'rails', '~> 5'
 
-  s.add_development_dependency 'bundler', '~> 1.14'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'engine_cart'
+  s.add_development_dependency 'engine_cart', '~> 2.2.0'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'poltergeist'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec-rails', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~> 0.65.0'
+  s.add_development_dependency 'rubocop', '~> 0.66.0'
   s.add_development_dependency 'rubocop-rspec', '~> 1.32.0'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'solr_wrapper'
+  s.add_development_dependency 'sqlite3'
 end