berkshelf 8.0.5 → 8.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef3b782c88bc9fe560b6c02c84ab32f6df5e2bf39d3c4b56d441079952e56a96
-  data.tar.gz: bd6f6b271645d42e62c29fa74e3a7d4633533b8dd104e386d064374d175dd27e
+  metadata.gz: 80b38fc167aeaac8e33a0219cc4ada1bf3e1614a5553294cabfdc7460c5f56b6
+  data.tar.gz: 4f642360c7e11c3946c8463cd422dd2279a27f3bcf6512481183dd55e98613d8
 SHA512:
-  metadata.gz: 8f9111b9f7a17c8dd8a65463e963a4a6f5c662d3affd9cec1125f90b0d5d71b7a742ef51e6b50161791cdd94f920acd2240ba2fc1472054f596d2e7dd1b18d25
-  data.tar.gz: d5113a1ebeb056843f92b6ae6e25d6850127e257cea2596a4c7bc55d42ba8f81c76388c8451a5fca126231f029271b6f6197e57504fa201113219721aef0a619
+  metadata.gz: 452b88f63d021f69c75c196f3bd39e1e4f4595e208d75b1f88bc190964c79d05ce8fabc03726884d22396072c00c63fd8423194b495054e96c46cc9439d11bc7
+  data.tar.gz: d05010ba4e991b5300b1bda01f1efc73f797e1f85af0666095ff633524f1e3ec54ab650a0ecb81bd59402fd100f6249af7e7fa31f36d526192d88212b32ac5fa

data/berkshelf.gemspec

@@ -42,7 +42,11 @@ Gem::Specification.new do |s|
   s.add_dependency "octokit",              "~> 4.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"
-  s.add_dependency "chef",                 ">= 15.7.32" # needed for --skip-syntax-check
+  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 "chef-config"
   # this is required for Mixlib::Config#from_json
   s.add_dependency "mixlib-config", ">= 2.2.5"

data/lib/berkshelf/ssl_policies.rb

@@ -16,7 +16,7 @@ module Berkshelf
     def add_trusted_cert(cert)
       @store.add_cert(cert)
     rescue OpenSSL::X509::StoreError => e
-      raise e unless e.message == "cert already in hash table"
+      raise e unless e.message.match(/cert already in hash table/)
     end
 
     def trusted_certs_dir

data/lib/berkshelf/validator.rb

@@ -1,3 +1,5 @@
+require 'chef/version_class'
+
 module Berkshelf
   module Validator
     class << self
@@ -25,10 +27,19 @@ module Berkshelf
           base, name = Pathname.new(cookbook.path.to_s).split
 
           files = Dir.glob("#{name}/**/*.rb", base: base.to_s).select { |f| f =~ /[[:space:]]/ }
+          validate_versions(cookbook)
 
           raise InvalidCookbookFiles.new(cookbook, files) unless files.empty?
         end
       end
+
+      def validate_versions(cookbook)
+        cookbook_dependencies = cookbook.dependencies
+        cookbook_dependencies.each do |cookbook_name, cookbook_version|
+          version = cookbook_version.gsub(/[^\d,\.]/, '')
+          Chef::Version.new(version)
+        end
+      end
     end
   end
 end

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb

@@ -130,17 +130,17 @@ describe Berkshelf::APIClient::Connection do
     end
 
     it "raises Berkshelf::APIClient::ServiceUnavailable for 500s" do
-      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [500, "Internal Server Error"])
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: 500, body: "Internal Server Error")
       expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavailable)
     end
 
     it "raises Berkshelf::APIClient::ServiceNotFound for 404s" do
-      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [404, "Not Found"])
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: 404, body: "Not Found")
       expect { subject }.to raise_error(Berkshelf::APIClient::ServiceNotFound)
     end
 
     it "raises Net::HTTPBadRequest for 400s" do
-      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [400, "Bad Request"])
+      stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: 400, body: "Bad Request")
       expect { subject }.to raise_error(Berkshelf::APIClient::BadResponse)
     end
 

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -107,7 +107,7 @@ describe Berkshelf::CommunityREST do
     it "raises a CookbookNotFound error on a 404 response for a non-existent cookbook" do
       stub_request(:get, "#{api_uri}/cookbooks/not_real/versions/1_0_0").to_return(
         status: 404,
-        body: nil
+        body: "Not Found"
       )
 
       expect do
@@ -142,7 +142,7 @@ describe Berkshelf::CommunityREST do
     it "raises a CookbookNotFound error on a 404 response" do
       stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
         status: 404,
-        body: nil
+        body: "Not Found"
       )
 
       expect do
@@ -177,7 +177,7 @@ describe Berkshelf::CommunityREST do
     it "raises a CookbookNotFound error on a 404 response" do
       stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
         status: 404,
-        body: nil
+        body: "Not Found"
       )
 
       expect do

data/spec/unit/berkshelf/validator_spec.rb

@@ -6,6 +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"})
       expect do
         subject.validate_files(cookbook)
       end.to raise_error(Berkshelf::InvalidCookbookFiles)
@@ -13,6 +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"})
+      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"})
+      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"})
       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.5
+  version: 8.0.9
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout