berkshelf 7.0.8 → 7.2.1

data/spec/unit/berkshelf/locations/base_spec.rb

@@ -46,8 +46,7 @@ module Berkshelf
         let(:cookbook) do
           double("cookbook",
             cookbook_name: "cookbook",
-            version: "0.1.0"
-          )
+            version: "0.1.0")
         end
 
         before do

data/spec/unit/berkshelf/locations/git_spec.rb

@@ -104,11 +104,10 @@ module Berkshelf
 
       context "when the repository is cached" do
         it "pulls a new version" do
-          allow(Dir).to receive(:chdir) { |args, &b| b.call } # Force eval the chdir block
-
+          cache_path = subject.send(:cache_path)
           allow(subject).to receive(:cached?).and_return(true)
           expect(subject).to receive(:git).with(
-            'fetch --force --tags https://repo.com "refs/heads/*:refs/heads/*"'
+            'fetch --force --tags https://repo.com "refs/heads/*:refs/heads/*"', cwd: cache_path.to_s
           )
           subject.install
         end
@@ -116,8 +115,6 @@ module Berkshelf
 
       context "when the revision is not cached" do
         it "clones the repository" do
-          allow(Dir).to receive(:chdir) { |args, &b| b.call } # Force eval the chdir block
-
           cache_path = subject.send(:cache_path)
           allow(subject).to receive(:cached?).and_return(false)
           expect(subject).to receive(:git).with(

data/spec/unit/berkshelf/locations/path_spec.rb

@@ -8,8 +8,7 @@ module Berkshelf
       double("dependency",
         name: "nginx",
         version_constraint: constraint,
-        berksfile: berksfile
-      )
+        berksfile: berksfile)
     end
     let(:path) { fixtures_path.join("cookbooks", "example_cookbook") }
     let(:relative_path) { Pathname.new("../../../fixtures/cookbooks/example_cookbook") }

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -8,8 +8,7 @@ describe Berkshelf::Lockfile do
     let(:lock_path) { File.absolute_path("/path/to/Bacon") }
     let(:berksfile) do
       double("Berksfile",
-        filepath: lock_path
-      )
+        filepath: lock_path)
     end
 
     subject { described_class.from_berksfile(berksfile) }
@@ -77,8 +76,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: {},
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -95,8 +93,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: { "bacon" => "1.0.0" },
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       bacon = double(name: "bacon", version: "1.0.0", dependencies: {})
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
@@ -115,15 +112,13 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: { "bacon" => "1.0.0" },
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       bacon = double("bacon",
         name: "bacon",
         version_constraint: Semverse::Constraint.new(">= 0.0.0"),
         version: "1.0.0",
         location: "api",
-        dependencies: { "apt" => "1.0.0" }
-      )
+        dependencies: { "apt" => "1.0.0" })
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -141,8 +136,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: { "bacon" => "1.0.0" },
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -177,8 +171,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: {},
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       berksfile = double("berksfile", dependencies: [apt])
       subject.instance_variable_set(:@berksfile, berksfile)
       allow(subject).to receive(:find).with(apt).and_return(apt)
@@ -195,8 +188,7 @@ describe Berkshelf::Lockfile do
         version: "1.0.0",
         location: "api",
         dependencies: {},
-        cached_cookbook: cookbook
-      )
+        cached_cookbook: cookbook)
       apt_master = apt.dup
       allow(apt_master).to receive_messages(location: "github")
       allow(apt_master).to receive_messages(cached_cookbook: cookbook)
@@ -393,8 +385,7 @@ describe Berkshelf::Lockfile::Graph do
         name: "test-0.0.1",
         version: "0.0.1",
         cookbook_name: "test",
-        dependencies: {}
-      )
+        dependencies: {})
       subject.update([cookbook])
 
       expect(subject.locks.keys).to include(cookbook.cookbook_name)

data/spec/unit/berkshelf/ridley_compat_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 require "chef/cookbook_manifest"
 
 describe Berkshelf::RidleyCompat do
-  let(:opts) { Hash.new }
+  let(:opts) { {} }
 
-  subject { described_class.new(opts) }
+  subject { described_class.new(**opts) }
 
   context "default" do
     it "has a cookbook version_class" do

data/spec/unit/berkshelf/source_spec.rb

@@ -4,8 +4,9 @@ module Berkshelf
   describe Source do
     let(:berksfile) { double("Berksfile", filepath: "/test/Berksfile") }
     let(:arguments) { [] }
+    let(:kwargs) { {} }
     let(:config) { Config.new }
