berkshelf 8.0.9 → 8.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b38fc167aeaac8e33a0219cc4ada1bf3e1614a5553294cabfdc7460c5f56b6
-  data.tar.gz: 4f642360c7e11c3946c8463cd422dd2279a27f3bcf6512481183dd55e98613d8
+  metadata.gz: 547ce4d95888e7fd0fcfb2b50c449cc78c67ffb4885b44d953e69383d5d5ed26
+  data.tar.gz: 472be5adafecb5a2741701dc0c083017126c2cd9fb91bc5692a4d3f80beb2db6
 SHA512:
-  metadata.gz: 452b88f63d021f69c75c196f3bd39e1e4f4595e208d75b1f88bc190964c79d05ce8fabc03726884d22396072c00c63fd8423194b495054e96c46cc9439d11bc7
-  data.tar.gz: d05010ba4e991b5300b1bda01f1efc73f797e1f85af0666095ff633524f1e3ec54ab650a0ecb81bd59402fd100f6249af7e7fa31f36d526192d88212b32ac5fa
+  metadata.gz: b28e165ac351b1902ba1bc65f7715d5a1a709881f46c039f4186b7dd6e924a9412789332cae9c37db8e75caff2a503d4fa91637d872fc7f12b51fa6cc04dcea0
+  data.tar.gz: 78c7e37a5ebee0dbb8faa346cd5807f888fd16b8591688ee3248d04be4372035561ba65765700d6c39ab56d2d09f22acdc4d1aad24f416537babc5f042ae3caa

data/Gemfile

@@ -8,6 +8,7 @@ end
 
 group :development do
   gem "aruba",         "~> 0.10" # Stay below 1 until aruba/in_process monkeypatching stops
+  gem "debug"
   gem "cucumber",      "< 4.0" # until we identify what is generating the ~@no_run tag in CI
   gem "cucumber-expressions", "= 5.0.13"
   gem "chef-zero",     ">= 4.0"

data/berkshelf.gemspec

@@ -33,20 +33,36 @@ Gem::Specification.new do |s|
     "changelog_uri"   => "https://github.com/chef/berkshelf/blob/main/CHANGELOG.md",
   }
 
+  ruby_version = Gem::Version.new(RUBY_VERSION)
+
   s.add_dependency "mixlib-shellout",      ">= 2.0", "< 4.0"
-  s.add_dependency "cleanroom",            "~> 1.0"
-  s.add_dependency "minitar",              ">= 0.6"
+
+  s.add_dependency "chef-cleanroom",            "~> 1.0"
+
+  if ruby_version >= Gem::Version.new("3.1.0")
+    s.add_dependency "minitar",              "~> 1.0"
+    s.add_dependency "chef",                 ">= 18.0.0"
+  else
+    s.add_dependency "minitar",              "~> 0.12"
+
+    if ruby_version >= Gem::Version.new("3.0.0")
+      s.add_dependency "chef",                 "~> 17.0" # needed for --skip-syntax-check
+    else
+      s.add_dependency "chef",                 ">= 15.7.32"
+    end
+  end
+
   s.add_dependency "retryable",            ">= 2.0", "< 4.0"
   s.add_dependency "solve",                "~> 4.0"
-  s.add_dependency "thor",                 ">= 0.20"
-  s.add_dependency "octokit",              "~> 4.0"
+
+  s.add_dependency "thor",                 ">= 0.20", "< 1.3.0"
+  s.add_dependency "octokit",              ">= 4.0", "< 6.0"
+
   s.add_dependency "mixlib-archive",       ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal
   s.add_dependency "concurrent-ruby",      "~> 1.0"
-  if RUBY_VERSION.match?(/3.0/)
-    s.add_dependency "chef",                 "~> 17.0" # needed for --skip-syntax-check
-  elsif 
-    s.add_dependency "chef",                 ">= 15.7.32" 
-  end
+
+  s.add_dependency "ffi",                "~> 1.9", "< 1.16.0" #
+
   s.add_dependency "chef-config"
   # this is required for Mixlib::Config#from_json
   s.add_dependency "mixlib-config", ">= 2.2.5"

data/lib/berkshelf/packager.rb

@@ -1,4 +1,4 @@
-require "archive/tar/minitar"
+require "minitar"
 require "find" unless defined?(Find)
 require "zlib" unless defined?(Zlib)
 
@@ -47,7 +47,7 @@ module Berkshelf
         Find.find(source) do |entry|
           next if source == entry
 
-          Archive::Tar::Minitar.pack_file(entry, tar)
+          Minitar.pack_file(entry, tar)
         end
       ensure
         tar.close
@@ -79,12 +79,12 @@ module Berkshelf
     # @return [String]
     attr_reader :filename
 
-    # A private decorator for Archive::Tar::Minitar::Writer that
+    # A private decorator for Minitar::Writer that
     # turns absolute paths into relative ones.
     class RelativeTarWriter < SimpleDelegator # :nodoc:
       def initialize(io, base_path)
         @base_path = Pathname.new(base_path)
-        super(Archive::Tar::Minitar::Writer.new(io))
+        super(Minitar::Writer.new(io))
       end
 
       %w{add_file add_file_simple mkdir}.each do |method|

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "8.0.9".freeze
+  VERSION = "8.0.15".freeze
 end

data/spec/tmp/berkshelf/cookbooks/fake-0.1.0/metadata.rb

@@ -0,0 +1,2 @@
+name     'fake'
+version  '0.1.0'

data/spec/tmp/berkshelf/cookbooks/fake-0.2.0/metadata.rb

@@ -0,0 +1,2 @@
+name     'fake'
+version  '0.2.0'

data/spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb

@@ -0,0 +1,2 @@
+name     'fake'
+version  '1.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 8.0.9
+  version: 8.0.15
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,10 +9,10 @@ authors:
 - Michael Ivey
 - Justin Campbell
 - Seth Vargo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -35,7 +35,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: cleanroom
+  name: chef-cleanroom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -50,18 +50,32 @@ dependencies:
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 18.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 18.0.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,20 +127,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.20'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mixlib-archive
   requirement: !ruby/object:Gem::Requirement
@@ -159,19 +185,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 15.7.32
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 15.7.32
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
@@ -314,6 +346,21 @@ files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/path_helpers.rb
 - spec/support/shared_examples/formatter.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.1.0/attributes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.1.0/files/default/file.h
+- spec/tmp/berkshelf/cookbooks/fake-0.1.0/metadata.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.1.0/recipes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.1.0/templates/default/template.erb
+- spec/tmp/berkshelf/cookbooks/fake-0.2.0/attributes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.2.0/files/default/file.h
+- spec/tmp/berkshelf/cookbooks/fake-0.2.0/metadata.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.2.0/recipes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-0.2.0/templates/default/template.erb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/attributes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/files/default/file.h
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/metadata.rb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/recipes/default.rb
+- spec/tmp/berkshelf/cookbooks/fake-1.0.0/templates/default/template.erb
 - spec/unit/berkshelf/berksfile_spec.rb
 - spec/unit/berkshelf/berkshelf/api_client/chef_server_connection_spec.rb
 - spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb
@@ -363,7 +410,7 @@ metadata:
   bug_tracker_uri: https://github.com/chef/berkshelf/issues
   source_code_uri: https://github.com/chef/berkshelf
   changelog_uri: https://github.com/chef/berkshelf/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -378,8 +425,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies
 test_files: []