diff --git a/Gemfile b/Gemfile index cfb43026334..76406332c60 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ group :test do gem 'rspec-its' gem 'rspec-rails', '~> 6.1.4' gem 'rspec-wait' - gem 'rubocop', '~> 1.67.0' + gem 'rubocop', '~> 1.68.0' gem 'rubocop-capybara' gem 'rubocop-factory_bot' gem 'rubocop-rails', '~> 2.27' diff --git a/Gemfile.lock b/Gemfile.lock index b8878928431..99657472719 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM rdoc (>= 4.0.0) reline (>= 0.4.2) jaro_winkler (1.5.6) - json (2.7.4) + json (2.7.5) json-diff (0.4.1) json-schema (5.0.1) addressable (~> 2.8) @@ -471,7 +471,7 @@ GEM activesupport (>= 3.0.0) mustache (~> 1.0, >= 0.99.4) rspec (~> 3.0) - rubocop (1.67.0) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -481,7 +481,7 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.33.0) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) @@ -659,7 +659,7 @@ DEPENDENCIES rspec-rails (~> 6.1.4) rspec-wait rspec_api_documentation (>= 6.1.0) - rubocop (~> 1.67.0) + rubocop (~> 1.68.0) rubocop-capybara rubocop-factory_bot rubocop-rails (~> 2.27) diff --git a/app/presenters/v3/relationship_presenter.rb b/app/presenters/v3/relationship_presenter.rb index b26776bbeaa..86eb892aae5 100644 --- a/app/presenters/v3/relationship_presenter.rb +++ b/app/presenters/v3/relationship_presenter.rb @@ -16,13 +16,9 @@ def to_hash private def build_relations - data = [] - - @relationships.each do |relationship| - data << { name: relationship.name, guid: relationship.guid, link: "/v2/#{@relation_url}/#{relationship.guid}" } + @relationships.map do |relationship| + { name: relationship.name, guid: relationship.guid, link: "/v2/#{@relation_url}/#{relationship.guid}" } end - - data end end end diff --git a/app/presenters/v3/to_many_relationship_presenter.rb b/app/presenters/v3/to_many_relationship_presenter.rb index 49fb8829617..5da27b20ebf 100644 --- a/app/presenters/v3/to_many_relationship_presenter.rb +++ b/app/presenters/v3/to_many_relationship_presenter.rb @@ -25,13 +25,9 @@ def to_hash private def build_relations - data = [] - - @relationships.each do |relationship| - data << { guid: relationship.guid } + @relationships.map do |relationship| + { guid: relationship.guid } end - - data end def build_links diff --git a/docs/v3/helpers/docs_helpers.rb b/docs/v3/helpers/docs_helpers.rb index ba7ea92d09f..884e7e16db2 100644 --- a/docs/v3/helpers/docs_helpers.rb +++ b/docs/v3/helpers/docs_helpers.rb @@ -13,14 +13,13 @@ def current_version def extract_table_of_contents(html) page = Nokogiri::HTML(html) - headings = [] - page.css('h1,h2,h3').each do |heading| - headings.push({ - id: heading.attribute('id').to_s, - text: heading.content, - level: heading.name[1].to_i, - children: [] - }) + headings = page.css('h1,h2,h3').map do |heading| + { + id: heading.attribute('id').to_s, + text: heading.content, + level: heading.name[1].to_i, + children: [] + } end [3, 2].each do |heading_level| diff --git a/lib/cloud_controller/metrics/periodic_updater.rb b/lib/cloud_controller/metrics/periodic_updater.rb index 4db073deabf..8a5e6ccbc8b 100644 --- a/lib/cloud_controller/metrics/periodic_updater.rb +++ b/lib/cloud_controller/metrics/periodic_updater.rb @@ -159,9 +159,8 @@ def update_webserver_stats local_stats = Puma.stats_hash worker_count = local_stats[:booted_workers] - worker_stats = [] - local_stats[:worker_status].each do |worker_status| - worker_stats << { + worker_stats = local_stats[:worker_status].map do |worker_status| + { started_at: Time.parse(worker_status[:started_at]).utc.to_i, index: worker_status[:index], pid: worker_status[:pid],