knife-ec-backup 2.4.15 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb6a9c53f5ef60525564d583b9906c746c3af34b8fe25fe92d8e0f362d1f039
-  data.tar.gz: '04987273e967c37af6b3738bac962349f07edc5a4db1a0ec13c0004093adc8af'
+  metadata.gz: 04d60d691882443cee81667126f9f681d74a57bec9c1aa6891d0ea24d23c0825
+  data.tar.gz: 3839aaf3e1266642987da3a8047939bcbf249e4f35e8f637068ac9f228a9ad01
 SHA512:
-  metadata.gz: ab40c44efddf1418bf52ed6d329b4e8d4419c927dbdcbfc758440d53b178183747c333c9019bbaec16b59750ec0432e9bf7397bcd651e978445abfe2f4515b4d
-  data.tar.gz: b5a4137aca897ffcf811e1c96fc87b3ffeb435337ac1aaf1a2301ed9ea0683983da8c1991daa9ce5413d6551453de98e2c99c6f8cb1156420f78a5104d9919e6
+  metadata.gz: 3d76b279ecd5178017431e5c0bfad401b40a080ace47b764d70697c426b04ce808b92380d26ab94f5473f743f71e3c16b080a920c2d6acdbffb10f0dcf555ecb
+  data.tar.gz: 85876db29caeb5531803fc902ff8ca185b52fb65ac5b3909e591fda18c0af43a483f7cc1d16919ff34978df372254900e78fce3f66e670f65a5125e2c7513cbc

data/lib/chef/knife/ec_backup.rb

@@ -13,7 +13,11 @@ class Chef
         require 'chef/chef_fs/config'
         require 'chef/chef_fs/file_system'
         require 'chef/chef_fs/file_pattern'
-        require 'chef/chef_fs/parallelizer'
+        begin
+          require 'chef/chef_fs/parallelizer'
+        rescue LoadError
+          require 'chef-utils/parallel_map' unless defined?(ChefUtils::ParallelMap)
+        end
         require_relative '../server'
         require 'fileutils' unless defined?(FileUtils)
       end

data/lib/chef/knife/ec_base.rb

@@ -125,7 +125,11 @@ class Chef
         def configure_chef
           super
           Chef::Config[:concurrency] = config[:concurrency].to_i if config[:concurrency]
-          Chef::ChefFS::Parallelizer.threads = (Chef::Config[:concurrency] || 10) - 1
+          if defined?(Chef::ChefFS::Parallelizer)
+            Chef::ChefFS::Parallelizer.threads = (Chef::Config[:concurrency] || 10) - 1
+          elsif defined?(ChefUtils::DefaultThreadPool)
+            ChefUtils::DefaultThreadPool.instance.threads = (Chef::Config[:concurrency] || 10) - 1
+          end
         end
 
         def org_admin

data/lib/chef/knife/ec_restore.rb

@@ -34,7 +34,11 @@ class Chef
         require 'chef/chef_fs/command_line'
         require 'chef/chef_fs/data_handler/acl_data_handler'
         require 'securerandom' unless defined?(SecureRandom)
-        require 'chef/chef_fs/parallelizer'
+        begin
+          require 'chef/chef_fs/parallelizer'
+        rescue LoadError
+          require 'chef-utils/parallel_map' unless defined?(ChefUtils::ParallelMap)
+        end
         require_relative '../tsorter'
         require_relative '../server'
       end

data/lib/knife_ec_backup/version.rb

@@ -1,4 +1,4 @@
 # when you change this to double quotes, also update .expeditor/update_version.sh
 module KnifeECBackup
-  VERSION = '2.4.15'
+  VERSION = '2.5.3'
 end

data/spec/chef/knife/ec_restore_spec.rb

@@ -3,6 +3,7 @@ require 'chef/knife/ec_restore'
 require 'fakefs/spec_helpers'
 require_relative './ec_error_handler_spec'
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir"
+require 'net/http'
 
 def make_user(username)
   FileUtils.mkdir_p("/users")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-ec-backup
 version: !ruby/object:Gem::Version
-  version: 2.4.15
+  version: 2.5.3
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-17 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.9'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="