From 7f15e0bf4e95791e78b81aaee58954fdcb3ee5fd Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Thu, 16 Jul 2020 09:56:27 -0500 Subject: [PATCH] fixing ruby --- Dockerfile | 2 +- dependencies/Gemfile | 8 ++++---- dependencies/Gemfile.lock | 29 ++++++++++++++++++----------- lib/linter.sh | 2 +- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3b07c9d..814061db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ ARG GLIBC_VERSION='2.31-r0' #################### # Run APK installs # #################### -RUN apk add --no-cache \ +RUN apk add --update --no-cache \ ansible-lint \ bash \ curl \ diff --git a/dependencies/Gemfile b/dependencies/Gemfile index 525cef06..bde8ce96 100644 --- a/dependencies/Gemfile +++ b/dependencies/Gemfile @@ -2,9 +2,9 @@ source "https://rubygems.org" -git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } +git_source(:github) { |repo_name| "https://github.com/#{repo_name}" } - -gem "rubocop", "~> 0.77.0" +gem "rubocop", "~> 0.82.0" +gem "rubocop-github", "~> 0.16.0" +gem "rubocop-performance", "~>1.7.0" gem "rubocop-rails", "~> 2.5" -gem "rubocop-github", "~> 0.14.0" diff --git a/dependencies/Gemfile.lock b/dependencies/Gemfile.lock index f98938fc..cb5ca1b1 100644 --- a/dependencies/Gemfile.lock +++ b/dependencies/Gemfile.lock @@ -18,32 +18,39 @@ GEM ast (~> 2.4.1) rack (2.2.3) rainbow (3.0.0) - rubocop (0.77.0) + rexml (3.2.4) + rubocop (0.82.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-github (0.14.0) - rubocop (~> 0.59) - rubocop-rails (2.5.2) - activesupport + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-github (0.16.0) + rubocop (<= 0.82.0) + rubocop-performance (~> 1.0) + rubocop-rails (~> 2.0) + rubocop-performance (1.7.0) + rubocop (>= 0.82.0) + rubocop-rails (2.6.0) + activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.72.0) + rubocop (>= 0.82.0) ruby-progressbar (1.10.1) thread_safe (0.3.6) tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) zeitwerk (2.4.0) PLATFORMS ruby DEPENDENCIES - rubocop (~> 0.77.0) - rubocop-github (~> 0.14.0) + rubocop (~> 0.82.0) + rubocop-github (~> 0.16.0) + rubocop-performance (~> 1.7.0) rubocop-rails (~> 2.5) BUNDLED WITH diff --git a/lib/linter.sh b/lib/linter.sh index 451fec90..c63df84e 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1064,7 +1064,7 @@ if [ "$VALIDATE_RUBY" == "true" ]; then # Lint the ruby files # ####################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "RUBY" "rubocop" "rubocop -c $RUBY_LINTER_RULES" ".*\.\(rb\)\$" "${FILE_ARRAY_RUBY[@]}" + LintCodebase "RUBY" "rubocop" "rubocop -c $RUBY_LINTER_RULES --force-exclusion" ".*\.\(rb\)\$" "${FILE_ARRAY_RUBY[@]}" fi ########################