1
0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-14 00:49:54 +00:00

Updated gems and rails for vulnerabilities, switched to bundle-audit from hakiri due to hakiri not supporting ruby 3, and removed the travisci gem.

This commit is contained in:
2021-08-30 20:06:31 +00:00
parent cb5f0e28ae
commit f7ea68da17
4 changed files with 97 additions and 165 deletions

View File

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby '3.0.0' ruby '3.0.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '6.1.3.1' gem 'rails', '6.1.4.1'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
#gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development #gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development
gem 'sqlite3', :group => :development gem 'sqlite3', :group => :development
@@ -63,7 +63,6 @@ group :development do
gem 'rubocop' gem 'rubocop'
gem 'bullet' gem 'bullet'
gem 'brakeman' gem 'brakeman'
gem 'hakiri' gem 'bundler-audit'
gem 'travis'
end end

View File

@@ -1,75 +1,76 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.1.3.1) actioncable (6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.3.1) actionmailbox (6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
activejob (= 6.1.3.1) activejob (= 6.1.4.1)
activerecord (= 6.1.3.1) activerecord (= 6.1.4.1)
activestorage (= 6.1.3.1) activestorage (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.3.1) actionmailer (6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
actionview (= 6.1.3.1) actionview (= 6.1.4.1)
activejob (= 6.1.3.1) activejob (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.3.1) actionpack (6.1.4.1)
actionview (= 6.1.3.1) actionview (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.3.1) actiontext (6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
activerecord (= 6.1.3.1) activerecord (= 6.1.4.1)
activestorage (= 6.1.3.1) activestorage (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.3.1) actionview (6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.3.1) activejob (6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.3.1) activemodel (6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
activerecord (6.1.3.1) activerecord (6.1.4.1)
activemodel (= 6.1.3.1) activemodel (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
activestorage (6.1.3.1) activestorage (6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
activejob (= 6.1.3.1) activejob (= 6.1.4.1)
activerecord (= 6.1.3.1) activerecord (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
marcel (~> 1.0.0) marcel (~> 1.0.0)
mini_mime (~> 1.0.2) mini_mime (>= 1.1.0)
activesupport (6.1.3.1) activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
tzinfo (~> 2.0) tzinfo (~> 2.0)
zeitwerk (~> 2.3) zeitwerk (~> 2.3)
addressable (2.4.0)
ast (2.4.2) ast (2.4.2)
backports (3.21.0)
bcrypt (3.1.16) bcrypt (3.1.16)
brakeman (5.0.0) brakeman (5.1.1)
builder (3.2.4) builder (3.2.4)
bullet (6.1.4) bullet (6.1.5)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.11) uniform_notifier (~> 1.11)
cancancan (3.2.1) bundler-audit (0.8.0)
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
cancancan (3.3.0)
coffee-rails (5.0.0) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 5.2.0) railties (>= 5.2.0)
@@ -77,11 +78,9 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
commander (4.4.6) concurrent-ruby (1.1.9)
highline (~> 1.7.2)
concurrent-ruby (1.1.8)
crass (1.0.6) crass (1.0.6)
daemons (1.3.1) daemons (1.4.1)
dalli (2.7.11) dalli (2.7.11)
delayed_job (4.1.9) delayed_job (4.1.9)
activesupport (>= 3.0, < 6.2) activesupport (>= 3.0, < 6.2)
@@ -93,49 +92,20 @@ GEM
delayed_job (> 2.0.3) delayed_job (> 2.0.3)
rack-protection (>= 1.5.5) rack-protection (>= 1.5.5)
sinatra (>= 1.4.4) sinatra (>= 1.4.4)
devise (4.7.3) devise (4.8.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
erubi (1.10.0) erubi (1.10.0)
ethon (0.12.0) execjs (2.8.1)
ffi (>= 1.3.0) globalid (0.5.2)
execjs (2.7.0) activesupport (>= 5.0)
faraday (0.17.4)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
ffi (1.15.0)
gh (0.15.1)
addressable (~> 2.4.0)
backports
faraday (~> 0.8)
multi_json (~> 1.0)
net-http-persistent (~> 2.9)
net-http-pipeline
globalid (0.4.2)
activesupport (>= 4.2.0)
hakiri (0.7.2)
activesupport
bundler
commander
i18n
json
rake
rest-client
terminal-table
highline (1.7.10)
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.8.10) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
influxdb (0.8.1) influxdb (0.8.1)
influxdb-rails (1.0.1) influxdb-rails (1.0.2)
influxdb (~> 0.6, >= 0.6.4) influxdb (~> 0.6, >= 0.6.4)
railties (>= 5.0) railties (>= 5.0)
jbuilder (2.11.2) jbuilder (2.11.2)
@@ -144,115 +114,94 @@ GEM
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.5.1) libv8 (3.16.14.19-x86_64-linux)
launchy (2.4.3) loofah (2.12.0)
addressable (~> 2.3)
libv8 (3.16.14.19)
loofah (2.9.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (1.0.0) marcel (1.0.1)
method_source (1.0.0) method_source (1.0.0)
mime-types (3.3.1) mini_mime (1.1.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minitest (5.14.4) minitest (5.14.4)
multi_json (1.15.0)
multipart-post (2.1.1)
mustermann (1.1.1) mustermann (1.1.1)
ruby2_keywords (~> 0.0.1) ruby2_keywords (~> 0.0.1)
mysql2 (0.5.3) mysql2 (0.5.3)
net-http-persistent (2.9.4) newrelic_rpm (7.2.0)
net-http-pipeline (1.0.1) nio4r (2.5.8)
netrc (0.11.0) nokogiri (1.12.4-x86_64-linux)
newrelic_rpm (6.15.0)
nio4r (2.5.7)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.20.1) parallel (1.20.1)
parser (3.0.0.0) parser (3.0.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
passenger (6.0.8) passenger (6.0.10)
rack rack
rake (>= 0.8.1) rake (>= 0.8.1)
puma (5.2.2) puma (5.4.0)
nio4r (~> 2.0) nio4r (~> 2.0)
pusher-client (0.6.2)
json
websocket (~> 1.0)
racc (1.5.2) racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-protection (2.1.0) rack-protection (2.1.0)
rack rack
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.1.3.1) rails (6.1.4.1)
actioncable (= 6.1.3.1) actioncable (= 6.1.4.1)
actionmailbox (= 6.1.3.1) actionmailbox (= 6.1.4.1)
actionmailer (= 6.1.3.1) actionmailer (= 6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
actiontext (= 6.1.3.1) actiontext (= 6.1.4.1)
actionview (= 6.1.3.1) actionview (= 6.1.4.1)
activejob (= 6.1.3.1) activejob (= 6.1.4.1)
activemodel (= 6.1.3.1) activemodel (= 6.1.4.1)
activerecord (= 6.1.3.1) activerecord (= 6.1.4.1)
activestorage (= 6.1.3.1) activestorage (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.3.1) railties (= 6.1.4.1)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.4.2)
loofah (~> 2.3) loofah (~> 2.3)
rails_12factor (0.0.3) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
rails_stdout_logging rails_stdout_logging
rails_serve_static_assets (0.0.5) rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5) rails_stdout_logging (0.0.5)
railties (6.1.3.1) railties (6.1.4.1)
actionpack (= 6.1.3.1) actionpack (= 6.1.4.1)
activesupport (= 6.1.3.1) activesupport (= 6.1.4.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.13)
thor (~> 1.0) thor (~> 1.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (13.0.3) rake (13.0.6)
rb-readline (0.5.5) rb-readline (0.5.5)
rdoc (6.3.0) rdoc (6.3.2)
ref (2.0.0) ref (2.0.0)
regexp_parser (2.1.1) regexp_parser (2.1.1)
responders (3.0.1) responders (3.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
railties (>= 5.0) railties (>= 5.0)
rest-client (2.1.0) rexml (3.2.5)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.4)
round_robin_tournament (0.1.1) round_robin_tournament (0.1.1)
rubocop (1.12.0) rubocop (1.20.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.0.0.0) parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml rexml
rubocop-ast (>= 1.2.0, < 2.0) rubocop-ast (>= 1.9.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1) rubocop-ast (1.11.0)
parser (>= 2.7.1.5) parser (>= 3.0.1.1)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4) ruby2_keywords (0.0.5)
sdoc (2.1.0) sdoc (2.2.0)
rdoc (>= 5.0) rdoc (>= 5.0)
sinatra (2.1.0) sinatra (2.1.0)
mustermann (~> 1.0) mustermann (~> 1.0)
@@ -268,51 +217,36 @@ GEM
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.4.2) sqlite3 (1.4.2)
terminal-table (1.6.0)
therubyracer (0.12.3) therubyracer (0.12.3)
libv8 (~> 3.16.14.15) libv8 (~> 3.16.14.15)
ref ref
thor (1.1.0) thor (1.1.0)
tilt (2.0.10) tilt (2.0.10)
travis (1.8.13)
backports
faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1)
gh (~> 0.13)
highline (~> 1.6)
launchy (~> 2.1)
pusher-client (~> 0.4)
typhoeus (~> 0.6, >= 0.6.8)
turbolinks (5.2.1) turbolinks (5.2.1)
turbolinks-source (~> 5.2) turbolinks-source (~> 5.2)
turbolinks-source (5.2.0) turbolinks-source (5.2.0)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (2.0.4) tzinfo (2.0.4)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2021.1) tzinfo-data (1.2021.1)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
uglifier (4.2.0) uglifier (4.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (2.0.0) unicode-display_width (2.0.0)
uniform_notifier (1.14.2) uniform_notifier (1.14.2)
warden (1.2.9) warden (1.2.9)
rack (>= 2.0.9) rack (>= 2.0.9)
websocket (1.2.9) websocket-driver (0.7.5)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
zeitwerk (2.4.2) zeitwerk (2.4.2)
PLATFORMS PLATFORMS
ruby x86_64-linux
DEPENDENCIES DEPENDENCIES
brakeman brakeman
bullet bullet
bundler-audit
cancancan cancancan
coffee-rails coffee-rails
daemons daemons
@@ -320,7 +254,6 @@ DEPENDENCIES
delayed_job_active_record delayed_job_active_record
delayed_job_web delayed_job_web
devise devise
hakiri
influxdb-rails influxdb-rails
jbuilder jbuilder
jquery-rails jquery-rails
@@ -328,7 +261,7 @@ DEPENDENCIES
newrelic_rpm newrelic_rpm
passenger passenger
puma puma
rails (= 6.1.3.1) rails (= 6.1.4.1)
rails_12factor rails_12factor
rb-readline rb-readline
round_robin_tournament round_robin_tournament
@@ -337,7 +270,6 @@ DEPENDENCIES
spring spring
sqlite3 sqlite3
therubyracer therubyracer
travis
turbolinks turbolinks
tzinfo-data tzinfo-data
uglifier uglifier
@@ -346,4 +278,4 @@ RUBY VERSION
ruby 3.0.0p0 ruby 3.0.0p0
BUNDLED WITH BUNDLED WITH
2.2.9 2.2.26

View File

@@ -4,5 +4,5 @@ project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
cd ${project_dir} cd ${project_dir}
bundle exec rake db:migrate RAILS_ENV=test bundle exec rake db:migrate RAILS_ENV=test
CI=true brakeman CI=true brakeman
bundle exec hakiri gemfile:scan --force bundle exec bundle-audit check --update
bundle exec rake test bundle exec rake test

View File

@@ -17,6 +17,7 @@ RUN apt-get -qq update \
default-libmysqlclient-dev \ default-libmysqlclient-dev \
nodejs \ nodejs \
tzdata \ tzdata \
git \
&& apt-get -qq clean \ && apt-get -qq clean \
&& apt-get autoremove -y \ && apt-get autoremove -y \
&& rm -rf \ && rm -rf \