berkshelf 8.0.5 → 8.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef3b782c88bc9fe560b6c02c84ab32f6df5e2bf39d3c4b56d441079952e56a96
-  data.tar.gz: bd6f6b271645d42e62c29fa74e3a7d4633533b8dd104e386d064374d175dd27e
+  metadata.gz: 1b5a13a8ee09f56803846ad1bf3046802f231c30f80d75c89a3a7a372e779fb6
+  data.tar.gz: 5410164e53e455a48de4cae7721a8a58f46a80e74a954bb588b33e3c005f80da
 SHA512:
-  metadata.gz: 8f9111b9f7a17c8dd8a65463e963a4a6f5c662d3affd9cec1125f90b0d5d71b7a742ef51e6b50161791cdd94f920acd2240ba2fc1472054f596d2e7dd1b18d25
-  data.tar.gz: d5113a1ebeb056843f92b6ae6e25d6850127e257cea2596a4c7bc55d42ba8f81c76388c8451a5fca126231f029271b6f6197e57504fa201113219721aef0a619
+  metadata.gz: 556d5c24a23c8926a51e68215db48679470aa91b0e5a11c89a61249a4ad527608dae6bea34516e5aa0847a561b1e41f57e27b88c77af9fdc78f1eb9ca6bc2da1
+  data.tar.gz: 65a853433f25465b79f9e3fda0ef52b62cc73a1149d11b4768d40779898960430859073654778b07a2ea3a0da8e81a8b08ddbfb4f51f39bbda67a1da30b6d683

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/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.7".freeze
 end

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.7
 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-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout