berkshelf 8.0.22 → 8.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285e9896759a9c75e6b12468afdd4766ba16a747eb4e3d08fe5c27632bcd6ff4
-  data.tar.gz: c9a643ebb4ddda00a859f0b732078be6a89baa0b9bae6fd5270c99affb24e7b2
+  metadata.gz: 243aee6c932d3ff3dc95bd8f1dde13652ce81c87d68f0c615962be393474a03e
+  data.tar.gz: 4b9aae366a701d3757c7974ef4648a153fef377864b4129ffe30efcdfd581dae
 SHA512:
-  metadata.gz: a03b55f1d8a8101e7423dc1bbbaeb05954ae4ea76be52f6638a3e4f6d2aa9328606884882c867fed211317917d46d47a5510d544804ef2b883d4c92527032e7f
-  data.tar.gz: d45006fe865e833985b02c6038c8f00a1779ea2a59d3a2566279a077565993e9dc4451e211f194d1ee73ee48a5f6f12dcd3dcda83637a5c1d0a005136b27bae3
+  metadata.gz: 4abf43f9c38dc44c7ecf9b059d1b7229261e1cc973e2cb9d99a4a089fc94bf0b851bd05ca0df5701640d48b252097e67c4181a4ff5c55988caeba8286c168d6e
+  data.tar.gz: '015965f2adeaa363786a715d409d7521fa409a4b86a52d1cca99df40568ecc2bf5fe47853135869dae213e9b0139a7bf1fa716628ac25a873b95d0c306848e13'

data/Gemfile

@@ -3,14 +3,16 @@ source "https://rubygems.org"
 gemspec
 
 group :build do
-  gem "rake",          ">= 10.1"
+  gem "rake", ">= 10.1"
 end
 
+gem "syslog"
+
 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 "aruba",         "~> 2.3"
+  gem "cucumber",      ">= 9.2", "< 10"
+  gem "cucumber-cucumber-expressions", "~> 17.1"
   gem "chef-zero",     ">= 4.0"
   gem "dep_selector",  ">= 1.0"
   gem "fuubar",        ">= 2.0"
