berkshelf 7.2.2 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3328d9ead777bfb150d7588648ca5376fa46fa5fafa8ded0afdb9cc710043b3
-  data.tar.gz: 94203ac8481a5a5155987e5f060d6fd1c78cc9f3073dd84efcb597d1a21ff5c6
+  metadata.gz: 74b3f02281f737a99b466bb6e902b83e14dc4753eca57e4c53ebcc9d18147c4b
+  data.tar.gz: e8c566401ba73574604f2427b91a414af8a10e04d20d6c78df0e5cac58bc9ebc
 SHA512:
-  metadata.gz: 337c5f8eb9d149f27e7fc40f6e1228f7fdbc2606a8c352dbe8c942ee5f6ab081e5db039fb9b46e41a9dbaff017ddf7d004d02c7d8d272d3042cf892e5e68396e
-  data.tar.gz: b9d8896f85f1c98924c3472ad97648071bc8301854a0ea49fe7dde2472faafe54f035b27140928462de7e099aa95983cda21d52d928ad93698ccf7e1404265e2
+  metadata.gz: ad41f78382168194e5e7289a58ddb2213724839c64a5cf033551d874f935af0b2f6343a64499649499aed797a63b5d5d261298733cd4131e56b072a1671e55ee
+  data.tar.gz: 19735889f013e0c9afca6ae0ab3b4496d2d35d09dc85592fb2b6d549a5e1224f19dc76926021f7ec5be735ff44d49299f0b6a69122e27f719a72611a91424dda

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/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
 

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/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/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.2.2".freeze
+  VERSION = "8.0.0".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/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.2
+  version: 8.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -314,6 +314,21 @@ 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
@@ -375,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies