chef-dk 0.13.21 → 0.14.25

data/spec/unit/policyfile/reports/upload_spec.rb

@@ -1,96 +1,96 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'chef-dk/policyfile/reports/upload'
-
-# For the LockedCookbookForUpload class:
-require 'chef-dk/policyfile/uploader'
-
-# Used for verifying doubles
-require 'chef-dk/policyfile/cookbook_locks'
-
-describe ChefDK::Policyfile::Reports::Upload do
-
-  let(:ui) { TestHelpers::TestUI.new }
-
-  let(:reused_cookbooks) { [] }
-
-  let(:uploaded_cookbooks) { [] }
-
-  subject(:upload_report) { described_class.new(ui: ui, reused_cbs: reused_cookbooks, uploaded_cbs: uploaded_cookbooks) }
-
-  it "has a ui object" do
-    expect(upload_report.ui).to eq(ui)
-  end
-
-  it "has a list of cookbooks that are being uploaded" do
-    expect(upload_report.uploaded_cbs).to equal(uploaded_cookbooks)
-  end
-
-  it "has a list of cookbooks that would be uploaded but are already on the server" do
-    expect(upload_report.reused_cbs).to equal(reused_cookbooks)
-  end
-
-  describe "reporting uploaded and reused cookbooks" do
-
-    def cb_with_lock(name, version, identifier)
-      lock = instance_double("ChefDK::Policyfile::CookbookLock",
-                             name: name,
-                             version: version,
-                             identifier: identifier)
-
-      ChefDK::Policyfile::Uploader::LockedCookbookForUpload.new(nil, lock)
-    end
-
-    let(:cookbook_one) do
-      cb_with_lock("short-name", "10.11.12", "49582c3db4e3b54674ecfb57fe82157720350274")
-    end
-
-    let(:cookbook_two) do
-      cb_with_lock("a-longer-named-cookbook", "1.0.0", "e4ac353bebdc949cd2cd8ce69983a56b96917dfa")
-    end
-
-    let(:reused_cookbooks) { [ cookbook_one, cookbook_two ] }
-
-    let(:cookbook_three) do
-      cb_with_lock("foo", "1.2.42", "cb61daebfb0d255cae928ca1a92db29b055755cf")
-    end
-
-    let(:cookbook_four) do
-      cb_with_lock("barbazqux", "12.34.5678", "1241ea6f9866d0e61d11129bb32e5fc96cd2bac0")
-    end
-
-    let(:uploaded_cookbooks) { [ cookbook_three, cookbook_four ] }
-
-    it "prints a table showing the re-used and uploaded cookbooks" do
-      upload_report.show
-
-      expected_output = <<-E
-Using    short-name              10.11.12   (49582c3d)
-Using    a-longer-named-cookbook 1.0.0      (e4ac353b)
-Uploaded foo                     1.2.42     (cb61daeb)
-Uploaded barbazqux               12.34.5678 (1241ea6f)
-E
-      expect(ui.output).to eq(expected_output)
-    end
-
-  end
-
-end
-
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef-dk/policyfile/reports/upload'
+
+# For the LockedCookbookForUpload class:
+require 'chef-dk/policyfile/uploader'
+
+# Used for verifying doubles
+require 'chef-dk/policyfile/cookbook_locks'
+
+describe ChefDK::Policyfile::Reports::Upload do
+
+  let(:ui) { TestHelpers::TestUI.new }
+
+  let(:reused_cookbooks) { [] }
+
+  let(:uploaded_cookbooks) { [] }
+
+  subject(:upload_report) { described_class.new(ui: ui, reused_cbs: reused_cookbooks, uploaded_cbs: uploaded_cookbooks) }
+
+  it "has a ui object" do
+    expect(upload_report.ui).to eq(ui)
+  end
+
+  it "has a list of cookbooks that are being uploaded" do
+    expect(upload_report.uploaded_cbs).to equal(uploaded_cookbooks)
+  end
+
+  it "has a list of cookbooks that would be uploaded but are already on the server" do
+    expect(upload_report.reused_cbs).to equal(reused_cookbooks)
+  end
+
+  describe "reporting uploaded and reused cookbooks" do
+
+    def cb_with_lock(name, version, identifier)
+      lock = instance_double("ChefDK::Policyfile::CookbookLock",
+                             name: name,
+                             version: version,
+                             identifier: identifier)
+
+      ChefDK::Policyfile::Uploader::LockedCookbookForUpload.new(nil, lock)
+    end
+
+    let(:cookbook_one) do
+      cb_with_lock("short-name", "10.11.12", "49582c3db4e3b54674ecfb57fe82157720350274")
+    end
+
+    let(:cookbook_two) do
+      cb_with_lock("a-longer-named-cookbook", "1.0.0", "e4ac353bebdc949cd2cd8ce69983a56b96917dfa")
+    end
+
+    let(:reused_cookbooks) { [ cookbook_one, cookbook_two ] }
+
+    let(:cookbook_three) do
+      cb_with_lock("foo", "1.2.42", "cb61daebfb0d255cae928ca1a92db29b055755cf")
+    end
+
+    let(:cookbook_four) do
+      cb_with_lock("barbazqux", "12.34.5678", "1241ea6f9866d0e61d11129bb32e5fc96cd2bac0")
+    end
+
+    let(:uploaded_cookbooks) { [ cookbook_three, cookbook_four ] }
+
+    it "prints a table showing the re-used and uploaded cookbooks" do
+      upload_report.show
+
+      expected_output = <<-E
+Using    short-name              10.11.12   (49582c3d)
+Using    a-longer-named-cookbook 1.0.0      (e4ac353b)
+Uploaded foo                     1.2.42     (cb61daeb)
+Uploaded barbazqux               12.34.5678 (1241ea6f)
+E
+      expect(ui.output).to eq(expected_output)
+    end
+
+  end
+
+end
+
+

data/spec/unit/policyfile/solution_dependencies_spec.rb

@@ -1,145 +1,145 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-require 'chef-dk/policyfile/solution_dependencies'
-
-describe ChefDK::Policyfile::SolutionDependencies do
-
-  let(:dependency_data) { {"Policyfile" => [], "dependencies" => {}} }
-
-  let(:solution_dependencies) do
-    s = described_class.new
-    s.consume_lock_data(dependency_data)
-    s
-  end
-
-  it "has a list of dependencies declared in the Policyfile" do
-    expect(solution_dependencies.policyfile_dependencies).to eq([])
-  end
-
-  it "has a map of dependencies declared by cookbooks" do
-    expect(solution_dependencies.cookbook_dependencies).to eq({})
-  end
-
-  context "when populated with dependency data from a lockfile" do
-
-    let(:dependency_data) do
-      {
-        "Policyfile" => [
-          [ "nginx", "~> 1.0"], ["postgresql", ">= 0.0.0" ]
-        ],
-        "dependencies" => {
-          "nginx (1.2.3)" => [ ["apt", "~> 2.3"], ["yum", "~>3.4"] ],
-          "apt (2.5.6)" => [],
-          "yum (3.4.1)" => [],
-          "postgresql (5.0.0)" => []
-        }
-      }
-    end
-
-    it "has a list of dependencies from the policyfile" do
-      expected = [ "nginx", "~> 1.0"], ["postgresql", ">= 0.0.0" ]
-      expect(solution_dependencies.policyfile_dependencies_for_lock).to eq(expected)
-    end
-
-    it "has a list of dependencies from cookbooks" do
-      expected = {
-        "nginx (1.2.3)" => [ ["apt", "~> 2.3"], ["yum", "~> 3.4"] ],
-        "apt (2.5.6)" => [],
-        "yum (3.4.1)" => [],
-        "postgresql (5.0.0)" => []
-      }
-      expect(solution_dependencies.cookbook_deps_for_lock).to eq(expected)
-    end
-
-  end
-
-  context "when populated with dependency data" do
-
-    let(:expected_deps_for_lock) do
-      {
-        "nginx (1.2.3)" => [ ["apt", "~> 2.3"], ["yum", "~> 3.4"] ],
-        "apt (2.5.6)" => [],
-        "yum (3.4.1)" => [],
-        "postgresql (5.0.0)" => []
-      }
-    end
-
-    let(:expected_policyfile_deps_for_lock) do
-      [ [ "nginx", "~> 1.0"], ["postgresql", ">= 0.0.0" ] ]
-    end
-
-    before do
-      solution_dependencies.add_policyfile_dep("nginx", "~> 1.0")
-      solution_dependencies.add_policyfile_dep("postgresql", ">= 0.0.0")
-      solution_dependencies.add_cookbook_dep("nginx", "1.2.3", [ ["apt", "~> 2.3"], ["yum", "~>3.4"] ])
-      solution_dependencies.add_cookbook_dep("apt", "2.5.6", [])
-      solution_dependencies.add_cookbook_dep("yum", "3.4.1", [])
-      solution_dependencies.add_cookbook_dep("postgresql", "5.0.0", [])
-    end
-
-    it "has a list of dependencies from the Policyfile" do
-      expect(solution_dependencies.policyfile_dependencies_for_lock).to eq(expected_policyfile_deps_for_lock)
-    end
-
-    it "has a list of dependencies from cookbooks" do
-      expect(solution_dependencies.cookbook_deps_for_lock).to eq(expected_deps_for_lock)
-    end
-
-    it "generates lock info containing both policyfile and cookbook dependencies" do
-      expected = {"Policyfile" => expected_policyfile_deps_for_lock, "dependencies" => expected_deps_for_lock}
-      expect(solution_dependencies.to_lock).to eq(expected)
-    end
-
-    describe "checking for dependency conflicts" do
-
-      it "does not raise if a cookbook that's in the dependency set with a different version doesn't conflict" do
-        solution_dependencies.update_cookbook_dep("yum", "3.5.0", [ ])
-        expect(solution_dependencies.test_conflict!('yum', '3.5.0')).to be(false)
-      end
-
-      it "raises if a cookbook is not in the current solution set" do
-        expected_message = "Cookbook foo (1.0.0) not in the working set, cannot test for conflicts"
-        expect { solution_dependencies.test_conflict!('foo', '1.0.0') }.to raise_error(ChefDK::CookbookNotInWorkingSet, expected_message)
-      end
-
-      it "raises when a cookbook conflicts with a Policyfile constraint" do
-        solution_dependencies.update_cookbook_dep("nginx", "2.0.0", [])
-
-        expected_message = "Cookbook nginx (2.0.0) conflicts with other dependencies:\nPolicyfile depends on nginx ~> 1.0"
-        expect { solution_dependencies.test_conflict!('nginx', '2.0.0') }.to raise_error(ChefDK::DependencyConflict, expected_message)
-      end
-
-      it "raises when a cookbook conflicts with another cookbook's dependency constraint" do
-        solution_dependencies.update_cookbook_dep("apt", "3.0.0", [])
-
-        expected_message = "Cookbook apt (3.0.0) conflicts with other dependencies:\nnginx (1.2.3) depends on apt ~> 2.3"
-        expect { solution_dependencies.test_conflict!('apt', '3.0.0') }.to raise_error(ChefDK::DependencyConflict, expected_message)
-      end
-
-      it "raises when a cookbook's dependencies are no longer satisfiable" do
-        solution_dependencies.update_cookbook_dep("nginx", "1.2.3", [ [ "apt", "~> 3.0" ] ])
-        expected_message = "Cookbook nginx (1.2.3) has dependency constraints that cannot be met by the existing cookbook set:\n" +
-          "Dependency on apt ~> 3.0 conflicts with existing version apt (2.5.6)"
-        expect { solution_dependencies.test_conflict!('nginx', '1.2.3') }.to raise_error(ChefDK::DependencyConflict, expected_message)
-      end
-
-    end
-  end
-
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef-dk/policyfile/solution_dependencies'
+
+describe ChefDK::Policyfile::SolutionDependencies do
+
+  let(:dependency_data) { {"Policyfile" => [], "dependencies" => {}} }
+
+  let(:solution_dependencies) do
+    s = described_class.new
+    s.consume_lock_data(dependency_data)
+    s
+  end
+
+  it "has a list of dependencies declared in the Policyfile" do
+    expect(solution_dependencies.policyfile_dependencies).to eq([])
+  end
+
+  it "has a map of dependencies declared by cookbooks" do
+    expect(solution_dependencies.cookbook_dependencies).to eq({})
+  end
+
+  context "when populated with dependency data from a lockfile" do
+
+    let(:dependency_data) do
+      {
+        "Policyfile" => [
+          [ "nginx", "~> 1.0"], ["postgresql", ">= 0.0.0" ]
+        ],
+        "dependencies" => {
+          "nginx (1.2.3)" => [ ["apt", "~> 2.3"], ["yum", "~>3.4"] ],
+          "apt (2.5.6)" => [],
+          "yum (3.4.1)" => [],
+          "postgresql (5.0.0)" => []
+        }
+      }
+    end
+
+    it "has a list of dependencies from the policyfile" do
+      expected = [ "nginx", "~> 1.0"], ["postgresql", ">= 0.0.0" ]
+      expect(solution_dependencies.policyfile_dependencies_for_lock).to eq(expected)
+    end
+
+    it "has a list of dependencies from cookbooks" do
+      expected = {
+        "nginx (1.2.3)" => [ ["apt", "~> 2.3"], ["yum", "~> 3.4"] ],
+        "apt (2.5.6)" => [],
+        "yum (3.4.1)" => [],
+        "postgresql (5.0.0)" => []
+      }
+      expect(solution_dependencies.cookbook_deps_for_lock).to eq(expected)
+    end
+
+  end
+
+  context "when populated with dependency data" do
+
+    let(:expected_deps_for_lock) do
+      {
+        "nginx (1.2.3)" => [ ["apt", "~> 2.3"], ["yum", "~> 3.4"] ],
+        "apt (2.5.6)" => [],
+        "yum (3.4.1)" => [],
+        "postgresql (5.0.0)" => []
+      }
+    end
+
+    let(:expected_policyfile_deps_for_lock) do
+      [ [ "nginx", "~> 1.0"], ["postgresql", ">= 0.0.0" ] ]
+    end
+
+    before do
+      solution_dependencies.add_policyfile_dep("nginx", "~> 1.0")
+      solution_dependencies.add_policyfile_dep("postgresql", ">= 0.0.0")
+      solution_dependencies.add_cookbook_dep("nginx", "1.2.3", [ ["apt", "~> 2.3"], ["yum", "~>3.4"] ])
+      solution_dependencies.add_cookbook_dep("apt", "2.5.6", [])
+      solution_dependencies.add_cookbook_dep("yum", "3.4.1", [])
+      solution_dependencies.add_cookbook_dep("postgresql", "5.0.0", [])
+    end
+
+    it "has a list of dependencies from the Policyfile" do
+      expect(solution_dependencies.policyfile_dependencies_for_lock).to eq(expected_policyfile_deps_for_lock)
+    end
+
+    it "has a list of dependencies from cookbooks" do
+      expect(solution_dependencies.cookbook_deps_for_lock).to eq(expected_deps_for_lock)
+    end
+
+    it "generates lock info containing both policyfile and cookbook dependencies" do
+      expected = {"Policyfile" => expected_policyfile_deps_for_lock, "dependencies" => expected_deps_for_lock}
+      expect(solution_dependencies.to_lock).to eq(expected)
+    end
+
+    describe "checking for dependency conflicts" do
+
+      it "does not raise if a cookbook that's in the dependency set with a different version doesn't conflict" do
+        solution_dependencies.update_cookbook_dep("yum", "3.5.0", [ ])
+        expect(solution_dependencies.test_conflict!('yum', '3.5.0')).to be(false)
+      end
+
+      it "raises if a cookbook is not in the current solution set" do
+        expected_message = "Cookbook foo (1.0.0) not in the working set, cannot test for conflicts"
+        expect { solution_dependencies.test_conflict!('foo', '1.0.0') }.to raise_error(ChefDK::CookbookNotInWorkingSet, expected_message)
+      end
+
+      it "raises when a cookbook conflicts with a Policyfile constraint" do
+        solution_dependencies.update_cookbook_dep("nginx", "2.0.0", [])
+
+        expected_message = "Cookbook nginx (2.0.0) conflicts with other dependencies:\nPolicyfile depends on nginx ~> 1.0"
+        expect { solution_dependencies.test_conflict!('nginx', '2.0.0') }.to raise_error(ChefDK::DependencyConflict, expected_message)
+      end
+
+      it "raises when a cookbook conflicts with another cookbook's dependency constraint" do
+        solution_dependencies.update_cookbook_dep("apt", "3.0.0", [])
+
+        expected_message = "Cookbook apt (3.0.0) conflicts with other dependencies:\nnginx (1.2.3) depends on apt ~> 2.3"
+        expect { solution_dependencies.test_conflict!('apt', '3.0.0') }.to raise_error(ChefDK::DependencyConflict, expected_message)
+      end
+
+      it "raises when a cookbook's dependencies are no longer satisfiable" do
+        solution_dependencies.update_cookbook_dep("nginx", "1.2.3", [ [ "apt", "~> 3.0" ] ])
+        expected_message = "Cookbook nginx (1.2.3) has dependency constraints that cannot be met by the existing cookbook set:\n" +
+          "Dependency on apt ~> 3.0 conflicts with existing version apt (2.5.6)"
+        expect { solution_dependencies.test_conflict!('nginx', '1.2.3') }.to raise_error(ChefDK::DependencyConflict, expected_message)
+      end
+
+    end
+  end
+
+end