chef-dk 1.2.22 → 1.3.40

data/spec/unit/command/generator_commands/cookbook_file_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/cookbook_file'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/cookbook_file"
 
 describe ChefDK::Command::GeneratorCommands::CookbookFile do
 
@@ -29,4 +29,3 @@ describe ChefDK::Command::GeneratorCommands::CookbookFile do
 
   end
 end
-

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -15,22 +15,22 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/custom_generator_cookbook'
-require 'shared/setup_git_committer_config'
-require 'chef-dk/command/generator_commands/cookbook'
+require "spec_helper"
+require "shared/custom_generator_cookbook"
+require "shared/setup_git_committer_config"
+require "chef-dk/command/generator_commands/cookbook"
 
 describe ChefDK::Command::GeneratorCommands::Cookbook do
 
   include_context("setup_git_committer_config")
 
-  let(:argv) { %w[new_cookbook] }
+  let(:argv) { %w{new_cookbook} }
 
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
   let(:expected_cookbook_file_relpaths) do
-    %w[
+    %w{
       .gitignore
       .kitchen.yml
       test
@@ -47,7 +47,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       spec/unit
       spec/unit/recipes
       spec/unit/recipes/default_spec.rb
-    ]
+    }
   end
 
   let(:expected_cookbook_files) do
@@ -56,8 +56,8 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
     end
   end
 
-    let(:non_delivery_breadcrumb) do
-<<-EOF
+  let(:non_delivery_breadcrumb) do
+    <<-EOF
 Your cookbook is ready. Type `cd new_cookbook` to enter it.
 
 There are several commands you can run to get started locally developing and testing your cookbook.
@@ -71,7 +71,7 @@ If you'd prefer to dive right in, the default recipe can be found at:
 
 recipes/default.rb
 EOF
-   end
+  end
 
   subject(:cookbook_generator) do
     g = described_class.new(argv)
@@ -98,7 +98,7 @@ EOF
 
   it "configures the chef runner" do
     expect(cookbook_generator.chef_runner).to be_a(ChefDK::ChefRunner)
-    expect(cookbook_generator.chef_runner.cookbook_path).to eq(File.expand_path('lib/chef-dk/skeletons', project_root))
+    expect(cookbook_generator.chef_runner.cookbook_path).to eq(File.expand_path("lib/chef-dk/skeletons", project_root))
   end
 
   context "when given invalid/incomplete arguments" do
@@ -107,7 +107,6 @@ EOF
       "Usage: chef generate cookbook NAME [options]\n"
     end
 
-
     def with_argv(argv)
       generator = described_class.new(argv)
       allow(generator).to receive(:stdout).and_return(stdout_io)
@@ -136,7 +135,7 @@ EOF
 
   context "when given the name of the cookbook to generate" do
 
-    let(:argv) { %w[new_cookbook] }
+    let(:argv) { %w{new_cookbook} }
 
     before do
       reset_tempdir
@@ -287,15 +286,13 @@ source 'https://supermarket.chef.io'
 metadata
 
 group :delivery do
-  cookbook 'delivery_build', git: 'https://github.com/chef-cookbooks/delivery_build'
-  cookbook 'delivery-base', git: 'https://github.com/chef-cookbooks/delivery-base'
   cookbook 'test', path: './test/fixtures/cookbooks/test'
 end
   CONFIG_DOT_JSON
         end
 
         it "sets the sources for delivery library cookbooks to github" do
-         expect(IO.read(file)).to include(expected_content)
+          expect(IO.read(file)).to include(expected_content)
         end
 
       end
@@ -303,9 +300,9 @@ end
 
     context "when passed delivery option" do
 
-      let(:argv) { %w[new_cookbook --delivery] }
+      let(:argv) { %w{new_cookbook --delivery} }
 
-      it 'still works with no action' do
+      it "still works with no action" do
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
           expect(cookbook_generator.run).to eq(0)
@@ -315,7 +312,7 @@ end
 
     context "when given the verbose flag" do
 
