cheffish 16.0.26 → 17.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e2132a23578c15fe42a8603cf3cd4d72eee69a671f853c273a5a61788f9a31
-  data.tar.gz: 75a4e43250b1b53eb3fd10aee2af0dd5e62e3ee5a6bcede10792691d77080d7c
+  metadata.gz: 6a022a0802ceebdb2656147e6ada5348b95a0d6df170317ce7407d049502c741
+  data.tar.gz: ea8e169d0521142100ab4224be43a870c375f3c32a25f509ff0de15b7343384c
 SHA512:
-  metadata.gz: 93706f7357daca264cbdd1ca1a6b3d2912597968e68f58ae376fc71284a3d7f4c92bbf91d31a9fdd3450d317e1961ea91372c3f348a77465a27d8f73a40d45ab
-  data.tar.gz: 3e47fb9564110ced0731b2c19f00af626482fc9fc4daa6be1e7c056a583c22f43a6aae8a64489899ffd7ceef10c17f7d12b942240cf65a8331fd34ee48ec020f
+  metadata.gz: f2ade13896c429b961aa71d2ff1c721102e7d896d7ba7d157b13a312dc9c3268de544e4d2883cccd48f5d68e09c915ce34217eff02b9fde2be73fb2bc597aef2
+  data.tar.gz: b6b89cfdc3d836c83330619ec878e503de1226591779728229fbff51b6cff6bb9cd4624796eba695ff51e8e326e97c90ffc913e1b0d39ed7b01f16535ef5c217

data/Gemfile

@@ -3,19 +3,23 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chefstyle", "1.7.4"
+  gem "chefstyle", "1.7.5"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
 
+
 # Allow Travis to run tests with different dependency versions
 if ENV["GEMFILE_MOD"]
   puts 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"
+    # gem "chef", "~> 16"
+    # gem "ohai", "~> 16"
   end
 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,9 +12,10 @@ 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 = ">= 2.7.0"
 
   s.add_dependency "chef-zero", ">= 14.0"
+  s.add_dependency "chef-utils", ">= 17.0"
   s.add_dependency "net-ssh"
 
   s.bindir       = "bin"

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).

data/lib/cheffish/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 16.0.26
+  version: 17.0.0
 platform: ruby
 authors:
 - Chef Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-04-22 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: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="