chef-dk 0.11.2 → 0.12.0

data/spec/unit/helpers_spec.rb

@@ -1,92 +1,92 @@
-#
-# 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/helpers'
-
-describe ChefDK::Helpers do
-
-  let (:helpers) do
-    ChefDK::Helpers.send(:reset!)
-    ChefDK::Helpers
-  end
-
-  let(:env) { {} }
-
-  describe "chefdk_home" do
-    before do
-      allow(ENV).to receive(:[]) do |k|
-        env[k]
-      end
-      allow(Chef::Platform).to receive(:windows?).and_return(false)
-    end
-
-    context 'when CHEFDK_HOME is set' do
-      let(:env) { {'CHEFDK_HOME' => 'foo' } }
-      it "returns CHEFDK_HOME" do
-        expect(helpers.chefdk_home).to eq(env['CHEFDK_HOME'])
-      end
-    end
-
-    context 'when CHEFDK_HOME is not set' do
-      context 'on windows' do
-        before do
-          allow(Chef::Platform).to receive(:windows?).and_return(true)
-        end
-
-        let(:env) { { 'LOCALAPPDATA' => 'C:\\foo' } }
-
-        it 'uses LOCALAPPDATA' do
-          expect(File).to receive(:join).with(env['LOCALAPPDATA'], 'chefdk').and_return('chefdkdefaulthome')
-          expect(helpers.chefdk_home).to eq('chefdkdefaulthome')
-        end
-      end
-
-      context 'on *nix' do
-        it 'uses LOCALAPPDATA' do
-          expect(File).to receive(:expand_path).with('~/.chefdk').and_return('chefdkdefaulthome')
-          expect(helpers.chefdk_home).to eq('chefdkdefaulthome')
-        end
-      end
-    end
-
-    context 'using usr_bin_prefix' do
-      before do
-        stub_const('RUBY_PLATFORM', ruby_platform_string)
-      end
-
-      context 'on Mac' do
-        let(:ruby_platform_string) { 'x86_64-darwin12.0' }
-
-        it 'uses /usr/local/bin' do
-          expect(helpers.usr_bin_prefix).to eq('/usr/local/bin')
-          expect(helpers.usr_bin_path('berks')).to eq('/usr/local/bin/berks')
-        end
-      end
-
-      context 'on other systems' do
-        let(:ruby_platform_string) { 'x86_64-linux' }
-
-        it 'uses /usr/bin' do
-          expect(helpers.usr_bin_prefix).to eq('/usr/bin')
-          expect(helpers.usr_bin_path('berks')).to eq('/usr/bin/berks')
-        end
-      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/helpers'
+
+describe ChefDK::Helpers do
+
+  let (:helpers) do
+    ChefDK::Helpers.send(:reset!)
+    ChefDK::Helpers
+  end
+
+  let(:env) { {} }
+
+  describe "chefdk_home" do
+    before do
+      allow(ENV).to receive(:[]) do |k|
+        env[k]
+      end
+      allow(Chef::Platform).to receive(:windows?).and_return(false)
+    end
+
+    context 'when CHEFDK_HOME is set' do
+      let(:env) { {'CHEFDK_HOME' => 'foo' } }
+      it "returns CHEFDK_HOME" do
+        expect(helpers.chefdk_home).to eq(env['CHEFDK_HOME'])
+      end
+    end
+
+    context 'when CHEFDK_HOME is not set' do
+      context 'on windows' do
+        before do
+          allow(Chef::Platform).to receive(:windows?).and_return(true)
+        end
+
+        let(:env) { { 'LOCALAPPDATA' => 'C:\\foo' } }
+
+        it 'uses LOCALAPPDATA' do
+          expect(File).to receive(:join).with(env['LOCALAPPDATA'], 'chefdk').and_return('chefdkdefaulthome')
+          expect(helpers.chefdk_home).to eq('chefdkdefaulthome')
+        end
+      end
+
+      context 'on *nix' do
+        it 'uses LOCALAPPDATA' do
+          expect(File).to receive(:expand_path).with('~/.chefdk').and_return('chefdkdefaulthome')
+          expect(helpers.chefdk_home).to eq('chefdkdefaulthome')
+        end
+      end
+    end
+
+    context 'using usr_bin_prefix' do
+      before do
+        stub_const('RUBY_PLATFORM', ruby_platform_string)
+      end
+
+      context 'on Mac' do
+        let(:ruby_platform_string) { 'x86_64-darwin12.0' }
+
+        it 'uses /usr/local/bin' do
+          expect(helpers.usr_bin_prefix).to eq('/usr/local/bin')
+          expect(helpers.usr_bin_path('berks')).to eq('/usr/local/bin/berks')
+        end
+      end
+
+      context 'on other systems' do
+        let(:ruby_platform_string) { 'x86_64-linux' }
+
+        it 'uses /usr/bin' do
+          expect(helpers.usr_bin_prefix).to eq('/usr/bin')
+          expect(helpers.usr_bin_path('berks')).to eq('/usr/bin/berks')
+        end
+      end
+    end
+
+  end
+end

data/spec/unit/pager_spec.rb

@@ -1,119 +1,119 @@
-#
-# 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/chef_repo_cookbook_source_spec.rb

