Merge pull request #70 from glebm/patch-1

Drop support for versions of rubies and Rails that no longer receive security updates, fix tests, support Rails 5.1

.travis.yml

@@ -1,23 +1,22 @@
 sudo: false
+dist: trusty
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - jruby-9.1.5.0
-  - rbx
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+  - jruby-9
+  - rbx-3
 
 matrix:
-  allow_failures:
-    # Rubinius has a lot of trouble and no large following, so I'm going to
-    # allow failures on it until it gets more stable on Travis / Real Life(tm).
-    # Let me know if you need it. Patches are welcome!
-    - rvm: rbx
-    - rvm: 1.9.3
   fast_finish: true
 
-cache: false # bundler
-bundler_args: --without guard
+cache:
+  directories:
+  - .bundle
+  - spec/railsapps/rails_42/.bundle
+  - spec/railsapps/rails_42_sprockets_rails_3/.bundle
+  - spec/railsapps/rails_50/.bundle
+  - spec/railsapps/rails_51/.bundle
+bundler_args: --without guard --path=.bundle
 script: "rake"

Gemfile

@@ -5,13 +5,9 @@ gemspec
 
 # Additional development dependencies I use but don't want to declare in the
 # gemfile since they aren't required to develop this codebase.
-if RUBY_VERSION >= "2.3.0"
-  group :development do
-    gem 'guard'
-    gem 'guard-rspec'
-  end
-else
-  gem "rails", ">= 3.0", "< 5.0"
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
 end
 
 # Added here so it does not show up on the Gemspec; I only want it for CI builds

Rakefile

@@ -2,13 +2,22 @@ require "bundler/gem_tasks"
 
 desc "Install gems for embedded Rails apps"
 task :install_gems do
-  sh "./setup.sh install #{RUBY_VERSION}"
+  Bundler.with_clean_env do
+    sh "./setup.sh install"
+  end
+end
+
+desc "Update gems for embedded Rails apps"
+task :update_gems do
+  Bundler.with_clean_env do
+    sh "./setup.sh update"
+  end
 end
 
 desc "Run specs"
 task :spec do
   sh "bundle exec rspec -f progress"
 end
 
-desc "Default: Install gems and run specs"
-task :default => [:install_gems, :spec]
+desc "Default: Update gems and run specs"
+task :default => [:update_gems, :spec]

roadie-rails.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "roadie", "~> 3.1"
-  spec.add_dependency "railties", ">= 3.0", "< 5.1"
+  spec.add_dependency "railties", ">= 3.0", "< 5.2"
 
-  spec.add_development_dependency "rails", ">= 3.0", "< 5.1"
+  spec.add_development_dependency "rails", ">= 4.2", "< 5.2"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-rails"

setup.sh

@@ -14,18 +14,16 @@ function green() {
 }
 
 function update() {
+  bundle config --local path .bundle
   bundle update | grep -ve "^Using "
 }
 
 function install() {
-  bundle install --quiet && green "  OK"
+  bundle install --quiet --path=.bundle && green "  OK"
 }
 
 
 root=$(dirname $0)
-ruby_version=$2
-
-[ -z "$ruby_version" ] && echo "Need to pass ruby version as second parameter. This is used to skip some installs due to lack of support of gems on certain ruby versions." && exit 1;
 
 # Set by Travis CI; interferes with the nested repos
 unset BUNDLE_GEMFILE
@@ -36,14 +34,10 @@ if [[ $1 == "install" ]]; then
 
   for app_path in $root/spec/railsapps/rails_*; do
     (
-      header "Rails app $(basename $app_path) with ruby $ruby_version"
-      if [[ $app_path == *rails_50* ]] && [[ $ruby_version != "2.2.2" ]] && [[ $ruby_version != "2.3.0" ]]; then
-        echo "Skipping installing gems for $(basename $app_path) because dependencies are not support for ruby version $ruby_version"
-      else
-        cd $app_path
-        echo "Installing gems for $(basename $app_path)"
-        install
-      fi
+      header "Rails app $(basename $app_path)"
+      cd $app_path
+      echo "Installing gems for $(basename $app_path)"
+      install
     )
   done
   echo ""

spec/integration_spec.rb

@@ -8,24 +8,12 @@ def parse_html_in_email(mail)
   end
 
   rails_apps = [
-    RailsApp.new("Rails 3.0.x", 'rails_30', runner: :script, asset_pipeline: false, digests: false),
-    ## We do not yet support live-compilation through asset pipeline
-    RailsApp.new("Rails 3.1.x", 'rails_31', runner: :script, asset_pipeline: true, digests: false),
-    RailsApp.new("Rails 3.2.x", 'rails_32', runner: :script, asset_pipeline: true, digests: false),
-    RailsApp.new("Rails 4.0.x", 'rails_40', runner: :bin, asset_pipeline: true, digests: false),
-    RailsApp.new("Rails 4.0.x (without asset pipeline)", 'rails_40_no_pipeline', runner: :bin, asset_pipeline: false, digests: false),
-    RailsApp.new("Rails 4.0.x (precompiled)", 'rails_40_precompiled', runner: :bin, asset_pipeline: true, digests: true),
-    RailsApp.new("Rails 4.1.x", 'rails_41', runner: :bin, asset_pipeline: true, digests: false),
     RailsApp.new("Rails 4.2.x", 'rails_42', runner: :bin, asset_pipeline: true, digests: false),
-    RailsApp.new("Rails 4.2.x (with sprockets-rails 3)", 'rails_42_sprockets_rails_3', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3)
+    RailsApp.new("Rails 4.2.x (with sprockets-rails 3)", 'rails_42_sprockets_rails_3', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3),
+    RailsApp.new("Rails 5.0.x", 'rails_50', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3),
+    RailsApp.new("Rails 5.1.0", 'rails_51', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3)
   ]
 
-  # Rails 5 requires at least ruby version 2.2.2
-  if RUBY_VERSION >= "2.2.2" && !(RUBY_ENGINE == 'jruby' && RUBY_VERSION == '2.3.1')
-    rails_apps << RailsApp.new("Rails 5.0.x", 'rails_50', runner: :bin, asset_pipeline: true, digests: true, sprockets: 3)
-    rails_apps << RailsApp.new("Rails 5.0.x (with sprockets 4)", 'rails_50_sprockets_4', runner: :bin, asset_pipeline: true, digests: true, sprockets: 4)
-  end
-
   rails_apps.each do |app|
     describe "with #{app}" do
       before { app.reset }