berkshelf 6.3.4 → 7.0.0

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "6.3.4"
+  VERSION = "7.0.0"
 end

data/spec/fixtures/cookbook-path-uploader/apt-2.3.6/metadata.rb

@@ -0,0 +1,2 @@
+name "apt"
+version "2.3.6"

data/spec/fixtures/cookbook-path-uploader/build-essential-1.4.2/metadata.rb

@@ -0,0 +1,2 @@
+name "build-essential"
+version "1.4.2"

data/spec/fixtures/cookbook-path-uploader/jenkins-2.0.3/metadata.rb

@@ -0,0 +1,5 @@
+name "jenkins"
+version "2.0.3"
+depends "apt", "~> 2.0"
+depends "runit", "~> 1.5"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-path-uploader/jenkins-config-0.1.0/metadata.rb

@@ -0,0 +1,4 @@
+name "jenkins-config"
+version "0.1.0"
+depends "jenkins", "~> 2.0"
+depends "yum", "~> 3.0"

data/spec/fixtures/cookbook-path-uploader/runit-1.5.8/metadata.rb

@@ -0,0 +1,5 @@
+name "runit"
+version "1.5.8"
+depends "build-essential"
+depends "yum", "~> 3.0"
+depends "yum-epel"

data/spec/fixtures/cookbook-path-uploader/yum-3.0.6/metadata.rb

@@ -0,0 +1,2 @@
+name "yum"
+version "3.0.6"

data/spec/fixtures/cookbook-path-uploader/yum-epel-0.2.0/metadata.rb

@@ -0,0 +1,3 @@
+name "yum-epel"
+version "0.2.0"
+depends "yum", "~> 3.0"

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require "rspec"
 require "cleanroom/rspec"
 require "webmock/rspec"
 require "rspec/its"
-require "berkshelf"
 
 Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
@@ -64,6 +63,8 @@ def capture(stream)
   result
 end
 
+require "berkshelf"
+
 module Berkshelf
   class GitLocation
     include Berkshelf::RSpec::Git
@@ -71,7 +72,6 @@ module Berkshelf
     alias :real_clone :clone
     def clone
       fake_remote = generate_fake_git_remote(uri, tags: @branch ? [@branch] : [])
-      tmp_clone = File.join(self.class.tmpdir, uri.gsub(/[\/:]/, "-"))
       @uri = "file://#{fake_remote}"
       real_clone
     end

data/spec/support/chef_api.rb

@@ -83,14 +83,14 @@ module Berkshelf
         end.join("\n")
 
         if options[:dependencies]
-          options[:dependencies].each do |name, constraint|
-            metadata << "depends '#{name}', '#{constraint}'\n"
+          options[:dependencies].each do |dep_name, constraint|
+            metadata << "depends '#{dep_name}', '#{constraint}'\n"
           end
         end
 
         if options[:recommendations]
-          options[:recommendations].each do |name, constraint|
-            metadata << "recommends '#{name}', '#{constraint}'\n"
+          options[:recommendations].each do |rec_name, constraint|
+            metadata << "recommends '#{rec_name}', '#{constraint}'\n"
           end
         end
 

data/spec/support/chef_server.rb

@@ -23,7 +23,7 @@ module Berkshelf::RSpec
       def start(options = {})
         return @server if @server
 
-        options = options.reverse_merge(port: PORT)
+        options = { port: PORT }.merge(options)
         options[:generate_real_keys] = false
 
         @server = ChefZero::Server.new(options)

data/spec/support/matchers/file_system_matchers.rb

@@ -59,9 +59,7 @@ module Berkshelf
         end
 
         def file(name, &block)
-          silence_warnings do
-            @tree[name] = FileMatcher.new(location(name), &block)
-          end
+          @tree[name] = FileMatcher.new(location(name), &block)
         end
 
         def no_file(name)

data/spec/support/path_helpers.rb

@@ -40,7 +40,7 @@ module Berkshelf
       #
       # @return [Bershelf::Chef::Config]
       def chef_config
-        Ridley::Chef::Config.from_file(chef_config_path)
+        Berkshelf::ChefConfigCompat.from_file(chef_config_path)
       end
 
       def clean_tmp_path

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -192,26 +192,6 @@ describe Berkshelf::Berksfile do
     end
   end
 
-  describe "#site" do
-    it "raises a Berkshelf::Deprecated error" do
-      expect { subject.site }.to raise_error(Berkshelf::DeprecatedError)
-    end
-
-    it "is a DSL method" do
-      expect(subject).to have_exposed_method(:site)
-    end
-  end
-
-  describe "#chef_api" do
-    it "raises a Berkshelf::Deprecated error" do
-      expect { subject.chef_api }.to raise_error(Berkshelf::DeprecatedError)
-    end
-
-    it "is a DSL method" do
-      expect(subject).to have_exposed_method(:chef_api)
-    end
-  end
-
   describe "#extension" do
     it "is a DSL method" do
       expect(subject).to have_exposed_method(:extension)
@@ -385,12 +365,12 @@ describe Berkshelf::Berksfile do
   end
 
   describe "#vendor" do
-    let(:cached_cookbook)    { double(Berkshelf::CachedCookbook, cookbook_name: "my_cookbook", path: "/my_cookbook/path", compiled_metadata?: true) }
-    let(:installer)          { double(Berkshelf::Installer, run: [cached_cookbook]) }
+    let(:cached_cookbook)    { instance_double(Berkshelf::CachedCookbook, cookbook_name: "my_cookbook", path: "/my_cookbook/path", compile_metadata: true, reload: nil) }
+    let(:installer)          { instance_double(Berkshelf::Installer, run: [cached_cookbook]) }
     let(:raw_metadata_files) { [File.join(cached_cookbook.cookbook_name, "metadata.rb")] }
 
     let(:destination) { "/a/destination/path" }
-    let(:options) { { :exclude => raw_metadata_files + Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
+    let(:options) { { :exclude => Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
 
     before do
       allow(Berkshelf::Installer).to receive(:new).and_return(installer)
@@ -404,7 +384,6 @@ describe Berkshelf::Berksfile do
 
     it "excludes the top-level metadata.rb file" do
       expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, "my_cookbook/recipes/metadata.rb", File::FNM_DOTMATCH) }).to be(false)
-      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, "my_cookbook/metadata.rb", File::FNM_DOTMATCH) }).to be(true)
     end
   end
 

data/spec/unit/berkshelf/cached_cookbook_spec.rb

@@ -76,17 +76,13 @@ describe Berkshelf::CachedCookbook do
       expect(subject.dependencies).to include(dependencies)
     end
 
-    it "contains recommendations from the cookbook metadata" do
-      expect(subject.dependencies).to include(recommendations)
-    end
-
     it "returns a hash" do
       expect(subject.dependencies).to be_a(Hash)
     end
   end
 
   describe "#pretty_hash" do
-    shared_examples "a pretty_hash cookbook attribute" do |attribute, key|
+    shared_examples "a pretty_hash string cookbook attribute" do |attribute, key|
       it "is not present when the `#{attribute}` attribute is nil" do
         allow(subject).to receive(attribute.to_sym).and_return(nil)
         expect(subject.pretty_hash).to_not have_key((key || attribute).to_sym)
@@ -96,9 +92,11 @@ describe Berkshelf::CachedCookbook do
         allow(subject).to receive(attribute.to_sym).and_return("")
         expect(subject.pretty_hash).to_not have_key((key || attribute).to_sym)
       end
+    end
 
-      it "is not present when the `#{attribute}` attribute is an empty array" do
-        allow(subject).to receive(attribute.to_sym).and_return([])
+    shared_examples "a pretty_hash hash cookbook attribute" do |attribute, key|
+      it "is not present when the `#{attribute}` attribute is nil" do
+        allow(subject).to receive(attribute.to_sym).and_return(nil)
         expect(subject.pretty_hash).to_not have_key((key || attribute).to_sym)
       end
 
@@ -113,13 +111,13 @@ describe Berkshelf::CachedCookbook do
       end
     end
 
-    it_behaves_like "a pretty_hash cookbook attribute", "cookbook_name", "name"
-    it_behaves_like "a pretty_hash cookbook attribute", "version"
-    it_behaves_like "a pretty_hash cookbook attribute", "description"
-    it_behaves_like "a pretty_hash cookbook attribute", "maintainer", "author"
-    it_behaves_like "a pretty_hash cookbook attribute", "maintainer_email", "email"
-    it_behaves_like "a pretty_hash cookbook attribute", "license"
-    it_behaves_like "a pretty_hash cookbook attribute", "platforms"
-    it_behaves_like "a pretty_hash cookbook attribute", "dependencies"
+    it_behaves_like "a pretty_hash string cookbook attribute", "cookbook_name", "name"
+    it_behaves_like "a pretty_hash string cookbook attribute", "version"
+    it_behaves_like "a pretty_hash string cookbook attribute", "description"
+    it_behaves_like "a pretty_hash string cookbook attribute", "maintainer", "author"
+    it_behaves_like "a pretty_hash string cookbook attribute", "maintainer_email", "email"
+    it_behaves_like "a pretty_hash string cookbook attribute", "license"
+    it_behaves_like "a pretty_hash hash cookbook attribute", "platforms"
+    it_behaves_like "a pretty_hash hash cookbook attribute", "dependencies"
   end
 end

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -29,7 +29,7 @@ describe Berkshelf::CommunityREST do
         expect(Berkshelf::CommunityREST.uri_escape_version(nil)).to be_a(String)
       end
 
-      it 'converts a version to it\'s underscored version' do
+      it "converts a version to it's underscored version" do
         expect(Berkshelf::CommunityREST.uri_escape_version("1.1.2")).to eq("1_1_2")
       end
 
@@ -64,14 +64,6 @@ describe Berkshelf::CommunityREST do
   let(:api_uri) { Berkshelf::CommunityREST::V1_API }
   subject { Berkshelf::CommunityREST.new(api_uri) }
 
-  describe "#initialize" do
-    context "Faraday handlers" do
-      it "includes follow_redirects to prevent 301 from community, stopping some cookbooks installing" do
-        expect(subject.builder.handlers).to include(Ridley::Middleware::FollowRedirects)
-      end
-    end
-  end
-
   describe "#download" do
     let(:archive) { double("archive", path: "/foo/bar", unlink: true) }
 
@@ -93,7 +85,6 @@ describe Berkshelf::CommunityREST do
         .and_return("/foo/nginx")
         .once
       expect(archive).to receive(:unlink).once
-      expect(Dir).to receive(:chdir).with("/foo/nginx")
 
       subject.download("bacon", "1.0.0")
     end
@@ -109,8 +100,8 @@ describe Berkshelf::CommunityREST do
 
       result = subject.find("bacon", "1.0.0")
 
-      expect(result.cookbook).to eq("/path/to/cookbook")
-      expect(result.version).to eq("1.0.0")
+      expect(result["cookbook"]).to eq("/path/to/cookbook")
+      expect(result["version"]).to eq("1.0.0")
     end
 
     it "raises a CookbookNotFound error on a 404 response for a non-existent cookbook" do

data/spec/unit/berkshelf/config_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Berkshelf::Config do
   describe "::file" do
     context "when the file does not exist" do
-      before { allow(File).to receive(:exists?).and_return(false) }
+      before { allow(File).to receive(:exist?).and_return(false) }
 
       it "is nil" do
         expect(Berkshelf::Config.file).to be_nil
@@ -25,7 +25,7 @@ describe Berkshelf::Config do
     context "a Chef config to read defaults from" do
       let(:chef_config) do
         double(
-          Ridley::Chef::Config,
+          Berkshelf::ChefConfigCompat,
           chef_server_url: "https://chef.example.com",
           validation_client_name: "validator",
           validation_key: "validator.pem",
@@ -75,7 +75,7 @@ describe Berkshelf::Config do
     end
 
     before do
-      allow(File).to receive(:exists?).and_return(false)
+      allow(File).to receive(:exist?).and_return(false)
     end
 
     after do
@@ -85,7 +85,7 @@ describe Berkshelf::Config do
     context "when ENV['BERKSHELF_CONFIG'] is used" do
       before do
         allow(ENV).to receive(:[]).with("BERKSHELF_CONFIG").and_return("/tmp/config.json")
-        allow(File).to receive(:exists?).with("/tmp/config.json").and_return(true)
+        allow(File).to receive(:exist?).with("/tmp/config.json").and_return(true)
       end
 
       it "points to a location within it" do

data/spec/unit/berkshelf/downloader_spec.rb

@@ -86,12 +86,10 @@ module Berkshelf
       describe "chef_server location type" do
         let(:chef_server_url) { "http://configured-chef-server/" }
         let(:ridley_client) do
-          double(Ridley::Client,
-            cookbook: double("cookbook", download: "fake")
-          )
+          instance_double(Berkshelf::RidleyCompat)
         end
         let(:chef_config) do
-          double(Ridley::Chef::Config,
+          double(Berkshelf::ChefConfigCompat,
             node_name: "fake-client",
             client_key: "client-key",
             chef_server_url: chef_server_url,
@@ -101,10 +99,7 @@ module Berkshelf
             cookbook_copyright: "user",
             cookbook_email: "user@example.com",
             cookbook_license: "apachev2",
-            trusted_certs_dir: self_signed_crt_path,
-            knife: {
-              chef_guard: false,
-            }
+            trusted_certs_dir: self_signed_crt_path
           )
         end
 
@@ -133,7 +128,7 @@ module Berkshelf
               cert_store: cert_store,
             },
           }
-          expect(Ridley).to receive(:open).with(credentials) { ridley_client }
+          expect(Berkshelf::RidleyCompat).to receive(:new_client).with(credentials) { ridley_client }
           subject.try_download(source, name, version)
         end
 
@@ -151,7 +146,7 @@ module Berkshelf
                 cert_store: cert_store,
               },
             }
-            expect(Ridley).to receive(:open).with(credentials) { ridley_client }
+            expect(Berkshelf::RidleyCompat).to receive(:new_client).with(credentials) { ridley_client }
             subject.try_download(source, name, version)
           end
         end
@@ -170,7 +165,7 @@ module Berkshelf
                 cert_store: cert_store,
               },
             }
-            expect(Ridley).to receive(:open).with(credentials) { ridley_client }
+            expect(Berkshelf::RidleyCompat).to receive(:new_client).with(credentials) { ridley_client }
             subject.try_download(source, name, version)
           end
         end

data/spec/unit/berkshelf/lockfile_spec.rb

@@ -58,7 +58,7 @@ describe Berkshelf::Lockfile do
     end
 
     it "returns false when the file does not exist" do
-      allow(File).to receive(:exists?).and_return(false)
+      allow(File).to receive(:exist?).and_return(false)
       expect(subject.present?).to be(false)
     end
 
@@ -225,7 +225,7 @@ describe Berkshelf::Lockfile do
 
       context "when the Chef environment does not exist" do
         it "raises an exception" do
-          allow(connection).to receive(:environment).and_return(double(find: nil))
+          allow(connection).to receive(:get).and_raise(Berkshelf::APIClient::ServiceNotFound)
           expect do
             subject.apply("production")
           end.to raise_error(Berkshelf::EnvironmentNotFound)
@@ -233,14 +233,17 @@ describe Berkshelf::Lockfile do
       end
 
       it "locks the environment cookbook versions on chef server" do
-        environment = double("environment", :cookbook_versions= => nil, save: true)
-        allow(connection).to receive(:environment).and_return(double(find: environment))
+        environment = instance_double(Chef::Environment)
+        env_hash = double(Hash)
+        expect(connection).to receive(:get).with("environments/production").and_return(env_hash)
+        expect(Chef::Environment).to receive(:from_hash).with(env_hash).and_return(environment)
 
-        expect(environment).to receive(:cookbook_versions=).with(
+        expect(environment).to receive(:cookbook_versions).with(
           "apt" => "= 1.0.0",
           "jenkins" => "= 1.4.5"
         )
 
+        expect(environment).to receive(:save)
         subject.apply("production")
       end
     end
@@ -294,7 +297,7 @@ describe Berkshelf::Lockfile do
 
   describe "#update_environment_file" do
     it "raises an exception when environment file does not exist" do
-      allow(File).to receive(:exists?).and_return(false)
+      allow(File).to receive(:exist?).and_return(false)
       expect do
         subject.update_environment_file("/broken/path", nil)
       end.to raise_error(Berkshelf::EnvironmentFileNotFound)
@@ -307,7 +310,7 @@ describe Berkshelf::Lockfile do
         "jenkins" => "1.4.5",
       }
 
-      allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:exist?).and_return(true)
       allow(File).to receive(:read).and_return("{}")
       allow(File).to receive(:open).and_yield(file)
 

data/spec/unit/berkshelf/source_spec.rb

@@ -194,7 +194,7 @@ module Berkshelf
     end
 
     describe "#search" do
-      let (:cookbooks) do
+      let(:cookbooks) do
         [
         APIClient::RemoteCookbook.new("cb1", "1.0.8"),
         APIClient::RemoteCookbook.new("cb1", "1.0.22"),

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -6,7 +6,7 @@ describe Berkshelf::SSLPolicy do
   let(:self_signed_crt_path_windows_forwardslashes) { "C:/users/vagrant/.chef/trusted_certs" }
 
   let(:chef_config) do
-    double(Ridley::Chef::Config,
+    double(Berkshelf::ChefConfigCompat,
       node_name: "fake-client",
       client_key: "client-key",
       chef_server_url: "http://configured-chef-server/",
@@ -16,10 +16,7 @@ describe Berkshelf::SSLPolicy do
       cookbook_copyright: "user",
       cookbook_email: "user@example.com",
       cookbook_license: "apachev2",
-      trusted_certs_dir: self_signed_crt_path,
-      knife: {
-        chef_guard: false,
-      }
+      trusted_certs_dir: self_signed_crt_path
     )
   end
 

data/spec/unit/berkshelf/uploader_spec.rb

@@ -51,7 +51,7 @@ module Berkshelf
       let(:options) { Hash.new }
 
       let(:chef_config) do
-        double(Ridley::Chef::Config,
+        double(Berkshelf::ChefConfigCompat,
           node_name: "fake-client",
           client_key: "client-key",
           chef_server_url: "http://configured-chef-server/",
@@ -61,10 +61,7 @@ module Berkshelf
           cookbook_copyright: "user",
           cookbook_email: "user@example.com",
           cookbook_license: "apachev2",
-          trusted_certs_dir: self_signed_crt_path,
-          knife: {
-            chef_guard: false,
-          }
+          trusted_certs_dir: self_signed_crt_path
         )
       end
 
@@ -125,7 +122,7 @@ module Berkshelf
         end
 
         it "uses the Berkshelf::Config options" do
-          expect(Ridley).to receive(:open).with(
+          expect(Berkshelf::RidleyCompat).to receive(:new_client).with(
             server_url:  chef_config.chef_server_url,
             client_name: chef_config.node_name,
             client_key:  chef_config.client_key,
@@ -142,7 +139,7 @@ module Berkshelf
         subject { Uploader.new(berksfile, ssl_verify: false) }
 
         it "uses the passed option" do
-          expect(Ridley).to receive(:open).with(
+          expect(Berkshelf::RidleyCompat).to receive(:new_client).with(
             server_url:  chef_config.chef_server_url,
             client_name: chef_config.node_name,
             client_key:  chef_config.client_key,
@@ -159,7 +156,7 @@ module Berkshelf
         subject { Uploader.new(berksfile, server_url: "http://custom") }
 
         it "uses the passed in :server_url" do
-          expect(Ridley).to receive(:open)
+          expect(Berkshelf::RidleyCompat).to receive(:new_client)
             .with(include(server_url: "http://custom"))
           subject.run
         end
@@ -169,7 +166,7 @@ module Berkshelf
         subject { Uploader.new(berksfile, client_name: "custom") }
 
         it "uses the passed in :client_name" do
-          expect(Ridley).to receive(:open)
+          expect(Berkshelf::RidleyCompat).to receive(:new_client)
             .with(include(client_name: "custom"))
           subject.run
         end
@@ -179,11 +176,64 @@ module Berkshelf
         subject { Uploader.new(berksfile, client_key: "custom") }
 
         it "uses the passed in :client_key" do
-          expect(Ridley).to receive(:open)
+          expect(Berkshelf::RidleyCompat).to receive(:new_client)
             .with(include(client_key: "custom"))
           subject.run
         end
       end
     end
+
+    describe "#lookup_dependencies" do
+      before do
+        allow_any_instance_of(Berkshelf::Berksfile).to receive(:lockfile).and_return(lockfile)
+      end
+
+      let(:berksfile) { Berkshelf::Berksfile.from_file(fixtures_path.join("berksfiles/default")) }
+      let(:lockfile) { Berkshelf::Lockfile.from_file(fixtures_path.join("lockfiles/default.lock")) }
+
+      context "when given a cookbook that has no dependencies" do
+        subject { described_class.new(berksfile).send(:lookup_dependencies, "yum") }
+
+        it "returns empty array" do
+          expect(subject).to eq []
+        end
+      end
+
+      context "when given a cookbook that has dependencies" do
+        subject { described_class.new(berksfile).send(:lookup_dependencies, "yum-epel") }
+
+        it "returns array of cookbook's dependencies" do
+          expect(subject).to eq ["yum"]
+        end
+      end
+
+      context "when given a cookbook that has dependencies which have dependencies" do
+        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"]
+        end
+      end
+    end
+
+    describe "#filtered_cookbooks" do
+      context "when iterating over a list of of cookbooks that have dependencies" do
+        before do
+          allow_any_instance_of(Berkshelf::Dependency).to receive(:berksfile).and_return(berksfile)
+          allow_any_instance_of(Berkshelf::Berksfile).to receive(:lockfile).and_return(lockfile)
+          allow(Berkshelf::CookbookStore).to receive(:instance).and_return(cookbook_store)
+        end
+
+        let(:berksfile) { Berkshelf::Berksfile.from_file(fixtures_path.join("berksfiles/default")) }
+        let(:lockfile) { Berkshelf::Lockfile.from_file(fixtures_path.join("lockfiles/default.lock")) }
+        let(:cookbook_store) { Berkshelf::CookbookStore.new(fixtures_path.join("cookbook-path-uploader")) }
+
+        subject { described_class.new(berksfile).send(:filtered_cookbooks) }
+
+        it "returns filtered list in correct order" do
+          expect(subject.map(&:name)).to eq ["yum", "yum-epel", "build-essential", "runit", "apt", "jenkins", "jenkins-config"]
+        end
+      end
+    end
   end
 end