Skip to content

Commit 687bed3

Browse files
authored
Merge pull request #106 from bastelfreak/argh
voxpupuli-rubocop: Update 4.2.0->5.0.0
2 parents 130335e + b4f5ea4 commit 687bed3

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

.rubocop_todo.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3-
# using RuboCop version 1.79.2.
3+
# using RuboCop version 1.81.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
77
# versions of RuboCop, may require this file to be generated again.
88

9+
# Offense count: 1
10+
# This cop supports safe autocorrection (--autocorrect).
11+
# Configuration parameters: EnforcedStyleAlignWith, Severity.
12+
# SupportedStylesAlignWith: start_of_line, begin
13+
Layout/BeginEndAlignment:
14+
Exclude:
15+
- 'lib/bolt/plugin.rb'
16+
917
# Offense count: 14
1018
# This cop supports safe autocorrection (--autocorrect).
1119
Layout/ClosingHeredocIndentation:
@@ -308,7 +316,6 @@ RSpec/Be:
308316

309317
# Offense count: 2
310318
# This cop supports safe autocorrection (--autocorrect).
311-
# Configuration parameters: AutoCorrect.
312319
RSpec/BeEmpty:
313320
Exclude:
314321
- 'spec/unit/project_manager/module_migrator_spec.rb'
@@ -435,7 +442,7 @@ RSpec/ImplicitSubject:
435442
Enabled: false
436443

437444
# Offense count: 71
438-
# This cop supports safe autocorrection (--autocorrect).
445+
# This cop supports unsafe autocorrection (--autocorrect-all).
439446
RSpec/IncludeExamples:
440447
Enabled: false
441448

@@ -456,6 +463,7 @@ RSpec/InstanceVariable:
456463
Enabled: false
457464

458465
# Offense count: 11
466+
# This cop supports safe autocorrection (--autocorrect).
459467
RSpec/IteratedExpectation:
460468
Exclude:
461469
- 'spec/integration/parallel_spec.rb'
@@ -607,7 +615,6 @@ RSpec/RepeatedExampleGroupDescription:
607615

608616
# Offense count: 12
609617
# This cop supports safe autocorrection (--autocorrect).
610-
# Configuration parameters: AutoCorrect.
611618
RSpec/ScatteredLet:
612619
Exclude:
613620
- 'bolt-modules/boltlib/spec/functions/set_resources_spec.rb'
@@ -623,14 +630,11 @@ RSpec/SortMetadata:
623630
- 'spec/integration/inventory_spec.rb'
624631

625632
# Offense count: 78
626-
# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
627-
# Include: **/*_spec.rb
633+
# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
628634
RSpec/SpecFilePathFormat:
629635
Enabled: false
630636

631637
# Offense count: 3
632-
# Configuration parameters: Include.
633-
# Include: **/*_spec*rb*, **/spec/**/*
634638
RSpec/SpecFilePathSuffix:
635639
Exclude:
636640
- 'bolt-modules/boltlib/spec/functions/puppetdb_fact.rb'
@@ -1112,7 +1116,7 @@ Style/TernaryParentheses:
11121116
# Offense count: 522
11131117
# This cop supports safe autocorrection (--autocorrect).
11141118
# Configuration parameters: EnforcedStyleForMultiline.
1115-
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
1119+
# SupportedStylesForMultiline: comma, consistent_comma, diff_comma, no_comma
11161120
Style/TrailingCommaInArguments:
11171121
Enabled: false
11181122

bolt-modules/boltlib/lib/puppet/functions/apply_prep.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ def run_task(targets, task, args = {}, options = {})
7171
#
7272
private def agent?(target)
7373
inventory.features(target).include?('puppet-agent') ||
74-
executor.transport(target.transport).provided_features.include?('puppet-agent') ||
75-
target.remote?
74+
executor.transport(target.transport).provided_features.include?('puppet-agent') ||
75+
target.remote?
7676
end
7777

7878
# Generate the plugin tarball.

dev-resources/bump_mods.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
require 'rss'
88

99
def parse_puppetfile_get_mod_versions
10-
module_re = /^mod 'puppetlabs-([a-z_\-]+)', *'([0-9.]+)'$/i
10+
module_re = /^mod 'puppetlabs-([a-z_-]+)', *'([0-9.]+)'$/i
1111
versions = {}
1212
File.foreach('Puppetfile') do |line|
1313
match = module_re.match(line)
@@ -40,7 +40,7 @@ def latest_version_for_module(mod)
4040
end
4141

4242
def puppetfile_set_mod_versions!(versions_new)
43-
module_re = /^mod 'puppetlabs-([a-z_\-]+)', *'([0-9.]+)'$/i
43+
module_re = /^mod 'puppetlabs-([a-z_-]+)', *'([0-9.]+)'$/i
4444
lines = File.open('Puppetfile').readlines
4545

4646
# update lines

openbolt.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Gem::Specification.new do |spec|
6969
spec.add_development_dependency "octokit", ">= 4.0", "< 9"
7070
spec.add_development_dependency "rake", ">= 12.0", "< 14"
7171
spec.add_development_dependency "rspec", ">= 3.0", "< 4"
72-
spec.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
72+
spec.add_development_dependency 'voxpupuli-rubocop', '~> 5.0.0'
7373

7474
platform = RUBY_PLATFORM
7575
if platform =~ /mingw|mswin/

0 commit comments

Comments
 (0)