berkshelf 7.2.1 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4950e40e68a8fa20ad29aa5d589f27e4dd3fa0d7966abaedae2a9fc81398bc42
-  data.tar.gz: 706ca0ccbf4033186ac0adb6b1da988a55028fa1ccfae5c09a02c2ac414d31b4
+  metadata.gz: 99d23b6a2d3692b3124db831c84e4038aac41cc9a21848b65a38256995f687a0
+  data.tar.gz: ff21e7c229ce9564ad1dd589556ed8a89488cb66788e4c4268751036ead8b949
 SHA512:
-  metadata.gz: a4207838b3b203d6446a6f4d529e2d74a67a4109dadb206011be3e9f34a7bd3ca5373df4e3ec5e07994da54571d6c9d91c7c245cd45b4afdbe5b6481c5db9aec
-  data.tar.gz: 4a57a2691d696385dbf46aa141b69b5dcd619a920f9abfb3a8b4ce0f5c3155591216b7c1267a804f3f80c8b805875253824b67686a1141df0107e772329fb3dc
+  metadata.gz: 539e905ff46b5d587ccb1911678c1ca8ae547e4bdd9e3c78e5a0aa69d9552f4f16eca2422659b5b2c3f6d1996276d6c0599af6edad81e0cdcd4c06aac7b390f3
+  data.tar.gz: 883c28941e1735a37c102e7d175b634cf6a7ced2994508c5da3611b3d9a73b0fcdcc51bd3fea0c3a671a226e490e41e2808643a6ce51709983d33f4b1c62c46d

data/Gemfile

@@ -7,7 +7,6 @@ group :build do
 end
 
 group :development do
-  gem "chef-bin" # for the proxy tests
   gem "aruba",         "~> 0.10" # Stay below 1 until aruba/in_process monkeypatching stops
   gem "cucumber",      "< 4.0" # until we identify what is generating the ~@no_run tag in CI
   gem "cucumber-expressions", "= 5.0.13"

data/berkshelf.gemspec

@@ -25,8 +25,13 @@ Gem::Specification.new do |s|
   s.name                      = "berkshelf"
   s.require_paths             = ["lib"]
   s.version                   = Berkshelf::VERSION
-  s.required_ruby_version     = ">= 2.4.0"
+  s.required_ruby_version     = ">= 2.7.0"
   s.required_rubygems_version = ">= 2.0.0"
+  s.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",
+  }
 
   s.add_dependency "mixlib-shellout",      ">= 2.0", "< 4.0"
   s.add_dependency "cleanroom",            "~> 1.0"

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -5,15 +5,13 @@ module Berkshelf
     require_relative "errors"
 
     class ChefServerConnection
-      attr_reader :client
-
-      def initialize(*args)
-        @client = Berkshelf::RidleyCompat.new(*args)
-        @url = args[0][:server_url]
+      def initialize(**args)
+        @client = Berkshelf::RidleyCompat.new(**args)
+        @url = args[:server_url]
       end
 
       def universe
-        response = client.get("universe")
+        response = @client.get("universe")
 
         [].tap do |cookbooks|
           response.each do |name, versions|

data/lib/berkshelf/api_client.rb

@@ -16,8 +16,8 @@ module Berkshelf
         Connection.new(*args)
       end
 
-      def chef_server(*args)
-        ChefServerConnection.new(*args)
+      def chef_server(**args)
+        ChefServerConnection.new(**args)
       end
     end
   end

data/lib/berkshelf/berksfile.rb

@@ -118,7 +118,7 @@ module Berkshelf
     #   cookbook 'artifact', path: '/Users/reset/code/artifact'
     #
     # @example a cookbook dependency that will be retrieved from a Git server
-    #   cookbook 'artifact', git: 'git://github.com/RiotGames/artifact-cookbook.git'
+    #   cookbook 'artifact', git: 'https://github.com/chef/artifact-cookbook.git'
     #
     # @overload cookbook(name, version_constraint, options = {})
     #   @param [#to_s] name
@@ -156,7 +156,7 @@ module Berkshelf
         options[:group] += @active_group
       end
 
-      add_dependency(name, constraint, options)
+      add_dependency(name, constraint, **options)
     end
     expose :cookbook
 
@@ -644,7 +644,7 @@ module Berkshelf
           FileUtils.mkdir_p(cookbook_destination)
 
           # Dir.glob does not support backslash as a File separator
-          src   = cookbook.path.to_s.tr('\\', "/")
+          src   = cookbook.path.to_s.tr("\\", "/")
           files = FileSyncer.glob(File.join(src, "**/*"))
 
           # strip directories

data/lib/berkshelf/installer.rb

@@ -19,13 +19,13 @@ module Berkshelf
     def build_universe
       berksfile.sources.collect do |source|
         Thread.new do
-          begin
-            Berkshelf.formatter.msg("Fetching cookbook index from #{source}...")
-            source.build_universe
-          rescue Berkshelf::APIClientError => ex
-            Berkshelf.formatter.warn "Error retrieving universe from source: #{source}"
-            Berkshelf.formatter.warn "  * [#{ex.class}] #{ex}"
-          end
+
+          Berkshelf.formatter.msg("Fetching cookbook index from #{source}...")
+          source.build_universe
+        rescue Berkshelf::APIClientError => ex
+          Berkshelf.formatter.warn "Error retrieving universe from source: #{source}"
+          Berkshelf.formatter.warn "  * [#{ex.class}] #{ex}"
+
         end
       end.map(&:join)
     end

data/lib/berkshelf/location.rb

@@ -9,7 +9,7 @@ module Berkshelf
       # is returned.
       #
       # @example Create a git location
-      #   Location.init(dependency, git: 'git://github.com/berkshelf/berkshelf.git')
+      #   Location.init(dependency, git: 'https://github.com/berkshelf/berkshelf.git')
       #
       # @example Create a GitHub location
       #   Location.init(dependency, github: 'berkshelf/berkshelf')

data/lib/berkshelf/locations/github.rb

@@ -9,7 +9,7 @@ module Berkshelf
       when :https
         options[:git] = "https://#{HOST}/#{options.delete(:github)}.git"
       when :git
-        options[:git] = "git://#{HOST}/#{options.delete(:github)}.git"
+        options[:git] = "https://#{HOST}/#{options.delete(:github)}.git"
       else
         # if some bizarre value is provided, treat it as :https
         options[:git] = "https://#{HOST}/#{options.delete(:github)}.git"

data/lib/berkshelf/ssl_policies.rb

@@ -20,7 +20,7 @@ module Berkshelf
     end
 
     def trusted_certs_dir
-      config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s.tr('\\', "/")
+      config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s.tr("\\", "/")
       if config_dir.empty? || !::File.exist?(config_dir)
         File.join(ENV["HOME"], ".chef", "trusted_certs")
       else

data/lib/berkshelf/thor_ext/hash_with_indifferent_access.rb

@@ -1,5 +1,5 @@
 class Thor
-  module CoreExt #:nodoc:
+  module CoreExt # :nodoc:
     class HashWithIndifferentAccess < ::Hash
       def has_key?(key)
         super(convert_key(key))

data/lib/berkshelf/uploader.rb

@@ -59,41 +59,41 @@ module Berkshelf
         connection.get("users/#{Berkshelf.config.chef.node_name}") rescue nil
 
         cookbooks.map do |cookbook|
+
+          compiled_metadata = cookbook.compile_metadata
+          cookbook.reload if compiled_metadata
+          cookbook_version = cookbook.cookbook_version
+          Berkshelf.log.debug "  Uploading #{cookbook.cookbook_name}"
+          cookbook_version.freeze_version if options[:freeze]
+
+          # another two lines that are necessary for chef < 13.2 support (affects 11.x/12.x as well)
+          cookbook_version.metadata.maintainer "" if cookbook_version.metadata.maintainer.nil?
+          cookbook_version.metadata.maintainer_email "" if cookbook_version.metadata.maintainer_email.nil?
+
           begin
-            compiled_metadata = cookbook.compile_metadata
-            cookbook.reload if compiled_metadata
-            cookbook_version = cookbook.cookbook_version
-            Berkshelf.log.debug "  Uploading #{cookbook.cookbook_name}"
-            cookbook_version.freeze_version if options[:freeze]
-
-            # another two lines that are necessary for chef < 13.2 support (affects 11.x/12.x as well)
-            cookbook_version.metadata.maintainer "" if cookbook_version.metadata.maintainer.nil?
-            cookbook_version.metadata.maintainer_email "" if cookbook_version.metadata.maintainer_email.nil?
-
-            begin
-              Chef::CookbookUploader.new(
-                [ cookbook_version ],
-                force: options[:force],
-                concurrency: 1, # sadly
-                rest: connection,
-                skip_syntax_check: options[:skip_syntax_check]
-              ).upload_cookbooks
-              Berkshelf.formatter.uploaded(cookbook, connection)
-            rescue Chef::Exceptions::CookbookFrozen
-              if options[:halt_on_frozen]
-                raise FrozenCookbook.new(cookbook)
-              end
-
-              Berkshelf.formatter.skipping(cookbook, connection)
-            end
-          ensure
-            if compiled_metadata
-              # this is necessary on windows to clean up the ruby object that was pointing at the file
-              # so that we can reliably delete it.  windows is terrible.
-              GC.start
-              File.unlink(compiled_metadata)
+            Chef::CookbookUploader.new(
+              [ cookbook_version ],
+              force: options[:force],
+              concurrency: 1, # sadly
+              rest: connection,
+              skip_syntax_check: options[:skip_syntax_check]
+            ).upload_cookbooks
+            Berkshelf.formatter.uploaded(cookbook, connection)
+          rescue Chef::Exceptions::CookbookFrozen
+            if options[:halt_on_frozen]
+              raise FrozenCookbook.new(cookbook)
             end
