Skip to content

Commit 85ae8a6

Browse files
committed
Layout/IndentationStyle
This commit enables the Rubocop Layout/IndentationStyle cop and addresses all offenses.
1 parent e88dde0 commit 85ae8a6

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
2222
I18n/RailsI18n/DecorateString:
2323
Enabled: false
2424

25-
# This cop supports safe auto-correction (--auto-correct).
26-
# Configuration parameters: IndentationWidth, EnforcedStyle.
27-
# SupportedStyles: spaces, tabs
28-
Layout/IndentationStyle:
29-
Exclude:
30-
- 'lib/puppet/ffi/windows/structs.rb'
31-
- 'lib/puppet/transaction.rb'
32-
3325
# This cop supports safe auto-correction (--auto-correct).
3426
# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
3527
Layout/IndentationWidth:

lib/puppet/ffi/windows/structs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class OSVERSIONINFO < FFI::Struct
258258
)
259259
end
260260

261-
MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
261+
MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
262262

263263
# SYMLINK_REPARSE_DATA_BUFFER
264264
# https://msdn.microsoft.com/en-us/library/cc232006.aspx

lib/puppet/transaction.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,11 @@ def failed_dependencies?(resource)
304304
s = resource_status(resource)
305305
if s && s.dependency_failed?
306306
if @merge_dependency_warnings && is_puppet_class
307-
# Notes: Puppet::Resource::Status.failed_dependencies() is an Array of Puppet::Resource(s) and
308-
# Puppet::Resource.ref() calls Puppet::Resource.to_s() which is: "#{type}[#{title}]" and
309-
# Puppet::Resource.resource_status(resource) calls Puppet::Resource.to_s()
307+
# Notes: Puppet::Resource::Status.failed_dependencies() is an Array of
308+
# Puppet::Resource(s) and Puppet::Resource.ref() calls
309+
# Puppet::Resource.to_s() which is: "#{type}[#{title}]" and
310+
# Puppet::Resource.resource_status(resource) calls
311+
# Puppet::Resource.to_s()
310312
class_dependencies_to_be_notified = (s.failed_dependencies.map(&:ref) - @failed_class_dependencies_already_notified.to_a)
311313
class_dependencies_to_be_notified.each do |dep_ref|
312314
resource.notice _("Class dependency %{dep} has failures: %{status}") % { dep: dep_ref, status: resource_status(dep_ref).failed }

0 commit comments

Comments
 (0)