Updating workstation from chefstyle to cookstyle

.expeditor/config.yml

@@ -33,7 +33,7 @@ pipelines:
       definition: .expeditor/release.omnibus.yml
       env:
         - ADHOC: true
-        - IGNORE_ARTIFACTORY_RUBY_PROXY: true        
+        - IGNORE_ARTIFACTORY_RUBY_PROXY: true
   - third-party-packages:
       description: post-release publishing of Workstation packages to third party distribution platforms
 
@@ -122,9 +122,6 @@ subscriptions:
   - workload: ruby_gem_published:chefspec-*
     actions:
        - bash:.expeditor/update_dep.sh
-  - workload: ruby_gem_published:chefstyle-*
-    actions:
-       - bash:.expeditor/update_dep.sh
   - workload: ruby_gem_published:cookbook-omnifetch-*
     actions:
        - bash:.expeditor/update_dep.sh

Gemfile

@@ -1,12 +1,12 @@
 source "https://rubygems.org"
 
 group :development do
-  gem "chefstyle"
+  gem "cookstyle"
+  gem "rubocop-performance"
   gem "rake"
   # enable tests for the verification behavior in omnibus/verification
   gem "chef-cli"
   gem "rspec"
 
   gem "simplecov", require: false
 end
-

Rakefile

@@ -1,12 +1,12 @@
 begin
-  require "chefstyle"
+  require "cookstyle/chefstyle"
   require "rubocop/rake_task"
-  desc "Run Chefstyle tests"
+  desc "Run Cookstyle tests"
   RuboCop::RakeTask.new(:style) do |task|
     task.options += ["--display-cop-names", "--no-color"]
   end
 rescue LoadError
-  puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
+  puts "cookstyle gem is not installed. bundle install first to make sure all dependencies are installed."
 end
 task default: %i{style}
 

components/gems/Gemfile

@@ -132,8 +132,6 @@ group(:ruby_shadow) do
   gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby unless RUBY_PLATFORM == "x64-mingw-ucrt"
 end
 
-gem "chefstyle", group: :test
-
 # Ensure support for push-client on Windows
 if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
   gem "rdp-ruby-wmi"

components/gems/Gemfile.lock

@@ -456,8 +456,6 @@ GEM
       logger (< 1.6)
       rspec (~> 3.0)
       rspec-expectations (<= 3.12.3)
-    chefstyle (2.2.3)
-      rubocop (= 1.25.1)
     citrus (3.0.2)
     cleanroom (1.0.0)
     coderay (1.1.3)
@@ -956,6 +954,7 @@ GEM
     optimist (3.2.0)
     options (2.3.2)
     os (1.1.4)
+    ostruct (0.6.1)
     parallel (1.26.3)
     parser (3.3.7.4)
       ast (~> 2.4.1)
@@ -1383,7 +1382,6 @@ DEPENDENCIES
   chef_deprecations (>= 0.1.2)
   cheffish (>= 17.0)
   chefspec (>= 9.3)
-  chefstyle
   cookstyle (>= 7.8)
   dep-selector-libgecode
   dep_selector

omnibus/config/projects/chef-workstation.rb

@@ -139,4 +139,4 @@
   skip_packager true
 end
 
-compress :dmg
+compress :dmg

omnibus/config/software/gems.rb

@@ -84,7 +84,7 @@
   appbundle "chef-run", lockdir: project_dir, gem: "chef-apply", without: %w{development docs debug}, env: env
   appbundle "chef-cli", lockdir: project_dir, gem: "chef-cli", without: %w{development profile test}, env: env
   appbundle "berkshelf", lockdir: project_dir, gem: "berkshelf", without: %w{changelog build docs debug development}, env: env
-  appbundle "mixlib-install", lockdir: project_dir, gem: "mixlib-install", without: %w{test chefstyle debug}, env: env
+  appbundle "mixlib-install", lockdir: project_dir, gem: "mixlib-install", without: %w{test debug}, env: env
   appbundle "chef-zero", lockdir: project_dir, gem: "chef-zero", without: %w{pedant development debug}, env: env
   appbundle "cookstyle", lockdir: project_dir, gem: "cookstyle", without: %w{docs profiling rubocop_gems development debug}, env: env
   appbundle "fauxhai", lockdir: project_dir, gem: "fauxhai-chef", env: env

omnibus/config/software/git-custom-bindir.rb

@@ -91,19 +91,19 @@
   end
 
   erb source: "config.mak.erb",
-      dest: "#{project_dir}/config.mak",
-      mode: 0755,
-      vars: {
-               cc: env["CC"],
-               ld: env["LD"],
-               cflags: env["CFLAGS"],
-               cppflags: env["CPPFLAGS"],
-               install: env["INSTALL"],
-               install_dir: install_dir,
-               ldflags: env["LDFLAGS"],
-               shell_path: env["SHELL_PATH"],
-               config_hash: config_hash,
-             }
+    dest: "#{project_dir}/config.mak",
+    mode: 0755,
+    vars: {
+             cc: env["CC"],
+             ld: env["LD"],
+             cflags: env["CFLAGS"],
+             cppflags: env["CPPFLAGS"],
+             install: env["INSTALL"],
+             install_dir: install_dir,
+             ldflags: env["LDFLAGS"],
+             shell_path: env["SHELL_PATH"],
+             config_hash: config_hash,
+           }
 
   # NOTE - If you run ./configure the environment variables set above will not be
   # used and only the command line args will be used. The issue with this is you

omnibus/config/software/openssl.rb

@@ -34,7 +34,7 @@
 # Source URL for OpenSSL 3.2.4
 source url: "https://www.openssl.org/source/openssl-#{version}.tar.gz", extract: :lax_tar
 internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz", extract: :lax_tar,
-                authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
+  authorization: "X-JFrog-Art-Api:#{ENV["ARTIFACTORY_TOKEN"]}"
 
 version("3.2.4") { source sha256: "b23ad7fd9f73e43ad1767e636040e88ba7c9e5775bfa5618436a0dd2c17c3716" }
 
@@ -147,4 +147,4 @@
   end
 
   command "#{install_dir}/embedded/bin/openssl list -providers"
-end
+end