+
+            Berkshelf.formatter.skipping(cookbook, connection)
+          end
+        ensure
+          if compiled_metadata
+            # this is necessary on windows to clean up the ruby object that was pointing at the file
+            # so that we can reliably delete it.  windows is terrible.
+            GC.start
+            File.unlink(compiled_metadata)
           end
+
         end
       end
     end

data/lib/berkshelf/version.rb

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

data/spec/config/knife.rb

@@ -4,7 +4,7 @@ node_name                "berkshelf"
 client_key               File.expand_path("spec/config/berkshelf.pem")
 validation_client_name   "validator"
 validation_key           File.expand_path("spec/config/validator.pem")
-chef_server_url          "http://localhost:26310"
+chef_server_url          "http://127.0.0.1:26310"
 cache_type               "BasicFile"
 cache_options( path: "#{ENV["HOME"]}/.chef/checksums" )
 cookbook_path []

data/spec/support/git.rb

@@ -5,7 +5,7 @@ module Berkshelf
       include Berkshelf::RSpec::PathHelpers
 
       def git_origin_for(repo, options = {})
-        "file://#{generate_fake_git_remote("git@github.com/RiotGames/#{repo}.git", options)}/.git"
+        "file://#{generate_fake_git_remote("git@github.com/chef/#{repo}.git", options)}/.git"
       end
 
       def generate_fake_git_remote(uri, options = {})

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

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

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

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

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

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

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

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe Berkshelf::APIClient::ChefServerConnection do
+  let(:instance) do
+    described_class.new(
+      server_url: "https://chef.example.org/organizations/foobar",
+      timeout: 30,
+      open_timeout: 3,
+      ssl: {}
+    )
+  end
+
+  describe "#universe" do
+    before do
+      body_response = %q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+
+      stub_request(:get, "https://chef.example.org/organizations/foobar/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+    end
+
+    subject { instance.universe }
+
+    it "returns an array of APIClient::RemoteCookbook" do
+      expect(subject).to be_a(Array)
+
+      subject.each do |remote|
+        expect(remote).to be_a(Berkshelf::APIClient::RemoteCookbook)
+      end
+    end
+
+    it "contains a item for each dependency" do
+      expect(subject.size).to eq(3)
+      expect(subject[0].name).to eql("ruby")
+      expect(subject[0].version).to eql("1.2.3")
+      expect(subject[1].name).to eql("ruby")
+      expect(subject[1].version).to eql("2.0.0")
+      expect(subject[2].name).to eql("elixir")
+      expect(subject[2].version).to eql("1.0.0")
+    end
+
+    it "has the dependencies for each" do
+      expect(subject[0].dependencies).to include("build-essential" => ">= 1.2.2")
+      expect(subject[1].dependencies).to include("build-essential" => ">= 1.2.2")
+      expect(subject[2].dependencies).to be_empty
+    end
+
+    it "has the platforms for each" do
+      expect(subject[0].platforms).to be_empty
+      expect(subject[1].platforms).to be_empty
+      expect(subject[2].platforms).to include("CentOS" => "= 6.0.0")
+    end
+
+    it "has a location_path for each" do
+      subject.each do |remote|
+        expect(remote.location_path).to_not be_nil
+      end
+    end
+
+    it "has a location_type for each" do
+      subject.each do |remote|
+        expect(remote.location_type).to_not be_nil
+      end
+    end
+  end
+end

data/spec/unit/berkshelf/dependency_spec.rb

@@ -35,7 +35,7 @@ describe Berkshelf::Dependency do
       end
 
       context "given a location key :git" do
-        let(:url) { "git://url_to_git" }
+        let(:url) { "https://url_to_git" }
         let(:source) { described_class.new(berksfile, cookbook_name, git: url) }
 
         it "initializes a GitLocation for location" do

data/spec/unit/berkshelf/location_spec.rb

@@ -11,7 +11,7 @@ module Berkshelf
       end
 
       it "finds a :git location by key" do
-        instance = described_class.init(dependency, git: "git://foo.com/meats/bacon.git")
+        instance = described_class.init(dependency, git: "https://foo.com/meats/bacon.git")
         expect(instance).to be_a(GitLocation)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 8.0.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -314,7 +314,23 @@ 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
 - spec/unit/berkshelf/berkshelf/api_client/remote_cookbook_spec.rb
 - spec/unit/berkshelf/berkshelf/api_client_spec.rb
@@ -358,7 +374,10 @@ files:
 homepage: https://docs.chef.io/berkshelf.html
 licenses:
 - Apache-2.0
-metadata: {}
+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:
 rdoc_options: []
 require_paths:
@@ -367,14 +386,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies