Skip to content

Commit 3e996e7

Browse files
committed
Layout/LineEndStringConcatenationIndentation
This commit enables the Rubocop Layout/LineEndStringConcatenationIndentation cop and addresses all offenses.
1 parent d6b06a3 commit 3e996e7

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ Layout/IndentationWidth:
4040
Exclude:
4141
- 'lib/puppet/provider/package/*.rb'
4242

43+
Layout/LineEndStringConcatenationIndentation:
44+
Enabled: true
45+
4346
# puppet uses symbol booleans in types and providers to work around long standing
4447
# bugs when trying to manage falsey pararameters and properties
4548
Lint/BooleanSymbol:

lib/puppet/application/lookup.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ def generate_scope
364364
if TRUSTED_INFORMATION_FACTS.any? { |key| given_facts.key? key }
365365
unless TRUSTED_INFORMATION_FACTS.all? { |key| given_facts.key? key }
366366
raise _("When overriding any of the %{trusted_facts_list} facts with %{fact_file} "\
367-
"given via the --facts flag, they must all be overridden.") % { fact_file: fact_file ,trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',')}
367+
"given via the --facts flag, they must all be overridden.") % { fact_file: fact_file ,trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',')}
368368
end
369369
end
370370
end

lib/puppet/functions/eyaml_lookup_key.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def eyaml_lookup_key(key, options, context)
3131
# TRANSLATORS 'eyaml_lookup_key':, 'path', 'paths' 'glob', 'globs', 'mapped_paths', and lookup_key should not be translated
3232
raise ArgumentError,
3333
_("'eyaml_lookup_key': one of 'path', 'paths' 'glob', 'globs' or 'mapped_paths' must be declared in hiera.yaml"\
34-
" when using this lookup_key function")
34+
" when using this lookup_key function")
3535
end
3636

3737
# nil key is used to indicate that the cache contains the raw content of the eyaml file

lib/puppet/interface/action.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ def set_rendering_method_for(type, proc)
109109
msg = if proc.arity < 0 then
110110
# TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
111111
_("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
112-
" the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
113-
" when_invoked block, not a variable number") %
112+
" the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
113+
" when_invoked block, not a variable number") %
114114
{ face: @face.name, name: name, arg_count: @positional_arg_count }
115115
else
116116
# TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
117117
_("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
118-
" the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
119-
" when_invoked block, not %{string}") %
118+
" the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
119+
" when_invoked block, not %{string}") %
120120
{ face: @face.name, name: name, arg_count: @positional_arg_count, string: proc.arity.to_s }
121121
end
122122
raise ArgumentError, msg

0 commit comments

Comments
 (0)