berkshelf 8.0.9 → 8.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80b38fc167aeaac8e33a0219cc4ada1bf3e1614a5553294cabfdc7460c5f56b6
-  data.tar.gz: 4f642360c7e11c3946c8463cd422dd2279a27f3bcf6512481183dd55e98613d8
+  metadata.gz: f70d01359005c084d1481b29aa447f541456420f8d5b0050efc391978dd5b646
+  data.tar.gz: 47a1fcb983563b5b75c7bfe44abf111284129b4463d06d3d32881210df310f12
 SHA512:
-  metadata.gz: 452b88f63d021f69c75c196f3bd39e1e4f4595e208d75b1f88bc190964c79d05ce8fabc03726884d22396072c00c63fd8423194b495054e96c46cc9439d11bc7
-  data.tar.gz: d05010ba4e991b5300b1bda01f1efc73f797e1f85af0666095ff633524f1e3ec54ab650a0ecb81bd59402fd100f6249af7e7fa31f36d526192d88212b32ac5fa
+  metadata.gz: b36dc3abfbde5d769ae5d2310e9a13738baff867e343f8fb560d649962564a9451689f2a4b3e3dff396e3de427968b78e98fad3bf466f2cc3fc6d721074e69f3
+  data.tar.gz: 2f788eb2b9ddbb243fef2c1f8e51ae7d9e5e57b4b1d3aec767d97822f50058dd63a792326977190a9a3d147b8847979fca2902411f1dc37d46d34ac0deb7f8c5

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"
@@ -20,6 +21,9 @@ group :development do
   gem "chefstyle"
 end
 
+gem "appbundler"
+
+
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,

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

@@ -39,11 +39,11 @@ module Berkshelf
       def is_gzip_file(path)
         # You cannot write "\x1F\x8B" because the default encoding of
         # ruby >= 1.9.3 is UTF-8 and 8B is an invalid in UTF-8.
-        IO.binread(path, 2) == [0x1F, 0x8B].pack("C*")
+        File.binread(path, 2) == [0x1F, 0x8B].pack("C*")
       end
 
       def is_tar_file(path)
-        IO.binread(path, 8, 257).to_s == "ustar\x0000"
+        File.binread(path, 8, 257).to_s == "ustar\x0000"
       end
     end
 

data/lib/berkshelf/downloader.rb

@@ -152,7 +152,12 @@ module Berkshelf
         unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
 
         url = remote_cookbook.location_path
-        URI.open(url, "rb") do |remote_file|
+        begin
+          uri = URI.parse(url)
+        rescue URI::InvalidURIError
+          raise "Invalid URI: #{url}"
+        end
+        uri.open("rb") do |remote_file|
           archive_path.open("wb") { |local_file| local_file.write remote_file.read }
         end
 
@@ -186,7 +191,7 @@ module Berkshelf
         resp = connection.get(cookbook_uri.request_uri + "&private_token=" + options["private_token"])
         return nil unless resp.status == 200
 
-        open(archive_path, "wb") { |file| file.write(resp.body) }
+        File.open(archive_path, "wb") { |file| file.write(resp.body) }
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)
 

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

@@ -30,7 +30,7 @@ module Berkshelf
 
     def set_custom_certs
       ::Dir.glob("#{trusted_certs_dir}/{*.crt,*.pem}").each do |cert|
-        cert = OpenSSL::X509::Certificate.new(IO.read(cert))
+        cert = OpenSSL::X509::Certificate.new(File.read(cert))
         add_trusted_cert(cert)
       end
     end

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/cached_cookbook_spec.rb

@@ -43,7 +43,7 @@ describe Berkshelf::CachedCookbook do
     describe "::checksum" do
       it "returns a checksum of the given filepath" do
         path = fixtures_path.join("cookbooks", "example_cookbook-0.5.0", "README.md")
-        expected_md5 = if IO.binread(path).include?("\r\n")
+        expected_md5 = if File.binread(path).include?("\r\n")
                          # On windows, with git configured for auto crlf
                          "2414583f86c9eb68bdbb0be391939341"
                        else

data/spec/unit/berkshelf/downloader_spec.rb

@@ -15,7 +15,7 @@ module Berkshelf
 
     let(:graph) { double(Lockfile::Graph, locks: {}) }
     let(:self_signed_crt_path) { File.join(BERKS_SPEC_DATA, "trusted_certs") }
-    let(:self_signed_crt) { OpenSSL::X509::Certificate.new(IO.read("#{self_signed_crt_path}/example.crt")) }
+    let(:self_signed_crt) { OpenSSL::X509::Certificate.new(File.read("#{self_signed_crt_path}/example.crt")) }
     let(:cert_store) { OpenSSL::X509::Store.new.add_cert(self_signed_crt) }
     let(:ssl_policy) { double(SSLPolicy, store: cert_store) }
 

data/spec/unit/berkshelf/uploader_spec.rb

@@ -15,7 +15,7 @@ module Berkshelf
 
     let(:graph) { double(Lockfile::Graph, locks: {}) }
     let(:self_signed_crt_path) { File.join(BERKS_SPEC_DATA, "trusted_certs") }
-    let(:self_signed_crt) { OpenSSL::X509::Certificate.new(IO.read("#{self_signed_crt_path}/example.crt")) }
+    let(:self_signed_crt) { OpenSSL::X509::Certificate.new(File.read("#{self_signed_crt_path}/example.crt")) }
     let(:cert_store) { OpenSSL::X509::Store.new.add_cert(self_signed_crt) }
     let(:ssl_policy) { double(SSLPolicy, store: cert_store) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 8.0.9
+  version: 8.0.21
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2025-05-14 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
@@ -378,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies