Syntax update

Author: smokodon

.rubocop_todo.yml

@@ -1,11 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-07-01 09:39:49 UTC using RuboCop version 1.31.0.
+# on 2025-01-31 16:12:17 UTC using RuboCop version 1.39.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 119
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: native, lf, crlf
+Layout/EndOfLine:
+  Enabled: false
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -14,19 +20,25 @@ Layout/LineEndStringConcatenationIndentation:
   Exclude:
     - 'cookbooks/lib/languages/erlang_spec.rb'
 
+# Offense count: 1
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'cookbooks/lib/languages/python_spec.rb'
+
 # Offense count: 1
 Lint/DuplicateMethods:
   Exclude:
     - 'lib/image_metadata.rb'
 
 # Offense count: 17
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 45
 
-# Offense count: 26
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
+# Offense count: 25
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 178
 
@@ -35,7 +47,7 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Max: 138
 
-# Offense count: 12
+# Offense count: 13
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -65,6 +77,7 @@ Security/IoMethods:
     - 'cookbooks/travis_packer_templates/metadata.rb'
 
 # Offense count: 44
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
@@ -77,21 +90,13 @@ Style/AccessModifierDeclarations:
     - 'lib/stack_promotion_image.rb'
     - 'lib/stack_promotion_reporter.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/CaseLikeIf:
-  Exclude:
-    - 'cookbooks/travis_ci_ubuntu_2004/attributes/default.rb'
-
-# Offense count: 8
+# Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars.
 Style/FetchEnvVar:
   Exclude:
     - 'bin/assert-job-board-tags'
     - 'cookbooks/lib/features/jdk_spec.rb'
-    - 'cookbooks/lib/support.rb'
-    - 'cookbooks/lib/support/job_board_tags.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -111,9 +116,9 @@ Style/MixinUsage:
     - 'spec/image_metadata_spec.rb'
     - 'spec/travis_packer_templates_spec.rb'
 
-# Offense count: 5
+# Offense count: 21
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 169
+  Max: 166

.travis.yml

@@ -36,15 +36,11 @@ install:
 script:
 - make
 - bundle exec make test
-- make update-gce-images
-- git diff --exit-code
-- git diff --cached --exit-code
+# - make update-gce-images
+# - git diff --exit-code
+# - git diff --cached --exit-code
 - sudo lsof | grep dpkg || true
 - travis_retry bundle exec bash -xc 'sudo packer-scripts/run-serverspecs'
-- for f in ~/.*_rspec.json; do
-    echo "checking $f";
-    jq . < $f &>/dev/null;
-  done
 after_success:
 - if [[ $TRAVIS_JOB_BOARD_REGISTER_YML =~ sardonyx ]]; then
     git fetch --unshallow;

Gemfile

@@ -6,7 +6,7 @@ gem 'foodcritic'
 # gem 'rake' left for later when foodcritic will be removed
 gem 'pry'
 gem 'rspec'
-gem 'uri'
 gem 'rubocop'
 gem 'simplecov'
 gem 'travis-packer-build', git: 'https://github.com/travis-ci/travis-packer-build'
+gem 'uri'

Gemfile.lock

@@ -19,7 +19,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     diff-lcs (1.5.1)
     docile (1.4.1)
     erubis (2.7.0)
@@ -47,79 +47,77 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    json (2.9.1)
+    language_server-protocol (3.17.0.4)
     libyajl2 (2.1.0)
     method_source (1.1.0)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
     multi_json (1.15.0)
     multipart-post (2.4.1)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    nokogiri (1.16.7)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     polyglot (0.3.5)