-    subject(:instance) { described_class.new(berksfile, *arguments) }
+    subject(:instance) { described_class.new(berksfile, *arguments, **kwargs) }
     before do
       allow(Berkshelf::Config).to receive(:instance).and_return(config)
     end
@@ -19,7 +20,8 @@ module Berkshelf
       end
 
       context "with a string argument and options" do
-        let(:arguments) { ["https://example.com", { key: "value" }] }
+        let(:arguments) { ["https://example.com" ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq :supermarket }
       end
 
@@ -29,7 +31,8 @@ module Berkshelf
       end
 
       context "with a symbol argument and options" do
-        let(:arguments) { [:chef_server, { key: "value" }] }
+        let(:arguments) { [:chef_server ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq :chef_server }
       end
 
@@ -44,7 +47,8 @@ module Berkshelf
       end
 
       context "with a hash argument and disconnected options" do
-        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }, { key: "value" }] }
+        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq :artifactory }
       end
     end
@@ -58,7 +62,8 @@ module Berkshelf
       end
 
       context "with a string argument and options" do
-        let(:arguments) { ["https://example.com", { key: "value" }] }
+        let(:arguments) { ["https://example.com" ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq "https://example.com" }
       end
 
@@ -69,7 +74,8 @@ module Berkshelf
       end
 
       context "with a symbol argument and options" do
-        let(:arguments) { [:chef_server, { key: "value" }] }
+        let(:arguments) { [:chef_server] }
+        let(:kwargs) { { key: "value" } }
         before { config.chef.chef_server_url = "https://chefserver/" }
         it { is_expected.to eq "https://chefserver/" }
       end
@@ -85,7 +91,8 @@ module Berkshelf
       end
 
       context "with a hash argument and disconnected options" do
-        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }, { key: "value" }] }
+        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" } ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq "https://example.com/api/chef/chef-virtual" }
       end
 
@@ -96,7 +103,7 @@ module Berkshelf
 
       context "with a chef_repo source" do
         let(:arguments) { [{ chef_repo: "." }] }
-        it { is_expected.to eq(windows? ? "file://C/test" : "file:///test") }
+        it { is_expected.to eq(windows? ? "file://D/test" : "file:///test") }
       end
     end
 
@@ -110,16 +117,17 @@ module Berkshelf
         # Check all baseline values.
         its([:timeout]) { is_expected.to eq 30 }
         its([:open_timeout]) { is_expected.to eq 3 }
-        its([:ssl, :verify]) { is_expected.to be true }
-        its([:ssl, :ca_file]) { is_expected.to be_nil }
-        its([:ssl, :ca_path]) { is_expected.to be_nil }
-        its([:ssl, :client_cert]) { is_expected.to be_nil }
-        its([:ssl, :client_key]) { is_expected.to be_nil }
-        its([:ssl, :cert_store]) { is_expected.to be_a(OpenSSL::X509::Store) }
+        its(%i{ssl verify}) { is_expected.to be true }
+        its(%i{ssl ca_file}) { is_expected.to be_nil }
+        its(%i{ssl ca_path}) { is_expected.to be_nil }
+        its(%i{ssl client_cert}) { is_expected.to be_nil }
+        its(%i{ssl client_key}) { is_expected.to be_nil }
+        its(%i{ssl cert_store}) { is_expected.to be_a(OpenSSL::X509::Store) }
       end
 
       context "with a string argument and options" do
-        let(:arguments) { ["https://example.com", { key: "value" }] }
+        let(:arguments) { ["https://example.com"] }
+        let(:kwargs) { { key: "value" } }
         its([:key]) { is_expected.to eq "value" }
       end
 
@@ -129,7 +137,8 @@ module Berkshelf
       end
 
       context "with a symbol argument and options" do
-        let(:arguments) { [:chef_server, { key: "value" }] }
+        let(:arguments) { [:chef_server] }
+        let(:kwargs) { { key: "value" } }
         its([:key]) { is_expected.to eq "value" }
       end
 
@@ -144,7 +153,8 @@ module Berkshelf
       end
 
       context "with a hash argument and disconnected options" do
-        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }, { key: "value" }] }
+        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" } ] }
+        let(:kwargs) { { key: "value" } }
         its([:key]) { is_expected.to eq "value" }
       end
 
@@ -156,7 +166,7 @@ module Berkshelf
 
       context "with a chef_repo source" do
         let(:arguments) { [{ chef_repo: "." }] }
