Skip to content

Commit 1eb862b

Browse files
bastelfreakbastelfreak
committed
rubocop: autofix
1 parent 2ae80e5 commit 1eb862b

7 files changed

Lines changed: 39 additions & 34 deletions

File tree

‎.rubocop_todo.yml‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
2-
# `rubocop --auto-gen-config`
3-
# on 2023-08-17 21:30:48 UTC using RuboCop version 1.50.2.
2+
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3+
# using RuboCop version 1.85.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
@@ -29,17 +29,6 @@ Lint/ShadowingOuterLocalVariable:
2929
- 'lib/puppet/face/catalog/pull.rb'
3030
- 'lib/puppet/face/catalog/seed.rb'
3131

32-
# Offense count: 2
33-
Lint/UriEscapeUnescape:
34-
Exclude:
35-
- 'lib/puppet/catalog-diff/searchfacts.rb'
36-
37-
# Offense count: 1
38-
# Configuration parameters: CheckForMethodsWithNoSideEffects.
39-
Lint/Void:
40-
Exclude:
41-
- 'lib/puppet/face/catalog/seed.rb'
42-
4332
# Offense count: 5
4433
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
4534
# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
@@ -48,7 +37,7 @@ Naming/MethodParameterName:
4837
- 'lib/puppet/catalog-diff/formater.rb'
4938

5039
# Offense count: 4
51-
# Configuration parameters: Max.
40+
# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
5241
RSpec/IndexedLet:
5342
Exclude:
5443
- 'spec/unit/puppet/catalog_diff/comparer_spec.rb'
@@ -79,12 +68,13 @@ Style/FormatString:
7968
- 'lib/puppet/catalog-diff/differ.rb'
8069
- 'lib/puppet/catalog-diff/formater.rb'
8170

82-
# Offense count: 12
71+
# Offense count: 11
8372
# This cop supports unsafe autocorrection (--autocorrect-all).
8473
# Configuration parameters: EnforcedStyle.
8574
# SupportedStyles: always, always_true, never
8675
Style/FrozenStringLiteralComment:
8776
Exclude:
77+
- '**/*.arb'
8878
- 'lib/puppet/catalog-diff/comparer.rb'
8979
- 'lib/puppet/catalog-diff/compilecatalog.rb'
9080
- 'lib/puppet/catalog-diff/differ.rb'
@@ -95,19 +85,34 @@ Style/FrozenStringLiteralComment:
9585
- 'lib/puppet/face/catalog/diff.rb'
9686
- 'lib/puppet/face/catalog/pull.rb'
9787
- 'lib/puppet/face/catalog/seed.rb'
98-
- 'spec/spec_helper_local.rb'
9988
- 'spec/unit/puppet/catalog_diff/comparer_spec.rb'
10089

10190
# Offense count: 1
10291
# This cop supports unsafe autocorrection (--autocorrect-all).
103-
Style/MapToHash:
92+
# Configuration parameters: AllowedReceivers.
93+
# AllowedReceivers: Thread.current
94+
Style/HashEachMethods:
10495
Exclude:
105-
- 'lib/puppet/catalog-diff/searchfacts.rb'
96+
- 'lib/puppet/catalog-diff/compilecatalog.rb'
97+
98+
# Offense count: 2
99+
# This cop supports unsafe autocorrection (--autocorrect-all).
100+
Style/MapIntoArray:
101+
Exclude:
102+
- 'lib/puppet/catalog-diff/comparer.rb'
103+
- 'lib/puppet/catalog-diff/preprocessor.rb'
106104

107105
# Offense count: 1
108-
Style/MixinUsage:
106+
# This cop supports unsafe autocorrection (--autocorrect-all).
107+
Style/MapJoin:
109108
Exclude:
110-
- 'spec/spec_helper_local.rb'
109+
- 'lib/puppet/catalog-diff/formater.rb'
110+
111+
# Offense count: 1
112+
# This cop supports unsafe autocorrection (--autocorrect-all).
113+
Style/MapToHash:
114+
Exclude:
115+
- 'lib/puppet/catalog-diff/searchfacts.rb'
111116

112117
# Offense count: 1
113118
Style/MultilineBlockChain:

‎lib/puppet/catalog-diff/comparer.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ def compare_resources(old, new, options)
4545

4646
next if new_resource[:parameters] == resource[:parameters]
4747

48-
parameters_in_old[resource[:resource_id]] = \
48+
parameters_in_old[resource[:resource_id]] =
4949
(resource[:parameters].to_a - new_resource[:parameters].to_a).to_h
5050

51-
parameters_in_new[resource[:resource_id]] = \
51+
parameters_in_new[resource[:resource_id]] =
5252
(new_resource[:parameters].to_a - resource[:parameters].to_a).to_h
5353

5454
if options[:show_resource_diff]
5555
Puppet.debug("Resource diff: #{resource[:resource_id]}")
5656

5757
diff_array = str_diff(
5858
Puppet::CatalogDiff::Formater.new.resource_to_string(resource),
59-
Puppet::CatalogDiff::Formater.new.resource_to_string(new_resource)
59+
Puppet::CatalogDiff::Formater.new.resource_to_string(new_resource),
6060
).split("\n")
6161
if diff_array.size >= 3
6262
string_differences[resource[:resource_id]] = diff_array[3..-1]