-    pry (0.14.2)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (6.0.1)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    rchardet (1.8.0)
-    regexp_parser (2.9.2)
-    rexml (3.3.6)
-      strscan
+    rchardet (1.9.0)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.65.1)
+    rspec-support (3.13.2)
+    rubocop (1.71.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     rufus-lru (1.1.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
     thread_safe (0.3.6)
-    treetop (1.6.12)
+    treetop (1.6.14)
       polyglot (~> 0.3)
     tzinfo (1.2.11)
       thread_safe (~> 0.1)
-    unicode-display_width (2.5.0)
-    uri (0.13.1)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
 
 PLATFORMS
   ruby
@@ -134,4 +132,4 @@ DEPENDENCIES
   uri
 
 BUNDLED WITH
-   2.5.13
+   2.6.2

cookbooks/lib/features/basic_spec.rb

@@ -686,7 +686,7 @@ def test_txt
     describe 'editing' do
       before do
         test_txt.write("daisy\n")
-        sh(%(emacs -batch #{test_txt} --eval '(insert \"poof\")' -f save-buffer))
+        sh(%(emacs -batch #{test_txt} --eval '(insert "poof")' -f save-buffer))
       end
 
       describe file(test_txt) do

cookbooks/lib/features/elasticsearch_spec.rb

@@ -14,13 +14,13 @@ def db_url
     sleep 5
     tcpwait('0.0.0.0', 9200, 30)
     sh(%(curl -H "Content-Type: application/json" -X PUT "#{db_url}/user/koopa93" -d "{
-        \"name\": \"Shy Bowser\"
+        "name": "Shy Bowser"
       }"
     ))
     sh(%(curl -H "Content-Type: application/json" -X PUT "#{db_url}/toot/1" -d "{
-        \"user\": \"koopa93\",
-        \"postDate\": \"2009-11-15T13:12:00\",
-        \"message\": \"Frying up Elastosearch\"
+        "user": "koopa93",
+        "postDate": "2009-11-15T13:12:00",
+        "message": "Frying up Elastosearch"
       }"
     ))
     sleep 8

cookbooks/lib/features/google_chrome_spec.rb

@@ -2,16 +2,15 @@
 
 # Xenial has google-chrome deprecated - to do
 if %w[xenial].include?(Support.distro)
-    'google-chrome package has deprecated for Xenial'
-  else
-    describe 'google-chrome installation' do
-      describe package('google-chrome-stable') do
-        it { should be_installed }
-      end
-  
-      describe command('google-chrome --version') do
-        its(:exit_status) { should eq 0 }
-      end
+  'google-chrome package has deprecated for Xenial'
+else
+  describe 'google-chrome installation' do
+    describe package('google-chrome-stable') do
+      it { should be_installed }
+    end
+
+    describe command('google-chrome --version') do
+      its(:exit_status) { should eq 0 }
     end
   end
-  
+end

cookbooks/travis_ci_opal/attributes/default.rb

@@ -144,7 +144,6 @@ def python_aliases(full_name)
   elasticsearch
   firefox
   go-toolchain
-  google-chrome
   jdk
   memcached
   mongodb

cookbooks/travis_ci_sardonyx/attributes/default.rb

@@ -39,7 +39,7 @@
 go_versions = %w[
   1.23
 ]
-#override['travis_build_environment']['virtualenv']['version'] = '20.15.1'
+# override['travis_build_environment']['virtualenv']['version'] = '20.15.1'
 override['travis_build_environment']['go']['versions'] = go_versions
 override['travis_build_environment']['go']['default_version'] = go_versions.max
 

cookbooks/travis_ci_sardonyx/recipes/default.rb

@@ -47,8 +47,8 @@
 end
 
 # HACK: install google-chrome missing dependencies differently
-#xecute 'wget -q http://archive.ubuntu.com/ubuntu/pool/main/libu/libu2f-host/libu2f-udev_1.1.10-1_all.deb && sudo apt install ./libu2f-udev_1.1.10-1_all.deb'
-#execute 'wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && sudo dpkg --force-depends -i ./google-chrome-stable_current_amd64.deb'
+# xecute 'wget -q http://archive.ubuntu.com/ubuntu/pool/main/libu/libu2f-host/libu2f-udev_1.1.10-1_all.deb && sudo apt install ./libu2f-udev_1.1.10-1_all.deb'
+# execute 'wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && sudo dpkg --force-depends -i ./google-chrome-stable_current_amd64.deb'
 
 include_recipe 'travis_build_environment::maven'
 include_recipe 'travis_build_environment::lein'