Rails 6 (#785)

* Enable Rails 6 migrations * Update Ruby versions and remove rbx * Remove support for Devise 4.0 to 4.5. Minimum supported Devise version is 4.6 * Update Gemfile to use latest versions when possible. Add newer Ruby versions to travis config * Use latest bundler 2.0.1 * Drop Rails 4.2 support * Up required rubygems version to 2.5.0 * Update minimum required versions for Ruby, Devise, Bundler, Actionmailer * Update devise version in gemspec * Standardize devise version (4.6) across all Gemfiles
scambra · Feb 22, 2019 · 8c313de · 8c313de
1 parent 71a1991
commit 8c313de
Show file tree

Hide file tree

Showing 26 changed files with 648 additions and 1,285 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,51 +1,42 @@
 language: ruby
+before_install:
+  - gem update --system
+  - gem install bundler
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - rbx
-  - jruby-9.1.16.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.1
+  - ruby-head
+  - jruby-9.2.6.0
 jdk:
-  - openjdk7
+  - openjdk11
 script: bundle exec rake test
 env:
   matrix:
     - DEVISE_ORM=active_record
     - DEVISE_ORM=mongoid
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile.devise-4.0
-  - gemfiles/Gemfile.devise-4.1
-  - gemfiles/Gemfile.devise-4.4
-  - gemfiles/Gemfile.rails-4.2
   - gemfiles/Gemfile.rails-5.0
+  - gemfiles/Gemfile.rails-5.1
+  - gemfiles/Gemfile.rails-5.2
+  - gemfiles/Gemfile.rails-master
 install: "travis_retry bundle install"
 services:
   - mongodb
 matrix:
   exclude:
-    - rvm: 2.1.10
-      gemfile: Gemfile
-    - rvm: 2.4.3
-      gemfile: gemfiles/Gemfile.devise-4.0
-    - rvm: 2.4.3
-      gemfile: gemfiles/Gemfile.devise-4.1
-    - rvm: 2.5.0
-      gemfile: gemfiles/Gemfile.devise-4.0
-    - rvm: 2.5.0
-      gemfile: gemfiles/Gemfile.devise-4.1
-  include:
-    - rvm: 2.5.0
+    - rvm: 2.2.10
       gemfile: gemfiles/Gemfile.rails-master
-      env: DEVISE_ORM=active_record
-    - rvm: 2.5.0
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile.rails-master
+    - rvm: 2.4.5
       gemfile: gemfiles/Gemfile.rails-master
-      env: DEVISE_ORM=mongoid
   allow_failures:
-    - rvm: rbx
-    - rvm: jruby-9.1.16.0
-      gemfile: Gemfile
+    - rvm: jruby-9.2.6.0
+    - rvm: ruby-head
     - gemfile: gemfiles/Gemfile.rails-master
diff --git a/Gemfile b/Gemfile
@@ -1,24 +1,23 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
 group :test do
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1'
   end
 
   platforms :ruby do
-    gem "sqlite3", "~> 1.3.4"
+    gem 'sqlite3', '~> 1.3.6'
   end
 
-  gem 'devise', '~> 4.0'
-  gem 'activerecord', '~> 5.1.0'
-  gem 'actionmailer', '~> 5.1.0'
-  gem "mongoid"
-  # gem "mongoid", :github => "mongoid/mongoid", :branch => "master"
-  gem "capybara"
-  #gem "launchy", "~> 2.4.3"
+  gem 'actionmailer', '~> 5.2.2'
+  gem 'activerecord', '~> 5.2.2'
+  gem 'capybara'
+  gem 'devise', '~> 4.6'
   gem 'mocha'
+  gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master'
   gem 'nokogiri'
   gem 'rspec-rails'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,166 +2,167 @@ PATH
   remote: .
   specs:
     devise_invitable (1.7.5)
-      actionmailer (>= 4.1.0)
-      devise (>= 4.0.0)
+      actionmailer (>= 5.0)
+      devise (~> 4.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activerecord-jdbc-adapter (5.0.pre1)
-      activerecord (>= 2.2)
-    activerecord-jdbcsqlite3-adapter (5.0.pre1)
-      activerecord-jdbc-adapter (~> 5.0.pre1)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (5.1.5)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
+      arel (>= 9.0)
+    activerecord-jdbc-adapter (52.1-java)
+      activerecord (~> 5.2.0)
+    activerecord-jdbcsqlite3-adapter (52.1-java)
+      activerecord-jdbc-adapter (= 52.1)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (8.0.0)
-    bcrypt (3.1.11)
-    bcrypt (3.1.11-java)
-    bson (4.3.0)
-    bson (4.3.0-java)
+    arel (9.0.0)
+    bcrypt (3.1.12)
+    bcrypt (3.1.12-java)
+    bson (4.4.2)
+    bson (4.4.2-java)
     builder (3.2.3)
-    capybara (3.0.1)
+    capybara (3.13.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.0)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
-    crass (1.0.3)
-    devise (4.4.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.4)
+    crass (1.0.4)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    erubi (1.8.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (0.9.5)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
-    jdbc-sqlite3 (3.8.11.2)
-    loofah (2.2.2)
+    jdbc-sqlite3 (3.20.1)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    mocha (1.5.0)
+    mocha (1.8.0)
       metaclass (~> 0.0.1)
-    mongo (2.5.1)
-      bson (>= 4.3.0, < 5.0.0)
-    mongoid (7.0.0)
+    mongo (2.7.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.2)
       activemodel (>= 5.1, < 6.0.0)
       mongo (>= 2.5.1, < 3.0.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.2-java)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.1-java)
     orm_adapter (0.5.0)
-    public_suffix (3.0.2)
-    rack (2.0.4)
-    rack-test (1.0.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.3.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     sqlite3 (1.3.13)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    xpath (3.0.0)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  actionmailer (~> 5.1.0)
-  activerecord (~> 5.1.0)
-  activerecord-jdbcsqlite3-adapter (>= 5.0.pre1)
-  bundler (>= 1.1.0)
+  actionmailer (~> 5.2.2)
+  activerecord (~> 5.2.2)
+  activerecord-jdbcsqlite3-adapter (~> 52.1)
+  bundler (~> 2.0.1)
   capybara
-  devise (~> 4.0)
+  devise (~> 4.6)
   devise_invitable!
   mocha
   mongoid
   nokogiri
   rspec-rails
-  sqlite3 (~> 1.3.4)
+  sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.3
+   2.0.1
diff --git a/README.rdoc b/README.rdoc
@@ -3,7 +3,7 @@
 
 It adds support to devise[https://github.com/plataformatec/devise] for sending invitations by email (it requires to be authenticated) and accept the invitation setting the password.
 
-It works with Devise >= 4.0
+It works with Devise >= 4.6
 If you want to use devise 3.0.x, you must use 1.2.1 or lower
 If you want to use devise 3.1.x, you must use 1.3.2 or lower
 If you want to use devise >= 3.2, you must use 1.6.1 or lower

diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec
@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'devise_invitable/version'
 
@@ -15,13 +14,12 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files {app,config,lib}`.split("\n") + %w[LICENSE README.rdoc CHANGELOG.md]
   s.require_path = "lib"
   s.rdoc_options = ["--main", "README.rdoc", "--charset=UTF-8"]
-  s.test_files = `git ls-files test`.split("\n")
+  s.test_files   = `git ls-files test`.split("\n")
 
-  s.required_ruby_version     = '>= 2.1.0'
-  s.required_rubygems_version = '>= 1.3.6'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_development_dependency('bundler', '>= 1.1.0')
+  s.add_runtime_dependency 'actionmailer', '>= 5.0'
+  s.add_runtime_dependency 'devise', '>= 4.6'
 
-  s.add_runtime_dependency('actionmailer', '>= 4.1.0')
-  s.add_runtime_dependency('devise', '>= 4.0.0')
+  s.add_development_dependency 'bundler', '~> 2.0.1'
 end