@@ -23,7 +25,6 @@ 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

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.name                      = "berkshelf"
   s.require_paths             = ["lib"]
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = ">= 2.7.0"
+  s.required_ruby_version     = ">= 3.1.0"
   s.required_rubygems_version = ">= 2.0.0"
   s.metadata                  = {
     "bug_tracker_uri" => "https://github.com/chef/berkshelf/issues",
@@ -35,9 +35,9 @@ Gem::Specification.new do |s|
 
   ruby_version = Gem::Version.new(RUBY_VERSION)
 
-  s.add_dependency "mixlib-shellout",      ">= 2.0", "< 4.0"
+  s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
 
-  s.add_dependency "chef-cleanroom",            "~> 1.0"
+  s.add_dependency "chef-cleanroom", "~> 1.0"
 
   if ruby_version >= Gem::Version.new("3.1.0")
     s.add_dependency "minitar",              "~> 1.0"
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.add_dependency "retryable",            ">= 2.0", "< 4.0"
   s.add_dependency "solve",                "~> 4.0"
 
-  s.add_dependency "thor",                 ">= 0.20", "< 1.3.0"
+  s.add_dependency "thor",                 "~> 1.4"
   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

data/lib/berkshelf/validator.rb

@@ -1,4 +1,4 @@
-require 'chef/version_class'
+require "chef/version_class"
 
 module Berkshelf
   module Validator
@@ -36,7 +36,7 @@ module Berkshelf
       def validate_versions(cookbook)
         cookbook_dependencies = cookbook.dependencies
         cookbook_dependencies.each do |cookbook_name, cookbook_version|
-          version = cookbook_version.gsub(/[^\d,\.]/, '')
+          version = cookbook_version.gsub(/[^\d,\.]/, "")
           Chef::Version.new(version)
         end
       end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "8.0.22".freeze
+  VERSION = "8.1.4".freeze
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require_relative "support/test_keys"
+
 def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end

data/spec/support/test_keys.rb

@@ -0,0 +1,16 @@
+require "openssl"
+require "fileutils"
+
+module TestKeyHelper
+  def self.generate_rsa_key(path)
+    return if File.exist?(path) # Don't regenerate if already exists
+
+    key = OpenSSL::PKey::RSA.new(2048)
+    FileUtils.mkdir_p(File.dirname(path))
+    File.write(path, key.to_pem)
+  end
+end
+
+# Generate the test keys
+TestKeyHelper.generate_rsa_key("spec/config/berkshelf.pem")
+TestKeyHelper.generate_rsa_key("spec/config/validator.pem")

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -231,8 +231,8 @@ describe Berkshelf::Lockfile do
         expect(Chef::Environment).to receive(:from_hash).with(env_hash).and_return(environment)
 
         expect(environment).to receive(:cookbook_versions).with(
-          {"apt" => "= 1.0.0",
-          "jenkins" => "= 1.4.5"}
+          { "apt" => "= 1.0.0",
+          "jenkins" => "= 1.4.5" }
         )
 
         expect(environment).to receive(:save)

data/spec/unit/berkshelf/validator_spec.rb

@@ -6,7 +6,7 @@ describe Berkshelf::Validator do
 
     it "raises an error when the cookbook has spaces in the files" do
       allow(Dir).to receive(:glob).and_return(["/there are/spaces/in this/recipes/default.rb"])
-      allow(cookbook).to receive(:dependencies).and_return({"cookbook" => "1.0.0"})
+      allow(cookbook).to receive(:dependencies).and_return({ "cookbook" => "1.0.0" })
       expect do
         subject.validate_files(cookbook)
       end.to raise_error(Berkshelf::InvalidCookbookFiles)
@@ -14,21 +14,21 @@ describe Berkshelf::Validator do
 
     it "does not raise an error when the cookbook is valid" do
       allow(Dir).to receive(:glob).and_return(["/there-are/no-spaces/in-this/recipes/default.rb"])
-      allow(cookbook).to receive(:dependencies).and_return({"cookbook" => "1.0.0"})
+      allow(cookbook).to receive(:dependencies).and_return({ "cookbook" => "1.0.0" })
       expect do
         subject.validate_files(cookbook)
       end.to_not raise_error
     end
 
     it "raises an error when the cookbook version is not valid" do
-      allow(cookbook).to receive(:dependencies).and_return({"cookbook" => "1"})
+      allow(cookbook).to receive(:dependencies).and_return({ "cookbook" => "1" })
       expect do
         subject.validate_files(cookbook)
       end.to raise_error
     end
 
     it "does not raise an error when the cookbook version is valid" do
-      allow(cookbook).to receive(:dependencies).and_return({"cookbook" => "1.0"})
+      allow(cookbook).to receive(:dependencies).and_return({ "cookbook" => "1.0" })
       expect do
         subject.validate_files(cookbook)
       end.to_not raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 8.0.22
+  version: 8.1.4
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -114,22 +114,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.20'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -305,9 +299,7 @@ files:
 - lib/berkshelf/validator.rb
 - lib/berkshelf/version.rb
 - lib/berkshelf/visualizer.rb
-- spec/config/berkshelf.pem
 - spec/config/knife.rb
-- spec/config/validator.pem
 - spec/data/trusted_certs/example.crt
 - spec/fixtures/Berksfile
 - spec/fixtures/berksfiles/default
@@ -346,6 +338,7 @@ files:
 - spec/support/matchers/filepath_matchers.rb
 - spec/support/path_helpers.rb
 - spec/support/shared_examples/formatter.rb
+- spec/support/test_keys.rb
 - 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
@@ -403,7 +396,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/spec/config/berkshelf.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAs3u5qfmdEWtzYHvXpbQRyefhUjeTG7nwhn/LaYY6ou19xxW0
-I5MKSBqCxUCHqODRc7ox8zSF37x3jMBHbSczOcfbWsSe/qGnmvZZQhHmXCje2zkW
-ByaRHmmatzkz1aAqAmZm/wdSuVLXytsbrPXuaj/MiHa6QH3e/ZFaYME7rMkouqfC
-pUlSa2tZ9Ko1ZCCwjkiifuP4yQFsS6/G6b8c7F8wdq4byfJ9o6FN34lJHrzfG0ZV
-hwS47Bdn6FDBQ6PVxrBsvQNE2n7QlNLfXWi4Tb8OpmQif01FjxleAr5kamx3GD+s
-jC7fKHE9bZ0apZ1MVmkz9PhFmOigV5jl9Att+QIDAQABAoIBAQCCG6qXgQ9PVWkq
-BBxrToGmr6UzCH5nlv65QWKfeGKBQU/wRdd0Al9trWomu4Sb831iOxOCjgyOB/1R
-1wDwK36C4FIvFmF7jIwHVZWWw4sOO8JxgIxrWpXQShWRxLHCpnxNiRYYwaJCHb+4
-meUSGKVf+Ce4tPiHT7eacQfnI6yyr1hWusKu0I8w7NsfeNc+/Rpne6mifLfaB/9u
-b9kgfD15HGEsuUaMLZ/y1HFWvw2G2Og1cDrIpBIVtUAhA+DnjjLe/YoETeSmQAxH
-ioQpJJ/gSqtTczIoyPXXiwaF5wUTQrsn5zZhTs9mAQy7hcSR92IH2xBSmK3+wlz0
-vHZIq9rRAoGBAOeRUTRDgj+f+BlH1qFqf4EfkBN5quVM2808LYBGZWfA5/6o9jSN
-AM84VXq3S8Wy5V6UMcSv4mOqEr3tEUYE8or9r/RxzpGahSdi8Ttju9vvpJH5I3xr
-xx2ZK/vlrAfr6JHlE4bqqc5unCslUt2/liCWpERQ3cFcPydQb7Imrm+DAoGBAMZr
-mcxBeMyQHG6Kcpc7EQXZ5i7a8T6ksPu7FbAZ70Meb9UMtVIYpVBalutCXKhl7D4K
-qrCmV2gQryBz+S7AecFZSKvXdb7ueYzf8EcI/v+loNu9v9/4m4YV3bPBkMhW5kcK
-xFnVIsYqUlR+dsS8JfjSCpk4lePVSSt7B26eIFfTAoGBAJHPDKSuBWtunNe+RkUp
-O9PgPeYlbBgqBxT52WS17tAfxXSyiySXzHSuchRtKgb4GDkvcw73+MLsqhRxG7lN
-EDO4fXyb1IgWFdWxFVhh+j4IbUWE7HVBoAThF7Lq8SGjx7Nl3J/NTtKvDyKTw9Pg
-+PTYJeLmUFuabCGjIlG4zYllAoGBAIwe5oB4597GEl35xUyI+M+B/myuTtknIpjS
-mFFBL1bdwqnYjJ+KKgwhvRwsRBTjzT5O+BVBks45ogKwA5OBdzoUXB6GTG9mJ05V
-wm/XqYRNqdgkGsEG5oV9IZBUrHLd80bOErVBr4nzzyo+GI98MvCRG8zySd+X+lEL
-U8dJQZvjAoGAWorll+fomfie6t5XbkpwMo8rn60yFUiRE7HWxA2qDj3IpoE6SfNE
-eOpsf1Zzx30r8answ9lPnd753ACdgNzE66ScWD+cQeB6OlMZMaW5tVSjddZ7854L
-00znt8b1OLkVY33xfsa89wKH343304BhVHABPMxm5Leua/H21/BqSK0=
------END RSA PRIVATE KEY-----

data/spec/config/validator.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxvMbzsVt0PJ0ozcpQZC+zpaWYAZe/nHnSFeTkm9BAtQUA8vp
-cKMJTXNw4Lm3jcotrPATMgGgwVG7ram689JcQSnwSgIFinr5ZLRB22qyGdqHHmAf
-w4RVde6dJON2IqI51JzQ5Pfs+M1SYcKiCzcBHvFddug5VcMjipFLv7QPKDmal8Ep
-tOtRhb8Ad2DBXV7gX3e8ZaKfQgA0uc07g1KmcjR7vOG25nxY6NRxTwWn5+uMVgCp
-1xjbBeq7XF2gJPYVNsNRu8C3/rMX7D3NuKpJGj3CsKOtECREsq+7lk7A7OPzrP0g
-Um/dUSeV99FLavrJNZ8TRc+BLZD/RiE1x0wG9wIDAQABAoIBAAbRchSGA5tzk7e8
-Pje3BDMESicEUOEbejeqeK4+DdZQ+lae+GMZ00nKOQYal0XOtf4FREMkdyPo7yum
-c3fDr9Gz5D5FD3eNe1qOKuugHnZwXM0Xsj77HAqsoMoQ2Y2aTa0Rqr8OGBr2vmoH
-R5Jm0i0DTJa0orJju6YWEKiDPTm9oCT025M3G4kswM4jnzQiTciksfEYJGIK1Alk
-Lcct/8TtyoYNhzYfzFi2wIQx4Iy6o/2AqWjvcJT2RI3cge5CBOXR7Y1Zqt5/vWm+
-MvSy+krujFTTKpJKbatOsRGoCX6e8IcIQ4MtOj9jSPQPvGcQrjEdks6+zKID6INW
-ZZYrvqECgYEA8EKB/oYzNueoBvaFcw1ONUNScYnr9IS/7oZnciw53cMwDumsH9qB
-NbEH6m1/2EQhOU5KoAQX2qd8KNQ6oIL1ae51ACtdEBP9Sb9j2q+IlEOf3bLga+w1
-DXeQ0wx4ZHyF6a2AJK4qVO+nDnYw074VxaApLXDyfXpIS7N9lOJxeb8CgYEA0/vF
-mt/+r6v2YOVWtSah44lIyaDj3N6fjYcI34aJvowwe+Njfnd2o4BkqhthQKOnl6FI
-SQPrLBdwc4OvN9oWMZHX2b0ols0Bf5ZxAfqMvCS2JG+SiiZT+p+cPnCitfPZ6zn7
-5SMpVMqlMS8GxNze8ZkieQ7PaF28rF0xUJZIkMkCgYEAwspJNqB7OVKMCkkoXOU2
-uTxBxUe7A9309mAF0q1EpSUw+4Y8RP8UrwE+l7P7aM2j2iA9pIptBJuxsDCQ7739
-Vss8FM0TgIuUWYxQWubh5sMFA+uYxCcXxDliM5nyqhXDRHekYxjJvV8npDPy1llQ
-sY9ukyb1kwHnR2jYsjL9KWUCgYAmB1vKzfZVs4bOmTX154lRVXaOXWOjYvjCnf/0
-gaFCYsnr374gmPPanxTwA1tuCi3toMxj9OUCku3kezI61c/3co+Di1C1xO9I4UdC
-sJ0Av6FBZham2/ti0bFo7jHybF2iulM7JxSqFnSOHz6aoHkKZItvpj2FHpPTZCCN
-sXgxKQKBgDyBsl4/LCG+eQrxaL6Y7DHP9oNTw5hRbQWlZlXfygyUbKCqj1OfOrVu
-hDAn/ElMLgSgRbI8nXq68cu6UE4wO4Di6fQyCb2pP7tgS+0swbq85YoMbHh/z+yN
-WUvLQHfN4RHJStY3JX/cBcSoIiArNbuFcPThM02YBDhbiW+NQhZV
------END RSA PRIVATE KEY-----