-      let(:argv) { %w[ new_cookbook --verbose ] }
+      let(:argv) { %w{ new_cookbook --verbose } }
 
       it "configures the generator context with verbose mode enabled" do
         cookbook_generator.read_and_validate_params
@@ -506,7 +503,7 @@ OUTPUT
 
     context "when configured for Policyfiles" do
 
-      let(:argv) { %w[new_cookbook --policy] }
+      let(:argv) { %w{new_cookbook --policy} }
 
       describe "Policyfile.rb" do
 
@@ -575,7 +572,7 @@ verifier:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.2
+  - name: centos-7.3
 
 suites:
   - name: default
@@ -603,7 +600,7 @@ SPEC_HELPER
 
     context "when configured for Berkshelf" do
 
-      let(:argv) { %w[new_cookbook --berks] }
+      let(:argv) { %w{new_cookbook --berks} }
 
       describe "Berksfile" do
 
@@ -650,7 +647,7 @@ verifier:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.2
+  - name: centos-7.3
 
 suites:
   - name: default
@@ -730,19 +727,19 @@ SPEC_HELPER
     it "configures the generator context for long form option key1" do
       cookbook_generator.read_and_validate_params
       cookbook_generator.setup_context
-      expect(generator_context.key1).to eq('value1')
+      expect(generator_context.key1).to eq("value1")
     end
 
     it "configures the generator context for short form option key2" do
       cookbook_generator.read_and_validate_params
       cookbook_generator.setup_context
-      expect(generator_context.key2).to eq('value2')
+      expect(generator_context.key2).to eq("value2")
     end
 
     it "configures the generator context for key3 containing additional spaces" do
       cookbook_generator.read_and_validate_params
       cookbook_generator.setup_context
-      expect(generator_context.key3).to eq('value3')
+      expect(generator_context.key3).to eq("value3")
     end
 
   end

data/spec/unit/command/generator_commands/generator_generator_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'pathname'
-require 'chef-dk/command/generator_commands/generator_generator'
+require "spec_helper"
+require "pathname"
+require "chef-dk/command/generator_commands/generator_generator"
 
 describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
 
@@ -41,7 +41,6 @@ describe ChefDK::Command::GeneratorCommands::GeneratorGenerator do
 
   subject(:generator_generator) { described_class.new(argv) }
 
-
   before do
     # This has to be the very first thing we do for any tests
     reset_tempdir
@@ -212,7 +211,7 @@ METADATA
 
   context "with too many arguments" do
 
-    let(:argv) { %w[ one extra ] }
+    let(:argv) { %w{ one extra } }
 
     it "fails" do
       expect(generator_generator.run).to eq(1)
@@ -226,4 +225,3 @@ METADATA
   end
 
 end
-

data/spec/unit/command/generator_commands/lwrp_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/lwrp'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/lwrp"
 
 describe ChefDK::Command::GeneratorCommands::LWRP do
 
@@ -29,4 +29,3 @@ describe ChefDK::Command::GeneratorCommands::LWRP do
 
   end
 end
-

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/policyfile'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/policyfile"
 
 describe ChefDK::Command::GeneratorCommands::Policyfile do
 
@@ -221,5 +221,3 @@ POLICYFILE_RB
   end
 
 end
-
-

data/spec/unit/command/generator_commands/recipe_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/recipe'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/recipe"
 
 describe ChefDK::Command::GeneratorCommands::Recipe do
 
@@ -27,7 +27,7 @@ describe ChefDK::Command::GeneratorCommands::Recipe do
     let(:generated_files) { [ "recipes/new_recipe.rb",
                               "spec/spec_helper.rb",
                               "spec/unit/recipes/new_recipe_spec.rb",
-                              "test/smoke/default/new_recipe.rb"
+                              "test/smoke/default/new_recipe_test.rb",
                             ] }
     let(:new_file_name) { "new_recipe" }
 

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -15,21 +15,21 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_generated_file'
-require 'chef-dk/command/generator_commands/repo'
+require "spec_helper"
+require "shared/a_generated_file"
+require "chef-dk/command/generator_commands/repo"
 
 describe ChefDK::Command::GeneratorCommands::Repo do
 
-  let(:argv) { %w[new_repo] }
+  let(:argv) { %w{new_repo} }
 
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
   let(:expected_cookbook_file_relpaths) do
-    %w[
+    %w{
       LICENSE
-    ]
+    }
   end
 
   let(:file) { "" }
@@ -62,7 +62,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
 
     context "when conflicting --roles and --policy are given" do
 
-      let(:argv) { %w[ new-repo --roles --policy ] }
+      let(:argv) { %w{ new-repo --roles --policy } }
 
       it "emits an error saying that the options are exclusive" do
         expected_message = "Roles and Policyfiles are exclusive. Please only select one."
@@ -248,7 +248,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
           let(:file) { "cookbooks/example/attributes/default.rb" }
 
           it "has the right contents" do
-            expect(file_contents).to match(/default\["example"\]\["name"\] = "Sam Doe"/)
+            expect(file_contents).to match(/default\['example'\]\['name'\] = 'Sam Doe'/)
           end
         end
 
@@ -256,7 +256,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
           let(:file) { "cookbooks/example/recipes/default.rb" }
 
           it "has the right contents" do
-            expect(file_contents).to match(/log "Welcome to Chef, \#\{node\["example"\]\["name"\]\}!" do/)
+            expect(file_contents).to match(/log "Welcome to Chef, \#\{node\['example'\]\['name'\]\}!" do/)
           end
         end
       end
@@ -281,7 +281,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
 
       context "when Policyfiles are enabled" do
 
-        let(:argv) { %w[ new_repo --policy ] }
+        let(:argv) { %w{ new_repo --policy } }
 
         it "does not create a roles directory" do
           expect(File).to_not exist(File.join(repo_path, "roles"))
@@ -313,7 +313,7 @@ README
 
       context "when roles/environments are enabled" do
 
-        let(:argv) { %w[new_repo --roles] }
+        let(:argv) { %w{new_repo --roles} }
 
         it "does not create a policies directory" do
           expect(File).to_not exist(File.join(repo_path, "policies"))

data/spec/unit/command/generator_commands/template_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/template'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/template"
 
 describe ChefDK::Command::GeneratorCommands::Template do
 
@@ -29,4 +29,3 @@ describe ChefDK::Command::GeneratorCommands::Template do
 
   end
 end
-

data/spec/unit/command/install_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/install'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/install"
 
 describe ChefDK::Command::Install do
 
@@ -52,7 +52,7 @@ describe ChefDK::Command::Install do
 
   context "when an explicit config file path is given" do
 
-    let(:params) { %w[ -c ~/.chef/alternate_config.rb ] }
+    let(:params) { %w{ -c ~/.chef/alternate_config.rb } }
 
     let(:chef_config_loader) { instance_double("Chef::WorkstationConfigLoader") }
 
@@ -144,7 +144,7 @@ describe ChefDK::Command::Install do
       end
 
       it "displays the exception and cause" do
-        expected_error_text=<<-E
+        expected_error_text = <<-E
 Error: install failed
 Reason: (StandardError) some operation failed
 
@@ -159,7 +159,7 @@ E
         let(:params) { ["-D"] }
 
         it "displays the exception and cause with backtrace" do
-          expected_error_text=<<-E
+          expected_error_text = <<-E
 Error: install failed
 Reason: (StandardError) some operation failed
 

data/spec/unit/command/provision_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/provision'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/provision"
 
 describe ChefDK::Command::Provision do
 
@@ -65,7 +65,7 @@ describe ChefDK::Command::Provision do
 
       context "when --no-policy is combined with policy arguments" do
 
-        let(:params) { %w[ --no-policy some-policy-group ] }
+        let(:params) { %w{ --no-policy some-policy-group } }
 
         it "prints usage and exits non-zero" do
           expect(command.run(params)).to eq(1)
@@ -76,7 +76,7 @@ describe ChefDK::Command::Provision do
 
       context "when a POLICY_GROUP is given but neither of --sync or --policy-name are given" do
 
-        let(:params) { %w[ some-policy-group ] }
+        let(:params) { %w{ some-policy-group } }
 
         it "prints usage and exits non-zero" do
           expect(command.run(params)).to eq(1)
@@ -87,7 +87,7 @@ describe ChefDK::Command::Provision do
 
       context "when both --sync and --policy-name are given" do
 
-        let(:params) { %w[ some-policy-group --policy-name foo --sync] }
+        let(:params) { %w{ some-policy-group --policy-name foo --sync} }
 
         it "prints usage and exits non-zero" do
           expect(command.run(params)).to eq(1)
@@ -98,7 +98,7 @@ describe ChefDK::Command::Provision do
 
       context "when too many arguments are given" do
 
-        let(:params) { %w[ policygroup extraneous-argument --sync ] }
+        let(:params) { %w{ policygroup extraneous-argument --sync } }
 
         it "prints usage and exits non-zero" do
           expect(command.run(params)).to eq(1)
@@ -112,7 +112,7 @@ describe ChefDK::Command::Provision do
 
       let(:context) { ChefDK::ProvisioningData.context }
 
-      shared_examples  "common_optional_options" do
+      shared_examples "common_optional_options" do
 
         context "with default option values" do
 
@@ -127,7 +127,7 @@ describe ChefDK::Command::Provision do
           end
 
           it "sets the cookbook name to 'provision'" do
-            expect(command.provisioning_cookbook_name).to eq('provision')
+            expect(command.provisioning_cookbook_name).to eq("provision")
           end
 
           it "sets the recipe to 'default'" do
@@ -144,7 +144,7 @@ describe ChefDK::Command::Provision do
 
         context "with -n NODE_NAME" do
 
-          let(:extra_params) { %w[ -n example-node ] }
+          let(:extra_params) { %w{ -n example-node } }
 
           it "sets the default requested node name" do
             expect(command.node_name).to eq("example-node")
@@ -155,7 +155,7 @@ describe ChefDK::Command::Provision do
 
         context "with --cookbook COOKBOOK_PATH" do
 
-          let(:extra_params) { %w[ --cookbook ~/mystuff/my-provision-cookbook ] }
+          let(:extra_params) { %w{ --cookbook ~/mystuff/my-provision-cookbook } }
 
           let(:expected_cookbook_path) { File.expand_path("~/mystuff") }
           let(:expected_cookbook_name) { "my-provision-cookbook" }
@@ -186,7 +186,7 @@ describe ChefDK::Command::Provision do
 
         context "with -r MACHINE_RECIPE" do
 
-          let(:extra_params) { %w[ -r ec2cluster ] }
+          let(:extra_params) { %w{ -r ec2cluster } }
 
           it "sets the recipe to run as specified" do
             expect(command.recipe).to eq("ec2cluster")
@@ -197,7 +197,7 @@ describe ChefDK::Command::Provision do
 
         context "with --target" do
 
-          let(:extra_params) { %w[ -t 192.168.255.123 ] }
+          let(:extra_params) { %w{ -t 192.168.255.123 } }
 
           it "sets the target host to the given value" do
             expect(context.target).to eq("192.168.255.123")
@@ -207,7 +207,7 @@ describe ChefDK::Command::Provision do
 
         context "with --opt" do
           context "with one user-specified option" do
-            let(:extra_params) { %w[ --opt color=ebfg ] }
+            let(:extra_params) { %w{ --opt color=ebfg } }
 
             it "sets the given option name to the given value" do
               expect(context.opts.color).to eq("ebfg")
@@ -216,7 +216,7 @@ describe ChefDK::Command::Provision do
 
           context "with an option given as a quoted arg with spaces" do
 
-            let(:extra_params) { [ '--opt', 'color = ebfg' ] }
+            let(:extra_params) { [ "--opt", "color = ebfg" ] }
 
             it "sets the given option name to the given value" do
               expect(context.opts.color).to eq("ebfg")
@@ -225,7 +225,7 @@ describe ChefDK::Command::Provision do
 
           context "with an option with an '=' in it" do
 
