berkshelf 8.0.1 → 8.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d23b6a2d3692b3124db831c84e4038aac41cc9a21848b65a38256995f687a0
-  data.tar.gz: ff21e7c229ce9564ad1dd589556ed8a89488cb66788e4c4268751036ead8b949
+  metadata.gz: ef3b782c88bc9fe560b6c02c84ab32f6df5e2bf39d3c4b56d441079952e56a96
+  data.tar.gz: bd6f6b271645d42e62c29fa74e3a7d4633533b8dd104e386d064374d175dd27e
 SHA512:
-  metadata.gz: 539e905ff46b5d587ccb1911678c1ca8ae547e4bdd9e3c78e5a0aa69d9552f4f16eca2422659b5b2c3f6d1996276d6c0599af6edad81e0cdcd4c06aac7b390f3
-  data.tar.gz: 883c28941e1735a37c102e7d175b634cf6a7ced2994508c5da3611b3d9a73b0fcdcc51bd3fea0c3a671a226e490e41e2808643a6ce51709983d33f4b1c62c46d
+  metadata.gz: 8f9111b9f7a17c8dd8a65463e963a4a6f5c662d3affd9cec1125f90b0d5d71b7a742ef51e6b50161791cdd94f920acd2240ba2fc1472054f596d2e7dd1b18d25
+  data.tar.gz: d5113a1ebeb056843f92b6ae6e25d6850127e257cea2596a4c7bc55d42ba8f81c76388c8451a5fca126231f029271b6f6197e57504fa201113219721aef0a619

data/lib/berkshelf/downloader.rb

@@ -152,7 +152,7 @@ module Berkshelf
         unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
 
         url = remote_cookbook.location_path
-        open(url, "rb") do |remote_file|
+        URI.open(url, "rb") do |remote_file|
           archive_path.open("wb") { |local_file| local_file.write remote_file.read }
         end
 

data/lib/berkshelf/packager.rb

@@ -1,4 +1,5 @@
 require "archive/tar/minitar"
+require "find" unless defined?(Find)
 require "zlib" unless defined?(Zlib)
 
 module Berkshelf
@@ -40,8 +41,18 @@ module Berkshelf
     # @return [String]
     #   path to the generated archive
     def run(source)
-      tgz = Zlib::GzipWriter.new(File.open(out_file, "wb"))
-      Archive::Tar::Minitar.pack(Dir.glob("#{source}/*"), tgz)
+      begin
+        dest = Zlib::GzipWriter.open(out_file)
+        tar = RelativeTarWriter.new(dest, source)
+        Find.find(source) do |entry|
+          next if source == entry
+
+          Archive::Tar::Minitar.pack_file(entry, tar)
+        end
+      ensure
+        tar.close
+        dest.close
+      end
 
       out_file
     rescue SystemCallError => ex
@@ -67,5 +78,30 @@ module Berkshelf
 
     # @return [String]
     attr_reader :filename
+
+    # A private decorator for Archive::Tar::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))
+      end
+
+      %w{add_file add_file_simple mkdir}.each do |method|
+        class_eval <<~RUBY
+          def #{method}(name, *opts, &block)
+            super(relative_path(name), *opts, &block)
+          end
+        RUBY
+      end
+
+      private
+
+      attr_reader :base_path
+
+      def relative_path(path)
+        Pathname.new(path).relative_path_from(base_path).to_s
+      end
+    end
   end
 end

data/lib/berkshelf/version.rb

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

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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.0.5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,10 +9,10 @@ authors:
 - Michael Ivey
 - Justin Campbell
 - Seth Vargo
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -314,21 +314,6 @@ 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
@@ -378,7 +363,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
@@ -393,8 +378,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies
 test_files: []

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

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

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

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

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

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