cheffish 17.1.5 → 17.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72e807e4b3685b5e238fdcff944f78f20e689d36f1e744bfa47788201b561fea
-  data.tar.gz: c0d7e74a983374f5fb3ad88fe7f1d10dc80c9ab8c8f6bcef774030571ebe0e29
+  metadata.gz: 8909e50949ae38efda3547bb516fd6913022d55f1ec27e2771b1932bbd6888d5
+  data.tar.gz: 2085c957261844a51729d1ee4e5d5437b8081b5fa708b35c5afd2eb46ee3ac90
 SHA512:
-  metadata.gz: d213972c29b938be1db778e1d177090e89ef39e71d50b1bc0ffbbfe1fdf5c5f6c8c1eb0bdd33b4264bbf9f55a1ac7f120f22edc8d9c8a3cc3ea412b380f70199
-  data.tar.gz: eb0460c0a87bc8d9cd1e5571dc624579d6e17d68a9f2cf855dc27f104c096d2edaebba84f805942a910b231622987c5c3cb24f664c9d6a0ad410190a977099eb
+  metadata.gz: dee66506ac2a7985c5e38d341a1de8c6e354b286758411755032b7f89cc1e41ffd39eb3076afa7abf8337f98be9d86c6f4d1093b42609b670aada0afa0587f35
+  data.tar.gz: 7eaa3272587e33aa326b89d556e51829fb60a7a00024bbb4f5c59d451d0d86a76c018dd5a21d05c36745276be1961a7efb09e5e867240a11170c55faf384939b

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/chef_acl.rb

@@ -9,7 +9,7 @@ using ChefUtils::ParallelMap
 class Chef
   class Resource
     class ChefAcl < Cheffish::BaseResource
-      provides :chef_acl
+      provides :chef_acl, target_mode: true
 
       # Path of the thing being secured, e.g. nodes, nodes/*, nodes/mynode,
       # */*, **, roles/base, data/secrets, cookbooks/apache2, /users/*,

data/lib/chef/resource/chef_client.rb

@@ -4,7 +4,7 @@ require_relative "../../cheffish/chef_actor_base"
 class Chef
   class Resource
     class ChefClient < Cheffish::ChefActorBase
-      provides :chef_client
+      provides :chef_client, target_mode: true
 
       # Client attributes
       property :chef_client_name, Cheffish::NAME_REGEX, name_property: true

data/lib/chef/resource/chef_container.rb

@@ -5,7 +5,7 @@ require "chef/chef_fs/data_handler/container_data_handler"
 class Chef
   class Resource
     class ChefContainer < Cheffish::BaseResource
-      provides :chef_container
+      provides :chef_container, target_mode: true
 
       property :chef_container_name, Cheffish::NAME_REGEX, name_property: true
 

data/lib/chef/resource/chef_data_bag.rb

@@ -4,7 +4,7 @@ require_relative "../../cheffish/base_resource"
 class Chef
   class Resource
     class ChefDataBag < Cheffish::BaseResource
-      provides :chef_data_bag
+      provides :chef_data_bag, target_mode: true
 
       property :data_bag_name, Cheffish::NAME_REGEX, name_property: true
 

data/lib/chef/resource/chef_data_bag_item.rb

@@ -7,7 +7,7 @@ require "chef/encrypted_data_bag_item"
 class Chef
   class Resource
     class ChefDataBagItem < Cheffish::BaseResource
-      provides :chef_data_bag_item
+      provides :chef_data_bag_item, target_mode: true
 
       def initialize(*args)
         super

data/lib/chef/resource/chef_environment.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/environment_data_handler"
 class Chef
   class Resource
     class ChefEnvironment < Cheffish::BaseResource
-      provides :chef_environment
+      provides :chef_environment, target_mode: true
 
       property :environment_name, Cheffish::NAME_REGEX, name_property: true
       property :description, String

data/lib/chef/resource/chef_group.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/group_data_handler"
 class Chef
   class Resource
     class ChefGroup < Cheffish::BaseResource
-      provides :chef_group
+      provides :chef_group, target_mode: true
 
       property :group_name, Cheffish::NAME_REGEX, name_property: true
       property :users, ArrayType

data/lib/chef/resource/chef_mirror.rb

@@ -11,7 +11,7 @@ using ChefUtils::ParallelMap
 class Chef
   class Resource
     class ChefMirror < Cheffish::BaseResource
-      provides :chef_mirror
+      provides :chef_mirror, target_mode: true
 
       # Path of the data to mirror, e.g. nodes, nodes/*, nodes/mynode,
       # */*, **, roles/base, data/secrets, cookbooks/apache2, etc.

data/lib/chef/resource/chef_node.rb

@@ -6,7 +6,7 @@ require_relative "../../cheffish/node_properties"
 class Chef
   class Resource
     class ChefNode < Cheffish::BaseResource
-      provides :chef_node
+      provides :chef_node, target_mode: true
 
       include Cheffish::NodeProperties
 

data/lib/chef/resource/chef_organization.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/data_handler_base"
 class Chef
   class Resource
     class ChefOrganization < Cheffish::BaseResource
-      provides :chef_organization
+      provides :chef_organization, target_mode: true
 
       property :organization_name, Cheffish::NAME_REGEX, name_property: true
       property :full_name, String

data/lib/chef/resource/chef_resolved_cookbooks.rb

@@ -4,7 +4,7 @@ require "chef_zero"
 class Chef
   class Resource
     class ChefResolvedCookbooks < Cheffish::BaseResource
-      provides :chef_resolved_cookbooks
+      provides :chef_resolved_cookbooks, target_mode: true
 
       def initialize(*args)
         super

data/lib/chef/resource/chef_role.rb

@@ -6,7 +6,7 @@ require "chef/chef_fs/data_handler/role_data_handler"
 class Chef
   class Resource
     class ChefRole < Cheffish::BaseResource
-      provides :chef_role
+      provides :chef_role, target_mode: true
 
       property :role_name, Cheffish::NAME_REGEX, name_property: true
       property :description, String

data/lib/chef/resource/chef_user.rb

@@ -4,7 +4,7 @@ require_relative "../../cheffish/chef_actor_base"
 class Chef
   class Resource
     class ChefUser < Cheffish::ChefActorBase
-      provides :chef_user
+      provides :chef_user, target_mode: true
 
       # Client attributes
       property :user_name, Cheffish::NAME_REGEX, name_property: true

data/lib/chef/resource/private_key.rb

@@ -6,7 +6,7 @@ require_relative "../../cheffish/key_formatter"
 class Chef
   class Resource
     class PrivateKey < Cheffish::BaseResource
-      provides :private_key
+      provides :private_key, target_mode: true
 
       allowed_actions :create, :delete, :regenerate, :nothing
       default_action :create
@@ -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/chef/resource/public_key.rb

@@ -6,7 +6,7 @@ require_relative "../../cheffish/key_formatter"
 class Chef
   class Resource
     class PublicKey < Cheffish::BaseResource
-      provides :public_key
+      provides :public_key, target_mode: true
 
       allowed_actions :create, :delete, :nothing
       default_action :create

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = "17.1.5".freeze
+  VERSION = "17.1.8".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.8
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2024-08-14 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.