chef-dk 1.2.22 → 1.3.40

data/spec/unit/command/push_archive_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/push_archive'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/push_archive"
 
 describe ChefDK::Command::PushArchive do
 

data/spec/unit/command/push_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/push'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/push"
 
 describe ChefDK::Command::Push do
 
@@ -158,7 +158,7 @@ describe ChefDK::Command::Push do
         it "describes the error" do
           command.run(params)
 
-          expected_output=<<-E
+          expected_output = <<-E
 Error: push failed
 Reason: (StandardError) some operation failed
 
@@ -177,7 +177,7 @@ E
 
             command.run(params)
 
-            expected_output=<<-E
+            expected_output = <<-E
 Error: push failed
 Reason: (StandardError) some operation failed
 
@@ -196,4 +196,3 @@ E
   end
 
 end
-

data/spec/unit/command/shell_init_spec.rb

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/command/shell_init'
+require "spec_helper"
+require "chef-dk/command/shell_init"
 
 describe ChefDK::Command::ShellInit do
 
-  let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH'], git_bin_dir].join(File::PATH_SEPARATOR) }
+  let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"], git_bin_dir].join(File::PATH_SEPARATOR) }
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
@@ -32,7 +32,7 @@ describe ChefDK::Command::ShellInit do
   end
 
   shared_context "shell init script" do |shell|
-    let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, 'bin')) }
+    let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
     let(:expected_gem_root) { Gem.default_dir.to_s }
     let(:expected_gem_home) { Gem.user_dir }
     let(:expected_gem_path) { Gem.path.join(File::PATH_SEPARATOR) }
@@ -60,7 +60,7 @@ describe ChefDK::Command::ShellInit do
         expect(stdout_io.string).to include(expected_environment_commands)
       end
 
-      it "does not emit any empty lines", :if => ["powershell", "posh"].include?(shell) do
+      it "does not emit any empty lines", :if => %w{powershell posh}.include?(shell) do
         command_instance.run(argv)
         stdout_io.string.each_line do |s|
           expect(s.strip).not_to be_empty
@@ -86,7 +86,7 @@ describe ChefDK::Command::ShellInit do
         expect(stdout_io.string).to include(expected_environment_commands)
       end
 
-      it "does not emit any empty lines", :if => ["powershell", "posh"].include?(shell) do
+      it "does not emit any empty lines", :if => %w{powershell posh}.include?(shell) do
         command_instance.run(argv)
         stdout_io.string.each_line do |s|
           expect(s.strip).not_to be_empty
@@ -97,7 +97,7 @@ describe ChefDK::Command::ShellInit do
 
   shared_examples "a posix shell script" do |shell|
     before do
-      stub_const("File::PATH_SEPARATOR", ':')
+      stub_const("File::PATH_SEPARATOR", ":")
     end
 
     let(:expected_environment_commands) do
@@ -113,7 +113,7 @@ EOH
 
   shared_examples "a powershell script" do |shell|
     before do
-      stub_const("File::PATH_SEPARATOR", ';')
+      stub_const("File::PATH_SEPARATOR", ";")
     end
 
     let(:expected_environment_commands) do
@@ -141,7 +141,7 @@ EOH
           "exec" => "Runs the command in context of the embedded ruby",
           "env" => "Prints environment variables used by ChefDK",
           "gem" => "Runs the `gem` command in context of the embedded ruby",
-          "generate" => "Generate a new app, cookbook, or component"
+          "generate" => "Generate a new app, cookbook, or component",
         }
       end
 
@@ -189,7 +189,7 @@ END_COMPLETION
           "exec" => "Runs the command in context of the embedded ruby",
           "env" => "Prints environment variables used by ChefDK",
           "gem" => "Runs the `gem` command in context of the embedded ruby",
-          "generate" => "Generate a new app, cookbook, or component"
+          "generate" => "Generate a new app, cookbook, or component",
         }
       end
 
@@ -242,11 +242,11 @@ compdef _chef chef
     end
   end
 
-  context 'for fish' do
+  context "for fish" do
     before do
-      stub_const('File::PATH_SEPARATOR', ':')
+      stub_const("File::PATH_SEPARATOR", ":")
     end
-    let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH'], git_bin_dir].join(':').split(':').join('" "') }
+    let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"], git_bin_dir].join(":").split(":").join('" "') }
     let(:expected_environment_commands) do
       <<-EOH
 set -gx PATH "#{expected_path}" 2>/dev/null;
@@ -256,7 +256,7 @@ set -gx GEM_PATH "#{expected_gem_path}";
 EOH
     end
 
-    include_context 'shell init script', 'fish'
+    include_context "shell init script", "fish"
 
     describe "generating auto-complete" do
 
@@ -265,7 +265,7 @@ EOH
           "exec" => "Runs the command in context of the embedded ruby",
           "env" => "Prints environment variables used by ChefDK",
           "gem" => "Runs the `gem` command in context of the embedded ruby",
