diff --git a/Dockerfile b/Dockerfile index 2f10018..71441fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6.5 AS ensl_development +FROM ruby:2.6.10 AS ensl_development ENV RAILS_ENV development ENV APP_PATH /var/www @@ -31,7 +31,7 @@ RUN \ # For assets pipeline yarn \ # For poltergeist - phantomjs \ + # phantomjs \ firefox-esr && \ # Install bundler and bundle path gem install bundler && \ diff --git a/Gemfile b/Gemfile index 8504722..a491431 100644 --- a/Gemfile +++ b/Gemfile @@ -4,10 +4,10 @@ # Version data is in Gemfile.lock, running bundle update will fix it. source 'http://rubygems.org' -ruby '2.6.5' +ruby '2.6.10' # Rails core -gem 'rails', '~> 6.0.3.4' +gem 'rails', '~> 6.0.5' gem 'rake' # Dotenv @@ -104,11 +104,11 @@ end group :test do # FIXME: Use dev versions because of rspec bug - gem 'rspec-core', git: 'https://github.com/rspec/rspec-core' - gem 'rspec-expectations', git: 'https://github.com/rspec/rspec-expectations' - gem 'rspec-mocks', git: 'https://github.com/rspec/rspec-mocks' - gem 'rspec-rails', git: 'https://github.com/rspec/rspec-rails' - gem 'rspec-support', git: 'https://github.com/rspec/rspec-support' + gem 'rspec-core' + gem 'rspec-expectations' + gem 'rspec-mocks' + gem 'rspec-rails' + gem 'rspec-support' # FIXME: Downgraded b/c of deprecations, fix static attributes gem 'factory_bot_rails', '4.10.0' diff --git a/Gemfile.lock b/Gemfile.lock index e620707..12f0674 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,167 +1,123 @@ GIT remote: https://github.com/koraktor/steam-condenser-ruby.git - revision: 2cb441f0518a0b8d20a017dfcc42783ae878311a + revision: 3ee580b5c5d390ee3a706357f18f2e9a2949e5c2 specs: steam-condenser (1.3.11) multi_json (~> 1.6) multi_xml (~> 0.5) - -GIT - remote: https://github.com/rspec/rspec-core - revision: e7c5d030966a7e8dad3e0a67c61920c4f2437c15 - specs: - rspec-core (3.10.0.pre) - rspec-support (= 3.10.0.pre) - -GIT - remote: https://github.com/rspec/rspec-expectations - revision: e63ff4765e1cd2798b02ddddad259f1104ef87a5 - specs: - rspec-expectations (3.10.0.pre) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (= 3.10.0.pre) - -GIT - remote: https://github.com/rspec/rspec-mocks - revision: 0a52e0a86b126b4bab94d277b2ad99a7492dc37d - specs: - rspec-mocks (3.10.0.pre) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (= 3.10.0.pre) - -GIT - remote: https://github.com/rspec/rspec-rails - revision: 01704c50c146f720db914724c25681781ecefb23 - specs: - rspec-rails (4.1.0.pre) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (= 3.10.0.pre) - rspec-expectations (= 3.10.0.pre) - rspec-mocks (= 3.10.0.pre) - rspec-support (= 3.10.0.pre) - -GIT - remote: https://github.com/rspec/rspec-support - revision: 6447b0c2c9d1cd3e1504784fb85675ca9ae7b7c3 - specs: - rspec-support (3.10.0.pre) + rexml (~> 3.2) GEM remote: http://rubygems.org/ specs: - actioncable (6.0.3.4) - actionpack (= 6.0.3.4) + actioncable (6.0.5) + actionpack (= 6.0.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionmailbox (6.0.5) + actionpack (= 6.0.5) + activejob (= 6.0.5) + activerecord (= 6.0.5) + activestorage (= 6.0.5) + activesupport (= 6.0.5) mail (>= 2.7.1) - actionmailer (6.0.3.4) - actionpack (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) + actionmailer (6.0.5) + actionpack (= 6.0.5) + actionview (= 6.0.5) + activejob (= 6.0.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.4) - actionview (= 6.0.3.4) - activesupport (= 6.0.3.4) + actionpack (6.0.5) + actionview (= 6.0.5) + activesupport (= 6.0.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.4) - actionpack (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + actiontext (6.0.5) + actionpack (= 6.0.5) + activerecord (= 6.0.5) + activestorage (= 6.0.5) + activesupport (= 6.0.5) nokogiri (>= 1.8.5) - actionview (6.0.3.4) - activesupport (= 6.0.3.4) + actionview (6.0.5) + activesupport (= 6.0.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_flag (1.5.0) + active_flag (1.6.0) activerecord (>= 5) active_link_to (1.0.5) actionpack addressable active_record_union (1.3.0) activerecord (>= 4.0) - activejob (6.0.3.4) - activesupport (= 6.0.3.4) + activejob (6.0.5) + activesupport (= 6.0.5) globalid (>= 0.3.6) - activemodel (6.0.3.4) - activesupport (= 6.0.3.4) - activerecord (6.0.3.4) - activemodel (= 6.0.3.4) - activesupport (= 6.0.3.4) - activestorage (6.0.3.4) - actionpack (= 6.0.3.4) - activejob (= 6.0.3.4) - activerecord (= 6.0.3.4) - marcel (~> 0.3.1) - activesupport (6.0.3.4) + activemodel (6.0.5) + activesupport (= 6.0.5) + activerecord (6.0.5) + activemodel (= 6.0.5) + activesupport (= 6.0.5) + activestorage (6.0.5) + actionpack (= 6.0.5) + activejob (= 6.0.5) + activerecord (= 6.0.5) + marcel (~> 1.0) + activesupport (6.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - annotate (3.1.1) - activerecord (>= 3.2, < 7.0) + annotate (3.2.0) + activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) archive-zip (0.12.0) io-like (~> 0.3.0) - ast (2.4.1) - awesome_print (1.8.0) + ast (2.4.2) + awesome_print (1.9.2) bbcoder (1.1.1) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindex (0.8.1) - binding_of_caller (0.8.0) + binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) bluecloth (2.2.0) bourbon (3.1.8) sass (>= 3.2.0) thor builder (3.2.4) - bundle-audit (0.1.0) - bundler-audit - bundler-audit (0.7.0.1) - bundler (>= 1.2.0, < 3) - thor (>= 0.18, < 2) byebug (11.1.3) - capybara (3.33.0) + capybara (3.36.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (2.1.0) + carrierwave (2.2.2) activemodel (>= 5.0.0) activesupport (>= 5.0.0) addressable (~> 2.6) image_processing (~> 1.1) - mimemagic (>= 0.3.0) + marcel (~> 1.0.0) mini_mime (>= 0.1.3) - childprocess (3.0.0) + ssrf_filter (~> 1.0) + childprocess (4.1.0) cliver (0.3.2) - code_analyzer (0.5.2) + code_analyzer (0.5.5) sexp_processor - codeclimate-test-reporter (1.0.7) - simplecov + codeclimate-test-reporter (1.0.9) + simplecov (<= 0.13) coderay (1.1.3) coffee-rails (5.0.0) coffee-script (>= 2.2.0) @@ -170,29 +126,27 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) - connection_pool (2.2.3) - countries (3.0.1) - i18n_data (~> 0.10.0) + concurrent-ruby (1.1.10) + connection_pool (2.2.5) + countries (4.2.3) + i18n_data (~> 0.16.0) sixarm_ruby_unaccent (~> 1.1) - unicode_utils (~> 1.4) - country_select (4.0.0) - countries (~> 3.0) - sort_alphabetical (~> 1.0) + country_select (6.1.1) + countries (~> 4.2) + sort_alphabetical (~> 1.1) crass (1.0.6) - dalli (2.7.11) - database_cleaner (1.8.5) - database_cleaner-active_record (1.8.0) - activerecord - database_cleaner (~> 1.8.0) - database_cleaner-redis (1.8.0) - database_cleaner (~> 1.8.0) + dalli (3.2.1) + database_cleaner-active_record (2.0.1) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + database_cleaner-redis (2.0.0) + database_cleaner-core (~> 2.0.0) redis - debug_inspector (0.0.3) + debug_inspector (1.1.0) declarative (0.0.20) - declarative-option (0.1.0) - diff-lcs (1.4.4) - docile (1.3.2) + diff-lcs (1.5.0) + docile (1.1.5) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) @@ -200,15 +154,15 @@ GEM dynamic_form (1.1.4) erubi (1.10.0) erubis (2.7.0) - execjs (2.7.0) + execjs (2.8.1) factory_bot (4.10.0) activesupport (>= 3.0.0) factory_bot_rails (4.10.0) factory_bot (~> 4.10.0) railties (>= 3.0.0) - faraday (0.17.3) + faraday (0.17.5) multipart-post (>= 1.2, < 3) - ffi (1.13.1) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -218,8 +172,8 @@ GEM archive-zip (~> 0.7) get_process_mem (0.2.7) ffi (~> 1.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (1.0.0) + activesupport (>= 5.0) google-api-client (0.10.3) addressable (~> 2.3) googleauth (~> 0.5) @@ -236,10 +190,10 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - haml (5.2.0) + haml (5.2.2) temple (>= 0.8.0) tilt - hashie (4.1.0) + hashie (5.0.0) httpclient (2.8.3) hurley (0.2) i18n (0.9.5) @@ -247,14 +201,15 @@ GEM i18n-country-translations (1.4.1) i18n (>= 0.9.3, < 2) railties (>= 5.0) - i18n-js (3.8.0) + i18n-js (3.9.2) i18n (>= 0.6.6) i18n_country_select (1.2.1) i18n (~> 0.9.3) i18n-country-translations (~> 1.0, >= 1.3.0) unicode_utils (~> 1.0, >= 1.0.0) - i18n_data (0.10.0) - image_processing (1.12.1) + i18n_data (0.16.0) + simple_po_parser (~> 1.1) + image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-like (0.3.1) @@ -262,60 +217,57 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.3.1) - jwt (2.2.2) - loofah (2.7.0) + json (2.6.1) + jwt (2.3.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.2) + matrix (0.4.2) memoist (0.16.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) - mimemagic (0.3.5) + mime-types-data (3.2022.0105) mini_magick (4.11.0) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.2) + mini_mime (1.1.2) + minitest (5.15.0) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - mysql2 (0.5.3) + mysql2 (0.5.4) neat (1.6.0) bourbon (>= 3.1) sass (>= 3.3) - newrelic_rpm (6.13.1) - nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - omniauth (1.9.1) + newrelic_rpm (8.7.0) + nio4r (2.5.8) + nokogiri (1.13.6-arm64-darwin) + racc (~> 1.4) + omniauth (2.1.0) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - omniauth-openid (1.0.1) - omniauth (~> 1.0) - rack-openid (~> 1.3.1) - omniauth-rails_csrf_protection (0.1.2) + rack (>= 2.2.3) + rack-protection + omniauth-openid (2.0.1) + omniauth (>= 1.0, < 3.0) + rack-openid (~> 1.4.0) + omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) - omniauth (>= 1.3.1) + omniauth (~> 2.0) omniauth-steam (1.0.6) multi_json omniauth-openid - os (1.1.1) - parallel (1.20.0) - parser (2.7.2.0) + os (1.1.4) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) phantomjs (2.1.1.0) poltergeist (1.18.1) capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - power_assert (1.2.0) + power_assert (2.0.1) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -324,32 +276,35 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.6) - puma (5.0.4) + public_suffix (4.0.7) + puma (5.6.4) nio4r (~> 2.0) puma_worker_killer (0.3.1) get_process_mem (~> 0.2) puma (>= 2.7) + racc (1.6.0) rack (2.2.3) - rack-openid (1.3.1) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) + rack-protection (2.2.0) + rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.3.4) - actioncable (= 6.0.3.4) - actionmailbox (= 6.0.3.4) - actionmailer (= 6.0.3.4) - actionpack (= 6.0.3.4) - actiontext (= 6.0.3.4) - actionview (= 6.0.3.4) - activejob (= 6.0.3.4) - activemodel (= 6.0.3.4) - activerecord (= 6.0.3.4) - activestorage (= 6.0.3.4) - activesupport (= 6.0.3.4) + rails (6.0.5) + actioncable (= 6.0.5) + actionmailbox (= 6.0.5) + actionmailer (= 6.0.5) + actionpack (= 6.0.5) + actiontext (= 6.0.5) + actionview (= 6.0.5) + activejob (= 6.0.5) + activemodel (= 6.0.5) + activerecord (= 6.0.5) + activestorage (= 6.0.5) + activesupport (= 6.0.5) bundler (>= 1.3.0) - railties (= 6.0.3.4) + railties (= 6.0.5) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -358,64 +313,80 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rails_autolink (1.1.6) rails (> 3.1) - rails_best_practices (1.20.0) + rails_best_practices (1.23.1) activesupport - code_analyzer (>= 0.5.1) + code_analyzer (~> 0.5.5) erubis i18n json require_all (~> 3.0) ruby-progressbar - railties (6.0.3.4) - actionpack (= 6.0.3.4) - activesupport (= 6.0.3.4) + railties (6.0.5) + actionpack (= 6.0.5) + activesupport (= 6.0.5) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) + rainbow (3.1.1) + rake (13.0.6) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.2.2) - regexp_parser (1.8.2) - representable (3.0.4) + redis (4.6.0) + regexp_parser (2.4.0) + representable (3.1.1) declarative (< 0.1.0) - declarative-option (< 0.2.0) + trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) require_all (3.0.0) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) retriable (3.1.2) - rexml (3.2.4) - rmagick (4.1.2) - rspec_junit_formatter (0.4.1) + rexml (3.2.5) + rmagick (4.2.5) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-rails (5.1.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.11.0) + rspec_junit_formatter (0.5.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.3.0) + rubocop (1.29.1) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 1.1.1) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.1.1) - parser (>= 2.7.1.5) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) ruby-openid (2.9.2) - ruby-progressbar (1.10.1) - ruby-vips (2.0.17) - ffi (~> 1.9) - rubyzip (2.3.0) - sanitize (5.2.1) + ruby-progressbar (1.11.0) + ruby-vips (2.1.4) + ffi (~> 1.12) + rubyzip (2.3.2) + sanitize (6.0.0) crass (~> 1.0.2) - nokogiri (>= 1.8.0) - nokogumbo (~> 2.0) + nokogiri (>= 1.12.0) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -429,65 +400,70 @@ GEM tilt (>= 1.1, < 3) scrypt (3.0.7) ffi-compiler (>= 1.0, < 2.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + selenium-webdriver (4.1.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) - sexp_processor (4.15.1) + sexp_processor (4.16.1) signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simplecov (0.19.1) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov-html (0.12.3) + simple_po_parser (1.1.6) + simplecov (0.13.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) sixarm_ruby_unaccent (1.2.0) sort_alphabetical (1.1.0) unicode_utils (>= 1.2.2) - spring (2.1.1) + spring (3.1.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) + ssrf_filter (1.0.7) temple (0.8.2) - test-unit (3.3.6) + test-unit (3.5.3) power_assert - thor (1.0.1) + thor (1.2.1) thread_safe (0.3.6) tilt (2.0.10) time_difference (0.5.0) activesupport - timecop (0.9.2) - tinymce-rails (5.5.1) + timecop (0.9.5) + tinymce-rails (6.0.2) railties (>= 3.1.1) - tzinfo (1.2.8) + trailblazer-option (0.1.2) + tzinfo (1.2.9) thread_safe (~> 0.1) uber (0.1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.7.0) + unicode-display_width (2.1.0) unicode_utils (1.4.0) unread (0.11.0) activerecord (>= 3) - web-console (4.1.0) + web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (3.3.0) + will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.1) + zeitwerk (2.5.4) PLATFORMS - ruby + arm64-darwin-21 DEPENDENCIES active_flag @@ -537,18 +513,18 @@ DEPENDENCIES public_suffix puma puma_worker_killer - rails (~> 6.0.3.4) + rails (~> 6.0.5) rails-controller-testing rails_autolink rails_best_practices rake responders rmagick - rspec-core! - rspec-expectations! - rspec-mocks! - rspec-rails! - rspec-support! + rspec-core + rspec-expectations + rspec-mocks + rspec-rails + rspec-support rspec_junit_formatter rubocop sanitize @@ -569,7 +545,7 @@ DEPENDENCIES will_paginate RUBY VERSION - ruby 2.6.5p114 + ruby 2.6.10p210 BUNDLED WITH - 2.2.6 + 2.3.13