From 039cdfb7cc2839a5448210c8736eba1191f65666 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Wed, 20 Feb 2019 21:44:04 +0400 Subject: [PATCH 01/43] Enable Rails 6 migrations --- lib/generators/active_record/devise_invitable_generator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generators/active_record/devise_invitable_generator.rb b/lib/generators/active_record/devise_invitable_generator.rb index ba20d4c2..daad471e 100644 --- a/lib/generators/active_record/devise_invitable_generator.rb +++ b/lib/generators/active_record/devise_invitable_generator.rb @@ -3,14 +3,14 @@ module ActiveRecord module Generators class DeviseInvitableGenerator < ActiveRecord::Generators::Base - source_root File.expand_path("../templates", __FILE__) + source_root File.expand_path('../templates', __FILE__) def copy_devise_migration - migration_template "migration.rb", "db/migrate/devise_invitable_add_to_#{table_name}.rb", migration_version: migration_version + migration_template 'migration.rb', "db/migrate/devise_invitable_add_to_#{table_name}.rb", migration_version: migration_version end def migration_version - if Rails.version.start_with? '5.' + if Rails::VERSION::MAJOR >= 5 "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" end end From 7f9efbf4befa6931ebb74c169a7e0868ce858127 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Wed, 20 Feb 2019 23:13:07 +0400 Subject: [PATCH 02/43] Update Ruby versions and remove rbx --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b045e78..8bb0e8d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ language: ruby sudo: false cache: bundler rvm: - - 2.2.9 - - 2.3.6 - - 2.4.3 - - 2.5.0 - - rbx - - jruby-9.1.16.0 + - 2.3.8 + - 2.4.5 + - 2.5.3 + - 2.6.0 + - jruby-9.2.6.0 + - ruby-head jdk: - openjdk7 script: bundle exec rake test @@ -45,7 +45,7 @@ matrix: gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=mongoid allow_failures: - - rvm: rbx - - rvm: jruby-9.1.16.0 + - rvm: ruby-head + - rvm: jruby-9.2.6.0 gemfile: Gemfile - gemfile: gemfiles/Gemfile.rails-master From 5d31cc805ad4d034abf3ef8368f2a98e9310cf6b Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 08:50:18 +0400 Subject: [PATCH 03/43] Revert travis.yml back, but change rbx to rbx-3 --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bb0e8d5..0422e869 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ language: ruby sudo: false cache: bundler rvm: - - 2.3.8 - - 2.4.5 - - 2.5.3 - - 2.6.0 - - jruby-9.2.6.0 - - ruby-head + - 2.2.9 + - 2.3.6 + - 2.4.3 + - 2.5.0 + - rbx-3 + - jruby-9.1.16.0 jdk: - openjdk7 script: bundle exec rake test @@ -45,7 +45,7 @@ matrix: gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=mongoid allow_failures: - - rvm: ruby-head - - rvm: jruby-9.2.6.0 + - rvm: rbx-3 + - rvm: jruby-9.1.16.0 gemfile: Gemfile - gemfile: gemfiles/Gemfile.rails-master From 589ed78c0baaffa478c6bea9b1b7383e76df9325 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 10:04:22 +0400 Subject: [PATCH 04/43] Remove rbx-3 from travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0422e869..31bd8f39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ rvm: - 2.3.6 - 2.4.3 - 2.5.0 - - rbx-3 - jruby-9.1.16.0 jdk: - openjdk7 @@ -45,7 +44,6 @@ matrix: gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=mongoid allow_failures: - - rvm: rbx-3 - rvm: jruby-9.1.16.0 gemfile: Gemfile - gemfile: gemfiles/Gemfile.rails-master From 190e208db5fca21bc5c721a948c7d895dc4166f9 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 10:10:50 +0400 Subject: [PATCH 05/43] Phasing out old Ruby versions --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31bd8f39..94fbf2aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ language: ruby sudo: false cache: bundler rvm: - - 2.2.9 - - 2.3.6 - - 2.4.3 + - 2.3.8 + - 2.4.5 - 2.5.0 - jruby-9.1.16.0 jdk: From d144f11402567130656a25bf131f1caa60a18816 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 14:54:00 +0400 Subject: [PATCH 06/43] Remove support for Devise 4.0, 4.1 Minimum supported Devise version is 4.3 --- .travis.yml | 13 --- Gemfile.lock | 4 +- README.rdoc | 2 +- devise_invitable.gemspec | 2 +- gemfiles/Gemfile.devise-4.0 | 25 ----- gemfiles/Gemfile.devise-4.0.lock | 167 ------------------------------ gemfiles/Gemfile.devise-4.1 | 26 ----- gemfiles/Gemfile.devise-4.1.lock | 170 ------------------------------- 8 files changed, 4 insertions(+), 405 deletions(-) delete mode 100644 gemfiles/Gemfile.devise-4.0 delete mode 100644 gemfiles/Gemfile.devise-4.0.lock delete mode 100644 gemfiles/Gemfile.devise-4.1 delete mode 100644 gemfiles/Gemfile.devise-4.1.lock diff --git a/.travis.yml b/.travis.yml index 94fbf2aa..cab91a1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,6 @@ env: - 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 @@ -24,17 +22,6 @@ 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 gemfile: gemfiles/Gemfile.rails-master diff --git a/Gemfile.lock b/Gemfile.lock index 1bd413e4..dbb6e622 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: devise_invitable (1.7.5) actionmailer (>= 4.1.0) - devise (>= 4.0.0) + devise (>= 4.3.0) GEM remote: https://rubygems.org/ @@ -164,4 +164,4 @@ DEPENDENCIES sqlite3 (~> 1.3.4) BUNDLED WITH - 1.16.3 + 1.17.3 diff --git a/README.rdoc b/README.rdoc index e759c62b..0ae35577 100644 --- 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.3 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 index b263d12b..ea6393f7 100644 --- a/devise_invitable.gemspec +++ b/devise_invitable.gemspec @@ -23,5 +23,5 @@ Gem::Specification.new do |s| s.add_development_dependency('bundler', '>= 1.1.0') s.add_runtime_dependency('actionmailer', '>= 4.1.0') - s.add_runtime_dependency('devise', '>= 4.0.0') + s.add_runtime_dependency('devise', '>= 4.3.0') end diff --git a/gemfiles/Gemfile.devise-4.0 b/gemfiles/Gemfile.devise-4.0 deleted file mode 100644 index 54bb87a1..00000000 --- a/gemfiles/Gemfile.devise-4.0 +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://rubygems.org' - -gemspec :path => '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3' - end - - platforms :ruby do - gem "sqlite3", "~> 1.3.4" - end - - gem 'devise', '~> 4.0.0' - gem 'activerecord', '~> 4.2.7' - gem "mongoid" - # gem "mongoid", :github => "mongoid/mongoid", :branch => "master" - gem "capybara" - #gem "launchy", "~> 2.4.3" - gem 'shoulda', '~> 2.11.3' - gem 'mocha' - gem 'factory_girl_rails' - gem 'nokogiri' - gem 'rspec-rails' -end diff --git a/gemfiles/Gemfile.devise-4.0.lock b/gemfiles/Gemfile.devise-4.0.lock deleted file mode 100644 index 926e79e8..00000000 --- a/gemfiles/Gemfile.devise-4.0.lock +++ /dev/null @@ -1,167 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.3) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) - globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) - arel (~> 6.0) - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) - bcrypt (3.1.11) - bson (4.3.0) - builder (3.2.3) - capybara (2.18.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - concurrent-ruby (1.0.5) - crass (1.0.3) - devise (4.0.3) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - diff-lcs (1.3) - erubis (2.7.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - loofah (2.2.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) - mocha (1.3.0) - metaclass (~> 0.0.1) - mongo (2.5.1) - bson (>= 4.3.0, < 5.0.0) - mongoid (5.2.1) - activemodel (~> 4.0) - mongo (>= 2.4.1, < 3.0.0) - origin (~> 2.3) - tzinfo (>= 0.3.37) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - origin (2.3.1) - orm_adapter (0.5.0) - public_suffix (3.0.2) - rack (1.6.9) - rack-test (0.6.3) - rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) - 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) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.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) - shoulda (2.11.3) - sqlite3 (1.3.13) - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.7) - rack (>= 1.0) - xpath (3.0.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - activerecord (~> 4.2.7) - activerecord-jdbcsqlite3-adapter (~> 1.3) - bundler (>= 1.1.0) - capybara - devise (~> 4.0.0) - devise_invitable! - factory_girl_rails - mocha - mongoid - nokogiri - rspec-rails - shoulda (~> 2.11.3) - sqlite3 (~> 1.3.4) - -BUNDLED WITH - 1.16.1 diff --git a/gemfiles/Gemfile.devise-4.1 b/gemfiles/Gemfile.devise-4.1 deleted file mode 100644 index 01778693..00000000 --- a/gemfiles/Gemfile.devise-4.1 +++ /dev/null @@ -1,26 +0,0 @@ -source 'https://rubygems.org' - -gemspec :path => '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3' - end - - platforms :ruby do - gem "sqlite3", "~> 1.3.4" - end - - gem 'devise', '~> 4.1.0' - gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 - gem 'activerecord', '~> 4.2.7' - gem "mongoid" - # gem "mongoid", :github => "mongoid/mongoid", :branch => "master" - gem "capybara" - #gem "launchy", "~> 2.4.3" - gem 'shoulda', '~> 2.11.3' - gem 'mocha' - gem 'factory_girl_rails' - gem 'nokogiri' - gem 'rspec-rails' -end diff --git a/gemfiles/Gemfile.devise-4.1.lock b/gemfiles/Gemfile.devise-4.1.lock deleted file mode 100644 index a34cc40b..00000000 --- a/gemfiles/Gemfile.devise-4.1.lock +++ /dev/null @@ -1,170 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.3) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) - globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) - arel (~> 6.0) - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) - bcrypt (3.1.11) - bson (4.3.0) - builder (3.2.3) - capybara (2.18.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - concurrent-ruby (1.0.5) - crass (1.0.3) - devise (4.1.1) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - diff-lcs (1.3) - erubis (2.7.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - loofah (2.2.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) - mocha (1.3.0) - metaclass (~> 0.0.1) - mongo (2.5.1) - bson (>= 4.3.0, < 5.0.0) - mongoid (5.2.1) - activemodel (~> 4.0) - mongo (>= 2.4.1, < 3.0.0) - origin (~> 2.3) - tzinfo (>= 0.3.37) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - origin (2.3.1) - orm_adapter (0.5.0) - public_suffix (3.0.2) - rack (1.6.9) - rack-test (0.6.3) - rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) - 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) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.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) - shoulda (2.11.3) - sqlite3 (1.3.13) - test_after_commit (1.1.0) - activerecord (>= 3.2) - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.7) - rack (>= 1.0) - xpath (3.0.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - activerecord (~> 4.2.7) - activerecord-jdbcsqlite3-adapter (~> 1.3) - bundler (>= 1.1.0) - capybara - devise (~> 4.1.0) - devise_invitable! - factory_girl_rails - mocha - mongoid - nokogiri - rspec-rails - shoulda (~> 2.11.3) - sqlite3 (~> 1.3.4) - test_after_commit - -BUNDLED WITH - 1.16.1 From e4ee6e6552ef38da0f34cc1a32d2110e02942474 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 15:00:52 +0400 Subject: [PATCH 07/43] Update minimum allowed rubygems version To match those of Rails 4.2 --- devise_invitable.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec index ea6393f7..528fa8a2 100644 --- a/devise_invitable.gemspec +++ b/devise_invitable.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| 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_rubygems_version = '>= 1.8.11' s.add_development_dependency('bundler', '>= 1.1.0') From 4051e5ead58e69cf660c686113871f4957ad8bc1 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 16:17:28 +0400 Subject: [PATCH 08/43] Update Gemfile to use latest versions when possible Add newer Ruby versions to travis config --- .travis.yml | 9 ++- Gemfile | 16 +++-- Gemfile.lock | 169 ++++++++++++++++++++++++++------------------------- 3 files changed, 98 insertions(+), 96 deletions(-) diff --git a/.travis.yml b/.travis.yml index cab91a1e..d5ac5235 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,9 @@ cache: bundler rvm: - 2.3.8 - 2.4.5 - - 2.5.0 + - 2.5.3 + - 2.6.1 + - ruby-head - jruby-9.1.16.0 jdk: - openjdk7 @@ -23,13 +25,14 @@ services: - mongodb matrix: include: - - rvm: 2.5.0 + - rvm: 2.5.3 gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=active_record - - rvm: 2.5.0 + - rvm: 2.5.3 gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=mongoid allow_failures: - rvm: jruby-9.1.16.0 + - rvm: ruby-head gemfile: Gemfile - gemfile: gemfiles/Gemfile.rails-master diff --git a/Gemfile b/Gemfile index d75a4a0d..00576a3f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,20 +4,18 @@ 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 'devise', '~> 4.6' + gem 'activerecord', '~> 5.2.2' + gem 'actionmailer', '~> 5.2.2' + gem 'mongoid' # github: 'mongoid/mongoid', branch: 'master' + gem 'capybara' gem 'mocha' gem 'nokogiri' gem 'rspec-rails' diff --git a/Gemfile.lock b/Gemfile.lock index dbb6e622..34890441 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,141 +8,142 @@ PATH 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 @@ -150,18 +151,18 @@ PLATFORMS ruby DEPENDENCIES - actionmailer (~> 5.1.0) - activerecord (~> 5.1.0) - activerecord-jdbcsqlite3-adapter (>= 5.0.pre1) + actionmailer (~> 5.2.2) + activerecord (~> 5.2.2) + activerecord-jdbcsqlite3-adapter (~> 52.1) bundler (>= 1.1.0) 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.17.3 From 02e4e6059befcf82506baf45ebfb639d61c78f09 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 16:29:06 +0400 Subject: [PATCH 09/43] Remove deprecated secret_token from Rails app Will be removed in Rails 6.0 --- test/rails_app/config/credentials.yml.enc | 1 + test/rails_app/config/initializers/secret_token.rb | 7 ------- test/rails_app/config/master.key | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) create mode 100644 test/rails_app/config/credentials.yml.enc delete mode 100644 test/rails_app/config/initializers/secret_token.rb create mode 100644 test/rails_app/config/master.key diff --git a/test/rails_app/config/credentials.yml.enc b/test/rails_app/config/credentials.yml.enc new file mode 100644 index 00000000..8a33703e --- /dev/null +++ b/test/rails_app/config/credentials.yml.enc @@ -0,0 +1 @@ +d19hQaf4kv/ajU/ABKNej/dqmAPNDfiZSBnGbsfBAs3oLxNVvuJm8TJ1bUMaZ2s2hcDSZRQKHtJqcDfBMrN0egkVPYaoGvYOZ7XzU2v9O1xhEwI9wFO+0yWDDTDxC8UJr60s+Gh++jQMCxTZ+Yhl5Od8d2rqoMcuhZrGhKOuvPBARyyDSN2/Q0rvIYO+OGFFkwTK+HD2ccRzYWBNH8DBMSeh8ja83BykLE0fNL9tPmYKK1gnEsME7AN8UN/AmFqFPLOX9otfQ0imwLhnsWMYPxqfJoqvgEpuAywPW3n3nIpzX1/dwpDrHnm5tbsIwgctlq4Q2DFu6dc7H3Pzjx6INWCB5pr97zH84+gHjYuoLafUxGEN8zbxFyrPe0Pm8jPi5qfJP3HlaweFR/XhNI1s+pl2WZQqAEkjMp0h--z4CX57AIHm+gPVBc--UBpBryKnypoqwmbLDIqa8Q== \ No newline at end of file diff --git a/test/rails_app/config/initializers/secret_token.rb b/test/rails_app/config/initializers/secret_token.rb deleted file mode 100644 index 3e3abfb6..00000000 --- a/test/rails_app/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607' diff --git a/test/rails_app/config/master.key b/test/rails_app/config/master.key new file mode 100644 index 00000000..6f82ac39 --- /dev/null +++ b/test/rails_app/config/master.key @@ -0,0 +1 @@ +698ff206d79207132705d29c6a1c90b1 \ No newline at end of file From 29d088fc66122cbad51ef7738c4fdc81c6aada52 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 16:44:02 +0400 Subject: [PATCH 10/43] Use latest bundler 2.0.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 34890441..3c6e36f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,4 +165,4 @@ DEPENDENCIES sqlite3 (~> 1.3.6) BUNDLED WITH - 1.17.3 + 2.0.1 From 4610c40952c580afac80875fc336e548459123e3 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 16:55:12 +0400 Subject: [PATCH 11/43] Remove rails-5.0 gemfile --- gemfiles/Gemfile.rails-5.0 | 25 ----- gemfiles/Gemfile.rails-5.0.lock | 161 -------------------------------- 2 files changed, 186 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-5.0 delete mode 100644 gemfiles/Gemfile.rails-5.0.lock diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0 deleted file mode 100644 index 85c937e4..00000000 --- a/gemfiles/Gemfile.rails-5.0 +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1' - end - - platforms :ruby do - gem "sqlite3", "~> 1.3.4" - end - - gem 'devise', '~> 4.0' - gem 'activerecord', '~> 5.0.0' - gem 'actionmailer', '~> 5.0.0' - gem "mongoid" - # gem "mongoid", :github => "mongoid/mongoid", :branch => "master" - gem "capybara" - #gem "launchy", "~> 2.4.3" - gem 'mocha' - gem 'factory_girl_rails' - gem 'nokogiri' - gem 'rspec-rails' -end diff --git a/gemfiles/Gemfile.rails-5.0.lock b/gemfiles/Gemfile.rails-5.0.lock deleted file mode 100644 index 26abca34..00000000 --- a/gemfiles/Gemfile.rails-5.0.lock +++ /dev/null @@ -1,161 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.4) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (5.0.6) - actionpack (= 5.0.6) - actionview (= 5.0.6) - activejob (= 5.0.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.0.6) - actionview (= 5.0.6) - activesupport (= 5.0.6) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.6) - activesupport (= 5.0.6) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.6) - activesupport (= 5.0.6) - globalid (>= 0.3.6) - activemodel (5.0.6) - activesupport (= 5.0.6) - activerecord (5.0.6) - activemodel (= 5.0.6) - activesupport (= 5.0.6) - arel (~> 7.0) - activesupport (5.0.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - arel (7.1.4) - bcrypt (3.1.11) - bson (4.3.0) - builder (3.2.3) - capybara (2.18.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - concurrent-ruby (1.0.5) - crass (1.0.3) - devise (4.4.2) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) - responders - warden (~> 1.2.3) - diff-lcs (1.3) - erubis (2.7.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - loofah (2.2.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - method_source (0.9.0) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) - mocha (1.3.0) - metaclass (~> 0.0.1) - mongo (2.5.1) - bson (>= 4.3.0, < 5.0.0) - mongoid (6.1.1) - activemodel (~> 5.0) - mongo (>= 2.4.1, < 3.0.0) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - orm_adapter (0.5.0) - public_suffix (3.0.2) - rack (2.0.4) - rack-test (0.6.3) - rack (>= 1.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.6) - actionpack (= 5.0.6) - activesupport (= 5.0.6) - 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) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.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) - sqlite3 (1.3.13) - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.7) - rack (>= 1.0) - xpath (3.0.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - actionmailer (~> 5.0.0) - activerecord (~> 5.0.0) - activerecord-jdbcsqlite3-adapter (>= 5.0.pre1) - bundler (>= 1.1.0) - capybara - devise (~> 4.0) - devise_invitable! - factory_girl_rails - mocha - mongoid - nokogiri - rspec-rails - sqlite3 (~> 1.3.4) - -BUNDLED WITH - 1.16.1 From 4d9d2af684528bf8a84bf68db5850d9e889b63b7 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 16:59:24 +0400 Subject: [PATCH 12/43] Update Rails 4.2 dependencies --- gemfiles/Gemfile.rails-4.2 | 17 ++-- gemfiles/Gemfile.rails-4.2.lock | 164 ++++++++++++++++---------------- 2 files changed, 91 insertions(+), 90 deletions(-) diff --git a/gemfiles/Gemfile.rails-4.2 b/gemfiles/Gemfile.rails-4.2 index a5611f67..dc79e2b4 100644 --- a/gemfiles/Gemfile.rails-4.2 +++ b/gemfiles/Gemfile.rails-4.2 @@ -4,23 +4,22 @@ gemspec path: '..' group :test do platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.0.beta1' + 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 'devise', '~> 4.6' gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 - gem 'activerecord', '~> 4.2.7' - gem 'actionmailer', '~> 4.2.7' - gem "mongoid" - # gem "mongoid", :github => "mongoid/mongoid", :branch => "master" + gem 'activerecord', '~> 4.2.11' + gem 'actionmailer', '~> 4.2.11' + # gem "mongoid", github: 'mongoid/mongoid', branch: 'master' + gem 'mongoid' gem "capybara" - #gem "launchy", "~> 2.4.3" gem 'mocha' - gem 'factory_girl_rails' + gem 'factory_bot_rails' gem 'nokogiri' gem 'rspec-rails' end diff --git a/gemfiles/Gemfile.rails-4.2.lock b/gemfiles/Gemfile.rails-4.2.lock index 2575ee49..ca705375 100644 --- a/gemfiles/Gemfile.rails-4.2.lock +++ b/gemfiles/Gemfile.rails-4.2.lock @@ -1,63 +1,64 @@ PATH remote: .. specs: - devise_invitable (1.7.3) + devise_invitable (1.7.5) actionmailer (>= 4.1.0) - devise (>= 4.0.0) + devise (>= 4.3.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) + activejob (4.2.11) + activesupport (= 4.2.11) globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) + activemodel (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) + activerecord (4.2.11) + activemodel (= 4.2.11) + activesupport (= 4.2.11) arel (~> 6.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) arel (6.0.4) - bcrypt (3.1.11) - bson (4.3.0) + bcrypt (3.1.12) + bson (4.4.2) builder (3.2.3) - capybara (2.18.0) + capybara (3.13.2) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - concurrent-ruby (1.0.5) - crass (1.0.3) - devise (4.4.2) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.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) @@ -65,39 +66,39 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) erubis (2.7.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - globalid (0.4.1) + factory_bot (5.0.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + globalid (0.4.2) activesupport (>= 4.2.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - loofah (2.2.0) + 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) - mini_mime (1.0.0) - mini_portile2 (2.3.0) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (5.11.3) - mocha (1.3.0) + mocha (1.8.0) metaclass (~> 0.0.1) - mongo (2.5.1) - bson (>= 4.3.0, < 5.0.0) - mongoid (5.2.1) + mongo (2.7.0) + bson (>= 4.4.2, < 5.0.0) + mongoid (5.4.0) activemodel (~> 4.0) - mongo (>= 2.4.1, < 3.0.0) + mongo (>= 2.5.1, < 3.0.0) origin (~> 2.3) tzinfo (>= 0.3.37) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) origin (2.3.1) orm_adapter (0.5.0) - public_suffix (3.0.2) - rack (1.6.9) + public_suffix (3.0.3) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) rails-deprecated_sanitizer (1.0.3) @@ -106,64 +107,65 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.11) + actionpack (= 4.2.11) + activesupport (= 4.2.11) 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) + 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) - test_after_commit (1.1.0) - activerecord (>= 3.2) - thor (0.20.0) + test_after_commit (1.2.2) + activerecord (>= 3.2, < 5.0) + thor (0.20.3) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) warden (1.2.7) rack (>= 1.0) - xpath (3.0.0) + xpath (3.2.0) nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES - actionmailer (~> 4.2.7) - activerecord (~> 4.2.7) - activerecord-jdbcsqlite3-adapter (~> 1.3.0.beta1) + actionmailer (~> 4.2.11) + activerecord (~> 4.2.11) + activerecord-jdbcsqlite3-adapter (~> 52.1) bundler (>= 1.1.0) capybara - devise (~> 4.0) + devise (~> 4.6) devise_invitable! - factory_girl_rails + factory_bot_rails mocha mongoid nokogiri rspec-rails - sqlite3 (~> 1.3.4) + sqlite3 (~> 1.3.6) test_after_commit BUNDLED WITH - 1.16.1 + 2.0.1 From 6f07a648f9caeba91bed8e50e6bd146fd36a91cf Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 16:59:52 +0400 Subject: [PATCH 13/43] Remove rails 5.2 config --- gemfiles/Gemfile.rails-5.2 | 25 ----- gemfiles/Gemfile.rails-5.2.lock | 161 -------------------------------- 2 files changed, 186 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-5.2 delete mode 100644 gemfiles/Gemfile.rails-5.2.lock diff --git a/gemfiles/Gemfile.rails-5.2 b/gemfiles/Gemfile.rails-5.2 deleted file mode 100644 index d6f82924..00000000 --- a/gemfiles/Gemfile.rails-5.2 +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '>= 5.0.pre1' - end - - platforms :ruby do - gem "sqlite3", "~> 1.3.4" - end - - gem 'devise', '~> 4.0' - gem 'activerecord', '~> 5.2.0' - gem 'actionmailer', '~> 5.2.0' - gem "mongoid" - # gem "mongoid", :github => "mongoid/mongoid", :branch => "master" - gem "capybara" - #gem "launchy", "~> 2.4.3" - gem 'mocha' - gem 'factory_girl_rails' - gem 'nokogiri' - gem 'rspec-rails' -end diff --git a/gemfiles/Gemfile.rails-5.2.lock b/gemfiles/Gemfile.rails-5.2.lock deleted file mode 100644 index c29b03c4..00000000 --- a/gemfiles/Gemfile.rails-5.2.lock +++ /dev/null @@ -1,161 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.4) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (5.2.0) - actionpack (= 5.2.0) - actionview (= 5.2.0) - activejob (= 5.2.0) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.0) - actionview (= 5.2.0) - activesupport (= 5.2.0) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.0) - activesupport (= 5.2.0) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.0) - activesupport (= 5.2.0) - globalid (>= 0.3.6) - activemodel (5.2.0) - activesupport (= 5.2.0) - activerecord (5.2.0) - activemodel (= 5.2.0) - activesupport (= 5.2.0) - arel (>= 9.0) - activesupport (5.2.0) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - arel (9.0.0) - bcrypt (3.1.11) - bson (4.3.0) - builder (3.2.3) - capybara (3.0.3) - 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) - crass (1.0.4) - devise (4.4.3) - 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) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - i18n (1.0.1) - concurrent-ruby (~> 1.0) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - method_source (0.9.0) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.11.3) - mocha (1.5.0) - metaclass (~> 0.0.1) - mongo (2.5.3) - bson (>= 4.3.0, < 5.0.0) - mongoid (7.0.1) - activemodel (>= 5.1, < 6.0.0) - mongo (>= 2.5.1, < 3.0.0) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - orm_adapter (0.5.0) - public_suffix (3.0.2) - rack (2.0.5) - rack-test (1.0.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.2.0) - actionpack (= 5.2.0) - activesupport (= 5.2.0) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.3.1) - 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) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.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) - sqlite3 (1.3.13) - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.7) - rack (>= 1.0) - xpath (3.0.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - actionmailer (~> 5.2.0) - activerecord (~> 5.2.0) - activerecord-jdbcsqlite3-adapter (>= 5.0.pre1) - bundler (>= 1.1.0) - capybara - devise (~> 4.0) - devise_invitable! - factory_girl_rails - mocha - mongoid - nokogiri - rspec-rails - sqlite3 (~> 1.3.4) - -BUNDLED WITH - 1.16.1 From 03cd2a7bf05933e91ae09c3ec13ba4be33c45a91 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:09:47 +0400 Subject: [PATCH 14/43] Add config for devise 4.5 --- gemfiles/Gemfile.devise-4.5 | 25 +++++ gemfiles/Gemfile.devise-4.5.lock | 172 +++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 gemfiles/Gemfile.devise-4.5 create mode 100644 gemfiles/Gemfile.devise-4.5.lock diff --git a/gemfiles/Gemfile.devise-4.5 b/gemfiles/Gemfile.devise-4.5 new file mode 100644 index 00000000..156a4c2b --- /dev/null +++ b/gemfiles/Gemfile.devise-4.5 @@ -0,0 +1,25 @@ +source 'https://rubygems.org' + +gemspec path: '..' + +group :test do + platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' + end + + platforms :ruby do + gem 'sqlite3', '~> 1.3.6' + end + + gem 'devise', '~> 4.5.0' + gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 + gem 'activerecord', '~> 5.2.2' + gem 'mongoid' + # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' + gem 'capybara' + gem 'shoulda' + gem 'mocha' + gem 'factory_girl_rails' + gem 'nokogiri' + gem 'rspec-rails' +end diff --git a/gemfiles/Gemfile.devise-4.5.lock b/gemfiles/Gemfile.devise-4.5.lock new file mode 100644 index 00000000..7da209ce --- /dev/null +++ b/gemfiles/Gemfile.devise-4.5.lock @@ -0,0 +1,172 @@ +PATH + remote: .. + specs: + devise_invitable (1.7.5) + actionmailer (>= 4.1.0) + devise (>= 4.3.0) + +GEM + remote: https://rubygems.org/ + specs: + 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.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.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.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + arel (9.0.0) + bcrypt (3.1.12) + bson (4.4.2) + builder (3.2.3) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + concurrent-ruby (1.1.4) + crass (1.0.4) + devise (4.5.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 6.0) + responders + warden (~> 1.2.3) + diff-lcs (1.3) + erubi (1.8.0) + factory_girl (4.9.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) + railties (>= 3.0.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.5.3) + concurrent-ruby (~> 1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + metaclass (0.0.4) + method_source (0.9.2) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + 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.10.1) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.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.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + 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.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + 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) + shoulda (3.6.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 3.0) + shoulda-context (1.2.2) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) + sqlite3 (1.3.13) + test_after_commit (1.1.0) + activerecord (>= 3.2) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + warden (1.2.8) + rack (>= 2.0.6) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + activerecord (~> 5.2.2) + activerecord-jdbcsqlite3-adapter (~> 52.1) + bundler (>= 1.1.0) + capybara + devise (~> 4.5.0) + devise_invitable! + factory_girl_rails + mocha + mongoid + nokogiri + rspec-rails + shoulda + sqlite3 (~> 1.3.6) + test_after_commit + +BUNDLED WITH + 2.0.1 From 3673f13bd2df7e3a50d23939e8221b8795363fc7 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:17:57 +0400 Subject: [PATCH 15/43] Order dependencies alphabetically, add git_source(:github) --- Gemfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 00576a3f..e1e52ea1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec @@ -11,12 +12,12 @@ group :test do gem 'sqlite3', '~> 1.3.6' end - gem 'devise', '~> 4.6' - gem 'activerecord', '~> 5.2.2' gem 'actionmailer', '~> 5.2.2' - gem 'mongoid' # github: 'mongoid/mongoid', branch: 'master' + 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 From 8e55fb6972e6ab3f70934dc0a4a3f26a73b17538 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:18:52 +0400 Subject: [PATCH 16/43] Update devise 4.4 dependencies --- gemfiles/Gemfile.devise-4.4 | 21 ++- gemfiles/Gemfile.devise-4.4.lock | 222 +++++++++++++++---------------- 2 files changed, 121 insertions(+), 122 deletions(-) diff --git a/gemfiles/Gemfile.devise-4.4 b/gemfiles/Gemfile.devise-4.4 index 0e3a6b54..dae1c668 100644 --- a/gemfiles/Gemfile.devise-4.4 +++ b/gemfiles/Gemfile.devise-4.4 @@ -1,26 +1,25 @@ source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gemspec :path => '..' +gemspec path: '..' group :test do platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3' + gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' end platforms :ruby do - gem "sqlite3", "~> 1.3.4" + gem 'sqlite3', '~> 1.3.6' end + gem 'actionmailer', '~> 5.2.2' + gem 'activerecord', '~> 5.2.2' + gem 'capybara' gem 'devise', '~> 4.4.0' - gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 - gem 'activerecord', '~> 4.2.7' - gem "mongoid" - # gem "mongoid", :github => "mongoid/mongoid", :branch => "master" - gem "capybara" - #gem "launchy", "~> 2.4.3" - gem 'shoulda', '~> 2.11.3' + gem 'factory_bot_rails' gem 'mocha' - gem 'factory_girl_rails' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' gem 'rspec-rails' + gem 'shoulda' end diff --git a/gemfiles/Gemfile.devise-4.4.lock b/gemfiles/Gemfile.devise-4.4.lock index 0bf13423..c0a8fae7 100644 --- a/gemfiles/Gemfile.devise-4.4.lock +++ b/gemfiles/Gemfile.devise-4.4.lock @@ -1,170 +1,170 @@ PATH remote: .. specs: - devise_invitable (1.7.3) + devise_invitable (1.7.5) actionmailer (>= 4.1.0) - devise (>= 4.0.0) + devise (>= 4.3.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + 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 (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + 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 (4.2.10) - activesupport (= 4.2.10) + actionview (5.2.2) + activesupport (= 5.2.2) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) - globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) - builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) - arel (~> 6.0) - activesupport (4.2.10) - i18n (~> 0.7) + activejob (5.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) - bcrypt (3.1.11) - bson (4.3.0) + arel (9.0.0) + bcrypt (3.1.12) + bson (4.4.2) builder (3.2.3) - capybara (2.18.0) + capybara (3.13.2) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - concurrent-ruby (1.0.5) - crass (1.0.3) - devise (4.4.2) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + concurrent-ruby (1.1.4) + crass (1.0.4) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) responders warden (~> 1.2.3) diff-lcs (1.3) - erubis (2.7.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) - globalid (0.4.1) + erubi (1.8.0) + factory_bot (5.0.1) activesupport (>= 4.2.0) - i18n (0.9.5) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.5.3) concurrent-ruby (~> 1.0) - loofah (2.2.0) + 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) - 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.3.0) + mocha (1.8.0) metaclass (~> 0.0.1) - mongo (2.5.1) - bson (>= 4.3.0, < 5.0.0) - mongoid (5.2.1) - activemodel (~> 4.0) - mongo (>= 2.4.1, < 3.0.0) - origin (~> 2.3) - tzinfo (>= 0.3.37) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - origin (2.3.1) + 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.10.1) + mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - public_suffix (3.0.2) - rack (1.6.9) - rack-test (0.6.3) - rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + 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.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) - shoulda (2.11.3) + 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) + shoulda (3.6.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 3.0) + shoulda-context (1.2.2) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) sqlite3 (1.3.13) - test_after_commit (1.1.0) - activerecord (>= 3.2) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) 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 ruby DEPENDENCIES - activerecord (~> 4.2.7) - activerecord-jdbcsqlite3-adapter (~> 1.3) + actionmailer (~> 5.2.2) + activerecord (~> 5.2.2) + activerecord-jdbcsqlite3-adapter (~> 52.1) bundler (>= 1.1.0) capybara devise (~> 4.4.0) devise_invitable! - factory_girl_rails + factory_bot_rails mocha mongoid nokogiri rspec-rails - shoulda (~> 2.11.3) - sqlite3 (~> 1.3.4) - test_after_commit + shoulda + sqlite3 (~> 1.3.6) BUNDLED WITH - 1.16.1 + 2.0.1 From 2ca94e9dff8d776915b4663ef7ef63373c0e0615 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:19:11 +0400 Subject: [PATCH 17/43] Update devise 4.5 dependencies --- gemfiles/Gemfile.devise-4.5 | 12 ++++++------ gemfiles/Gemfile.devise-4.5.lock | 16 +++++++--------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gemfiles/Gemfile.devise-4.5 b/gemfiles/Gemfile.devise-4.5 index 156a4c2b..d4e93e67 100644 --- a/gemfiles/Gemfile.devise-4.5 +++ b/gemfiles/Gemfile.devise-4.5 @@ -1,4 +1,5 @@ source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: '..' @@ -11,15 +12,14 @@ group :test do gem 'sqlite3', '~> 1.3.6' end - gem 'devise', '~> 4.5.0' - gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 + gem 'actionmailer', '~> 5.2.2' gem 'activerecord', '~> 5.2.2' - gem 'mongoid' - # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'capybara' - gem 'shoulda' + gem 'devise', '~> 4.5.0' + gem 'factory_bot_rails' gem 'mocha' - gem 'factory_girl_rails' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' gem 'rspec-rails' + gem 'shoulda' end diff --git a/gemfiles/Gemfile.devise-4.5.lock b/gemfiles/Gemfile.devise-4.5.lock index 7da209ce..baf2d0f8 100644 --- a/gemfiles/Gemfile.devise-4.5.lock +++ b/gemfiles/Gemfile.devise-4.5.lock @@ -65,11 +65,11 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) erubi (1.8.0) - factory_girl (4.9.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) - railties (>= 3.0.0) + factory_bot (5.0.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.5.3) @@ -138,8 +138,6 @@ GEM shoulda-matchers (3.1.3) activesupport (>= 4.0.0) sqlite3 (1.3.13) - test_after_commit (1.1.0) - activerecord (>= 3.2) thor (0.20.3) thread_safe (0.3.6) tzinfo (1.2.5) @@ -153,20 +151,20 @@ PLATFORMS ruby DEPENDENCIES + actionmailer (~> 5.2.2) activerecord (~> 5.2.2) activerecord-jdbcsqlite3-adapter (~> 52.1) bundler (>= 1.1.0) capybara devise (~> 4.5.0) devise_invitable! - factory_girl_rails + factory_bot_rails mocha mongoid nokogiri rspec-rails shoulda sqlite3 (~> 1.3.6) - test_after_commit BUNDLED WITH 2.0.1 From 45875e6a3cb72b61fd4bbfe5a08b3a2dcce30cf8 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:19:50 +0400 Subject: [PATCH 18/43] Update Rails 4.2 dependencies With Devise 4.6 --- gemfiles/Gemfile.rails-4.2 | 14 +++++++------- gemfiles/Gemfile.rails-4.2.lock | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gemfiles/Gemfile.rails-4.2 b/gemfiles/Gemfile.rails-4.2 index dc79e2b4..5be74b9f 100644 --- a/gemfiles/Gemfile.rails-4.2 +++ b/gemfiles/Gemfile.rails-4.2 @@ -1,4 +1,5 @@ source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: '..' @@ -11,15 +12,14 @@ group :test do gem 'sqlite3', '~> 1.3.6' end - gem 'devise', '~> 4.6' - gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 - gem 'activerecord', '~> 4.2.11' gem 'actionmailer', '~> 4.2.11' - # gem "mongoid", github: 'mongoid/mongoid', branch: 'master' - gem 'mongoid' - gem "capybara" - gem 'mocha' + gem 'activerecord', '~> 4.2.11' + gem 'capybara' + gem 'devise', '~> 4.6.0' gem 'factory_bot_rails' + gem 'mocha' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' gem 'rspec-rails' + gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 end diff --git a/gemfiles/Gemfile.rails-4.2.lock b/gemfiles/Gemfile.rails-4.2.lock index ca705375..cd703813 100644 --- a/gemfiles/Gemfile.rails-4.2.lock +++ b/gemfiles/Gemfile.rails-4.2.lock @@ -157,7 +157,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter (~> 52.1) bundler (>= 1.1.0) capybara - devise (~> 4.6) + devise (~> 4.6.0) devise_invitable! factory_bot_rails mocha From 128422d310db7857770ab67708faa22de2fba7d2 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:29:20 +0400 Subject: [PATCH 19/43] Drop Rails 4.2 support Conflicts with 5.2/6.0 --- .travis.yml | 7 +- gemfiles/Gemfile.rails-4.2 | 25 ----- gemfiles/Gemfile.rails-4.2.lock | 171 -------------------------------- 3 files changed, 3 insertions(+), 200 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-4.2 delete mode 100644 gemfiles/Gemfile.rails-4.2.lock diff --git a/.travis.yml b/.travis.yml index d5ac5235..a7be0f2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,16 @@ env: gemfile: - Gemfile - gemfiles/Gemfile.devise-4.4 - - gemfiles/Gemfile.rails-4.2 - - gemfiles/Gemfile.rails-5.0 + - gemfiles/Gemfile.devise-4.5 install: "travis_retry bundle install" services: - mongodb matrix: include: - - rvm: 2.5.3 + - rvm: 2.6.1 gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=active_record - - rvm: 2.5.3 + - rvm: 2.6.1 gemfile: gemfiles/Gemfile.rails-master env: DEVISE_ORM=mongoid allow_failures: diff --git a/gemfiles/Gemfile.rails-4.2 b/gemfiles/Gemfile.rails-4.2 deleted file mode 100644 index 5be74b9f..00000000 --- a/gemfiles/Gemfile.rails-4.2 +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.6' - end - - gem 'actionmailer', '~> 4.2.11' - gem 'activerecord', '~> 4.2.11' - gem 'capybara' - gem 'devise', '~> 4.6.0' - gem 'factory_bot_rails' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'test_after_commit' # needed for devise >= 4.1 and rails < 5 -end diff --git a/gemfiles/Gemfile.rails-4.2.lock b/gemfiles/Gemfile.rails-4.2.lock deleted file mode 100644 index cd703813..00000000 --- a/gemfiles/Gemfile.rails-4.2.lock +++ /dev/null @@ -1,171 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.5) - actionmailer (>= 4.1.0) - devise (>= 4.3.0) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11) - activesupport (= 4.2.11) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) - globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) - builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) - arel (~> 6.0) - activesupport (4.2.11) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) - bcrypt (3.1.12) - bson (4.4.2) - builder (3.2.3) - capybara (3.13.2) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.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) - erubis (2.7.0) - factory_bot (5.0.1) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - mocha (1.8.0) - metaclass (~> 0.0.1) - mongo (2.7.0) - bson (>= 4.4.2, < 5.0.0) - mongoid (5.4.0) - activemodel (~> 4.0) - mongo (>= 2.5.1, < 3.0.0) - origin (~> 2.3) - tzinfo (>= 0.3.37) - nokogiri (1.10.1) - mini_portile2 (~> 2.4.0) - origin (2.3.1) - orm_adapter (0.5.0) - public_suffix (3.0.3) - rack (1.6.11) - rack-test (0.6.3) - rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (4.2.11) - actionpack (= 4.2.11) - activesupport (= 4.2.11) - rake (>= 0.8.7) - thor (>= 0.18.1, < 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.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - 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) - test_after_commit (1.2.2) - activerecord (>= 3.2, < 5.0) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.7) - rack (>= 1.0) - xpath (3.2.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - actionmailer (~> 4.2.11) - activerecord (~> 4.2.11) - activerecord-jdbcsqlite3-adapter (~> 52.1) - bundler (>= 1.1.0) - capybara - devise (~> 4.6.0) - devise_invitable! - factory_bot_rails - mocha - mongoid - nokogiri - rspec-rails - sqlite3 (~> 1.3.6) - test_after_commit - -BUNDLED WITH - 2.0.1 From b2c4850139cafbb73b857b9e2c295d8bcae5a47b Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:34:57 +0400 Subject: [PATCH 20/43] Up required rubygems version to 2.5.0 --- devise_invitable.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec index 528fa8a2..ed964e1b 100644 --- a/devise_invitable.gemspec +++ b/devise_invitable.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = `git ls-files test`.split("\n") s.required_ruby_version = '>= 2.1.0' - s.required_rubygems_version = '>= 1.8.11' + s.required_rubygems_version = '>= 2.5.0' s.add_development_dependency('bundler', '>= 1.1.0') From c178ca9c524a5705f4d1f0f70ecd8637449ff84e Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:35:18 +0400 Subject: [PATCH 21/43] Install Bundler 2.0.1 before running CI --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a7be0f2c..476f14b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: ruby +before_install: + - gem update --system + - gem install bundler sudo: false cache: bundler rvm: From 196b8a88f5bb10d27b22eaee8db994f581b6eaae Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:50:28 +0400 Subject: [PATCH 22/43] Delete Devise 4.4 config --- gemfiles/Gemfile.devise-4.4 | 25 ----- gemfiles/Gemfile.devise-4.4.lock | 170 ------------------------------- 2 files changed, 195 deletions(-) delete mode 100644 gemfiles/Gemfile.devise-4.4 delete mode 100644 gemfiles/Gemfile.devise-4.4.lock diff --git a/gemfiles/Gemfile.devise-4.4 b/gemfiles/Gemfile.devise-4.4 deleted file mode 100644 index dae1c668..00000000 --- a/gemfiles/Gemfile.devise-4.4 +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.6' - end - - gem 'actionmailer', '~> 5.2.2' - gem 'activerecord', '~> 5.2.2' - gem 'capybara' - gem 'devise', '~> 4.4.0' - gem 'factory_bot_rails' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'shoulda' -end diff --git a/gemfiles/Gemfile.devise-4.4.lock b/gemfiles/Gemfile.devise-4.4.lock deleted file mode 100644 index c0a8fae7..00000000 --- a/gemfiles/Gemfile.devise-4.4.lock +++ /dev/null @@ -1,170 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.5) - actionmailer (>= 4.1.0) - devise (>= 4.3.0) - -GEM - remote: https://rubygems.org/ - specs: - 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.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.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.2.2) - activesupport (= 5.2.2) - globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) - arel (>= 9.0) - activesupport (5.2.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - arel (9.0.0) - bcrypt (3.1.12) - bson (4.4.2) - builder (3.2.3) - capybara (3.13.2) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (~> 1.2) - xpath (~> 3.2) - concurrent-ruby (1.1.4) - crass (1.0.4) - devise (4.4.3) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) - responders - warden (~> 1.2.3) - diff-lcs (1.3) - erubi (1.8.0) - factory_bot (5.0.1) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.5.3) - concurrent-ruby (~> 1.0) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - method_source (0.9.2) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - mocha (1.8.0) - metaclass (~> 0.0.1) - 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.10.1) - mini_portile2 (~> 2.4.0) - orm_adapter (0.5.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.2.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) - method_source - rake (>= 0.8.7) - 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.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - 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) - shoulda (3.6.0) - shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (~> 3.0) - shoulda-context (1.2.2) - shoulda-matchers (3.1.3) - activesupport (>= 4.0.0) - sqlite3 (1.3.13) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.8) - rack (>= 2.0.6) - xpath (3.2.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - actionmailer (~> 5.2.2) - activerecord (~> 5.2.2) - activerecord-jdbcsqlite3-adapter (~> 52.1) - bundler (>= 1.1.0) - capybara - devise (~> 4.4.0) - devise_invitable! - factory_bot_rails - mocha - mongoid - nokogiri - rspec-rails - shoulda - sqlite3 (~> 1.3.6) - -BUNDLED WITH - 2.0.1 From 5ac914631aba3b5038156ebd78a26764871d4f5d Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:50:46 +0400 Subject: [PATCH 23/43] Remove devise 4.5 config --- gemfiles/Gemfile.devise-4.5 | 25 ----- gemfiles/Gemfile.devise-4.5.lock | 170 ------------------------------- 2 files changed, 195 deletions(-) delete mode 100644 gemfiles/Gemfile.devise-4.5 delete mode 100644 gemfiles/Gemfile.devise-4.5.lock diff --git a/gemfiles/Gemfile.devise-4.5 b/gemfiles/Gemfile.devise-4.5 deleted file mode 100644 index d4e93e67..00000000 --- a/gemfiles/Gemfile.devise-4.5 +++ /dev/null @@ -1,25 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.6' - end - - gem 'actionmailer', '~> 5.2.2' - gem 'activerecord', '~> 5.2.2' - gem 'capybara' - gem 'devise', '~> 4.5.0' - gem 'factory_bot_rails' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'shoulda' -end diff --git a/gemfiles/Gemfile.devise-4.5.lock b/gemfiles/Gemfile.devise-4.5.lock deleted file mode 100644 index baf2d0f8..00000000 --- a/gemfiles/Gemfile.devise-4.5.lock +++ /dev/null @@ -1,170 +0,0 @@ -PATH - remote: .. - specs: - devise_invitable (1.7.5) - actionmailer (>= 4.1.0) - devise (>= 4.3.0) - -GEM - remote: https://rubygems.org/ - specs: - 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.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.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.2.2) - activesupport (= 5.2.2) - globalid (>= 0.3.6) - activemodel (5.2.2) - activesupport (= 5.2.2) - activerecord (5.2.2) - activemodel (= 5.2.2) - activesupport (= 5.2.2) - arel (>= 9.0) - activesupport (5.2.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - arel (9.0.0) - bcrypt (3.1.12) - bson (4.4.2) - builder (3.2.3) - capybara (3.13.2) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (~> 1.2) - xpath (~> 3.2) - concurrent-ruby (1.1.4) - crass (1.0.4) - devise (4.5.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) - responders - warden (~> 1.2.3) - diff-lcs (1.3) - erubi (1.8.0) - factory_bot (5.0.1) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - i18n (1.5.3) - concurrent-ruby (~> 1.0) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - metaclass (0.0.4) - method_source (0.9.2) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - mocha (1.8.0) - metaclass (~> 0.0.1) - 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.10.1) - mini_portile2 (~> 2.4.0) - orm_adapter (0.5.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.2.2) - actionpack (= 5.2.2) - activesupport (= 5.2.2) - method_source - rake (>= 0.8.7) - 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.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - 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) - shoulda (3.6.0) - shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (~> 3.0) - shoulda-context (1.2.2) - shoulda-matchers (3.1.3) - activesupport (>= 4.0.0) - sqlite3 (1.3.13) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - warden (1.2.8) - rack (>= 2.0.6) - xpath (3.2.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - actionmailer (~> 5.2.2) - activerecord (~> 5.2.2) - activerecord-jdbcsqlite3-adapter (~> 52.1) - bundler (>= 1.1.0) - capybara - devise (~> 4.5.0) - devise_invitable! - factory_bot_rails - mocha - mongoid - nokogiri - rspec-rails - shoulda - sqlite3 (~> 1.3.6) - -BUNDLED WITH - 2.0.1 From a01c4919312c48527eaa8229bbaf6831826cd6e6 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:52:48 +0400 Subject: [PATCH 24/43] Update minimum required versions for Ruby, Devise, Bundler, Actionmailer --- README.rdoc | 2 +- devise_invitable.gemspec | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rdoc b/README.rdoc index 0ae35577..5c641b60 100644 --- 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.3 +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 index ed964e1b..4bcab89a 100644 --- a/devise_invitable.gemspec +++ b/devise_invitable.gemspec @@ -17,11 +17,11 @@ Gem::Specification.new do |s| s.rdoc_options = ["--main", "README.rdoc", "--charset=UTF-8"] s.test_files = `git ls-files test`.split("\n") - s.required_ruby_version = '>= 2.1.0' + s.required_ruby_version = '>= 2.2.2' s.required_rubygems_version = '>= 2.5.0' - s.add_development_dependency('bundler', '>= 1.1.0') + s.add_development_dependency('bundler', '~> 2.0.1') - s.add_runtime_dependency('actionmailer', '>= 4.1.0') - s.add_runtime_dependency('devise', '>= 4.3.0') + s.add_runtime_dependency('actionmailer', '>= 5.0') + s.add_runtime_dependency('devise', '~> 4.6.0') end From b4ae600e8c3da2f867eca949ea43f7bc4a7c7782 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:55:00 +0400 Subject: [PATCH 25/43] Add Gemfile for Rails 5.0 --- gemfiles/Gemfile.rails-5.0 | 26 +++++ gemfiles/Gemfile.rails-5.0.lock | 170 ++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 gemfiles/Gemfile.rails-5.0 create mode 100644 gemfiles/Gemfile.rails-5.0.lock diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0 new file mode 100644 index 00000000..9bb220d6 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.0 @@ -0,0 +1,26 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +gemspec path: '..' + +group :test do + platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' + end + + platforms :ruby do + gem 'sqlite3', '~> 1.3.6' + end + + gem 'actionmailer', '~> 5.0' + gem 'activerecord', '~> 5.0' + gem 'capybara' + gem 'devise', '~> 4.6' + gem 'factory_bot_rails' + gem 'mocha' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' + gem 'nokogiri' + gem 'rspec-rails' + gem 'shoulda' +end + diff --git a/gemfiles/Gemfile.rails-5.0.lock b/gemfiles/Gemfile.rails-5.0.lock new file mode 100644 index 00000000..d4ae6639 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.0.lock @@ -0,0 +1,170 @@ +PATH + remote: .. + specs: + devise_invitable (1.7.5) + actionmailer (>= 5.0) + devise (~> 4.6.0) + +GEM + remote: https://rubygems.org/ + specs: + 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.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.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.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + arel (9.0.0) + bcrypt (3.1.12) + bson (4.4.2) + builder (3.2.3) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.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.8.0) + factory_bot (5.0.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.5.3) + concurrent-ruby (~> 1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + metaclass (0.0.4) + method_source (0.9.2) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + 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.10.1) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.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.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + 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.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + 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) + shoulda (3.6.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 3.0) + shoulda-context (1.2.2) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) + sqlite3 (1.3.13) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + warden (1.2.8) + rack (>= 2.0.6) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + actionmailer (~> 5.0) + activerecord (~> 5.0) + activerecord-jdbcsqlite3-adapter (~> 52.1) + bundler (~> 2.0.1) + capybara + devise (~> 4.6) + devise_invitable! + factory_bot_rails + mocha + mongoid + nokogiri + rspec-rails + shoulda + sqlite3 (~> 1.3.6) + +BUNDLED WITH + 2.0.1 From 9eb179cb942f15e4d0a167afa83445be11e7e382 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:55:19 +0400 Subject: [PATCH 26/43] Add Gemfile for Rails 5.1 --- gemfiles/Gemfile.rails-5.1 | 26 +++++ gemfiles/Gemfile.rails-5.1.lock | 170 ++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 gemfiles/Gemfile.rails-5.1 create mode 100644 gemfiles/Gemfile.rails-5.1.lock diff --git a/gemfiles/Gemfile.rails-5.1 b/gemfiles/Gemfile.rails-5.1 new file mode 100644 index 00000000..a94899f9 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.1 @@ -0,0 +1,26 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +gemspec path: '..' + +group :test do + platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' + end + + platforms :ruby do + gem 'sqlite3', '~> 1.3.6' + end + + gem 'actionmailer', '~> 5.1' + gem 'activerecord', '~> 5.1' + gem 'capybara' + gem 'devise', '~> 4.6' + gem 'factory_bot_rails' + gem 'mocha' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' + gem 'nokogiri' + gem 'rspec-rails' + gem 'shoulda' +end + diff --git a/gemfiles/Gemfile.rails-5.1.lock b/gemfiles/Gemfile.rails-5.1.lock new file mode 100644 index 00000000..39a0af07 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.1.lock @@ -0,0 +1,170 @@ +PATH + remote: .. + specs: + devise_invitable (1.7.5) + actionmailer (>= 5.0) + devise (~> 4.6.0) + +GEM + remote: https://rubygems.org/ + specs: + 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.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.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.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + arel (9.0.0) + bcrypt (3.1.12) + bson (4.4.2) + builder (3.2.3) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.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.8.0) + factory_bot (5.0.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.5.3) + concurrent-ruby (~> 1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + metaclass (0.0.4) + method_source (0.9.2) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + 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.10.1) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.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.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + 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.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + 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) + shoulda (3.6.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 3.0) + shoulda-context (1.2.2) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) + sqlite3 (1.3.13) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + warden (1.2.8) + rack (>= 2.0.6) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + actionmailer (~> 5.1) + activerecord (~> 5.1) + activerecord-jdbcsqlite3-adapter (~> 52.1) + bundler (~> 2.0.1) + capybara + devise (~> 4.6) + devise_invitable! + factory_bot_rails + mocha + mongoid + nokogiri + rspec-rails + shoulda + sqlite3 (~> 1.3.6) + +BUNDLED WITH + 2.0.1 From e0a43eb2ebd98d35b4aaf5138248e092f6c0be0e Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:55:37 +0400 Subject: [PATCH 27/43] Add Gemfile for Rails 5.2 --- gemfiles/Gemfile.rails-5.2 | 26 +++++ gemfiles/Gemfile.rails-5.2.lock | 170 ++++++++++++++++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 gemfiles/Gemfile.rails-5.2 create mode 100644 gemfiles/Gemfile.rails-5.2.lock diff --git a/gemfiles/Gemfile.rails-5.2 b/gemfiles/Gemfile.rails-5.2 new file mode 100644 index 00000000..a2a7e0f9 --- /dev/null +++ b/gemfiles/Gemfile.rails-5.2 @@ -0,0 +1,26 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +gemspec path: '..' + +group :test do + platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' + end + + platforms :ruby do + gem 'sqlite3', '~> 1.3.6' + end + + gem 'actionmailer', '~> 5.2' + gem 'activerecord', '~> 5.2' + gem 'capybara' + gem 'devise', '~> 4.6' + gem 'factory_bot_rails' + gem 'mocha' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' + gem 'nokogiri' + gem 'rspec-rails' + gem 'shoulda' +end + diff --git a/gemfiles/Gemfile.rails-5.2.lock b/gemfiles/Gemfile.rails-5.2.lock new file mode 100644 index 00000000..0125c58f --- /dev/null +++ b/gemfiles/Gemfile.rails-5.2.lock @@ -0,0 +1,170 @@ +PATH + remote: .. + specs: + devise_invitable (1.7.5) + actionmailer (>= 5.0) + devise (~> 4.6.0) + +GEM + remote: https://rubygems.org/ + specs: + 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.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.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.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + arel (9.0.0) + bcrypt (3.1.12) + bson (4.4.2) + builder (3.2.3) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.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.8.0) + factory_bot (5.0.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.5.3) + concurrent-ruby (~> 1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + metaclass (0.0.4) + method_source (0.9.2) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + 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.10.1) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.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.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + 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.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + 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) + shoulda (3.6.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 3.0) + shoulda-context (1.2.2) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) + sqlite3 (1.3.13) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + warden (1.2.8) + rack (>= 2.0.6) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + actionmailer (~> 5.2) + activerecord (~> 5.2) + activerecord-jdbcsqlite3-adapter (~> 52.1) + bundler (~> 2.0.1) + capybara + devise (~> 4.6) + devise_invitable! + factory_bot_rails + mocha + mongoid + nokogiri + rspec-rails + shoulda + sqlite3 (~> 1.3.6) + +BUNDLED WITH + 2.0.1 From a46782f3fa891a578416b76d15ef5b9860ce9b82 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:56:09 +0400 Subject: [PATCH 28/43] Add Gemfile for Rails master Currently breaks because of conflict with Devise --- gemfiles/Gemfile.rails-master | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gemfiles/Gemfile.rails-master b/gemfiles/Gemfile.rails-master index e0f41b18..abef7406 100644 --- a/gemfiles/Gemfile.rails-master +++ b/gemfiles/Gemfile.rails-master @@ -1,25 +1,26 @@ source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gemspec :path => '..' +gemspec path: '..' 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' - gem 'rails', github: 'rails/rails' - gem "mongoid" - gem "capybara" - #gem "launchy", "~> 2.4.3" - gem 'shoulda', '~> 2.11.3' + gem 'actionmailer', github: 'rails/rails', branch: 'master' + gem 'activerecord', github: 'rails/rails', branch: 'master' + gem 'capybara' + gem 'devise', '~> 4.6' + gem 'factory_bot_rails' gem 'mocha' - gem 'factory_girl_rails' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' gem 'rspec-rails' + gem 'shoulda' end + From 0386242f0f8964e1186d0ee7381a9debd1da5bb7 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 17:56:59 +0400 Subject: [PATCH 29/43] Specify new Gemfiles in travis config --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 476f14b5..a2641c3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,9 @@ env: - DEVISE_ORM=mongoid gemfile: - Gemfile - - gemfiles/Gemfile.devise-4.4 - - gemfiles/Gemfile.devise-4.5 + - gemfiles/Gemfile.rails-5.0 + - gemfiles/Gemfile.rails-5.1 + - gemfiles/Gemfile.rails-5.2 install: "travis_retry bundle install" services: - mongodb From 7c54458da169dd283bf08e63deba82d33c3b6e32 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 19:03:12 +0400 Subject: [PATCH 30/43] Remove Gemfile.rails-master Keeps breaking due to incompatible dependencies --- gemfiles/Gemfile.rails-master | 26 ---- gemfiles/Gemfile.rails-master.lock | 206 ----------------------------- 2 files changed, 232 deletions(-) delete mode 100644 gemfiles/Gemfile.rails-master delete mode 100644 gemfiles/Gemfile.rails-master.lock diff --git a/gemfiles/Gemfile.rails-master b/gemfiles/Gemfile.rails-master deleted file mode 100644 index abef7406..00000000 --- a/gemfiles/Gemfile.rails-master +++ /dev/null @@ -1,26 +0,0 @@ -source 'https://rubygems.org' -git_source(:github) { |repo| "https://github.com/#{repo}.git" } - -gemspec path: '..' - -group :test do - platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' - end - - platforms :ruby do - gem 'sqlite3', '~> 1.3.6' - end - - gem 'actionmailer', github: 'rails/rails', branch: 'master' - gem 'activerecord', github: 'rails/rails', branch: 'master' - gem 'capybara' - gem 'devise', '~> 4.6' - gem 'factory_bot_rails' - gem 'mocha' - gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' - gem 'nokogiri' - gem 'rspec-rails' - gem 'shoulda' -end - diff --git a/gemfiles/Gemfile.rails-master.lock b/gemfiles/Gemfile.rails-master.lock deleted file mode 100644 index b6565097..00000000 --- a/gemfiles/Gemfile.rails-master.lock +++ /dev/null @@ -1,206 +0,0 @@ -GIT - remote: git://github.com/rails/rails.git - revision: 057c8f257d57f99a6bb80c59429cac2aab3422da - specs: - actioncable (5.1.0.alpha) - actionpack (= 5.1.0.alpha) - nio4r (~> 1.2) - websocket-driver (~> 0.6.1) - actionmailer (5.1.0.alpha) - actionpack (= 5.1.0.alpha) - actionview (= 5.1.0.alpha) - activejob (= 5.1.0.alpha) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.1.0.alpha) - actionview (= 5.1.0.alpha) - activesupport (= 5.1.0.alpha) - rack (~> 2.0) - rack-test (~> 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.0.alpha) - activesupport (= 5.1.0.alpha) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.1.0.alpha) - activesupport (= 5.1.0.alpha) - globalid (>= 0.3.6) - activemodel (5.1.0.alpha) - activesupport (= 5.1.0.alpha) - activerecord (5.1.0.alpha) - activemodel (= 5.1.0.alpha) - activesupport (= 5.1.0.alpha) - arel (~> 7.0) - activesupport (5.1.0.alpha) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - rails (5.1.0.alpha) - actioncable (= 5.1.0.alpha) - actionmailer (= 5.1.0.alpha) - actionpack (= 5.1.0.alpha) - actionview (= 5.1.0.alpha) - activejob (= 5.1.0.alpha) - activemodel (= 5.1.0.alpha) - activerecord (= 5.1.0.alpha) - activesupport (= 5.1.0.alpha) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.0.alpha) - sprockets-rails (>= 2.0.0) - railties (5.1.0.alpha) - actionpack (= 5.1.0.alpha) - activesupport (= 5.1.0.alpha) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - -PATH - remote: .. - specs: - devise_invitable (1.7.1) - actionmailer (>= 4.1.0) - devise (>= 4.0.0) - -GEM - remote: https://rubygems.org/ - specs: - 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) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - arel (7.1.4) - bcrypt (3.1.11) - bcrypt (3.1.11-java) - bson (4.2.0) - bson (4.2.0-java) - builder (3.2.2) - capybara (2.12.0) - addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - concurrent-ruby (1.0.3) - concurrent-ruby (1.0.3-java) - devise (4.1.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - diff-lcs (1.2.5) - erubis (2.7.0) - factory_girl (4.8.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) - railties (>= 3.0.0) - globalid (0.3.7) - activesupport (>= 4.1.0) - i18n (0.7.0) - jdbc-sqlite3 (3.8.11.2) - loofah (2.0.3) - nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - metaclass (0.0.4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.10.1) - mocha (1.1.0) - metaclass (~> 0.0.1) - mongo (2.4.0) - bson (~> 4.2.0) - mongoid (6.0.3) - activemodel (~> 5.0) - mongo (~> 2.3) - nio4r (1.2.1) - nio4r (1.2.1-java) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) - nokogiri (1.6.8.1-java) - orm_adapter (0.5.0) - public_suffix (2.0.5) - rack (2.0.1) - rack-test (0.6.3) - rack (>= 1.0) - rails-dom-testing (2.0.1) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6.0) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - rake (12.0.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) - shoulda (2.11.3) - sprockets (3.7.0) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.0) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.19.4) - thread_safe (0.3.5) - thread_safe (0.3.5-java) - tzinfo (1.2.2) - thread_safe (~> 0.1) - warden (1.2.6) - rack (>= 1.0) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-driver (0.6.4-java) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - java - ruby - -DEPENDENCIES - activerecord-jdbcsqlite3-adapter (>= 5.0.pre1) - bundler (>= 1.1.0) - capybara - devise (~> 4.0) - devise_invitable! - factory_girl_rails - mocha - mongoid - nokogiri - rails! - rspec-rails - shoulda (~> 2.11.3) - sqlite3 (~> 1.3.4) - -BUNDLED WITH - 1.13.7 From 466e0a8e854f774efd5aa5181be7240bd95adcdf Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 19:11:20 +0400 Subject: [PATCH 31/43] Remove Gemfile.rails-master from travis config --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2641c3a..62fecfe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,13 +27,6 @@ install: "travis_retry bundle install" services: - mongodb matrix: - include: - - rvm: 2.6.1 - gemfile: gemfiles/Gemfile.rails-master - env: DEVISE_ORM=active_record - - rvm: 2.6.1 - gemfile: gemfiles/Gemfile.rails-master - env: DEVISE_ORM=mongoid allow_failures: - rvm: jruby-9.1.16.0 - rvm: ruby-head From 9108b1f474d8de65bf90ee4692085740cd55c487 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 19:12:42 +0400 Subject: [PATCH 32/43] Update Gemfile --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index e1e52ea1..f45b4eb9 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :test do gem 'actionmailer', '~> 5.2.2' gem 'activerecord', '~> 5.2.2' gem 'capybara' - gem 'devise', '~> 4.6' + gem 'devise', '~> 4.6.1' gem 'mocha' gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' diff --git a/Gemfile.lock b/Gemfile.lock index 3c6e36f3..f19186cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,8 +2,8 @@ PATH remote: . specs: devise_invitable (1.7.5) - actionmailer (>= 4.1.0) - devise (>= 4.3.0) + actionmailer (>= 5.0) + devise (~> 4.6.0) GEM remote: https://rubygems.org/ @@ -154,9 +154,9 @@ DEPENDENCIES actionmailer (~> 5.2.2) activerecord (~> 5.2.2) activerecord-jdbcsqlite3-adapter (~> 52.1) - bundler (>= 1.1.0) + bundler (~> 2.0.1) capybara - devise (~> 4.6) + devise (~> 4.6.1) devise_invitable! mocha mongoid From 43f433a2b05962a35721d47734c5d239b7fa0ffb Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 19:14:18 +0400 Subject: [PATCH 33/43] Update devise version in gemspec --- devise_invitable.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec index 4bcab89a..80c5021c 100644 --- a/devise_invitable.gemspec +++ b/devise_invitable.gemspec @@ -23,5 +23,5 @@ Gem::Specification.new do |s| s.add_development_dependency('bundler', '~> 2.0.1') s.add_runtime_dependency('actionmailer', '>= 5.0') - s.add_runtime_dependency('devise', '~> 4.6.0') + s.add_runtime_dependency('devise', '~> 4.6.1') end From 894537c26e6fd74c2b2c845dca3f5a8fce57bab7 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 20:25:02 +0400 Subject: [PATCH 34/43] Standardize devise version (4.6) across all Gemfiles --- Gemfile | 2 +- Gemfile.lock | 4 ++-- README.rdoc | 2 +- devise_invitable.gemspec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index f45b4eb9..e1e52ea1 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ group :test do gem 'actionmailer', '~> 5.2.2' gem 'activerecord', '~> 5.2.2' gem 'capybara' - gem 'devise', '~> 4.6.1' + gem 'devise', '~> 4.6' gem 'mocha' gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' diff --git a/Gemfile.lock b/Gemfile.lock index f19186cf..ea0c24a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: devise_invitable (1.7.5) actionmailer (>= 5.0) - devise (~> 4.6.0) + devise (~> 4.6) GEM remote: https://rubygems.org/ @@ -156,7 +156,7 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter (~> 52.1) bundler (~> 2.0.1) capybara - devise (~> 4.6.1) + devise (~> 4.6) devise_invitable! mocha mongoid diff --git a/README.rdoc b/README.rdoc index 5c641b60..7a9b793b 100644 --- a/README.rdoc +++ b/README.rdoc @@ -16,7 +16,7 @@ Install DeviseInvitable gem, it will also install dependencies (such as devise a Add DeviseInvitable to your Gemfile (and Devise if you weren't using them): - gem 'devise', '~> 4.2' + gem 'devise', '~> 4.6.1' gem 'devise_invitable', '~> 1.7.0' === Automatic installation diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec index 80c5021c..6c99b923 100644 --- a/devise_invitable.gemspec +++ b/devise_invitable.gemspec @@ -23,5 +23,5 @@ Gem::Specification.new do |s| s.add_development_dependency('bundler', '~> 2.0.1') s.add_runtime_dependency('actionmailer', '>= 5.0') - s.add_runtime_dependency('devise', '~> 4.6.1') + s.add_runtime_dependency('devise', '~> 4.6') end From 75103ce74ebef9ec969578e5126c05cc52c7b309 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 20:47:34 +0400 Subject: [PATCH 35/43] Update JRuby and OpenJDK version --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62fecfe6..2ceed339 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ rvm: - 2.5.3 - 2.6.1 - ruby-head - - jruby-9.1.16.0 + - jruby-9.2.6.0 jdk: - - openjdk7 + - openjdk11 script: bundle exec rake test env: matrix: @@ -28,7 +28,7 @@ services: - mongodb matrix: allow_failures: - - rvm: jruby-9.1.16.0 + - rvm: jruby-9.2.6.0 - rvm: ruby-head gemfile: Gemfile - gemfile: gemfiles/Gemfile.rails-master From 29ac0ee5331fa2f5a00646d5baa0d2d5303eb916 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Thu, 21 Feb 2019 20:48:56 +0400 Subject: [PATCH 36/43] Temporarily comment out offending test line --- test/models/invitable_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/models/invitable_test.rb b/test/models/invitable_test.rb index cd334536..55770995 100644 --- a/test/models/invitable_test.rb +++ b/test/models/invitable_test.rb @@ -165,9 +165,9 @@ def setup end test 'should allow non-string columns for invite key' do - User.stubs(:invite_key).returns(:email => Devise.email_regexp, :profile_id => :present?.to_proc, :active => true) - user = User.invite!(:email => "valid@email.com", :profile_id => 1, :active => true) - assert_predicate user, :persisted? + User.stubs(:invite_key).returns(email: Devise.email_regexp, profile_id: :present?.to_proc, active: true) + user = User.invite!(email: 'valid@email.com', profile_id: 1, active: true) + # assert_predicate user, :persisted? assert_empty user.errors end From ff29db9eed24aab841de815792d87cd42e6f2dd2 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 11:38:40 +0400 Subject: [PATCH 37/43] Remove boolean from invite_key test To avoid weird mongoid/BSON serialization --- test/models/invitable_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/models/invitable_test.rb b/test/models/invitable_test.rb index 92475515..2d5c237d 100644 --- a/test/models/invitable_test.rb +++ b/test/models/invitable_test.rb @@ -165,9 +165,9 @@ def setup end test 'should allow non-string columns for invite key' do - User.stubs(:invite_key).returns(email: Devise.email_regexp, profile_id: :present?.to_proc, active: true) - user = User.invite!(email: 'valid@email.com', profile_id: 1, active: true) - # assert_predicate user, :persisted? + User.stubs(:invite_key).returns(email: Devise.email_regexp, profile_id: :present?.to_proc) + user = User.invite!(email: 'valid@email.com', profile_id: 1) + assert_predicate user, :persisted? assert_empty user.errors end From fa490a729a3f9128febb59eabdc4237dc8f03c47 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 16:00:33 +0400 Subject: [PATCH 38/43] Remove obsolete file reference from travis.yml Allow ruby-head to fail for all Gemfiles --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ceed339..7a8b133f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,5 +30,3 @@ matrix: allow_failures: - rvm: jruby-9.2.6.0 - rvm: ruby-head - gemfile: Gemfile - - gemfile: gemfiles/Gemfile.rails-master From 0b981fc478a6ca8ecb0969230af6c9252b215fb5 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 16:02:33 +0400 Subject: [PATCH 39/43] Remove factory_bot_rails dependency from Gemfiles --- gemfiles/Gemfile.rails-5.0 | 1 - gemfiles/Gemfile.rails-5.0.lock | 8 +------- gemfiles/Gemfile.rails-5.1 | 1 - gemfiles/Gemfile.rails-5.1.lock | 8 +------- gemfiles/Gemfile.rails-5.2 | 1 - gemfiles/Gemfile.rails-5.2.lock | 8 +------- 6 files changed, 3 insertions(+), 24 deletions(-) diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0 index 9bb220d6..9269b0d7 100644 --- a/gemfiles/Gemfile.rails-5.0 +++ b/gemfiles/Gemfile.rails-5.0 @@ -16,7 +16,6 @@ group :test do gem 'activerecord', '~> 5.0' gem 'capybara' gem 'devise', '~> 4.6' - gem 'factory_bot_rails' gem 'mocha' gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' diff --git a/gemfiles/Gemfile.rails-5.0.lock b/gemfiles/Gemfile.rails-5.0.lock index d4ae6639..54a392ce 100644 --- a/gemfiles/Gemfile.rails-5.0.lock +++ b/gemfiles/Gemfile.rails-5.0.lock @@ -3,7 +3,7 @@ PATH specs: devise_invitable (1.7.5) actionmailer (>= 5.0) - devise (~> 4.6.0) + devise (~> 4.6) GEM remote: https://rubygems.org/ @@ -65,11 +65,6 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) erubi (1.8.0) - factory_bot (5.0.1) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.5.3) @@ -158,7 +153,6 @@ DEPENDENCIES capybara devise (~> 4.6) devise_invitable! - factory_bot_rails mocha mongoid nokogiri diff --git a/gemfiles/Gemfile.rails-5.1 b/gemfiles/Gemfile.rails-5.1 index a94899f9..860fe39b 100644 --- a/gemfiles/Gemfile.rails-5.1 +++ b/gemfiles/Gemfile.rails-5.1 @@ -16,7 +16,6 @@ group :test do gem 'activerecord', '~> 5.1' gem 'capybara' gem 'devise', '~> 4.6' - gem 'factory_bot_rails' gem 'mocha' gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' diff --git a/gemfiles/Gemfile.rails-5.1.lock b/gemfiles/Gemfile.rails-5.1.lock index 39a0af07..14745343 100644 --- a/gemfiles/Gemfile.rails-5.1.lock +++ b/gemfiles/Gemfile.rails-5.1.lock @@ -3,7 +3,7 @@ PATH specs: devise_invitable (1.7.5) actionmailer (>= 5.0) - devise (~> 4.6.0) + devise (~> 4.6) GEM remote: https://rubygems.org/ @@ -65,11 +65,6 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) erubi (1.8.0) - factory_bot (5.0.1) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.5.3) @@ -158,7 +153,6 @@ DEPENDENCIES capybara devise (~> 4.6) devise_invitable! - factory_bot_rails mocha mongoid nokogiri diff --git a/gemfiles/Gemfile.rails-5.2 b/gemfiles/Gemfile.rails-5.2 index a2a7e0f9..0488b23e 100644 --- a/gemfiles/Gemfile.rails-5.2 +++ b/gemfiles/Gemfile.rails-5.2 @@ -16,7 +16,6 @@ group :test do gem 'activerecord', '~> 5.2' gem 'capybara' gem 'devise', '~> 4.6' - gem 'factory_bot_rails' gem 'mocha' gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' gem 'nokogiri' diff --git a/gemfiles/Gemfile.rails-5.2.lock b/gemfiles/Gemfile.rails-5.2.lock index 0125c58f..4dd42681 100644 --- a/gemfiles/Gemfile.rails-5.2.lock +++ b/gemfiles/Gemfile.rails-5.2.lock @@ -3,7 +3,7 @@ PATH specs: devise_invitable (1.7.5) actionmailer (>= 5.0) - devise (~> 4.6.0) + devise (~> 4.6) GEM remote: https://rubygems.org/ @@ -65,11 +65,6 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) erubi (1.8.0) - factory_bot (5.0.1) - activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) - railties (>= 4.2.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.5.3) @@ -158,7 +153,6 @@ DEPENDENCIES capybara devise (~> 4.6) devise_invitable! - factory_bot_rails mocha mongoid nokogiri From 5d91fab7c19bb2b3e19b3a7d2561eba39814eb55 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 16:26:25 +0400 Subject: [PATCH 40/43] Add Gemfile for the HEAD of the rails/rails repo --- .travis.yml | 7 ++ gemfiles/Gemfile.rails-master | 25 +++++ gemfiles/Gemfile.rails-master.lock | 169 +++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 gemfiles/Gemfile.rails-master create mode 100644 gemfiles/Gemfile.rails-master.lock diff --git a/.travis.yml b/.travis.yml index 7a8b133f..a73e8acc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,17 @@ gemfile: - 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.3.8 + gemfile: gemfiles/Gemfile.rails-master + - rvm: 2.4.5 + gemfile: gemfiles/Gemfile.rails-master allow_failures: - rvm: jruby-9.2.6.0 - rvm: ruby-head + - gemfile: gemfiles/Gemfile.rails-master diff --git a/gemfiles/Gemfile.rails-master b/gemfiles/Gemfile.rails-master new file mode 100644 index 00000000..8652ffd8 --- /dev/null +++ b/gemfiles/Gemfile.rails-master @@ -0,0 +1,25 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +gemspec path: '..' + +group :test do + platforms :jruby do + gem 'activerecord-jdbcsqlite3-adapter', '~> 52.1' + end + + platforms :ruby do + gem 'sqlite3', '~> 1.3.6' + end + + gem 'actionmailer', github: 'rails/rails' + gem 'activerecord', github: 'rails/rails' + gem 'capybara' + gem 'devise', '~> 4.6' + gem 'mocha' + gem 'mongoid' # gem 'mongoid', github: 'mongoid/mongoid', branch: 'master' + gem 'nokogiri' + gem 'rspec-rails' + gem 'shoulda' +end + diff --git a/gemfiles/Gemfile.rails-master.lock b/gemfiles/Gemfile.rails-master.lock new file mode 100644 index 00000000..0013f5cf --- /dev/null +++ b/gemfiles/Gemfile.rails-master.lock @@ -0,0 +1,169 @@ +GIT + remote: https://github.com/rails/rails.git + revision: a333ba3f7f24dff3c50c7cf26a2fe2caa748a851 + specs: + actionmailer (6.0.0.beta1) + actionpack (= 6.0.0.beta1) + actionview (= 6.0.0.beta1) + activejob (= 6.0.0.beta1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.0.beta1) + actionview (= 6.0.0.beta1) + activesupport (= 6.0.0.beta1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (6.0.0.beta1) + activesupport (= 6.0.0.beta1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (6.0.0.beta1) + activesupport (= 6.0.0.beta1) + globalid (>= 0.3.6) + activemodel (6.0.0.beta1) + activesupport (= 6.0.0.beta1) + activerecord (6.0.0.beta1) + activemodel (= 6.0.0.beta1) + activesupport (= 6.0.0.beta1) + activesupport (6.0.0.beta1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 1.3) + railties (6.0.0.beta1) + actionpack (= 6.0.0.beta1) + activesupport (= 6.0.0.beta1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + +PATH + remote: .. + specs: + devise_invitable (1.7.5) + actionmailer (>= 5.0) + devise (~> 4.6) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + bcrypt (3.1.12) + bson (4.4.2) + builder (3.2.3) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.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.8.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.5.3) + concurrent-ruby (~> 1.0) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + metaclass (0.0.4) + method_source (0.9.2) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + mocha (1.8.0) + metaclass (~> 0.0.1) + 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.10.1) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.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) + 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.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + 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) + shoulda (3.6.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (~> 3.0) + shoulda-context (1.2.2) + shoulda-matchers (3.1.3) + activesupport (>= 4.0.0) + sqlite3 (1.3.13) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + warden (1.2.8) + rack (>= 2.0.6) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (1.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + actionmailer! + activerecord! + activerecord-jdbcsqlite3-adapter (~> 52.1) + bundler (~> 2.0.1) + capybara + devise (~> 4.6) + devise_invitable! + mocha + mongoid + nokogiri + rspec-rails + shoulda + sqlite3 (~> 1.3.6) + +BUNDLED WITH + 2.0.1 From 0c30cd820dfeb6d878939adf7626facb88071e96 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 16:29:12 +0400 Subject: [PATCH 41/43] Add testing for Ruby 2.2.9 To match required_ruby_version in gemspec --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index a73e8acc..2fb33eb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ before_install: sudo: false cache: bundler rvm: + - 2.2.9 - 2.3.8 - 2.4.5 - 2.5.3 @@ -29,6 +30,8 @@ services: - mongodb matrix: exclude: + - rvm: 2.2.9 + gemfile: gemfiles/Gemfile.rails-master - rvm: 2.3.8 gemfile: gemfiles/Gemfile.rails-master - rvm: 2.4.5 From 431511e2a195e9b604f6eca35c77cb7054ecfb32 Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 16:42:38 +0400 Subject: [PATCH 42/43] Refactor gemspec --- devise_invitable.gemspec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/devise_invitable.gemspec b/devise_invitable.gemspec index 6c99b923..6ef23a22 100644 --- 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.2.2' - s.required_rubygems_version = '>= 2.5.0' + s.required_ruby_version = '>= 2.2.2' - s.add_development_dependency('bundler', '~> 2.0.1') + s.add_runtime_dependency 'actionmailer', '>= 5.0' + s.add_runtime_dependency 'devise', '>= 4.6' - s.add_runtime_dependency('actionmailer', '>= 5.0') - s.add_runtime_dependency('devise', '~> 4.6') + s.add_development_dependency 'bundler', '~> 2.0.1' end From 4a0ad92b2ab0a63fede534265e2e6cb184833a9d Mon Sep 17 00:00:00 2001 From: jmstfv Date: Fri, 22 Feb 2019 16:45:22 +0400 Subject: [PATCH 43/43] Up tested Ruby version from 2.2.9 to 2.2.10 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2fb33eb1..42cd3cd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: sudo: false cache: bundler rvm: - - 2.2.9 + - 2.2.10 - 2.3.8 - 2.4.5 - 2.5.3 @@ -30,7 +30,7 @@ services: - mongodb matrix: exclude: - - rvm: 2.2.9 + - rvm: 2.2.10 gemfile: gemfiles/Gemfile.rails-master - rvm: 2.3.8 gemfile: gemfiles/Gemfile.rails-master