Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359481 )
Change subject: wmflib, admin: fix RuboCop Style/For offenses
......................................................................
wmflib, admin: fix RuboCop Style/For offenses
Replace "for" with "each" as that more Ruby-ish. Also, while at it,
cleanup unique_users a tiny little bit and fix another issue with it
(Style/EmptyLiteral).
Change-Id: Icdca0cf24ed990c4afbd9eafd748f7ee207b333c
---
M .rubocop_todo.yml
M modules/admin/lib/puppet/parser/functions/unique_users.rb
M modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
3 files changed, 10 insertions(+), 16 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0b503bf..c463b8a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -12,13 +12,6 @@
Exclude:
- 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb'
-Style/EmptyLiteral:
- Exclude:
- - 'modules/admin/lib/puppet/parser/functions/unique_users.rb'
-
-Style/For:
- Enabled: false
-
Style/GlobalVars:
Exclude:
- 'utils/expanderb.rb'
diff --git a/modules/admin/lib/puppet/parser/functions/unique_users.rb
b/modules/admin/lib/puppet/parser/functions/unique_users.rb
index 3c98778..77fff67 100644
--- a/modules/admin/lib/puppet/parser/functions/unique_users.rb
+++ b/modules/admin/lib/puppet/parser/functions/unique_users.rb
@@ -1,13 +1,14 @@
module Puppet::Parser::Functions
- newfunction(:unique_users, :type => :rvalue) do |args|
- myhash = args[0]
- applied_groups = args[1]
- users = Array.new
- for group in applied_groups
+ newfunction(:unique_users, :arity => 2, :type => :rvalue) do |args|
+ myhash, applied_groups = args
+
+ users = []
+ applied_groups.each do |group|
if myhash['groups'].key?(group)
users.push(myhash['groups'][group]['members'])
end
end
- return users.flatten(2).uniq
+
+ users.flatten(2).uniq
end
end
diff --git a/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
b/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
index 88df67d..e13e403 100644
--- a/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb
@@ -79,7 +79,7 @@
# split hosts into N lists based the first digit of /NNNN/, defaulting to
zero
sublists = [[], [], [], [], [], [], [], [], [], []]
- for h in hosts
+ hosts.each do |h|
match = /([1-9])[0-9]{3}/.match(h)
if match
sublists[match[1].to_i].push(h)
@@ -89,7 +89,7 @@
end
# sort each sublist into a determinstic order based on seed
- for s in sublists
+ sublists.each do |s|
s.sort_by! { |x| Digest::MD5.hexdigest(seed + x) }
end
@@ -127,7 +127,7 @@
output['weekday'] = '*'
end
- return output
+ output
end
end
--
To view, visit https://gerrit.wikimedia.org/r/359481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdca0cf24ed990c4afbd9eafd748f7ee207b333c
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
