From 6b73324325d21eb6fafc21c024e24740ab5d90c7 Mon Sep 17 00:00:00 2001 From: forsaken1 Date: Mon, 20 Aug 2018 05:07:41 +1000 Subject: [PATCH 1/2] add many rails versions --- .gitignore | 3 +- .travis.yml | 4 + Gemfile | 7 +- Gemfile.lock | 260 ++++++++++++++++++++++++--------------------------- 4 files changed, 135 insertions(+), 139 deletions(-) diff --git a/.gitignore b/.gitignore index 93f24af..d52e88d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ spec/dummy/db/*.sqlite3-journal spec/dummy/log/*.log spec/dummy/tmp/ spec/dummy/.sass-cache -/coverage \ No newline at end of file +/coverage +.idea \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3398a11..ed48561 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,6 @@ language: ruby script: bundle exec rspec +env: + - "RAILS_VERSION=4.2.6" + - "RAILS_VERSION=5.1.6" + - "RAILS_VERSION=5.2" \ No newline at end of file diff --git a/Gemfile b/Gemfile index 007ecad..cbb5606 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,13 @@ gemspec # To use a debugger # gem 'byebug', group: [:development, :test] +# -gem 'rails', '~> 5' +def rails_version + ENV['RAILS_VERSION'] || '5.1' +end + +gem 'rails', rails_version group :development do gem 'listen' diff --git a/Gemfile.lock b/Gemfile.lock index e8e705a..3c5d14c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,73 +7,68 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.1.2) - actionpack (= 5.1.2) + actioncable (5.1.0) + actionpack (= 5.1.0) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) + actionmailer (5.1.0) + actionpack (= 5.1.0) + actionview (= 5.1.0) + activejob (= 5.1.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.2) - actionview (= 5.1.2) - activesupport (= 5.1.2) + actionpack (5.1.0) + actionview (= 5.1.0) + activesupport (= 5.1.0) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.2) - activesupport (= 5.1.2) + actionview (5.1.0) + activesupport (= 5.1.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activeadmin (1.0.0) + activeadmin (1.3.1) arbre (>= 1.1.1) - bourbon coffee-rails formtastic (~> 3.1) formtastic_i18n - inherited_resources (~> 1.7) - jquery-rails - jquery-ui-rails - kaminari (>= 0.15, < 2.0) - railties (>= 4.2, < 5.2) - ransack (~> 1.3) - sass-rails + inherited_resources (>= 1.9.0) + jquery-rails (>= 4.2.0) + kaminari (>= 0.15) + railties (>= 4.2, < 5.3) + ransack (>= 1.8.7) + sass (~> 3.1) sprockets (< 4.1) - activejob (5.1.2) - activesupport (= 5.1.2) + activejob (5.1.0) + activesupport (= 5.1.0) globalid (>= 0.3.6) - activemodel (5.1.2) - activesupport (= 5.1.2) - activerecord (5.1.2) - activemodel (= 5.1.2) - activesupport (= 5.1.2) + activemodel (5.1.0) + activesupport (= 5.1.0) + activerecord (5.1.0) + activemodel (= 5.1.0) + activesupport (= 5.1.0) arel (~> 8.0) - activesupport (5.1.2) + activesupport (5.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) arbre (1.1.1) activesupport (>= 3.0.0) arel (8.0.0) - bourbon (4.3.4) - sass (~> 3.4) - thor (~> 0.19) builder (3.2.3) - capybara (2.11.0) + capybara (3.6.0) addressable - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) cliver (0.3.2) codecov (0.1.10) json @@ -87,160 +82,151 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - database_cleaner (1.6.1) + crass (1.0.4) + database_cleaner (1.7.0) diff-lcs (1.3) - docile (1.1.5) - erubi (1.6.1) + docile (1.3.1) + erubi (1.7.1) execjs (2.7.0) - ffi (1.9.18) + ffi (1.9.25) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) - has_scope (0.7.1) - actionpack (>= 4.1, < 5.2) - activesupport (>= 4.1, < 5.2) - i18n (0.8.4) - inherited_resources (1.7.2) - actionpack (>= 3.2, < 5.2.x) + has_scope (0.7.2) + actionpack (>= 4.1) + activesupport (>= 4.1) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + inherited_resources (1.9.0) + actionpack (>= 4.2, < 5.3) has_scope (~> 0.6) - railties (>= 3.2, < 5.2.x) + railties (>= 4.2, < 5.3) responders - jquery-rails (4.3.1) + jquery-rails (4.3.3) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) json (2.1.0) - kaminari (1.1.0) + kaminari (1.1.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.0) - kaminari-activerecord (= 1.1.0) - kaminari-core (= 1.1.0) - kaminari-actionview (1.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) actionview - kaminari-core (= 1.1.0) - kaminari-activerecord (1.1.0) + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) activerecord - kaminari-core (= 1.1.0) - kaminari-core (1.1.0) - listen (3.0.8) + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.0.3) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.2.0) - minitest (5.10.2) - nio4r (2.1.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) - phantomjs (1.9.8.0) - poltergeist (1.12.0) - capybara (~> 2.1) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + nio4r (2.3.1) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) + phantomjs (2.1.1.0) + poltergeist (1.18.1) + capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - polyamorous (1.3.1) - activerecord (>= 3.0) - public_suffix (2.0.5) - rack (2.0.3) + public_suffix (3.0.3) + rack (2.0.5) rack-test (0.6.3) rack (>= 1.0) - rails (5.1.2) - actioncable (= 5.1.2) - actionmailer (= 5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) - activemodel (= 5.1.2) - activerecord (= 5.1.2) - activesupport (= 5.1.2) + rails (5.1.0) + actioncable (= 5.1.0) + actionmailer (= 5.1.0) + actionpack (= 5.1.0) + actionview (= 5.1.0) + activejob (= 5.1.0) + activemodel (= 5.1.0) + activerecord (= 5.1.0) + activesupport (= 5.1.0) bundler (>= 1.3.0, < 2.0) - railties (= 5.1.2) + railties (= 5.1.0) sprockets-rails (>= 2.0.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.1.2) - actionpack (= 5.1.2) - activesupport (= 5.1.2) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.0) + actionpack (= 5.1.0) + activesupport (= 5.1.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.0.0) - ransack (1.8.3) - actionpack (>= 3.0) - activerecord (>= 3.0) - activesupport (>= 3.0) + rake (12.3.1) + ransack (2.0.1) + actionpack (>= 5.0) + activerecord (>= 5.0) + activesupport (>= 5.0) i18n - polyamorous (~> 1.3) - rb-fsevent (0.9.8) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - sass (3.5.2) + 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) + ruby_dep (1.5.0) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) - sprockets (3.7.1) + simplecov-html (0.10.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) - tilt (2.0.8) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) url (0.3.2) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.1.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -253,9 +239,9 @@ DEPENDENCIES listen phantomjs poltergeist - rails (~> 5) + rails (= 5.1) rspec-rails sqlite3 BUNDLED WITH - 1.15.3 + 1.16.3 From 285662b0660f82b0dcffd421386ce3ef0678ecbc Mon Sep 17 00:00:00 2001 From: forsaken1 Date: Mon, 20 Aug 2018 05:17:58 +1000 Subject: [PATCH 2/2] remove Gemfile.lock --- Gemfile.lock | 247 --------------------------------------------------- 1 file changed, 247 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 3c5d14c..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,247 +0,0 @@ -PATH - remote: . - specs: - activeadmin_latlng (1.2.0) - activeadmin - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.1.0) - actionpack (= 5.1.0) - nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.0) - actionpack (= 5.1.0) - actionview (= 5.1.0) - activejob (= 5.1.0) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.1.0) - actionview (= 5.1.0) - activesupport (= 5.1.0) - 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) - activesupport (= 5.1.0) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activeadmin (1.3.1) - arbre (>= 1.1.1) - coffee-rails - formtastic (~> 3.1) - formtastic_i18n - inherited_resources (>= 1.9.0) - jquery-rails (>= 4.2.0) - kaminari (>= 0.15) - railties (>= 4.2, < 5.3) - ransack (>= 1.8.7) - sass (~> 3.1) - sprockets (< 4.1) - activejob (5.1.0) - activesupport (= 5.1.0) - globalid (>= 0.3.6) - activemodel (5.1.0) - activesupport (= 5.1.0) - activerecord (5.1.0) - activemodel (= 5.1.0) - activesupport (= 5.1.0) - arel (~> 8.0) - activesupport (5.1.0) - 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) - arbre (1.1.1) - activesupport (>= 3.0.0) - arel (8.0.0) - builder (3.2.3) - capybara (3.6.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - xpath (~> 3.1) - cliver (0.3.2) - codecov (0.1.10) - json - simplecov - url - coffee-rails (4.2.2) - coffee-script (>= 2.2.0) - railties (>= 4.0.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) - crass (1.0.4) - database_cleaner (1.7.0) - diff-lcs (1.3) - docile (1.3.1) - erubi (1.7.1) - execjs (2.7.0) - ffi (1.9.25) - formtastic (3.1.5) - actionpack (>= 3.2.13) - formtastic_i18n (0.6.0) - globalid (0.4.1) - activesupport (>= 4.2.0) - has_scope (0.7.2) - actionpack (>= 4.1) - activesupport (>= 4.1) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - inherited_resources (1.9.0) - actionpack (>= 4.2, < 5.3) - has_scope (~> 0.6) - railties (>= 4.2, < 5.3) - responders - jquery-rails (4.3.3) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - json (2.1.0) - kaminari (1.1.1) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.1.1) - kaminari-activerecord (= 1.1.1) - kaminari-core (= 1.1.1) - kaminari-actionview (1.1.1) - actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) - activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - loofah (2.2.2) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.0) - mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - nio4r (2.3.1) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) - phantomjs (2.1.1.0) - poltergeist (1.18.1) - capybara (>= 2.1, < 4) - cliver (~> 0.3.1) - websocket-driver (>= 0.2.0) - public_suffix (3.0.3) - rack (2.0.5) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.1.0) - actioncable (= 5.1.0) - actionmailer (= 5.1.0) - actionpack (= 5.1.0) - actionview (= 5.1.0) - activejob (= 5.1.0) - activemodel (= 5.1.0) - activerecord (= 5.1.0) - activesupport (= 5.1.0) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.0) - sprockets-rails (>= 2.0.0) - 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.0) - actionpack (= 5.1.0) - activesupport (= 5.1.0) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.3.1) - ransack (2.0.1) - actionpack (>= 5.0) - activerecord (>= 5.0) - activesupport (>= 5.0) - i18n - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) - 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.0) - 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) - ruby_dep (1.5.0) - sass (3.5.7) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.20.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - url (0.3.2) - websocket-driver (0.6.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - xpath (3.1.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - activeadmin_latlng! - capybara - codecov - database_cleaner - listen - phantomjs - poltergeist - rails (= 5.1) - rspec-rails - sqlite3 - -BUNDLED WITH - 1.16.3