berkshelf 7.0.6 → 7.1.0

data/spec/support/chef_server.rb

@@ -10,11 +10,11 @@ module Berkshelf
         attr_reader :server
 
         def clear_request_log
-          @request_log = Array.new
+          @request_log = []
         end
 
         def request_log
-          @request_log ||= Array.new
+          @request_log ||= []
         end
 
         def server_url

data/spec/support/git.rb

@@ -84,26 +84,26 @@ module Berkshelf
 
       private
 
-        # The path to store the local git clones.
-        #
-        # @return [Pathname]
+      # The path to store the local git clones.
+      #
+      # @return [Pathname]
       def clones
         ensure_and_return(tmp_path.join("clones"))
       end
 
-        # The path to store the git remotes.
-        #
-        # @return [Pathname]
+      # The path to store the git remotes.
+      #
+      # @return [Pathname]
       def remotes
         ensure_and_return(tmp_path.join("remotes"))
       end
 
-        # Generate a cookbook by the given name.
-        #
-        # @param [#to_s] name
-        #   the name of the cookbook to create
-        # @param [Hash] options
-        #   the list ooptions to pass to the generator
+      # Generate a cookbook by the given name.
+      #
+      # @param [#to_s] name
+      #   the name of the cookbook to create
+      # @param [Hash] options
+      #   the list ooptions to pass to the generator
       def generate_git_cookbook(name, options = {})
         options = {
           skip_vagrant: true,
@@ -114,12 +114,12 @@ module Berkshelf
         Berkshelf::Cli.new.invoke(:cookbook, [name.to_s], options)
       end
 
-        # Make sure the given path exists and return the path
-        #
-        # @param [#to_s] path
-        #   the path to create and return
-        #
-        # @return [Pathname]
+      # Make sure the given path exists and return the path
+      #
+      # @param [#to_s] path
+      #   the path to create and return
+      #
+      # @return [Pathname]
       def ensure_and_return(path)
         FileUtils.mkdir(path) unless File.exist?(path)
         Pathname.new(path).expand_path

data/spec/support/path_helpers.rb

@@ -50,10 +50,10 @@ module Berkshelf
 
       private
 
-        # This is the magical "reset" function that gives us a clean working
-        # directory on each run.
-        #
-        # @return [nil]
+      # This is the magical "reset" function that gives us a clean working
+      # directory on each run.
+      #
+      # @return [nil]
       def reload_configs
         Berkshelf.chef_config = chef_config
 

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

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

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

@@ -0,0 +1,3 @@
+name     'ekaf'
+version  '1.0.0'
+depends 'dep', '~> 1.0.0'

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

@@ -0,0 +1,3 @@
+name     'fake'
+version  '1.0.0'
+depends 'dep', '~> 1.0.0'

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -200,10 +200,10 @@ describe Berkshelf::Berksfile do
 
   describe "#dependencies" do
     let(:groups) do
-      [
-        :nautilus,
-        :skarner,
-      ]
+      %i{
+        nautilus
+        skarner
+      }
     end
 
     it "returns all Berkshelf::Dependencys added to the instance of Berksfile" do
@@ -235,8 +235,8 @@ describe Berkshelf::Berksfile do
   describe "#groups" do
     before do
       allow(subject).to receive(:dependencies) { [dependency_one, dependency_two] }
-      allow(dependency_one).to receive(:groups) { [:nautilus, :skarner] }
-      allow(dependency_two).to receive(:groups) { [:nautilus, :riven] }
+      allow(dependency_one).to receive(:groups) { %i{nautilus skarner} }
+      allow(dependency_two).to receive(:groups) { %i{nautilus riven} }
     end
 
     it "returns a hash containing keys for every group a dependency is a member of" do
@@ -255,7 +255,7 @@ describe Berkshelf::Berksfile do
   describe "#add_dependency" do
     let(:name) { "cookbook_one" }
     let(:constraint) { "= 1.2.0" }
-    let(:options) { Hash.new }
+    let(:options) { {} }
 
     before(:each) do
       subject.add_dependency(name, constraint, options)

data/spec/unit/berkshelf/cli_spec.rb

@@ -13,8 +13,7 @@ module Berkshelf
     describe "#upload" do
       it "calls to upload with params if passed in cli" do
         expect(berksfile).to receive(:upload).with(cookbooks,
-          include(skip_syntax_check: true, freeze: false)
-        )
+          include(skip_syntax_check: true, freeze: false))
 
         subject.options[:skip_syntax_check] = true
         subject.options[:no_freeze]         = true

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -68,7 +68,7 @@ describe Berkshelf::CommunityREST do
     let(:archive) { double("archive", path: "/foo/bar", unlink: true) }
 
     before do
