chef-powershell 18.1.0 → 18.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3943b91db500700d5fa545d1ac204c220f39f105ddffcfb3a9c1c7fa7d4a194
-  data.tar.gz: ee94470b0f02a82da5bb63aadefd4411b79398f6591f622d202264cf34a1f7ea
+  metadata.gz: 34ea7ab28b5ab85a2d5a005d5188357369e36a6be1889c0cefb37de03415ba28
+  data.tar.gz: 5d482700e657eac56aa58b784e71d79f8cc2c07ac845ca15824f69a30325fad0
 SHA512:
-  metadata.gz: dd20e5f7adb2d459a8f0006a919d220a1a73cb99d75d3c651166053378ffafc1bd2859ac1bd1dcdaba8074e3b84f648d4c786ea1f2789303f05562f78c7a45ab
-  data.tar.gz: 9c2419d28ea984490a4263588476a58726d94e1cf6c6d9da985ad649d2711a2a88484a78dd46e1170adf455b4eb4c747b664c6c1be3a0b302cac429e24a9fe8f
+  metadata.gz: 1cc2f20e89d6abb6c3293456794ebc7c407c37a52c342541a79ac75c352e5dead58a656b5279c7e4e0cae1be505f2396262eb626e32db64931b766aca49f4bac
+  data.tar.gz: 5b45a97ff046afb5893e97667e3e8a52966929bf7b9f19914796d76c8fbb6a746dc4be2c281c919e67bd0ac0de82306112b08f41d0240cbbeaf9835bac65b7fb

data/Rakefile

@@ -25,16 +25,27 @@ begin
   require "rspec/core/rake_task"
   require "rubygems"
   require "rake"
-  require "chefstyle"
+  require "cookstyle"
 rescue LoadError => e
   puts "Skipping missing rake dep: #{e}"
 end
 
-desc "Chefstyle Linting and format checking"
-task :chefstyle do
-  sh("bundle exec chefstyle")
+desc "Check Linting and code style."
+task :style do
+  require "rubocop/rake_task"
+  require "cookstyle/chefstyle"
+
+  if RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+    # Windows-specific command, rubocop erroneously reports the CRLF in each file which is removed when your PR is uploaeded to GitHub.
+    # This is a workaround to ignore the CRLF from the files before running cookstyle.
+    sh "cookstyle --chefstyle -c .rubocop.yml --except Layout/EndOfLine"
+  else
+    sh "cookstyle --chefstyle -c .rubocop.yml"
+  end
+rescue LoadError
+  puts "Rubocop or Cookstyle gems are not installed. bundle install first to make sure all dependencies are installed."
 end
 
-task all: %w{chefstyle spellcheck spec update_chef_powershell_dlls gem_build}.freeze
-task gem: %w{chefstyle spellcheck spec:doc gem_build}.freeze
-task gem_check: %w{chefstyle spellcheck spec}.freeze
+task all: %w{cookstyle spellcheck spec update_chef_powershell_dlls gem_build}.freeze
+task gem: %w{cookstyle spellcheck spec:doc gem_build}.freeze
+task gem_check: %w{cookstyle spellcheck spec}.freeze

data/chef-powershell.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/chef/chef-powershell-shim"
   spec.license       = "Apache-2.0"
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.add_runtime_dependency "ffi", "~> 1.15"
   spec.add_runtime_dependency "ffi-yajl", "~> 2.4"
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
     "bug_tracker_uri" => "https://github.com/chef/chef/issues",
     "changelog_uri" => "https://github.com/chef/chef-powershell-shim/CHANGELOG.md",
     "documentation_uri" => "https://github.com/chef/chef-powershell-shim/chef-powershell/README.md",
-    "homepage_uri" => "https://github.com/chef/chef/tree/main/chef-powershell",
+    "homepage_uri" => "https://github.com/chef/chef/tree/18-Stable/chef-powershell",
     "source_code_uri" => "https://github.com/chef/chef-powershell-shim/chef-powershell",
   }
 

data/lib/chef-powershell/pwsh.rb

@@ -50,7 +50,7 @@ class ChefPowerShell
       ENV["DOTNET_ROOT"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/AMD64"
       ENV["DOTNET_ROOT(x86)"] = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/x86"
 
-      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll"
+      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/8.0.0/Chef.PowerShell.Wrapper.Core.dll"
 
       super
     ensure
@@ -67,7 +67,7 @@ class ChefPowerShell
       # ensures that the correct architecture binaries are installed into the path.
       # Also note that the version of pwsh is determined by which assemblies the dll was
       # built with. To update powershell, those dependencies must be bumped.
-      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/5.0.0/Chef.PowerShell.Wrapper.Core.dll"
+      @powershell_dll = Gem.loaded_specs["chef-powershell"].full_gem_path + "/bin/ruby_bin_folder/#{ENV["PROCESSOR_ARCHITECTURE"]}/shared/Microsoft.NETCore.App/8.0.0/Chef.PowerShell.Wrapper.Core.dll"
       @dll ||= @powershell_dll
     end
   end

data/lib/chef-powershell/version.rb

@@ -16,5 +16,5 @@
 
 module ChefPowerShellModule
   CHEFPOWERSHELL_ROOT = File.expand_path("..", __dir__)
-  VERSION = "18.1.0"
+  VERSION = "18.6.2"
 end