[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: fix another couple minor RuboCop offenses
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/359480 ) Change subject: wmflib: fix another couple minor RuboCop offenses .. wmflib: fix another couple minor RuboCop offenses Change-Id: I44083947cd2e739d334b98840ae9246896ab5c40 --- M .rubocop_todo.yml M modules/wmflib/lib/puppet/parser/functions/array_concat.rb M modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb 3 files changed, 2 insertions(+), 7 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8c5ff72..0b503bf 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -2,10 +2,6 @@ Exclude: - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb' -Lint/UselessAssignment: - Exclude: -- 'modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb' - Metrics/LineLength: Max: 159 @@ -19,7 +15,6 @@ Style/EmptyLiteral: Exclude: - 'modules/admin/lib/puppet/parser/functions/unique_users.rb' -- 'modules/wmflib/lib/puppet/parser/functions/array_concat.rb' Style/For: Enabled: false diff --git a/modules/wmflib/lib/puppet/parser/functions/array_concat.rb b/modules/wmflib/lib/puppet/parser/functions/array_concat.rb index 89b9212..0fa1c98 100644 --- a/modules/wmflib/lib/puppet/parser/functions/array_concat.rb +++ b/modules/wmflib/lib/puppet/parser/functions/array_concat.rb @@ -15,7 +15,7 @@ # module Puppet::Parser::Functions newfunction(:array_concat, :type => :rvalue) do |args| -retval = Array.new +retval = [] args.each do |arg| if arg.is_a? Array retval += arg diff --git a/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb b/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb index 22d1e19..52a8ce6 100644 --- a/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb +++ b/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb @@ -15,7 +15,7 @@ newfunction(:validate_array_re, :arity => 2) do |args| items, re = args re = Regexp.new(re) -invalid = args.first.find { |item| item.to_s !~ re } +invalid = items.find { |item| item.to_s !~ re } unless invalid.nil? fail(Puppet::ParseError, "Array element \"#{invalid}\" does not match regular expression \"#{re.source}\".") end -- To view, visit https://gerrit.wikimedia.org/r/359480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44083947cd2e739d334b98840ae9246896ab5c40 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon LiambotisGerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: wmflib: fix another couple minor rubocop offenses
Faidon Liambotis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/359480 ) Change subject: wmflib: fix another couple minor rubocop offenses .. wmflib: fix another couple minor rubocop offenses Change-Id: I44083947cd2e739d334b98840ae9246896ab5c40 --- M .rubocop_todo.yml M modules/wmflib/lib/puppet/parser/functions/array_concat.rb M modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb 3 files changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/359480/1 diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 89dc0a5..0ebb7d6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -3,10 +3,6 @@ - 'modules/trebuchet/lib/puppet/provider/package/trebuchet.rb' - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb' -Lint/UselessAssignment: - Exclude: -- 'modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb' - Metrics/LineLength: Max: 159 @@ -20,7 +16,6 @@ Style/EmptyLiteral: Exclude: - 'modules/admin/lib/puppet/parser/functions/unique_users.rb' -- 'modules/wmflib/lib/puppet/parser/functions/array_concat.rb' Style/For: Enabled: false diff --git a/modules/wmflib/lib/puppet/parser/functions/array_concat.rb b/modules/wmflib/lib/puppet/parser/functions/array_concat.rb index 89b9212..0fa1c98 100644 --- a/modules/wmflib/lib/puppet/parser/functions/array_concat.rb +++ b/modules/wmflib/lib/puppet/parser/functions/array_concat.rb @@ -15,7 +15,7 @@ # module Puppet::Parser::Functions newfunction(:array_concat, :type => :rvalue) do |args| -retval = Array.new +retval = [] args.each do |arg| if arg.is_a? Array retval += arg diff --git a/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb b/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb index 22d1e19..52a8ce6 100644 --- a/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb +++ b/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb @@ -15,7 +15,7 @@ newfunction(:validate_array_re, :arity => 2) do |args| items, re = args re = Regexp.new(re) -invalid = args.first.find { |item| item.to_s !~ re } +invalid = items.find { |item| item.to_s !~ re } unless invalid.nil? fail(Puppet::ParseError, "Array element \"#{invalid}\" does not match regular expression \"#{re.source}\".") end -- To view, visit https://gerrit.wikimedia.org/r/359480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I44083947cd2e739d334b98840ae9246896ab5c40 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits