chef-dk 2.4.17 → 2.5.3

data/spec/unit/pager_spec.rb

@@ -1,117 +1,117 @@
-#
-# Copyright:: Copyright (c) 2015 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/pager"
-
-describe ChefDK::Pager do
-
-  context "with default options" do
-
-    subject(:pager) { ChefDK::Pager.new }
-
-    it "gives ENV for env" do
-      expect(pager.env).to eq(ENV)
-    end
-
-    it "checks stdout for TTY" do
-      expect($stdout).to receive(:tty?).twice.and_call_original
-      expect(pager.have_tty?).to eq($stdout.tty?)
-    end
-
-    it "enables paging" do
-      expect(pager).to receive(:env).and_return({ "PAGER" => "less" })
-      expect(pager).to receive(:have_tty?).and_return(true)
-      expect(pager.pager_enabled?).to be(true)
-    end
-  end
-
-  context "with paging enabled" do
-
-    subject(:pager) do
-      ChefDK::Pager.new(enable_pager: true).tap do |p|
-        allow(p).to receive(:env).and_return({ "PAGER" => "less" })
-        allow(p).to receive(:have_tty?).and_return(true)
-      end
-    end
-
-    let(:pipe_read) { instance_double("IO") }
-    let(:pipe_write) { instance_double("IO") }
-
-    let(:pager_env) { { "LESS" => "-FRX", "LV" => "-c" } }
-
-    before do
-      allow(IO).to receive(:pipe).and_return([pipe_read, pipe_write])
-    end
-
-    it "provides a UI object with stdout set to a pipe" do
-      expect(pager.ui.out_stream).to eq(pipe_write)
-    end
-
-    it "starts the pager" do
-      expect(Kernel).to receive(:trap).with(:INT, "IGNORE")
-      expect(Process).to receive(:spawn).with(pager_env, "less", in: pipe_read).and_return(12345)
-      expect(pipe_read).to receive(:close)
-      pager.start
-    end
-
-    it "waits for the pager to exit" do
-      expect(Kernel).to receive(:trap).with(:INT, "IGNORE")
-      expect(Process).to receive(:spawn).with(pager_env, "less", in: pipe_read).and_return(12345)
-      expect(pipe_read).to receive(:close)
-      pager.start
-
-      expect(pipe_write).to receive(:close)
-      expect(Process).to receive(:waitpid).with(12345)
-      pager.wait
-    end
-  end
-
-  context "with paging disabled" do
-
-    subject(:pager) do
-      ChefDK::Pager.new(enable_pager: false).tap do |p|
-        allow(p).to receive(:env).and_return({ "PAGER" => "less" })
-        allow(p).to receive(:have_tty?).and_return(true)
-      end
-    end
-
-    before do
-      expect(IO).to_not receive(:pipe)
-    end
-
-    it "provides a UI with stdout set to stdout" do
-      expect(pager.ui.out_stream).to eq($stdout)
-    end
-
-    it "no-ops on pager start" do
-      expect(Kernel).to_not receive(:trap)
-      expect(Process).to_not receive(:spawn)
-      pager.start
-    end
-
-    it "no-ops on pager wait" do
-      expect(Kernel).to_not receive(:trap)
-      expect(Process).to_not receive(:spawn)
-      pager.start
-
-      expect(Process).to_not receive(:waitpid)
-      pager.wait
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2015 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/pager"
+
+describe ChefDK::Pager do
+
+  context "with default options" do
+
+    subject(:pager) { ChefDK::Pager.new }
+
+    it "gives ENV for env" do
+      expect(pager.env).to eq(ENV)
+    end
+
+    it "checks stdout for TTY" do
+      expect($stdout).to receive(:tty?).twice.and_call_original
+      expect(pager.have_tty?).to eq($stdout.tty?)
+    end
+
+    it "enables paging" do
+      expect(pager).to receive(:env).and_return({ "PAGER" => "less" })
+      expect(pager).to receive(:have_tty?).and_return(true)
+      expect(pager.pager_enabled?).to be(true)
+    end
+  end
+
+  context "with paging enabled" do
+
+    subject(:pager) do
+      ChefDK::Pager.new(enable_pager: true).tap do |p|
+        allow(p).to receive(:env).and_return({ "PAGER" => "less" })
+        allow(p).to receive(:have_tty?).and_return(true)
+      end
+    end
+
+    let(:pipe_read) { instance_double("IO") }
+    let(:pipe_write) { instance_double("IO") }
+
+    let(:pager_env) { { "LESS" => "-FRX", "LV" => "-c" } }
+
+    before do
+      allow(IO).to receive(:pipe).and_return([pipe_read, pipe_write])
+    end
+
+    it "provides a UI object with stdout set to a pipe" do
+      expect(pager.ui.out_stream).to eq(pipe_write)
+    end
+
+    it "starts the pager" do
+      expect(Kernel).to receive(:trap).with(:INT, "IGNORE")
+      expect(Process).to receive(:spawn).with(pager_env, "less", in: pipe_read).and_return(12345)
+      expect(pipe_read).to receive(:close)
+      pager.start
+    end
+
+    it "waits for the pager to exit" do
+      expect(Kernel).to receive(:trap).with(:INT, "IGNORE")
+      expect(Process).to receive(:spawn).with(pager_env, "less", in: pipe_read).and_return(12345)
+      expect(pipe_read).to receive(:close)
+      pager.start
+
+      expect(pipe_write).to receive(:close)
+      expect(Process).to receive(:waitpid).with(12345)
+      pager.wait
+    end
+  end
+
+  context "with paging disabled" do
+
+    subject(:pager) do
+      ChefDK::Pager.new(enable_pager: false).tap do |p|
+        allow(p).to receive(:env).and_return({ "PAGER" => "less" })
+        allow(p).to receive(:have_tty?).and_return(true)
+      end
+    end
+
+    before do
+      expect(IO).to_not receive(:pipe)
+    end
+
+    it "provides a UI with stdout set to stdout" do
+      expect(pager.ui.out_stream).to eq($stdout)
+    end
+
+    it "no-ops on pager start" do
+      expect(Kernel).to_not receive(:trap)
+      expect(Process).to_not receive(:spawn)
+      pager.start
+    end
+
+    it "no-ops on pager wait" do
+      expect(Kernel).to_not receive(:trap)
+      expect(Process).to_not receive(:spawn)
+      pager.start
+
+      expect(Process).to_not receive(:waitpid)
+      pager.wait
+    end
+
+  end
+end

data/spec/unit/policyfile/artifactory_cookbook_source_spec.rb

@@ -1,59 +1,59 @@
-#
-# 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/source_uri"
-require "chef-dk/policyfile/artifactory_cookbook_source"
-
-describe ChefDK::Policyfile::ArtifactoryCookbookSource do
-  subject { described_class.new(cookbook_source) }
-
-  let(:cookbook_source) { "https://supermarket.chef.io/api/v1" }
-
-  let(:http_connection) { double("Chef::HTTP::Simple") }
-
-  let(:universe_response_encoded) { IO.read(File.join(fixtures_path, "cookbooks_api/small_universe.json")) }
-
-  let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_small_universe.json"))) }
-
-  describe "fetching the Universe graph" do
-
-    before do
-      expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
-      allow(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
-    end
-
-    it "fetches the universe graph" do
-      expect(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
-      actual_universe = subject.universe_graph
-      expect(actual_universe).to have_key("apt")
-      expect(actual_universe["apt"]).to eq(pruned_universe["apt"])
-      expect(subject.universe_graph).to eq(pruned_universe)
-    end
-
-    it "generates location options for a cookbook from the given graph" do
-      cookbook_url = "https://supermarket.chef.io/api/v1/cookbooks/apache2/versions/1.10.4/download"
-      expect(subject).to receive(:http_connection_for).with(cookbook_url).and_return(http_connection)
-      expected_opts = {
-        artifactory: cookbook_url,
-        http_client: http_connection,
-        version: "1.10.4",
-      }
-      expect(subject.source_options_for("apache2", "1.10.4")).to eq(expected_opts)
-    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/source_uri"
+require "chef-dk/policyfile/artifactory_cookbook_source"
+
+describe ChefDK::Policyfile::ArtifactoryCookbookSource do
+  subject { described_class.new(cookbook_source) }
+
+  let(:cookbook_source) { "https://supermarket.chef.io/api/v1" }
+
+  let(:http_connection) { double("Chef::HTTP::Simple") }
+
+  let(:universe_response_encoded) { IO.read(File.join(fixtures_path, "cookbooks_api/small_universe.json")) }
+
+  let(:pruned_universe) { JSON.parse(IO.read(File.join(fixtures_path, "cookbooks_api/pruned_small_universe.json"))) }
+
+  describe "fetching the Universe graph" do
+
+    before do
+      expect(subject).to receive(:http_connection_for).with(cookbook_source).and_return(http_connection)
+      allow(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
+    end
+
+    it "fetches the universe graph" do
+      expect(http_connection).to receive(:get).with("/universe").and_return(universe_response_encoded)
+      actual_universe = subject.universe_graph
+      expect(actual_universe).to have_key("apt")
+      expect(actual_universe["apt"]).to eq(pruned_universe["apt"])
+      expect(subject.universe_graph).to eq(pruned_universe)
+    end
+
+    it "generates location options for a cookbook from the given graph" do
+      cookbook_url = "https://supermarket.chef.io/api/v1/cookbooks/apache2/versions/1.10.4/download"
+      expect(subject).to receive(:http_connection_for).with(cookbook_url).and_return(http_connection)
+      expected_opts = {
+        artifactory: cookbook_url,
+        http_client: http_connection,
+        version: "1.10.4",
+      }
+      expect(subject.source_options_for("apache2", "1.10.4")).to eq(expected_opts)
+    end
+  end
+end

data/spec/unit/policyfile/attribute_merge_checker_spec.rb

@@ -1,80 +1,80 @@
-#
-# Copyright:: Copyright (c) 2017 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/attribute_merge_checker"
-
-describe ChefDK::Policyfile::AttributeMergeChecker do
-  let(:checker) { ChefDK::Policyfile::AttributeMergeChecker.new }
-
-  describe "when the same attribute is provided multiple times with the same value" do
-    describe "at the top level" do
-      before do
-        checker.with_attributes("foo", { "a" => "b" })
-        checker.with_attributes("bar", { "a" => "b", "c" => "d" })
-      end
-
-      it "does not raise an error" do
-        expect { checker.check! }.not_to raise_error
-      end
-    end
-
-    describe "deeply nested" do
-      before do
-        checker.with_attributes("foo", { "a" => { "b" => "c" } })
-        checker.with_attributes("bar", { "a" => { "b" => "c" } })
-      end
-
-      it "does not raise an error" do
-        expect { checker.check! }.not_to raise_error
-      end
-    end
-  end
-
-  describe "when conflicts are present" do
-    describe "at the top level" do
-      before do
-        checker.with_attributes("foo", { "a" => "b" })
-        checker.with_attributes("bar", { "a" => "c", "c" => "d" })
-      end
-
-      it "raises an error" do
-        expect { checker.check! }.to raise_error(
-          ChefDK::Policyfile::AttributeMergeChecker::ConflictError) do |e|
-            expect(e.attribute_path).to eq("[a]")
-            expect(e.provided_by).to include("foo", "bar")
-          end
-      end
-    end
-
-    describe "deeply nested" do
-      before do
-        checker.with_attributes("foo", { "a" => { "b" => "c" } })
-        checker.with_attributes("bar", { "a" => { "b" => "d" } })
-      end
-
-      it "raises an error" do
-        expect { checker.check! }.to raise_error(
-          ChefDK::Policyfile::AttributeMergeChecker::ConflictError) do |e|
-            expect(e.attribute_path).to eq("[a][b]")
-            expect(e.provided_by).to include("foo", "bar")
-          end
-      end
-    end
-  end
-
-end
+#
+# Copyright:: Copyright (c) 2017 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/attribute_merge_checker"
+
+describe ChefDK::Policyfile::AttributeMergeChecker do
+  let(:checker) { ChefDK::Policyfile::AttributeMergeChecker.new }
+
+  describe "when the same attribute is provided multiple times with the same value" do
+    describe "at the top level" do
+      before do
+        checker.with_attributes("foo", { "a" => "b" })
+        checker.with_attributes("bar", { "a" => "b", "c" => "d" })
+      end
+
+      it "does not raise an error" do
+        expect { checker.check! }.not_to raise_error
+      end
+    end
+
+    describe "deeply nested" do
+      before do
+        checker.with_attributes("foo", { "a" => { "b" => "c" } })
+        checker.with_attributes("bar", { "a" => { "b" => "c" } })
+      end
+
+      it "does not raise an error" do
+        expect { checker.check! }.not_to raise_error
+      end
+    end
+  end
+
+  describe "when conflicts are present" do
+    describe "at the top level" do
+      before do
+        checker.with_attributes("foo", { "a" => "b" })
+        checker.with_attributes("bar", { "a" => "c", "c" => "d" })
+      end
+
+      it "raises an error" do
+        expect { checker.check! }.to raise_error(
+          ChefDK::Policyfile::AttributeMergeChecker::ConflictError) do |e|
+            expect(e.attribute_path).to eq("[a]")
+            expect(e.provided_by).to include("foo", "bar")
+          end
+      end
+    end
+
+    describe "deeply nested" do
+      before do
+        checker.with_attributes("foo", { "a" => { "b" => "c" } })
+        checker.with_attributes("bar", { "a" => { "b" => "d" } })
+      end
+
+      it "raises an error" do
+        expect { checker.check! }.to raise_error(
+          ChefDK::Policyfile::AttributeMergeChecker::ConflictError) do |e|
+            expect(e.attribute_path).to eq("[a][b]")
+            expect(e.provided_by).to include("foo", "bar")
+          end
+      end
+    end
+  end
+
+end