cheffish 17.1.5 → 17.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72e807e4b3685b5e238fdcff944f78f20e689d36f1e744bfa47788201b561fea
-  data.tar.gz: c0d7e74a983374f5fb3ad88fe7f1d10dc80c9ab8c8f6bcef774030571ebe0e29
+  metadata.gz: 17d1aca4a7ae6e0769e3c2f2dfbc0b658f141fa170eee02f9540d21657456da4
+  data.tar.gz: f47af0396c10e0301bec26bce5fcc2b7c0fc91a8ae13169f0a6f5c5ab3aa0849
 SHA512:
-  metadata.gz: d213972c29b938be1db778e1d177090e89ef39e71d50b1bc0ffbbfe1fdf5c5f6c8c1eb0bdd33b4264bbf9f55a1ac7f120f22edc8d9c8a3cc3ea412b380f70199
-  data.tar.gz: eb0460c0a87bc8d9cd1e5571dc624579d6e17d68a9f2cf855dc27f104c096d2edaebba84f805942a910b231622987c5c3cb24f664c9d6a0ad410190a977099eb
+  metadata.gz: 35a9fac403e9aee67717bcdbdda99aed23bbc52667f15ee7a63d2defec29b64a51a9b351b5d203244b4526dba0251b7e105e65d378a8f6d0e608f4d02221c548
+  data.tar.gz: 65af1d611cdf2cbde5724881077fa66d0841403c08c24dac7b95efb5e1aaf07c46a599c0d7654a26646c8f8c71ea8e3ba69920b5464e74b65baecd129e1eb58e

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "2.0.8"
+  gem "cookstyle", "~> 7.32.8"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
@@ -14,8 +14,19 @@ if ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   group :development do
-    # temporarily we only support building against master
-    gem "chef", github: "chef/chef", branch: "master"
-    gem "ohai", github: "chef/ohai", branch: "master"
+    # chef 17 is on 3.0
+    # chef 18 is on 3.1
+    case RUBY_VERSION
+    when /^3\.0/
+      gem "chef", "~> 17.0"
+      gem "ohai", "~> 17.0"
+    when /^3\.1/
+      gem "chef", "~> 18.0"
+      gem "ohai", "~> 18.0"
+    else
+      # go with the latest, unbounded
+      gem "chef"
+      gem "ohai"
+    end
   end
 end

data/Rakefile

@@ -14,14 +14,14 @@ rescue LoadError
 end
 
 begin
-  require "chefstyle"
+  require "cookstyle/chefstyle"
   require "rubocop/rake_task"
   desc "Run Chefstyle 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
 
 begin

data/cheffish.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-zero", ">= 14.0"
   s.add_dependency "chef-utils", ">= 17.0"
+  s.add_dependency "logger", "< 1.6.0"
   s.add_dependency "net-ssh"
 
   s.require_path = "lib"

data/lib/chef/resource/private_key.rb

@@ -93,7 +93,6 @@ class Chef
                  (!current_private_key ||
                   current_resource.size != new_resource.size ||
                   current_resource.type != new_resource.type))
-
               case new_resource.type
               when :rsa
                 if new_resource.exponent
@@ -137,7 +136,7 @@ class Chef
                 converge_by "change format of #{new_resource.type} private key #{new_path} from #{current_resource.format} to #{new_resource.format}" do
                   write_private_key(current_private_key)
                 end
-              elsif RUBY_PLATFORM !~ /mswin|mingw32|windows/ && (@current_file_mode & 0077) != 0
+              elsif RUBY_PLATFORM !~ /mswin|mingw|windows/ && (@current_file_mode & 0077) != 0
                 new_mode = @current_file_mode & 07700
                 converge_by "change mode of private key #{new_path} to #{new_mode.to_s(8)}" do
                   ::File.chmod(new_mode, new_path)
@@ -249,7 +248,6 @@ class Chef
           else
             resource.action :delete
           end
-
           @current_resource = resource
         end
       end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "17.1.5".freeze
+  VERSION = "17.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 17.1.5
+  version: 17.1.7
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '17.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A set of Chef resources for configuring Chef Infra.