Skip to content

Commit

Permalink
Merge pull request #499 from puppetlabs/dependabot/bundler/rubocop-1.…
Browse files Browse the repository at this point in the history
…28.2

Update rubocop requirement from ~> 1.1.0 to ~> 1.28.2
  • Loading branch information
Samuel authored Jul 25, 2022
2 parents 9220590 + 7f1f8de commit 5b59edc
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Style/Next:
Enabled: false
Metrics/ParameterLists:
Max: 10
MaxOptionalParameters: 10
Style/GuardClause:
Enabled: false

Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ GEM
opentelemetry-semantic_conventions (1.8.0)
opentelemetry-api (~> 1.0)
parallel (1.22.1)
parser (3.1.1.0)
parser (3.1.2.0)
ast (~> 2.4.1)
pickup (0.0.11)
prometheus-client (2.1.0)
Expand All @@ -137,7 +137,7 @@ GEM
rainbow (3.1.1)
rake (13.0.6)
redis (4.6.0)
regexp_parser (2.2.1)
regexp_parser (2.3.1)
rexml (3.2.5)
rspec (3.11.0)
rspec-core (~> 3.11.0)
Expand All @@ -152,16 +152,16 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.0)
rubocop (1.1.0)
rubocop (1.28.2)
parallel (~> 1.10)
parser (>= 2.7.1.5)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.0.1)
rubocop-ast (>= 1.17.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.16.0)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.17.0)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
Expand All @@ -184,7 +184,7 @@ GEM
thor (1.2.1)
thrift (0.16.0)
tilt (2.0.10)
unicode-display_width (1.8.0)
unicode-display_width (2.1.0)
yarjuf (2.0.0)
builder
rspec (~> 3)
Expand All @@ -199,7 +199,7 @@ DEPENDENCIES
pry
rack-test (>= 0.6)
rspec (>= 3.2)
rubocop (~> 1.1.0)
rubocop (~> 1.28.2)
simplecov (>= 0.11.2)
thor (~> 1.0, >= 1.0.1)
vmpooler!
Expand Down
2 changes: 1 addition & 1 deletion lib/vmpooler/api/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def validate_date_str(date_str)
/^\d{4}-\d{2}-\d{2}$/ === date_str
end

# note: domain is not needed here, so we should update the callers of this method
# NOTE: domain is not needed here, so we should update the callers of this method
def hostname_shorten(hostname, domain=nil)
hostname[/[^.]+/]
end
Expand Down
14 changes: 7 additions & 7 deletions lib/vmpooler/pool_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1596,19 +1596,19 @@ def execute!(maxloop = 0, loop_delay = 1)
$config[:pools].each do |pool|
provider_name = pool['provider']
# The provider_class parameter can be defined in the provider's data eg
#:providers:
# :vsphere:
# provider_class: 'vsphere'
# :another-vsphere:
# provider_class: 'vsphere'
# :providers:
# :vsphere:
# provider_class: 'vsphere'
# :another-vsphere:
# provider_class: 'vsphere'
# the above would create two providers/vsphere.rb class objects named 'vsphere' and 'another-vsphere'
# each pools would then define which provider definition to use: vsphere or another-vsphere
#
# if provider_class is not defined it will try to use the provider_name as the class, this is to be
# backwards compatible for example when there is only one provider listed
# :providers:
# :dummy:
# filename: 'db.txs'
# :dummy:
# filename: 'db.txs'
# the above example would create an object based on the class providers/dummy.rb
if $config[:providers].nil? || $config[:providers][provider_name.to_sym].nil? || $config[:providers][provider_name.to_sym]['provider_class'].nil?
provider_class = provider_name
Expand Down
2 changes: 1 addition & 1 deletion vmpooler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'pry'
s.add_development_dependency 'rack-test', '>= 0.6'
s.add_development_dependency 'rspec', '>= 3.2'
s.add_development_dependency 'rubocop', '~> 1.1.0'
s.add_development_dependency 'rubocop', '~> 1.28.2'
s.add_development_dependency 'simplecov', '>= 0.11.2'
s.add_development_dependency 'thor', '~> 1.0', '>= 1.0.1'
s.add_development_dependency 'yarjuf', '>= 2.0'
Expand Down

0 comments on commit 5b59edc

Please sign in to comment.