-          "generate" => "Generate a new app, cookbook, or component"
+          "generate" => "Generate a new app, cookbook, or component",
         }
       end
 
@@ -307,7 +307,7 @@ END_COMPLETION
     end
   end
 
-  ['powershell', 'posh'].each do |shell|
+  %w{powershell posh}.each do |shell|
     context "for #{shell}" do
       it_behaves_like "a powershell script", shell
     end
@@ -326,7 +326,7 @@ END_COMPLETION
 
   context "when an unsupported shell is specified" do
 
-    let(:argv) { ['nosuchsh'] }
+    let(:argv) { ["nosuchsh"] }
 
     it "exits with an error message" do
       expect(command_instance.run(argv)).to eq(1)
@@ -336,6 +336,4 @@ END_COMPLETION
 
   end
 
-
 end
-

data/spec/unit/command/show_policy_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/show_policy'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/show_policy"
 
 describe ChefDK::Command::ShowPolicy do
 
@@ -50,7 +50,7 @@ describe ChefDK::Command::ShowPolicy do
 
     context "when given a path to the config" do
 
-      let(:params) { %w[ -c ~/otherstuff/config.rb ] }
+      let(:params) { %w{ -c ~/otherstuff/config.rb } }
 
       let(:config_arg) { "~/otherstuff/config.rb" }
 
@@ -101,7 +101,7 @@ describe ChefDK::Command::ShowPolicy do
 
       context "when --show-orphans is given" do
 
-        let(:params) { %w[ -o ] }
+        let(:params) { %w{ -o } }
 
         it "enables displaying orphans" do
           expect(command.show_orphans?).to be(true)
@@ -112,7 +112,7 @@ describe ChefDK::Command::ShowPolicy do
 
       context "when given a policy name" do
 
-        let(:params) { %w[ appserver ] }
+        let(:params) { %w{ appserver } }
 
         it "is not configured to show all policies" do
           expect(show_policy_service.show_all_policies?).to be(false)
@@ -127,7 +127,7 @@ describe ChefDK::Command::ShowPolicy do
 
       context "when given a policy name and a policy group name" do
 
-        let(:params) { %w[ appserver production ] }
+        let(:params) { %w{ appserver production } }
 
         it "is not configured to show all policies" do
           expect(show_policy_service.show_all_policies?).to be(false)
@@ -159,7 +159,7 @@ describe ChefDK::Command::ShowPolicy do
 
     context "when given too many arguments" do
 
-      let(:params) { %w[ appserver policygroup wut-is-this ] }
+      let(:params) { %w{ appserver policygroup wut-is-this } }
 
       it "shows usage and exits" do
         expect(command.run(params)).to eq(1)
@@ -188,7 +188,7 @@ describe ChefDK::Command::ShowPolicy do
       it "prints a debugging message and exits non-zero" do
         expect(command.run([])).to eq(1)
 
-        expected_output=<<-E
+        expected_output = <<-E
 Error: Failed to list policies
 Reason: (StandardError) some operation failed
 
@@ -201,9 +201,9 @@ E
 
         it "includes the backtrace in the error" do
 
-          command.run(%w[ -D ])
+          command.run(%w{ -D })
 
-          expected_output=<<-E
+          expected_output = <<-E
 Error: Failed to list policies
 Reason: (StandardError) some operation failed
 
@@ -232,4 +232,3 @@ E
 
   end
 end
-

data/spec/unit/command/undelete_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/undelete'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/undelete"
 
 describe ChefDK::Command::Undelete do
 
@@ -53,7 +53,7 @@ describe ChefDK::Command::Undelete do
 
     context "when given a path to the config" do
 
-      let(:params) { %w[ -c ~/otherstuff/config.rb ] }
+      let(:params) { %w{ -c ~/otherstuff/config.rb } }
 
       let(:config_arg) { "~/otherstuff/config.rb" }
 
@@ -99,7 +99,7 @@ describe ChefDK::Command::Undelete do
 
       context "when --last is given" do
 
-        let(:params) { %w[ -l ] }
+        let(:params) { %w{ -l } }
 
         it "disables list mode" do
           expect(command.list_undo_records?).to be(false)
@@ -131,7 +131,7 @@ describe ChefDK::Command::Undelete do
 
       context "when exclusive options --last and --id are given" do
 
-        let(:params) { %w[ --last --id foo ] }
+        let(:params) { %w{ --last --id foo } }
 
         it "emits an error message saying they are exclusive and exits" do
           expect(ui.output).to include("Error: options --last and --id cannot both be given.")
@@ -143,7 +143,6 @@ describe ChefDK::Command::Undelete do
     end
   end
 
-
   describe "running the command" do
 
     let(:ui) { TestHelpers::TestUI.new }
@@ -155,7 +154,7 @@ describe ChefDK::Command::Undelete do
 
     context "when given too many arguments" do
 
-      let(:params) { %w[ extra-thing ] }
+      let(:params) { %w{ extra-thing } }
 
       it "shows usage and exits" do
         expect(command.run(params)).to eq(1)
