Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359453 )
Change subject: wmflib: fix RuboCop infractions in serializers
......................................................................
wmflib: fix RuboCop infractions in serializers
- Layout/SpaceAfterComma
- Layout/SpaceAroundEqualsInParameterDefault
- Layout/SpaceAroundOperators
- Style/RescueModifier
- Style/Semicolon
Change-Id: I743615bcc90c73ffa902995b73e25f8f4fb89c75
---
M .rubocop_todo.yml
M modules/librenms/lib/puppet/parser/functions/phpdump.rb
M modules/wmflib/lib/puppet/parser/functions/ini.rb
M modules/wmflib/lib/puppet/parser/functions/ordered_json.rb
M modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
M modules/wmflib/lib/puppet/parser/functions/php_ini.rb
6 files changed, 32 insertions(+), 30 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index faf59a1..56f72db 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -65,27 +65,10 @@
Style/RescueModifier:
Exclude:
- - 'modules/librenms/lib/puppet/parser/functions/phpdump.rb'
- - 'modules/wmflib/lib/puppet/parser/functions/ini.rb'
- - 'modules/wmflib/lib/puppet/parser/functions/ordered_json.rb'
- - 'modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb'
- - 'modules/wmflib/lib/puppet/parser/functions/php_ini.rb'
- 'modules/wmflib/lib/puppet/parser/functions/require_package.rb'
-
-Style/Semicolon:
- Exclude:
- - 'modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb'
-
-Layout/SpaceAfterComma:
- Exclude:
- - 'modules/wmflib/lib/puppet/parser/functions/ini.rb'
Layout/SpaceAroundEqualsInParameterDefault:
Enabled: false
-
-Layout/SpaceAroundOperators:
- Exclude:
- - 'modules/librenms/lib/puppet/parser/functions/phpdump.rb'
Layout/SpaceInsideBrackets:
Enabled: false
diff --git a/modules/librenms/lib/puppet/parser/functions/phpdump.rb
b/modules/librenms/lib/puppet/parser/functions/phpdump.rb
index 03e3f2b..743c98f 100644
--- a/modules/librenms/lib/puppet/parser/functions/phpdump.rb
+++ b/modules/librenms/lib/puppet/parser/functions/phpdump.rb
@@ -3,20 +3,20 @@
# Serialize a hash into PHP array with lexicographically sorted keys.
#
-def phpdump(o, level=1)
- indent = " "*4
+def phpdump(o, level = 1)
+ indent = " " * 4
case o
when Hash
contents = ''
o.sort.each do |k, v|
- contents += indent*level
- contents += k.to_pson + " => " + phpdump(v, level+1)
+ contents += indent * level
+ contents += k.to_pson + " => " + phpdump(v, level + 1)
contents += ",\n"
end
- "array(\n" + contents + indent*(level-1) + ")"
+ "array(\n" + contents + indent * (level - 1) + ")"
when Array
- "array(" + o.map { |x| phpdump(x, level+1) }.join(', ') + ")"
+ "array(" + o.map { |x| phpdump(x, level + 1) }.join(', ') + ")"
when TrueClass
"TRUE"
when FalseClass
@@ -24,7 +24,11 @@
when nil
"NULL"
else
- o.include?('.') ? Float(o).to_s : Integer(o).to_s rescue o.to_pson
+ begin
+ o.include?('.') ? Float(o).to_s : Integer(o).to_s
+ rescue
+ o.to_pson
+ end
end
end
diff --git a/modules/wmflib/lib/puppet/parser/functions/ini.rb
b/modules/wmflib/lib/puppet/parser/functions/ini.rb
index 19a0d28..ce1fba2 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ini.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ini.rb
@@ -22,7 +22,9 @@
end
def ini_cast(v)
- v.include?('.') ? Float(v) : Integer(v) rescue v
+ v.include?('.') ? Float(v) : Integer(v)
+ rescue
+ v
end
module Puppet::Parser::Functions
@@ -30,7 +32,7 @@
if args.map(&:class).uniq != [Hash]
fail(ArgumentError, 'ini(): hash arguments required')
end
- args.reduce(&:merge).map do |section,items|
+ args.reduce(&:merge).map do |section, items|
ini_flatten(items).map do |k, vs|
case vs
when Array then vs.map { |v| "#{k}[#{v}] = #{ini_cast(v)}" }
diff --git a/modules/wmflib/lib/puppet/parser/functions/ordered_json.rb
b/modules/wmflib/lib/puppet/parser/functions/ordered_json.rb
index 74a4e2c..f6a9cdb 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ordered_json.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ordered_json.rb
@@ -25,7 +25,11 @@
when Hash
'{' + o.sort.map { |k, v| k.to_pson + ': ' + ordered_json(v) }.join(', ')
+ '}'
else
- o.include?('.') ? Float(o).to_s : Integer(o).to_s rescue o.to_pson
+ begin
+ o.include?('.') ? Float(o).to_s : Integer(o).to_s
+ rescue
+ o.to_pson
+ end
end
end
diff --git a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
index 8a459d1..737b1cc 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb
@@ -24,13 +24,20 @@
def map.each_pair
map.sort.each { |p| yield p }
end
- value.sort.reduce(map) { |h, (k, v)| h[k] = sort_keys_recursive(v); h }
+ value.sort.reduce(map) { |h, (k, v)|
+ h[k] = sort_keys_recursive(v)
+ h
+ }
when 'true', 'false'
value == 'true'
when :undef
nil
else
- value.include?('.') ? Float(value) : Integer(value) rescue value
+ begin
+ value.include?('.') ? Float(value) : Integer(value)
+ rescue
+ value
+ end
end
end
diff --git a/modules/wmflib/lib/puppet/parser/functions/php_ini.rb
b/modules/wmflib/lib/puppet/parser/functions/php_ini.rb
index 6593989..d6c8afc 100644
--- a/modules/wmflib/lib/puppet/parser/functions/php_ini.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/php_ini.rb
@@ -17,7 +17,9 @@
end
def ini_cast(v)
- v.include?('.') ? Float(v) : Integer(v) rescue v
+ v.include?('.') ? Float(v) : Integer(v)
+ rescue
+ v
end
module Puppet::Parser::Functions
--
To view, visit https://gerrit.wikimedia.org/r/359453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I743615bcc90c73ffa902995b73e25f8f4fb89c75
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