-        its([:path]) { is_expected.to eq(windows? ? "C:/test" : "/test") }
+        its([:path]) { is_expected.to eq(windows? ? "D:/test" : "/test") }
       end
     end
 
@@ -198,7 +208,8 @@ module Berkshelf
         [
         APIClient::RemoteCookbook.new("cb1", "1.0.8"),
         APIClient::RemoteCookbook.new("cb1", "1.0.22"),
-      ] end
+      ]
+      end
 
       before do
         allow_any_instance_of(APIClient::Connection).to receive(:universe).and_return(cookbooks)

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -16,19 +16,17 @@ describe Berkshelf::SSLPolicy do
       cookbook_copyright: "user",
       cookbook_email: "user@example.com",
       cookbook_license: "apachev2",
-      trusted_certs_dir: self_signed_crt_path
-    )
+      trusted_certs_dir: self_signed_crt_path)
   end
 
   let(:berkshelf_config) do
     double(Berkshelf::Config,
       ssl:  double(verify: true),
-      chef: chef_config
-    )
+      chef: chef_config)
   end
 
   subject do
-    Berkshelf::SSLPolicy.new()
+    Berkshelf::SSLPolicy.new
   end
 
   before do
@@ -75,7 +73,6 @@ describe Berkshelf::SSLPolicy do
         before do
           allow(chef_config).to receive_messages(trusted_certs_dir: self_signed_crt_path_windows_backslashes)
           allow(File).to receive(:exist?).with(self_signed_crt_path_windows_forwardslashes).and_return(true)
-          allow(Dir).to receive(:chdir).with(self_signed_crt_path_windows_forwardslashes)
         end
 
         it "replaces the backslashes in trusted_certs_dir from Berkshelf config with forwardslashes" do

data/spec/unit/berkshelf/uploader_spec.rb

@@ -5,14 +5,12 @@ module Berkshelf
     let(:berksfile) do
       double(Berksfile,
         lockfile: lockfile,
-        dependencies: []
-      )
+        dependencies: [])
     end
 
     let(:lockfile) do
       double(Lockfile,
-        graph: graph
-      )
+        graph: graph)
     end
 
     let(:graph) { double(Lockfile::Graph, locks: {}) }
@@ -48,7 +46,7 @@ module Berkshelf
     end
 
     describe "#run" do
-      let(:options) { Hash.new }
+      let(:options) { {} }
 
       let(:chef_config) do
         double(Berkshelf::ChefConfigCompat,
@@ -61,15 +59,13 @@ module Berkshelf
           cookbook_copyright: "user",
           cookbook_email: "user@example.com",
           cookbook_license: "apachev2",
-          trusted_certs_dir: self_signed_crt_path
-        )
+          trusted_certs_dir: self_signed_crt_path)
       end
 
       let(:berkshelf_config) do
         double(Config,
           ssl:  double(verify: true),
-          chef: chef_config
-        )
+          chef: chef_config)
       end
 
       let(:default_ridley_options) do
@@ -211,7 +207,7 @@ module Berkshelf
         subject { described_class.new(berksfile).send(:lookup_dependencies, "runit") }
 
         it "returns array of cookbook's dependencies and their dependencies" do
-          expect(subject).to eq ["build-essential", "yum", "yum-epel"]
+          expect(subject).to eq %w{build-essential yum yum-epel}
         end
       end
     end

data/spec/unit/berkshelf/validator_spec.rb

@@ -4,10 +4,6 @@ describe Berkshelf::Validator do
   describe "#validate_files" do
     let(:cookbook) { double("cookbook", cookbook_name: "cookbook", path: "path") }
 
-    before do
-      allow(Dir).to receive(:chdir) { |&block| block.call }
-    end
-
     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"])
       expect do
@@ -21,14 +17,5 @@ describe Berkshelf::Validator do
         subject.validate_files(cookbook)
       end.to_not raise_error
     end
-
-    it "does not raise an exception with spaces in the path" do
-      allow(Dir).to receive(:glob).and_return(["/there are/spaces/in this/recipes/default.rb"])
-      allow_any_instance_of(Pathname).to receive(:dirname).and_return("/there are/spaces/in this")
-
-      expect do
-        subject.validate_files(cookbook)
-      end.to_not raise_error
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.8
+  version: 7.2.1
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,10 +9,10 @@ authors:
 - Michael Ivey
 - Justin Campbell
 - Seth Vargo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.6.52
+        version: 15.7.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.6.52
+        version: 15.7.32
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +359,7 @@ homepage: https://docs.chef.io/berkshelf.html
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -374,8 +374,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies
 test_files: []