chef-dk 0.11.2 → 0.12.0

data/spec/shared/a_generated_file.rb

@@ -1,12 +1,12 @@
-shared_examples_for "a generated file" do |context_var|
-  before do
-    Dir.chdir(tempdir) do
-      allow(generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-      generator.run
-    end
-  end
-
-  it "should contain #{context_var} from the generator context" do
-    expect(File.read(file)).to match line
-  end
-end
+shared_examples_for "a generated file" do |context_var|
+  before do
+    Dir.chdir(tempdir) do
+      allow(generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+      generator.run
+    end
+  end
+
+  it "should contain #{context_var} from the generator context" do
+    expect(File.read(file)).to match line
+  end
+end

data/spec/shared/command_with_ui_object.rb

@@ -1,11 +1,11 @@
-shared_examples_for "a command with a UI object" do
-
-  subject(:command) { described_class.new }
-
-  it "configures a default UI component" do
-    ui = command.ui
-    expect(ui.out_stream).to eq($stdout)
-    expect(ui.err_stream).to eq($stderr)
-  end
-
-end
+shared_examples_for "a command with a UI object" do
+
+  subject(:command) { described_class.new }
+
+  it "configures a default UI component" do
+    ui = command.ui
+    expect(ui.out_stream).to eq($stdout)
+    expect(ui.err_stream).to eq($stderr)
+  end
+
+end

data/spec/shared/custom_generator_cookbook.rb

@@ -1,130 +1,130 @@
-
-# Required `let` bindings:
-# * `generator_name` in lowercase, e.g., "cookbook", "app"
-# * `generator_arg`: argument to the generator command
-# * `expected_cookbook_files`: a list of files the generator should create
-shared_examples_for "custom generator cookbook" do
-
-  context "when given a generator-cookbook path" do
-
-    let(:default_generator_cookbook_path) { File.expand_path('lib/chef-dk/skeletons/code_generator', project_root) }
-
-    let(:generator_cookbook_path) { File.join(tempdir, 'a_generator_cookbook') }
-    let(:generator_copyright_holder) { 'Chef' }
-    let(:generator_email) { 'mail@chef.io' }
-    let(:generator_license) { 'Free as in Beer'}
-
-    let(:argv) { [generator_arg, "--generator-cookbook", generator_cookbook_path] }
-
-    subject(:code_generator) { described_class.new(argv) }
-
-    before do
-      reset_tempdir
-      code_generator.read_and_validate_params
-      allow(code_generator.config_loader).to receive(:load)
-    end
-
-    it "configures the generator context" do
-      code_generator.setup_context
-      expect(generator_context.cookbook_name).to eq(generator_arg)
-      expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
-      expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
-    end
-
-    context "when the generator cookbook is configured in a configuration file" do
-
-      let(:argv) { [generator_arg] }
-
-      let(:generator_config) do
-        double("Generator Config Context",
-          license: generator_license,
-          copyright_holder: generator_copyright_holder,
-          email: generator_email)
-      end
-
-      let(:chefdk_config) do
-        double("Mixlib::Config context for ChefDK",
-          generator_cookbook: generator_cookbook_path,
-          generator: generator_config)
-      end
-
-      before do
-        allow(code_generator).to receive(:chefdk_config).and_return(chefdk_config)
-      end
-
-      it "configures the generator context" do
-        code_generator.setup_context
-        expect(generator_context.cookbook_name).to eq(generator_arg)
-        expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
-        expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
-      end
-    end
-
-    context "with an invalid generator-cookbook path" do
-
-      it "fails with an informative error" do
-        Dir.chdir(tempdir) do
-          allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          allow(code_generator).to receive(:stderr).and_return(stderr_io)
-          expect(code_generator.run).to eq(1)
-        end
-
-        cookbook_path = File.dirname(generator_cookbook_path)
-        expected_msg = %Q(ERROR: Could not find cookbook(s) to satisfy run list ["recipe[a_generator_cookbook::#{generator_name}]"] in #{cookbook_path})
-
-        expect(stderr_io.string).to include(expected_msg)
-      end
-
-    end
-
-    context "with a generator-cookbook path to a specific cookbook" do
-
-      let(:metadata_file) { File.join(generator_cookbook_path, "metadata.rb") }
-
-      before do
-        FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
-
-        # have to update metadata with the correct name
-        IO.binwrite(metadata_file, "name 'a_generator_cookbook'")
-      end
-
-      it "creates the new files" do
-        expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
-        expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
-
-        Dir.chdir(tempdir) do
-          allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          code_generator.run
-        end
-      end
-
-    end
-
-    context "with a generator-cookbook path to a directory containing a 'code_generator' cookbook" do
-
-      before do
-        FileUtils.mkdir_p(generator_cookbook_path)
-        FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
-
-        allow(code_generator).to receive(:stderr).and_return(stderr_io)
-      end
-
-      it "creates the new_files (and warns about deprecated usage)" do
-        allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-
-        Dir.chdir(tempdir) do
-          code_generator.run
-        end
-        generated_files = Dir.glob("#{tempdir}/#{generator_arg}/**/*", File::FNM_DOTMATCH)
-        expected_cookbook_files.each do |expected_file|
-          expect(generated_files).to include(expected_file)
-        end
-
-        code_generator_path = File.join(generator_cookbook_path, "code_generator")
-        warning_message = "WARN: Please configure the generator cookbook by giving the full path to the desired cookbook (like '#{code_generator_path}')"
-
-        expect(stderr_io.string).to include(warning_message)
-      end
-    end
-  end
-end
+
+# Required `let` bindings:
+# * `generator_name` in lowercase, e.g., "cookbook", "app"
+# * `generator_arg`: argument to the generator command
+# * `expected_cookbook_files`: a list of files the generator should create
+shared_examples_for "custom generator cookbook" do
+
+  context "when given a generator-cookbook path" do
+
+    let(:default_generator_cookbook_path) { File.expand_path('lib/chef-dk/skeletons/code_generator', project_root) }
+
+    let(:generator_cookbook_path) { File.join(tempdir, 'a_generator_cookbook') }
+    let(:generator_copyright_holder) { 'Chef' }
+    let(:generator_email) { 'mail@chef.io' }
+    let(:generator_license) { 'Free as in Beer'}
+
+    let(:argv) { [generator_arg, "--generator-cookbook", generator_cookbook_path] }
+
+    subject(:code_generator) { described_class.new(argv) }
+
+    before do
+      reset_tempdir
+      code_generator.read_and_validate_params
+      allow(code_generator.config_loader).to receive(:load)
+    end
+
+    it "configures the generator context" do
+      code_generator.setup_context
+      expect(generator_context.cookbook_name).to eq(generator_arg)
+      expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
+      expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
+    end
+
+    context "when the generator cookbook is configured in a configuration file" do
+
+      let(:argv) { [generator_arg] }
+
+      let(:generator_config) do
+        double("Generator Config Context",
+          license: generator_license,
+          copyright_holder: generator_copyright_holder,
+          email: generator_email)
+      end
+
+      let(:chefdk_config) do
+        double("Mixlib::Config context for ChefDK",
+          generator_cookbook: generator_cookbook_path,
+          generator: generator_config)
+      end
+
+      before do
+        allow(code_generator).to receive(:chefdk_config).and_return(chefdk_config)
+      end
+
+      it "configures the generator context" do
+        code_generator.setup_context
+        expect(generator_context.cookbook_name).to eq(generator_arg)
+        expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
+        expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
+      end
+    end
+
+    context "with an invalid generator-cookbook path" do
+
+      it "fails with an informative error" do
+        Dir.chdir(tempdir) do
+          allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          allow(code_generator).to receive(:stderr).and_return(stderr_io)
+          expect(code_generator.run).to eq(1)
+        end
+
+        cookbook_path = File.dirname(generator_cookbook_path)
+        expected_msg = %Q(ERROR: Could not find cookbook(s) to satisfy run list ["recipe[a_generator_cookbook::#{generator_name}]"] in #{cookbook_path})
+
+        expect(stderr_io.string).to include(expected_msg)
+      end
+
+    end
+
+    context "with a generator-cookbook path to a specific cookbook" do
+
+      let(:metadata_file) { File.join(generator_cookbook_path, "metadata.rb") }
+
+      before do
+        FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
+
+        # have to update metadata with the correct name
+        IO.binwrite(metadata_file, "name 'a_generator_cookbook'")
+      end
+
+      it "creates the new files" do
+        expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
+        expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
+
+        Dir.chdir(tempdir) do
+          allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          code_generator.run
+        end
+      end
+
+    end
+
+    context "with a generator-cookbook path to a directory containing a 'code_generator' cookbook" do
+
+      before do
+        FileUtils.mkdir_p(generator_cookbook_path)
+        FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
+
+        allow(code_generator).to receive(:stderr).and_return(stderr_io)
+      end
+
+      it "creates the new_files (and warns about deprecated usage)" do
+        allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+
+        Dir.chdir(tempdir) do
+          code_generator.run
+        end
+        generated_files = Dir.glob("#{tempdir}/#{generator_arg}/**/*", File::FNM_DOTMATCH)
+        expected_cookbook_files.each do |expected_file|
+          expect(generated_files).to include(expected_file)
+        end
+
+        code_generator_path = File.join(generator_cookbook_path, "code_generator")
+        warning_message = "WARN: Please configure the generator cookbook by giving the full path to the desired cookbook (like '#{code_generator_path}')"
+
+        expect(stderr_io.string).to include(warning_message)
+      end
+    end
+  end
+end

data/spec/shared/fixture_cookbook_checksums.rb

@@ -1,47 +1,47 @@
-#
-# 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 'chef-dk/helpers'
-
-RSpec.shared_context "fixture cookbooks checksums" do
-
-  def id_to_dotted(sha1_id)
-    major = sha1_id[0...14]
-    minor = sha1_id[14...28]
-    patch = sha1_id[28..40]
-    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
-    decimal_integers.join(".")
-  end
-
-  let(:cookbook_foo_cksum) { "467dc855408ce8b74f991c5dc2fd72a6aa369b60" }
-
-  let(:cookbook_foo_cksum_dotted) { id_to_dotted(cookbook_foo_cksum) }
-
-  let(:cookbook_bar_cksum) { "4c538def500b75e744a3af05df66afd04dc3b3c5" }
-
-  let(:cookbook_bar_cksum_dotted) { id_to_dotted(cookbook_bar_cksum) }
-
-  let(:cookbook_baz_cksum) { "5c9063efbc5b5d8acc37024d7383f7dd010ae728" }
-
-  let(:cookbook_baz_cksum_dotted) { id_to_dotted(cookbook_baz_cksum) }
-
-  let(:cookbook_dep_of_bar_cksum) { "a4a6a5e4c6d95a580d291f6415d55b010669feac" }
-
-  let(:cookbook_dep_of_bar_cksum_dotted) { id_to_dotted(cookbook_dep_of_bar_cksum) }
-
-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 'chef-dk/helpers'
+
+RSpec.shared_context "fixture cookbooks checksums" do
+
+  def id_to_dotted(sha1_id)
+    major = sha1_id[0...14]
+    minor = sha1_id[14...28]
+    patch = sha1_id[28..40]
+    decimal_integers =[major, minor, patch].map {|hex| hex.to_i(16) }
+    decimal_integers.join(".")
+  end
+
+  let(:cookbook_foo_cksum) { "467dc855408ce8b74f991c5dc2fd72a6aa369b60" }
+
+  let(:cookbook_foo_cksum_dotted) { id_to_dotted(cookbook_foo_cksum) }
+
+  let(:cookbook_bar_cksum) { "4c538def500b75e744a3af05df66afd04dc3b3c5" }
+
+  let(:cookbook_bar_cksum_dotted) { id_to_dotted(cookbook_bar_cksum) }
+
+  let(:cookbook_baz_cksum) { "5c9063efbc5b5d8acc37024d7383f7dd010ae728" }
+
+  let(:cookbook_baz_cksum_dotted) { id_to_dotted(cookbook_baz_cksum) }
+
+  let(:cookbook_dep_of_bar_cksum) { "a4a6a5e4c6d95a580d291f6415d55b010669feac" }
+
+  let(:cookbook_dep_of_bar_cksum_dotted) { id_to_dotted(cookbook_dep_of_bar_cksum) }
+
+end
+

data/spec/shared/setup_git_cookbooks.rb

@@ -1,53 +1,53 @@
-#
-# 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 'chef-dk/helpers'
-
-RSpec.shared_context "setup git cookbooks" do
-
-  include ChefDK::Helpers
-
-  let(:cookbook_pristine_path) do
-    File.expand_path("spec/unit/fixtures/dev_cookbooks/bar-cookbook.gitbundle", project_root)
-  end
-
-  let(:cookbook_path) { File.join(tempdir, "bar") }
-
-  let(:current_rev) { 'dfc68070c47cbf4267be14ea87f80680cb5dafb3' }
-
-  before do
-    reset_tempdir
-    system_command("git clone #{cookbook_pristine_path} #{cookbook_path}").error!
-    system_command("git reset --hard #{current_rev}", cwd: cookbook_path).error!
-    system_command("git remote remove origin", cwd: cookbook_path).error!
-  end
-
-  after do
-    clear_tempdir
-  end
-
-end
-
-RSpec.shared_context "setup git cookbook remote" do
-  let(:remote_url) { "file://#{tempdir}/bar-cookbook.git" }
-
-  before do
-    system_command("git init --bare #{tempdir}/bar-cookbook.git").error!
-    system_command("git remote add origin #{remote_url}", cwd: cookbook_path).error!
-    system_command("git push -u origin master", cwd: cookbook_path).error!
-  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 'chef-dk/helpers'
+
+RSpec.shared_context "setup git cookbooks" do
+
+  include ChefDK::Helpers
+
+  let(:cookbook_pristine_path) do
+    File.expand_path("spec/unit/fixtures/dev_cookbooks/bar-cookbook.gitbundle", project_root)
+  end
+
+  let(:cookbook_path) { File.join(tempdir, "bar") }
+
+  let(:current_rev) { 'dfc68070c47cbf4267be14ea87f80680cb5dafb3' }
+
+  before do
+    reset_tempdir
+    system_command("git clone #{cookbook_pristine_path} #{cookbook_path}").error!
+    system_command("git reset --hard #{current_rev}", cwd: cookbook_path).error!
+    system_command("git remote remove origin", cwd: cookbook_path).error!
+  end
+
+  after do
+    clear_tempdir
+  end
+
+end
+
+RSpec.shared_context "setup git cookbook remote" do
+  let(:remote_url) { "file://#{tempdir}/bar-cookbook.git" }
+
+  before do
+    system_command("git init --bare #{tempdir}/bar-cookbook.git").error!
+    system_command("git remote add origin #{remote_url}", cwd: cookbook_path).error!
+    system_command("git push -u origin master", cwd: cookbook_path).error!
+  end
+end