diff --git a/src/supermarket/engines/fieri/.rubocop.yml b/src/supermarket/engines/fieri/.rubocop.yml index b89e5aacb..ebfeb8461 100644 --- a/src/supermarket/engines/fieri/.rubocop.yml +++ b/src/supermarket/engines/fieri/.rubocop.yml @@ -14,3 +14,5 @@ Layout/MultilineOperationIndentation: EnforcedStyle: aligned Style/SymbolArray: EnforcedStyle: brackets +Chef/Ruby/UnlessDefinedRequire: + Enabled: false diff --git a/src/supermarket/engines/fieri/lib/quality_metric/cookstyle_helpers.rb b/src/supermarket/engines/fieri/lib/quality_metric/cookstyle_helpers.rb index d17f9127e..a4f70ce85 100644 --- a/src/supermarket/engines/fieri/lib/quality_metric/cookstyle_helpers.rb +++ b/src/supermarket/engines/fieri/lib/quality_metric/cookstyle_helpers.rb @@ -1,7 +1,7 @@ -require "mixlib/shellout" unless defined?(Mixlib::ShellOut) +require "mixlib/shellout" require "dotenv-rails" Dotenv.load(".env") -require "shellwords" unless defined?(Shellwords) +require "shellwords" module CookstyleHelpers def self.process_artifact(path) @@ -19,11 +19,10 @@ def self.parse_cookstyle_output(cookstyle_output) offenses_arr = JSON.parse(cookstyle_output)["files"].map { |h| h["offenses"]\ .each { |a| a.merge!("file" => h["path"]) } - } \ - .flatten.sort_by { |hsh| hsh["cop_name"] }\ + }.flatten.sort_by { |hsh| hsh["cop_name"] }\ .each { |a| status << "#{[a["cop_name"], a["message"],\ - a["file"], a["location"]["line"]].join(": ")}\n" + a["file"], a["location"]["line"]].join(": ")}\n" } [status, offenses_arr.size > 0]