cheffish 16.0.26 → 17.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e2132a23578c15fe42a8603cf3cd4d72eee69a671f853c273a5a61788f9a31
-  data.tar.gz: 75a4e43250b1b53eb3fd10aee2af0dd5e62e3ee5a6bcede10792691d77080d7c
+  metadata.gz: 72e807e4b3685b5e238fdcff944f78f20e689d36f1e744bfa47788201b561fea
+  data.tar.gz: c0d7e74a983374f5fb3ad88fe7f1d10dc80c9ab8c8f6bcef774030571ebe0e29
 SHA512:
-  metadata.gz: 93706f7357daca264cbdd1ca1a6b3d2912597968e68f58ae376fc71284a3d7f4c92bbf91d31a9fdd3450d317e1961ea91372c3f348a77465a27d8f73a40d45ab
-  data.tar.gz: 3e47fb9564110ced0731b2c19f00af626482fc9fc4daa6be1e7c056a583c22f43a6aae8a64489899ffd7ceef10c17f7d12b942240cf65a8331fd34ee48ec020f
+  metadata.gz: d213972c29b938be1db778e1d177090e89ef39e71d50b1bc0ffbbfe1fdf5c5f6c8c1eb0bdd33b4264bbf9f55a1ac7f120f22edc8d9c8a3cc3ea412b380f70199
+  data.tar.gz: eb0460c0a87bc8d9cd1e5571dc624579d6e17d68a9f2cf855dc27f104c096d2edaebba84f805942a910b231622987c5c3cb24f664c9d6a0ad410190a977099eb

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.7.4"
+  gem "chefstyle", "2.0.8"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
@@ -14,20 +14,8 @@ if ENV["GEMFILE_MOD"]
   instance_eval(ENV["GEMFILE_MOD"])
 else
   group :development do
-    gem "chef", "~> 16"
-    gem "ohai", "~> 16"
+    # temporarily we only support building against master
+    gem "chef", github: "chef/chef", branch: "master"
+    gem "ohai", github: "chef/ohai", branch: "master"
   end
 end
-
-group :docs do
-  gem "yard"
-  gem "redcarpet"
-  gem "github-markup"
-end
-
-group :debug do
-  gem "pry"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
-  gem "rb-readline"
-end

data/Rakefile

@@ -39,4 +39,4 @@ task :console do
   IRB.start
 end
 
-task default: %i{style spec}
+task default: %i{spec style}

data/cheffish.gemspec

@@ -12,14 +12,12 @@ Gem::Specification.new do |s|
   s.email = "oss@chef.io"
   s.homepage = "https://github.com/chef/cheffish"
 
-  s.required_ruby_version = ">= 2.6.0"
+  s.required_ruby_version = ">= 3.0"
 
   s.add_dependency "chef-zero", ">= 14.0"
+  s.add_dependency "chef-utils", ">= 17.0"
   s.add_dependency "net-ssh"
 
-  s.bindir       = "bin"
-  s.executables  = %w{ }
-
   s.require_path = "lib"
   s.files = %w{Gemfile Rakefile LICENSE} + Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }

data/lib/chef/resource/chef_acl.rb

@@ -1,9 +1,11 @@
 require_relative "../../cheffish"
 require_relative "../../cheffish/base_resource"
 require "chef/chef_fs/data_handler/acl_data_handler"
-require "chef/chef_fs/parallelizer"
+require "chef-utils/parallel_map" unless defined?(ChefUtils::ParallelMap)
 require "uri" unless defined?(URI)
 
+using ChefUtils::ParallelMap
+
 class Chef
   class Resource
     class ChefAcl < Cheffish::BaseResource
@@ -126,13 +128,13 @@ class Chef
           # the ACL has changed.
           if new_resource.recursive == true || (new_resource.recursive == :on_change && (!acl || changed))
             children, _error = list(path, "*")
-            Chef::ChefFS::Parallelizer.parallel_do(children) do |child|
+            children.parallel_each do |child|
               next if child.split("/")[-1] == "containers"
 
               create_acl(child)
             end
             # containers mess up our descent, so we do them last
-            Chef::ChefFS::Parallelizer.parallel_do(children) do |child|
+            children.parallel_each do |child|
               next if child.split("/")[-1] != "containers"
 
               create_acl(child)
@@ -301,7 +303,7 @@ class Chef
             #
             # Result: /*/foo = [ '/organizations/foo', '/users/foo' ]
             #
-            matches = Chef::ChefFS::Parallelizer.parallelize(matches) do |pth|
+            matches = matches.parallel_map do |pth|
               found, error = list(pth, part)
               if error
                 if parts[0..index - 1].all? { |p| p != "*" }
@@ -312,7 +314,7 @@ class Chef
               else
                 found
               end
-            end.flatten(1).to_a
+            end.flatten.to_a
           end
 
           matches

data/lib/chef/resource/chef_mirror.rb

@@ -2,9 +2,11 @@ require_relative "../../cheffish"
 require_relative "../../cheffish/base_resource"
 require "chef/chef_fs/file_pattern"
 require "chef/chef_fs/file_system"
-require "chef/chef_fs/parallelizer"
 require "chef/chef_fs/file_system/chef_server/chef_server_root_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir"
+require "chef-utils/parallel_map" unless defined?(ChefUtils::ParallelMap)
+
+using ChefUtils::ParallelMap
 
 class Chef
   class Resource
@@ -97,7 +99,7 @@ class Chef
           end
 
           # Honor concurrency
-          Chef::ChefFS::Parallelizer.threads = new_resource.concurrency - 1
+          ChefUtils::DefaultThreadPool.instance.threads = new_resource.concurrency - 1
 
           # We don't let the user pass absolute paths; we want to reserve those for
           # multi-org support (/organizations/foo).
@@ -108,7 +110,7 @@ class Chef
           # Copy!
           path = Chef::ChefFS::FilePattern.new("/#{new_resource.path}")
           ui = CopyListener.new(self)
-          error = Chef::ChefFS::FileSystem.copy_to(path, src_root, dest_root, nil, options, ui, proc { |p| p.path })
+          error, _result = Chef::ChefFS::FileSystem.copy_to(path, src_root, dest_root, nil, options, ui, proc { |p| p.path })
 
           if error
             raise "Errors while copying:#{ui.errors.map { |e| "#{e}\n" }.join("")}"

data/lib/cheffish/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 16.0.26
+  version: 17.1.5
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '14.0'
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '17.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="