chef-dk 0.14.25 → 0.15.9

data/spec/unit/command/verify_spec.rb

@@ -56,6 +56,7 @@ describe ChefDK::Command::Verify do
       "knife-supermarket",
       "opscode-pushy-client",
       "git",
+      "delivery-cli",
     ]
   end
 
@@ -65,9 +66,6 @@ describe ChefDK::Command::Verify do
 
   it "defines berks, tk, chef and chef-dk components by default" do
     expected_components = default_components
-    unless Chef::Platform.windows?
-      expected_components << "delivery-cli"
-    end
     expect(command_instance.components).not_to be_empty
     expect(command_instance.components.map(&:name)).to match_array(expected_components)
   end

data/spec/unit/commands_map_spec.rb

@@ -1,57 +1,57 @@
-#
-# 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/commands_map'
-require 'stringio'
-
-describe ChefDK::CommandsMap do
-
-  subject(:mapping) { ChefDK::CommandsMap.new }
-
-  before do
-    mapping.builtin("example", :Example)
-    mapping.builtin("hypenated-example", :HyphenatedExample)
-    mapping.builtin("explicit-path-example", :ExplicitPathExample, require_path: "unit/fixtures/command/explicit_path_example")
-    mapping.builtin("documented-example", :DocumentedExample, desc: "I have documentation")
-  end
-
-  it "defines a subcommand mapping" do
-    expect(mapping.have_command?("example")).to be true
-  end
-
-  it "infers a non-hypenated command's require path" do
-    expect(mapping.spec_for("example").require_path).to eq("chef-dk/command/example")
-  end
-
-  it "infers a hyphenated command's require path" do
-    expect(mapping.spec_for("hypenated-example").require_path).to eq("chef-dk/command/hypenated_example")
-  end
-
-  it "lists the available commands" do
-    expect(mapping.command_names).to match_array(%w[example hypenated-example explicit-path-example documented-example])
-  end
-
-  it "keeps the docstring of a command" do
-    expect(mapping.spec_for("documented-example").description).to eq("I have documentation")
-  end
-
-  it "creates an instance of a command" do
-    expect(mapping.instantiate("explicit-path-example")).to be_an_instance_of(ChefDK::Command::ExplicitPathExample)
-  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/commands_map'
+require 'stringio'
+
+describe ChefDK::CommandsMap do
+
+  subject(:mapping) { ChefDK::CommandsMap.new }
+
+  before do
+    mapping.builtin("example", :Example)
+    mapping.builtin("hypenated-example", :HyphenatedExample)
+    mapping.builtin("explicit-path-example", :ExplicitPathExample, require_path: "unit/fixtures/command/explicit_path_example")
+    mapping.builtin("documented-example", :DocumentedExample, desc: "I have documentation")
+  end
+
+  it "defines a subcommand mapping" do
+    expect(mapping.have_command?("example")).to be true
+  end
+
+  it "infers a non-hypenated command's require path" do
+    expect(mapping.spec_for("example").require_path).to eq("chef-dk/command/example")
+  end
+
+  it "infers a hyphenated command's require path" do
+    expect(mapping.spec_for("hypenated-example").require_path).to eq("chef-dk/command/hypenated_example")
+  end
+
+  it "lists the available commands" do
+    expect(mapping.command_names).to match_array(%w[example hypenated-example explicit-path-example documented-example])
+  end
+
+  it "keeps the docstring of a command" do
+    expect(mapping.spec_for("documented-example").description).to eq("I have documentation")
+  end
+
+  it "creates an instance of a command" do
+    expect(mapping.instantiate("explicit-path-example")).to be_an_instance_of(ChefDK::Command::ExplicitPathExample)
+  end
+
+end

data/spec/unit/configurable_spec.rb

@@ -1,41 +1,41 @@
-#
-# 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/configurable'
-require 'unit/fixtures/configurable/test_configurable'
-
-describe ChefDK::Configurable do
-
-  let(:includer) { TestConfigurable.new }
-
-  it 'provides chef_config' do
-    expect(includer.chef_config).to eq Chef::Config
-  end
-
-  it 'provides chefdk_config' do
-    expect(includer.chefdk_config).to eq Chef::Config.chefdk
-  end
-
-  it 'provides knife_config' do
-    expect(includer.knife_config).to eq Chef::Config.knife
-  end
-
-  it 'provides generator_config' do
-    expect(includer.generator_config).to eq Chef::Config.chefdk.generator
-  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/configurable'
+require 'unit/fixtures/configurable/test_configurable'
+
+describe ChefDK::Configurable do
+
+  let(:includer) { TestConfigurable.new }
+
+  it 'provides chef_config' do
+    expect(includer.chef_config).to eq Chef::Config
+  end
+
+  it 'provides chefdk_config' do
+    expect(includer.chefdk_config).to eq Chef::Config.chefdk
+  end
+
+  it 'provides knife_config' do
+    expect(includer.knife_config).to eq Chef::Config.knife
+  end
+
+  it 'provides generator_config' do
+    expect(includer.generator_config).to eq Chef::Config.chefdk.generator
+  end
+end

data/spec/unit/cookbook_metadata_spec.rb

@@ -1,98 +1,98 @@
-#
-# 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/cookbook_metadata'
-
-describe ChefDK::CookbookMetadata do
-
-  describe "providing the API required by CookbookOmnifetch" do
-
-    let(:metadata) { ChefDK::CookbookMetadata.new }
-
-    it "provides a `from_path` class method" do
-      expect(described_class).to respond_to(:from_path)
-    end
-
-    it "responds to #cookbook_name" do
-      expect(metadata).to respond_to(:cookbook_name)
-    end
-
-    it "responds to #version" do
-      expect(metadata).to respond_to(:version)
-    end
-
-  end
-
-  describe "when a cookbook is loaded" do
-
-
-    let(:cookbook) { described_class.from_path(cookbook_root) }
-
-    context "and the cookbook has only a metadata.rb" do
-
-      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook') }
-
-      it "has a name" do
-        expect(cookbook.name).to eq("example_cookbook")
-        expect(cookbook.cookbook_name).to eq("example_cookbook")
-      end
-
-      it "has a version" do
-        expect(cookbook.version).to eq("0.1.0")
-      end
-
-      it "has a map of dependencies" do
-        expect(cookbook.dependencies).to eq({})
-      end
-
-    end
-
-    context "and the cookbook has only a metadata.json" do
-
-      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook_metadata_json_only') }
-
-      it "has a name" do
-        expect(cookbook.name).to eq("example_cookbook")
-        expect(cookbook.cookbook_name).to eq("example_cookbook")
-      end
-
-      it "has a version" do
-        expect(cookbook.version).to eq("0.1.0")
-      end
-
-      it "has a map of dependencies" do
-        expect(cookbook.dependencies).to eq({})
-      end
-
-    end
-
-    context "and the cookbook has no metadata" do
-
-      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook_no_metadata') }
-
-      it "raises a MalformedCookbook error" do
-        msg = "Cookbook at #{cookbook_root} has neither metadata.json or metadata.rb"
-
-        expect { cookbook }.to raise_error(ChefDK::MalformedCookbook, msg)
-      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/cookbook_metadata'
+
+describe ChefDK::CookbookMetadata do
+
+  describe "providing the API required by CookbookOmnifetch" do
+
+    let(:metadata) { ChefDK::CookbookMetadata.new }
+
+    it "provides a `from_path` class method" do
+      expect(described_class).to respond_to(:from_path)
+    end
+
+    it "responds to #cookbook_name" do
+      expect(metadata).to respond_to(:cookbook_name)
+    end
+
+    it "responds to #version" do
+      expect(metadata).to respond_to(:version)
+    end
+
+  end
+
+  describe "when a cookbook is loaded" do
+
+
+    let(:cookbook) { described_class.from_path(cookbook_root) }
+
+    context "and the cookbook has only a metadata.rb" do
+
+      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook') }
+
+      it "has a name" do
+        expect(cookbook.name).to eq("example_cookbook")
+        expect(cookbook.cookbook_name).to eq("example_cookbook")
+      end
+
+      it "has a version" do
+        expect(cookbook.version).to eq("0.1.0")
+      end
+
+      it "has a map of dependencies" do
+        expect(cookbook.dependencies).to eq({})
+      end
+
+    end
+
+    context "and the cookbook has only a metadata.json" do
+
+      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook_metadata_json_only') }
+
+      it "has a name" do
+        expect(cookbook.name).to eq("example_cookbook")
+        expect(cookbook.cookbook_name).to eq("example_cookbook")
+      end
+
+      it "has a version" do
+        expect(cookbook.version).to eq("0.1.0")
+      end
+
+      it "has a map of dependencies" do
+        expect(cookbook.dependencies).to eq({})
+      end
+
+    end
+
+    context "and the cookbook has no metadata" do
+
+      let(:cookbook_root) { File.join(fixtures_path, 'example_cookbook_no_metadata') }
+
+      it "raises a MalformedCookbook error" do
+        msg = "Cookbook at #{cookbook_root} has neither metadata.json or metadata.rb"
+
+        expect { cookbook }.to raise_error(ChefDK::MalformedCookbook, msg)
+      end
+
+    end
+
+  end
+end
+

data/spec/unit/cookbook_profiler/git_spec.rb

@@ -1,176 +1,176 @@
-#
-# 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 'shared/setup_git_cookbooks'
-require 'fileutils'
-require 'chef-dk/helpers'
-require 'chef-dk/cookbook_profiler/git'
-
-describe ChefDK::CookbookProfiler::Git do
-
-  include ChefDK::Helpers
-
-  let(:git_profiler) do
-    ChefDK::CookbookProfiler::Git.new(cookbook_path)
-  end
-
-  context "with cookbooks in a valid git repo" do
-
-    include_context "setup git cookbooks"
-
-    def edit_repo
-      with_file(File.join(cookbook_path, "README.md"), "ab+") { |f| f.puts "some unpublished changes" }
-    end
-
-    context "given a clean repo with no remotes" do
-
-      it "reports that the repo has no remotes" do
-        expect(git_profiler.remote).to be_nil
-      end
-
-      it "determines the rev of the repo" do
-        expect(git_profiler.revision).to eq(current_rev)
-      end
-
-      it "reports that the repo is clean" do
-        expect(git_profiler.clean?).to be true
-      end
-
-      it "reports that the commits are unpublished" do
-        expect(git_profiler.unpublished_commits?).to be true
-      end
-
-      it "reports that no remotes have the commits" do
-        expect(git_profiler.synchronized_remotes).to eq([])
-      end
-
-    end
-
-    context "when the remote is a local branch" do
-
-      before do
-        allow(git_profiler).to receive(:remote_name).and_return(".")
-      end
-
-      it "reports that the repo doesn't have a remote" do
-        expect(git_profiler.have_remote?).to be(false)
-      end
-
-    end
-
-    context "with a remote configured" do
-
-      include_context "setup git cookbook remote"
-
-      context "given a clean repo with all commits published to the remote" do
-
-        it "determines the remote for the repo" do
-          expect(git_profiler.remote).to eq(remote_url)
-        end
-
-        it "determines the rev of the repo" do
-          expect(git_profiler.revision).to eq(current_rev)
-        end
-
-        it "reports that the repo is clean" do
-          expect(git_profiler.clean?).to be true
-        end
-
-        it "reports that all commits are published to the upstream" do
-          expect(git_profiler.unpublished_commits?).to be false
-        end
-
-        it "lists the remotes that commits are published to" do
-          expect(git_profiler.synchronized_remotes).to eq(%w[origin/master])
-        end
-
-      end
-
-      context "given a clean repo with unpublished changes" do
-
-        before do
-          edit_repo
-          system_command('git config --local user.name "Alice"', cwd: cookbook_path).error!
-          system_command('git config --local user.email "alice@example.com"', cwd: cookbook_path).error!
-          system_command('git commit -a -m "update readme" --author "Alice <alice@example.com>"', cwd: cookbook_path).error!
-        end
-
-        it "reports that the repo is clean" do
-          expect(git_profiler.clean?).to be true
-        end
-
-        it "reports that there are unpublished changes" do
-          expect(git_profiler.unpublished_commits?).to be true
-        end
-
-        it "reports that no remotes have the commits" do
-          expect(git_profiler.synchronized_remotes).to eq([])
-        end
-
-      end
-    end
-
-    context "given a dirty repo" do
-
-      before do
-        edit_repo
-      end
-
-      it "reports that the repo is dirty" do
-        expect(git_profiler.clean?).to be false
-      end
-
-    end
-
-  end
-
-  context "given a repo on an unborn master branch" do
-
-    let(:cookbook_path) { File.join(tempdir, "unborn") }
-
-    let(:profile_data) { git_profiler.profile_data }
-
-    before do
-      reset_tempdir
-      FileUtils.mkdir_p(cookbook_path)
-      system_command("git init .", cwd: cookbook_path).error!
-    end
-
-    it "does not error when profiling the cookbook" do
-      expect { git_profiler.profile_data }.to_not raise_error
-    end
-
-    it "has a nil revision" do
-      expect(profile_data["revision"]).to be_nil
-    end
-
-    it "has no remote" do
-      expect(profile_data["remote"]).to be_nil
-    end
-
-    it "has no synchronized remote branches" do
-      expect(profile_data["synchronized_remote_branches"]).to eq([])
-    end
-
-    it "is not published" do
-      expect(profile_data["published"]).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 'shared/setup_git_cookbooks'
+require 'fileutils'
+require 'chef-dk/helpers'
+require 'chef-dk/cookbook_profiler/git'
+
+describe ChefDK::CookbookProfiler::Git do
+
+  include ChefDK::Helpers
+
+  let(:git_profiler) do
+    ChefDK::CookbookProfiler::Git.new(cookbook_path)
+  end
+
+  context "with cookbooks in a valid git repo" do
+
+    include_context "setup git cookbooks"
+
+    def edit_repo
+      with_file(File.join(cookbook_path, "README.md"), "ab+") { |f| f.puts "some unpublished changes" }
+    end
+
+    context "given a clean repo with no remotes" do
+
+      it "reports that the repo has no remotes" do
+        expect(git_profiler.remote).to be_nil
+      end
+
+      it "determines the rev of the repo" do
+        expect(git_profiler.revision).to eq(current_rev)
+      end
+
+      it "reports that the repo is clean" do
+        expect(git_profiler.clean?).to be true
+      end
+
+      it "reports that the commits are unpublished" do
+        expect(git_profiler.unpublished_commits?).to be true
+      end
+
+      it "reports that no remotes have the commits" do
+        expect(git_profiler.synchronized_remotes).to eq([])
+      end
+
+    end
+
+    context "when the remote is a local branch" do
+
+      before do
+        allow(git_profiler).to receive(:remote_name).and_return(".")
+      end
+
+      it "reports that the repo doesn't have a remote" do
+        expect(git_profiler.have_remote?).to be(false)
+      end
+
+    end
+
+    context "with a remote configured" do
+
+      include_context "setup git cookbook remote"
+
+      context "given a clean repo with all commits published to the remote" do
+
+        it "determines the remote for the repo" do
+          expect(git_profiler.remote).to eq(remote_url)
+        end
+
+        it "determines the rev of the repo" do
+          expect(git_profiler.revision).to eq(current_rev)
+        end
+
+        it "reports that the repo is clean" do
+          expect(git_profiler.clean?).to be true
+        end
+
+        it "reports that all commits are published to the upstream" do
+          expect(git_profiler.unpublished_commits?).to be false
+        end
+
+        it "lists the remotes that commits are published to" do
+          expect(git_profiler.synchronized_remotes).to eq(%w[origin/master])
+        end
+
+      end
+
+      context "given a clean repo with unpublished changes" do
+
+        before do
+          edit_repo
+          system_command('git config --local user.name "Alice"', cwd: cookbook_path).error!
+          system_command('git config --local user.email "alice@example.com"', cwd: cookbook_path).error!
+          system_command('git commit -a -m "update readme" --author "Alice <alice@example.com>"', cwd: cookbook_path).error!
+        end
+
+        it "reports that the repo is clean" do
+          expect(git_profiler.clean?).to be true
+        end
+
+        it "reports that there are unpublished changes" do
+          expect(git_profiler.unpublished_commits?).to be true
+        end
+
+        it "reports that no remotes have the commits" do
+          expect(git_profiler.synchronized_remotes).to eq([])
+        end
+
+      end
+    end
+
+    context "given a dirty repo" do
+
+      before do
+        edit_repo
+      end
+
+      it "reports that the repo is dirty" do
+        expect(git_profiler.clean?).to be false
+      end
+
+    end
+
+  end
+
+  context "given a repo on an unborn master branch" do
+
+    let(:cookbook_path) { File.join(tempdir, "unborn") }
+
+    let(:profile_data) { git_profiler.profile_data }
+
+    before do
+      reset_tempdir
+      FileUtils.mkdir_p(cookbook_path)
+      system_command("git init .", cwd: cookbook_path).error!
+    end
+
+    it "does not error when profiling the cookbook" do
+      expect { git_profiler.profile_data }.to_not raise_error
+    end
+
+    it "has a nil revision" do
+      expect(profile_data["revision"]).to be_nil
+    end
+
+    it "has no remote" do
+      expect(profile_data["remote"]).to be_nil
+    end
+
+    it "has no synchronized remote branches" do
+      expect(profile_data["synchronized_remote_branches"]).to eq([])
+    end
+
+    it "is not published" do
+      expect(profile_data["published"]).to be(false)
+    end
+  end
+
+end
+