@@ -176,7 +175,7 @@ describe ChefDK::Command::Undelete do
 
     context "when the undelete service raises an exception" do
 
-      let(:params) { %w[ --last ] }
+      let(:params) { %w{ --last } }
 
       let(:backtrace) { caller[0...3] }
 
@@ -197,7 +196,7 @@ describe ChefDK::Command::Undelete do
       it "prints a debugging message and exits non-zero" do
         expect(command.run(params)).to eq(1)
 
-        expected_output=<<-E
+        expected_output = <<-E
 Error: Failed to undelete.
 Reason: (StandardError) some operation failed
 
@@ -210,9 +209,9 @@ E
 
         it "includes the backtrace in the error" do
 
-          command.run(params + %w[ -D ])
+          command.run(params + %w{ -D })
 
-        expected_output=<<-E
+          expected_output = <<-E
 Error: Failed to undelete.
 Reason: (StandardError) some operation failed
 
@@ -229,7 +228,7 @@ E
 
     context "when the undelete service executes successfully" do
 
-      let(:params) { %w[ --last ] }
+      let(:params) { %w{ --last } }
 
       before do
         expect(command.undelete_service).to receive(:run)
@@ -243,4 +242,3 @@ E
 
   end
 end
-

data/spec/unit/command/update_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/command_with_ui_object'
-require 'chef-dk/command/update'
+require "spec_helper"
+require "shared/command_with_ui_object"
+require "chef-dk/command/update"
 
 describe ChefDK::Command::Update do
 
@@ -54,7 +54,7 @@ describe ChefDK::Command::Update 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") }
 
@@ -162,7 +162,7 @@ describe ChefDK::Command::Update 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
 
@@ -177,7 +177,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
 
@@ -240,7 +240,7 @@ E
       end
 
       it "displays the exception and cause" do
-        expected_error_text=<<-E
+        expected_error_text = <<-E
 Error: Failed to update Policyfile lock
 Reason: (StandardError) some operation failed
 
@@ -255,7 +255,7 @@ E
         let(:params) { ["-a", "-D"] }
 
         it "displays the exception and cause with backtrace" do
-          expected_error_text=<<-E
+          expected_error_text = <<-E
 Error: Failed to update Policyfile lock
 Reason: (StandardError) some operation failed
 

data/spec/unit/command/verify_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/command/verify'
+require "spec_helper"
+require "chef-dk/command/verify"
 
 module Gem
 
@@ -80,13 +80,13 @@ describe ChefDK::Command::Verify do
     end
 
     it "should raise OmnibusInstallNotFound if directory is not looking like omnibus" do
-      allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,".rbenv/versions/2.1.1/bin/ruby"))
-      expect{command_instance.omnibus_apps_dir}.to raise_error(ChefDK::OmnibusInstallNotFound)
+      allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path, ".rbenv/versions/2.1.1/bin/ruby"))
+      expect { command_instance.omnibus_apps_dir }.to raise_error(ChefDK::OmnibusInstallNotFound)
     end
 
     it "raises OmnibusInstallNotFound if omnibus directory doesn't exist" do
-      allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,"eg_omnibus_dir/missing_apps/embedded/bin/ruby"))
-      expect{command_instance.omnibus_apps_dir}.to raise_error(ChefDK::OmnibusInstallNotFound)
+      allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path, "eg_omnibus_dir/missing_apps/embedded/bin/ruby"))
+      expect { command_instance.omnibus_apps_dir }.to raise_error(ChefDK::OmnibusInstallNotFound)
     end
 
     context "and a component's gem is not installed" do
@@ -98,8 +98,8 @@ describe ChefDK::Command::Verify do
       end
 
       it "raises MissingComponentError when a component doesn't exist" do
-        allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path,"eg_omnibus_dir/missing_component/embedded/bin/ruby"))
-        expect{command_instance.validate_components!}.to raise_error(ChefDK::MissingComponentError)
+        allow(Gem).to receive(:ruby).and_return(File.join(fixtures_path, "eg_omnibus_dir/missing_component/embedded/bin/ruby"))
+        expect { command_instance.validate_components! }.to raise_error(ChefDK::MissingComponentError)
       end
     end
   end
@@ -111,11 +111,11 @@ describe ChefDK::Command::Verify do
     def run_unit_test
       # Set rubyopt to empty to prevent bundler from infecting the ruby
       # subcommands (and loading a bunch of extra gems).
-      lambda { |_self| sh("#{Gem.real_ruby} verify_me", env: { "RUBYOPT" => ""}) }
+      lambda { |_self| sh("#{Gem.real_ruby} verify_me", env: { "RUBYOPT" => "" }) }
     end
 
     def run_integration_test
-      lambda { |_self| sh("#{Gem.real_ruby} integration_test", env: { "RUBYOPT" => ""}) }
+      lambda { |_self| sh("#{Gem.real_ruby} integration_test", env: { "RUBYOPT" => "" }) }
     end
 
     let(:all_tests_ok) do