Add installation of imagemagick to CI so that rmagick can be unlocked (…

…#84) * Add documentation about how to properly run wwtd locally
devise-security · Mar 3, 2019 · 7eddc2e · 7eddc2e
1 parent f68836f
commit 7eddc2e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: ruby
-before_install: gem install bundler -v '1.17.2'
-install: bundle _1.17.2_ install --jobs=2 --retry=2 --path=${BUNDLE_PATH:-vendor/bundle}
+dist: xenial
+before_install:
+  # install bundler < 2 because Rails 4.2 is incompatible with bundler >= 2
+  - gem install bundler -v '1.17.3'
+install: bundle _1.17.3_ install --jobs=2 --retry=2 --path=${BUNDLE_PATH:-vendor/bundle}
 cache: bundler
 script: bundle exec rake
 rvm:

diff --git a/Appraisals b/Appraisals
@@ -1,5 +1,6 @@
 appraise 'rails-4.2-stable' do
   gem 'rails', '~> 4.2.0'
+  gem 'bundler', '< 2'
   group :mongoid do
     gem "mongoid", "~> 4.0"
   end

diff --git a/Gemfile b/Gemfile
@@ -1,11 +1,5 @@
 source "https://rubygems.org"
 gemspec
-gem 'omniauth'
-gem 'rmagick', '< 3'
-
-group :development do
-  gem 'wwtd'
-end
 
 group :active_record do
   gem 'sqlite3', '~> 1.3.0'

diff --git a/README.md b/README.md
@@ -319,7 +319,8 @@ Standard tests can be invoked using `rake`.  To run the tests against the `mongo
 
 To locally simulate what travis-ci will run when you push code use:
 
-    $ wwtd
+    $ gem install bundler -v '1.17.3'
+    $ BUNDLER_VERSION=1.17.3 wwtd
 
 ## Copyright
 

diff --git a/devise-security.gemspec b/devise-security.gemspec
@@ -40,10 +40,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'easy_captcha'
   s.add_development_dependency 'm'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'omniauth'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'pry-rescue'
-  s.add_development_dependency 'pry'
   s.add_development_dependency 'rails_email_validator'
   s.add_development_dependency 'rubocop', '~> 0.59.2'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'wwtd'
 end
diff --git a/gemfiles/rails_4.2_stable.gemfile b/gemfiles/rails_4.2_stable.gemfile
@@ -2,13 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "omniauth"
-gem "rmagick", "< 3"
 gem "rails", "~> 4.2.0"
-
-group :development do
-  gem "wwtd"
-end
+gem "bundler", "< 2"
 
 group :active_record do
   gem "sqlite3", "~> 1.3.0"

diff --git a/gemfiles/rails_5.0_stable.gemfile b/gemfiles/rails_5.0_stable.gemfile
@@ -2,14 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "omniauth"
-gem "rmagick", "< 3"
 gem "rails", "~> 5.0.0"
 
-group :development do
-  gem "wwtd"
-end
-
 group :active_record do
   gem "sqlite3", "~> 1.3.0"
 end

diff --git a/gemfiles/rails_5.1_stable.gemfile b/gemfiles/rails_5.1_stable.gemfile
@@ -2,14 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "omniauth"
-gem "rmagick", "< 3"
 gem "rails", "~> 5.1.0"
 
-group :development do
-  gem "wwtd"
-end
-
 group :active_record do
   gem "sqlite3", "~> 1.3.0"
 end

diff --git a/gemfiles/rails_5.2_stable.gemfile b/gemfiles/rails_5.2_stable.gemfile
@@ -2,14 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "omniauth"
-gem "rmagick", "< 3"
 gem "rails", "~> 5.2.0"
 
-group :development do
-  gem "wwtd"
-end
-
 group :active_record do
   gem "sqlite3", "~> 1.3.0"
 end

diff --git a/gemfiles/rails_6.0_beta.gemfile b/gemfiles/rails_6.0_beta.gemfile
@@ -2,14 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "omniauth"
-gem "rmagick", "< 3"
 gem "rails", "~> 6.0.0.beta1"
 
-group :development do
-  gem "wwtd"
-end
-
 group :active_record do
   gem "sqlite3", "~> 1.3.0"
 end