‎lib/puppet/catalog-diff/differ.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ def diff(options = {})
106106
subtractions = resource_diffs_titles[:titles_only_in_old].size
107107
changes = resource_diffs[:new_params].keys.size
108108

109-
changes_percentage = ((titles[:from].size.zero? && 0) || (100 * (resource_diffs[:new_params].keys.size.to_f / titles[:from].size)))
110-
additions_percentage = ((titles[:to].size.zero? && 0) || (100 * (additions.to_f / titles[:to].size)))
111-
subtractions_percentage = ((titles[:from].size.zero? && 0) || (100 * (subtractions.to_f / titles[:from].size)))
109+
changes_percentage = (titles[:from].size.zero? && 0) || (100 * (resource_diffs[:new_params].keys.size.to_f / titles[:from].size))
110+
additions_percentage = (titles[:to].size.zero? && 0) || (100 * (additions.to_f / titles[:to].size))
111+
subtractions_percentage = (titles[:from].size.zero? && 0) || (100 * (subtractions.to_f / titles[:from].size))
112112

113113
output[:catalag_percentage_added] = '%.2f' % additions_percentage
114114
output[:catalog_percentage_removed] = '%.2f' % subtractions_percentage

‎lib/puppet/catalog-diff/formater.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def format_hash(v, indent = '', do_indent = false, comma = '')
2727
str = ''
2828
str << indent if do_indent
2929
str << '{' << "\n"
30-
keys = (v.sort_by { |key, _val| key }).to_h
30+
keys = v.sort_by { |key, _val| key }.to_h
3131
keys.each_pair do |key, val|
3232
str << "\t #{indent} #{key} => "
3333
str << format_value(val, "#{indent} ", true, ',', key)
@@ -51,7 +51,7 @@ def format_value(v, indent = '', do_indent = false, comma = '', k = nil)
5151
def resource_to_string(resource)
5252
str = ''
5353
str << "\t#{resource[:type].downcase}" << '{"' << resource[:title].to_s << '":' << "\n"
54-
params = (resource[:parameters].sort_by { |k, _v| k }).to_h
54+
params = resource[:parameters].sort_by { |k, _v| k }.to_h
5555
params.each_pair do |k, v|
5656
str << "\t #{k} => "
5757
indent = ' ' * k.to_s.size
@@ -104,7 +104,7 @@ def list_hash(header, value, mark = '%')
104104
list = value.map do |hash|
105105
number += 1
106106
hash.map do |key, val|
107-
header_spacing = ' ' * (79 - ("#{number}. #{key}".length + (((mark == '%' && ('%.2f' % val)) || val)).to_s.to_s.length))
107+
header_spacing = ' ' * (79 - ("#{number}. #{key}".length + ((mark == '%' && ('%.2f' % val)) || val).to_s.length))
108108
"#{number}. #{key}#{header_spacing}#{(mark == '%' && ('%.2f' % val)) || val}#{mark}"
109109
end
110110
end.join("\n")

‎lib/puppet/catalog-diff/preprocessor.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def convert25(resource, collector)
3333

3434
resource = { type: target.type,
3535
title: target.title,
36-
parameters: {} }
36+
parameters: {}, }
3737

3838
target.each do |param, value|
3939
resource[:parameters][param] = value

‎lib/puppet/catalog-diff/searchfacts.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def find_nodes(options = {})
2424

2525
def build_query(env, version)
2626
base_query = ['and', ['=', %w[node active], true]]
27-
query_field_catalog_environment = Puppet::Util::Package.versioncmp(version, '3') >= 0 ? 'catalog_environment' : 'catalog-environment'
27+
query_field_catalog_environment = (Puppet::Util::Package.versioncmp(version, '3') >= 0) ? 'catalog_environment' : 'catalog-environment'
2828
base_query.concat([['=', query_field_catalog_environment, env]]) if env
2929
real_facts = @facts.compact
3030
query = base_query.concat(real_facts.map { |k, v| ['=', ['fact', k], v] })
@@ -37,7 +37,7 @@ def build_query(env, version)
3737
['select-resources',
3838
['and',
3939
['=', 'type', 'Class'],
40-
['=', 'title', capit]]]]]]
40+
['=', 'title', capit],],],],]],
4141
)
4242
end
4343
query

‎lib/puppet/face/catalog/diff.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@
255255
total_nodes = nodes.size
256256
nodes[:total_percentage] = (nodes.map { |_node, summary| (summary.is_a?(Hash) && summary[:node_percentage]) || nil }.compact.reduce { |acc, elem| acc.to_f + elem } / total_nodes)
257257
nodes[:with_changes] = with_changes.size
258-
nodes[:most_changed] = most_changed.reverse.take(((options.key?(:changed_depth) && options[:changed_depth].to_i) || 10))
259-
nodes[:most_differences] = most_differences.reverse.take(((options.key?(:changed_depth) && options[:changed_depth].to_i) || 10))
258+
nodes[:most_changed] = most_changed.reverse.take((options.key?(:changed_depth) && options[:changed_depth].to_i) || 10)
259+
nodes[:most_differences] = most_differences.reverse.take((options.key?(:changed_depth) && options[:changed_depth].to_i) || 10)
260260
nodes[:total_nodes] = total_nodes
261261
nodes[:date] = Time.new.iso8601
262262
nodes[:all_changed_nodes] = with_changes.keys

0 commit comments

Comments
 (0)