-            let(:extra_params) { [ '--opt', 'api_key=abcdef==' ] }
+            let(:extra_params) { [ "--opt", "api_key=abcdef==" ] }
 
             it "sets the given option name to the given value" do
               expect(context.opts.api_key).to eq("abcdef==")
@@ -234,7 +234,7 @@ describe ChefDK::Command::Provision do
 
           context "with an option with a space in it" do
 
-            let(:extra_params) { [ '--opt', 'full_name=Bobo T. Clown' ] }
+            let(:extra_params) { [ "--opt", "full_name=Bobo T. Clown" ] }
 
             it "sets the given option name to the given value" do
               expect(context.opts.full_name).to eq("Bobo T. Clown")
@@ -242,7 +242,7 @@ describe ChefDK::Command::Provision do
           end
 
           context "with multiple options given" do
-            let(:extra_params) { %w[ --opt color=ebfg --opt nope=seppb ] }
+            let(:extra_params) { %w{ --opt color=ebfg --opt nope=seppb } }
 
             it "sets the given option name to the given value" do
               expect(context.opts.color).to eq("ebfg")
@@ -253,7 +253,7 @@ describe ChefDK::Command::Provision do
 
         context "with -d" do
 
-          let(:extra_params) { %w[ -d ] }
+          let(:extra_params) { %w{ -d } }
 
           it "sets the default action to destroy" do
             expect(command.default_action).to eq(:destroy)
@@ -277,7 +277,7 @@ describe ChefDK::Command::Provision do
         end
 
         let(:extra_params) { [] }
-        let(:params) { %w[ --no-policy ] + extra_params }
+        let(:params) { %w{ --no-policy } + extra_params }
 
         it "disables policyfile integration" do
           expect(command.enable_policyfile?).to be(false)
@@ -319,7 +319,7 @@ CONFIG
 
           let(:given_policy_group) { "some-policy-group" }
 
-          let(:params) { [ given_policy_group, '--sync', given_policyfile_path ] }
+          let(:params) { [ given_policy_group, "--sync", given_policyfile_path ] }
 
           it "sets policy group" do
             expect(command.policy_group).to eq(given_policy_group)
@@ -341,7 +341,7 @@ CONFIG
 
           let(:extra_params) { [] }
 
-          let(:params) { [ given_policy_group, '--sync' ] + extra_params }
+          let(:params) { [ given_policy_group, "--sync" ] + extra_params }
 
           before do
             allow(chef_config).to receive(:ssl_verify_mode).and_return(:verify_peer)
@@ -373,7 +373,6 @@ CONFIG
             expect(context.chef_config).to eq(expected_config)
           end
 
-
           include_examples "common_optional_options"
 
         end
@@ -386,8 +385,7 @@ CONFIG
 
         let(:extra_params) { [] }
 
-        let(:params) { [ given_policy_group, '--policy-name', "myapp" ] + extra_params }
-
+        let(:params) { [ given_policy_group, "--policy-name", "myapp" ] + extra_params }
 
         before do
           command.apply_params!(params)
@@ -444,7 +442,7 @@ CONFIG
 
     let(:chef_runner) { instance_double("ChefDK::ChefRunner") }
 
-    let(:params) { %w[ policygroup --sync ] }
+    let(:params) { %w{ policygroup --sync } }
 
     context "when the provision cookbook doesn't exist" do
 
@@ -495,7 +493,7 @@ CONFIG
       end
 
       it "prints an error and exits non-zero" do
-          expected_output=<<-E
+        expected_output = <<-E
 Error: push failed
 Reason: (StandardError) some operation failed
 
@@ -547,7 +545,7 @@ E
 
       context "when using --no-policy" do
 
-        let(:params) { %w[ --no-policy ] }
+        let(:params) { %w{ --no-policy } }
 
         it "exits 0" do
           return_value = command.run(params)
@@ -559,7 +557,7 @@ E
 
       context "with --policy-name" do
 
-        let(:params) { %w[ policygroup --policy-name otherapp ] }
+        let(:params) { %w{ policygroup --policy-name otherapp } }
 
         it "exits 0" do
           return_value = command.run(params)
@@ -589,4 +587,3 @@ E
 
   end
 end
-