@@ -1,93 +1,93 @@
-#
-# 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/chef_repo_cookbook_source'
-
-describe ChefDK::Policyfile::ChefRepoCookbookSource do
-
-  let(:repo_path) {
-    File.expand_path("spec/unit/fixtures/local_path_cookbooks", project_root)
-  }
-
-  let(:cookbook_source) { ChefDK::Policyfile::ChefRepoCookbookSource.new(repo_path) }
-
-  let(:local_repo_universe) {
-    {
-      "another-local-cookbook"=>{
-        "0.1.0"=>[],
-      },
-      "local-cookbook"=>{
-        "2.3.4"=>[],
-      },
-      "cookbook-with-a-dep"=>{
-        "9.9.9"=>[["another-local-cookbook", "~> 0.1"]],
-      },
-      "noignore"=>{
-        "0.1.0"=>[],
-      },
-    }
-  }
-
-  it "gives the set of arguments to `default_source` used to create it" do
-    expect(cookbook_source.default_source_args).to eq([:chef_repo, repo_path])
-  end
-
-  it "fetches the universe graph" do
-    actual_universe = cookbook_source.universe_graph
-    expect(actual_universe).to eql(local_repo_universe)
-  end
-
-  it "generates location options for a cookbook from the given graph" do
-    expected_opts = { path: File.join(repo_path, "local-cookbook"), version: "2.3.4" }
-    expect(cookbook_source.source_options_for("local-cookbook", "2.3.4")).to eq(expected_opts)
-  end
-
-  it "will append a cookbooks directory to the path if it finds it" do
-    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
-    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
-  end
-
-  it "the private setter will append a cookbooks directory to the path if finds it" do
-    expect(cookbook_source.path).to eql(repo_path)
-    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
-    cookbook_source.send(:path=, repo_path)
-    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
-  end
-
-  context "when created with a block to set source preferences" do
-
-    subject(:cookbook_source) do
-      described_class.new(repo_path) do |s|
-        s.preferred_for "foo", "bar", "baz"
-      end
-    end
-
-    it "sets the source preferences as given" do
-      expect(cookbook_source.preferred_cookbooks).to eq( %w[ foo bar baz ] )
-    end
-
-    it "is the preferred source for the requested cookbooks" do
-      expect(cookbook_source.preferred_source_for?("foo")).to be(true)
-      expect(cookbook_source.preferred_source_for?("bar")).to be(true)
-      expect(cookbook_source.preferred_source_for?("baz")).to be(true)
-      expect(cookbook_source.preferred_source_for?("razzledazzle")).to be(false)
-    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/chef_repo_cookbook_source'
+
+describe ChefDK::Policyfile::ChefRepoCookbookSource do
+
+  let(:repo_path) {
+    File.expand_path("spec/unit/fixtures/local_path_cookbooks", project_root)
+  }
+
+  let(:cookbook_source) { ChefDK::Policyfile::ChefRepoCookbookSource.new(repo_path) }
+
+  let(:local_repo_universe) {
+    {
+      "another-local-cookbook"=>{
+        "0.1.0"=>[],
+      },
+      "local-cookbook"=>{
+        "2.3.4"=>[],
+      },
+      "cookbook-with-a-dep"=>{
+        "9.9.9"=>[["another-local-cookbook", "~> 0.1"]],
+      },
+      "noignore"=>{
+        "0.1.0"=>[],
+      },
+    }
+  }
+
+  it "gives the set of arguments to `default_source` used to create it" do
+    expect(cookbook_source.default_source_args).to eq([:chef_repo, repo_path])
+  end
+
+  it "fetches the universe graph" do
+    actual_universe = cookbook_source.universe_graph
+    expect(actual_universe).to eql(local_repo_universe)
+  end
+
+  it "generates location options for a cookbook from the given graph" do
+    expected_opts = { path: File.join(repo_path, "local-cookbook"), version: "2.3.4" }
+    expect(cookbook_source.source_options_for("local-cookbook", "2.3.4")).to eq(expected_opts)
+  end
+
+  it "will append a cookbooks directory to the path if it finds it" do
+    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
+    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
+  end
+
+  it "the private setter will append a cookbooks directory to the path if finds it" do
+    expect(cookbook_source.path).to eql(repo_path)
+    expect(Dir).to receive(:exist?).with("#{repo_path}/cookbooks").and_return(true)
+    cookbook_source.send(:path=, repo_path)
+    expect(cookbook_source.path).to eql("#{repo_path}/cookbooks")
+  end
+
+  context "when created with a block to set source preferences" do
+
+    subject(:cookbook_source) do
+      described_class.new(repo_path) do |s|
+        s.preferred_for "foo", "bar", "baz"
+      end
+    end
+
+    it "sets the source preferences as given" do
+      expect(cookbook_source.preferred_cookbooks).to eq( %w[ foo bar baz ] )
+    end
+
+    it "is the preferred source for the requested cookbooks" do
+      expect(cookbook_source.preferred_source_for?("foo")).to be(true)
+      expect(cookbook_source.preferred_source_for?("bar")).to be(true)
+      expect(cookbook_source.preferred_source_for?("baz")).to be(true)
+      expect(cookbook_source.preferred_source_for?("razzledazzle")).to be(false)
+    end
+
+  end
+
+end