-      allow(subject).to receive(:stream).with(any_args()).and_return(archive)
+      allow(subject).to receive(:stream).with(any_args).and_return(archive)
       allow(Berkshelf::CommunityREST).to receive(:unpack)
         .and_return("/some/path")
     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/dependency_spec.rb

@@ -71,7 +71,7 @@ describe Berkshelf::Dependency do
         end
 
         context "given a group option containing an array of groups" do
-          let(:groups) { [ :development, :test ] }
+          let(:groups) { %i{development test} }
           let(:source) { described_class.new(berksfile, cookbook_name, group: groups) }
 
           it "assigns all the groups to the group attribute" do
@@ -95,24 +95,24 @@ describe Berkshelf::Dependency do
   describe "#add_group" do
     it "stores strings as symbols" do
       subject.add_group "foo"
-      expect(subject.groups).to eq([:default, :foo])
+      expect(subject.groups).to eq(%i{default foo})
     end
 
     it "does not store duplicate groups" do
       subject.add_group "bar"
       subject.add_group "bar"
       subject.add_group :bar
-      expect(subject.groups).to eq([:default, :bar])
+      expect(subject.groups).to eq(%i{default bar})
     end
 
     it "adds multiple groups" do
       subject.add_group "baz", "quux"
-      expect(subject.groups).to eq([:default, :baz, :quux])
+      expect(subject.groups).to eq(%i{default baz quux})
     end
 
     it "handles multiple groups as an array" do
       subject.add_group %w{baz quux}
-      expect(subject.groups).to eq([:default, :baz, :quux])
+      expect(subject.groups).to eq(%i{default baz quux})
     end
   end
 

data/spec/unit/berkshelf/downloader_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: {}) }
@@ -59,6 +57,31 @@ module Berkshelf
         subject.try_download(source, name, version)
       end
 
+      context "supports location paths" do
+        before(:each) do
+          allow(source).to receive(:type) { :supermarket }
+          allow(source).to receive(:options) { { ssl: {} } }
+          allow(source).to receive(:uri_string).and_return("http://localhost:8081/repository/chef-proxy")
+          allow(remote_cookbook).to receive(:location_type) { :opscode }
+        end
+
+        let(:rest) { double("community-rest") }
+
+        it "that are relative and prepends the source URI for the download" do
+          allow(remote_cookbook).to receive(:location_path) { "/api/v1" }
+          expect(CommunityREST).to receive(:new).with("http://localhost:8081/repository/chef-proxy/api/v1", { ssl: {} }) { rest }
+          expect(rest).to receive(:download).with(name, version)
+          subject.try_download(source, name, version)
+        end
+
+        it "that are absolute and uses the given absolute URI" do
+          allow(remote_cookbook).to receive(:location_path) { "http://localhost:8081/repository/chef-proxy/api/v1" }
+          expect(CommunityREST).to receive(:new).with("http://localhost:8081/repository/chef-proxy/api/v1", { ssl: {} }) { rest }
+          expect(rest).to receive(:download).with(name, version)
+          subject.try_download(source, name, version)
+        end
+      end
+
       context "with an artifactory source" do
         it "supports the 'opscode' location type" do
           allow(source).to receive(:type) { :artifactory }
@@ -99,15 +122,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
 
         before do

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/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,7 +2,7 @@ require "spec_helper"
 require "chef/cookbook_manifest"
 
 describe Berkshelf::RidleyCompat do
-  let(:opts) { Hash.new }
+  let(:opts) { {} }
 
   subject { described_class.new(opts) }
 

data/spec/unit/berkshelf/source_spec.rb

@@ -110,12 +110,12 @@ 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
@@ -198,7 +198,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)