berkshelf 7.0.9 → 7.2.2

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/core_ext/file_utils_spec.rb

@@ -7,12 +7,12 @@ describe FileUtils do
     let(:options) { {} }
 
     it "uses mv by default" do
-      expect(FileUtils).to receive(:old_mv).with(src, dest, options)
+      expect(FileUtils).to receive(:old_mv).with(src, dest, **options)
       FileUtils.mv(src, dest, options)
     end
 
     it "replaces mv with cp_r and rm_rf" do
-      expect(FileUtils).to receive(:cp_r).with(src, dest, options)
+      expect(FileUtils).to receive(:cp_r).with(src, dest, **options)
       expect(FileUtils).to receive(:rm_rf).with(src)
 
       FileUtils.mv(src, dest, options)

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

@@ -4,7 +4,7 @@ require "chef/cookbook_manifest"
 describe Berkshelf::RidleyCompat do
   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
 
@@ -119,7 +126,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" } }
         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
 

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -73,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/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.9
+  version: 7.2.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,10 +9,10 @@ authors:
 - Michael Ivey
 - Justin Campbell
 - Seth Vargo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2021-06-16 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
@@ -315,6 +315,7 @@ files:
 - spec/support/path_helpers.rb
 - spec/support/shared_examples/formatter.rb
 - 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
@@ -359,7 +360,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 +375,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: []