chef-dk 1.2.22 → 1.3.40

data/lib/chef-dk/command/push_archive.rb

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/push_archive'
-require 'chef-dk/configurable'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/policyfile_services/push_archive"
+require "chef-dk/configurable"
 
 module ChefDK
   module Command
@@ -123,4 +123,3 @@ E
     end
   end
 end
-

data/lib/chef-dk/command/shell_init.rb

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'erb'
+require "erb"
 
-require 'chef-dk/commands_map'
-require 'chef-dk/builtin_commands'
-require 'chef-dk/command/base'
-require 'mixlib/shellout'
+require "chef-dk/commands_map"
+require "chef-dk/builtin_commands"
+require "chef-dk/command/base"
+require "mixlib/shellout"
 
 module ChefDK
 
@@ -41,7 +41,7 @@ module ChefDK
   module Command
     class ShellInit < ChefDK::Command::Base
 
-      SUPPORTED_SHELLS = %w[ bash fish zsh sh powershell posh].map(&:freeze).freeze
+      SUPPORTED_SHELLS = %w{ bash fish zsh sh powershell posh}.map(&:freeze).freeze
 
       banner(<<-HELP)
 Usage: chef shell-init
@@ -117,7 +117,7 @@ HELP
       def completion_for(shell)
         return "" unless (completion_template_basename = completion_template_for(shell))
         completion_template_path = expand_completion_template_path(completion_template_basename)
-        erb = ERB.new(File.read(completion_template_path), nil, '-')
+        erb = ERB.new(File.read(completion_template_path), nil, "-")
         context_binding = shell_completion_template_context.get_binding
         erb.result(context_binding)
       end
@@ -134,7 +134,6 @@ HELP
           # Pull requests accepted!
           nil
         end
-
       end
 
       def expand_completion_template_path(basename)
@@ -147,17 +146,17 @@ HELP
 
       def export(shell, var, val)
         case shell
-        when 'sh', 'bash', 'zsh'
+        when "sh", "bash", "zsh"
           posix_shell_export(var, val)
-        when 'fish'
+        when "fish"
           fish_shell_export(var, val)
-        when 'powershell', 'posh'
+        when "powershell", "posh"
           powershell_export(var, val)
         end
       end
 
       def posix_shell_export(var, val)
-        emit_shell_cmd(%Q(export #{var}="#{val}"))
+        emit_shell_cmd(%Q{export #{var}="#{val}"})
       end
 
       def fish_shell_export(var, val)
@@ -165,15 +164,15 @@ HELP
         # divided by spaces (instead of colons). We also send STDERR to
         # /dev/null to avoid Fish's helpful warnings about nonexistent
         # PATH elements.
-        if var == 'PATH'
-          emit_shell_cmd(%Q(set -gx #{var} "#{val.split(':').join('" "')}" 2>/dev/null;))
+        if var == "PATH"
+          emit_shell_cmd(%Q{set -gx #{var} "#{val.split(':').join('" "')}" 2>/dev/null;})
         else
-          emit_shell_cmd(%Q(set -gx #{var} "#{val}";))
+          emit_shell_cmd(%Q{set -gx #{var} "#{val}";})
         end
       end
 
       def powershell_export(var, val)
-        emit_shell_cmd(%Q($env:#{var}="#{val}"))
+        emit_shell_cmd(%Q{$env:#{var}="#{val}"})
       end
     end
   end

data/lib/chef-dk/command/show_policy.rb

@@ -15,16 +15,15 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile/lister'
-require 'chef-dk/policyfile_services/show_policy'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/configurable"
+require "chef-dk/policyfile/lister"
+require "chef-dk/policyfile_services/show_policy"
 
 module ChefDK
   module Command
 
-
     class ShowPolicy < Base
 
       banner(<<-BANNER)
@@ -162,4 +161,3 @@ BANNER
     end
   end
 end
-

data/lib/chef-dk/command/undelete.rb

@@ -15,10 +15,10 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile_services/undelete'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/configurable"
+require "chef-dk/policyfile_services/undelete"
 
 module ChefDK
   module Command
@@ -102,8 +102,8 @@ BANNER
       def undelete_service
         @undelete_service ||=
           PolicyfileServices::Undelete.new(config: chef_config,
-                                             ui: ui,
-                                             undo_record_id: undo_record_id)
+                                           ui: ui,
+                                           undo_record_id: undo_record_id)
       end
 
       def debug?
@@ -152,4 +152,3 @@ BANNER
     end
   end
 end
-

data/lib/chef-dk/command/update.rb

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/install'
-require 'chef-dk/policyfile_services/update_attributes'
-require 'chef-dk/configurable'
+require "chef-dk/command/base"
+require "chef-dk/ui"
+require "chef-dk/policyfile_services/install"
+require "chef-dk/policyfile_services/update_attributes"
+require "chef-dk/configurable"
 
 module ChefDK
   module Command
@@ -145,4 +145,3 @@ BANNER
     end
   end
 end
-

data/lib/chef-dk/command/verify.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/base'
-require 'chef-dk/exceptions'
-require 'chef-dk/component_test'
+require "chef-dk/command/base"
+require "chef-dk/exceptions"
+require "chef-dk/component_test"
 
 module ChefDK
   module Command
@@ -44,7 +44,7 @@ module ChefDK
         :description  => "Display all test output, not just failing tests"
 
       class << self
-        def add_component(name, _delete_me=nil)
+        def add_component(name, _delete_me = nil)
           component = ComponentTest.new(name)
           yield component if block_given? #delete this conditional
           component_map[name] = component
@@ -92,7 +92,7 @@ module ChefDK
 
         c.smoke_test do
           tmpdir do |cwd|
-            FileUtils.touch(File.join(cwd,"Berksfile"))
+            FileUtils.touch(File.join(cwd, "Berksfile"))
             sh("#{bin("berks")} install", cwd: cwd)
           end
         end
@@ -215,7 +215,7 @@ KITCHEN_YML
           def format_gem_failure(name, versions)
             <<-EOS
 #{name} has multiple versions installed:
-#{versions.sort.map { |gv| "    #{gv.to_s}" }.join("\n")}
+#{versions.sort.map { |gv| "    #{gv}" }.join("\n")}
             EOS
           end
 
@@ -237,7 +237,7 @@ EOS
           # ------------
           # load the core gem and all of the drivers (ignoring versions).
           require "chef/provisioning"
-          drivers.map { |d| "#{d.gsub('-', '/')}_driver" }.each do |driver_gem|
+          drivers.map { |d| "#{d.tr('-', '/')}_driver" }.each do |driver_gem|
             begin
               begin
                 require driver_gem
@@ -258,18 +258,18 @@ EOS
 
               # write out the gemfile for this chef-provisioning version, and see if Bundler can make it go.
               with_file(File.join(cwd, gemfile)) do |f|
-                f.puts %Q(gem "chef-provisioning", "= #{provisioning_version}")
-                drivers.each { |d| f.puts %Q(gem "#{d}") }
+                f.puts %Q{gem "chef-provisioning", "= #{provisioning_version}"}
+                drivers.each { |d| f.puts %Q{gem "#{d}"} }
               end
 
               result = bundle_install_mutex.synchronize do
-                sh("#{embedded_bin("bundle")} install --local --quiet", cwd: cwd, env: {"BUNDLE_GEMFILE" => gemfile })
+                sh("#{embedded_bin("bundle")} install --local --quiet", cwd: cwd, env: { "BUNDLE_GEMFILE" => gemfile })
               end
 
               if result.exitstatus != 0
                 failures << result.stdout
               end
-            end  # end provisioning versions.
+            end # end provisioning versions.
 
             failures.each { |fail| puts fail }
 
@@ -281,7 +281,6 @@ EOS
         end
       end
 
-
       add_component "chefspec" do |c|
         c.gem_base_dir = "chefspec"
         c.unit_test do
@@ -329,7 +328,7 @@ require 'spec_helper'
         c.gem_base_dir = "rubocop"
         c.smoke_test do
           tmpdir do |cwd|
-            with_file(File.join(cwd, 'foo.rb')) do |f|
+            with_file(File.join(cwd, "foo.rb")) do |f|
               f.write <<-EOF
 def foo
   puts 'foo'
@@ -348,7 +347,7 @@ end
 
       add_component "knife-spork" do |c|
         c.gem_base_dir = "knife-spork"
-        c.smoke_test { sh("#{bin("knife")} spork info")}
+        c.smoke_test { sh("#{bin("knife")} spork info") }
       end
 
       add_component "kitchen-vagrant" do |c|
@@ -468,34 +467,34 @@ end
         add_component "git" do |c|
           c.base_dir = "embedded/bin"
           c.smoke_test do
-        	  tmpdir do |cwd|
+            tmpdir do |cwd|
               sh!("#{embedded_bin("git")} config -l")
-        	    sh!("#{embedded_bin("git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
-        	  end
+              sh!("#{embedded_bin("git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
+            end
           end
         end
       else
         add_component "git" do |c|
           c.base_dir = "gitbin"
           c.smoke_test do
-        	  tmpdir do |cwd|
+            tmpdir do |cwd|
               sh!("#{File.join(omnibus_root, "gitbin", "git")} config -l")
-        	    sh!("#{File.join(omnibus_root, "gitbin", "git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
+              sh!("#{File.join(omnibus_root, "gitbin", "git")} clone https://github.com/chef/chef-provisioning", cwd: cwd)
 
-        	    # If /usr/bin/git is a symlink, fail the test.
-        	    # Note that this test cannot go last because it does not return a
-        	    # Mixlib::Shellout object in the windows case, which will break the tests.
+              # If /usr/bin/git is a symlink, fail the test.
+              # Note that this test cannot go last because it does not return a
+              # Mixlib::Shellout object in the windows case, which will break the tests.
               failure_str = "#{nix_platform_native_bin_dir}/git contains a symlink which might mean we accidentally overwrote system git via chefdk."
               result = sh("readlink #{nix_platform_native_bin_dir}/git")
               # if a symlink was found, test to see if it is in a chefdk install
               if result.status.exitstatus == 0
-               raise failure_str if result.stdout =~ /chefdk/
+                raise failure_str if result.stdout =~ /chefdk/
               end
 
-        	    # <chef_dk>/bin/ should not contain a git binary.
-        	    failure_str = "`<chef_dk>/bin/git --help` should fail as git should be installed in gitbin"
-        	    fail_if_exit_zero("#{bin("git")} --help", failure_str)
-        	  end
+              # <chef_dk>/bin/ should not contain a git binary.
+              failure_str = "`<chef_dk>/bin/git --help` should fail as git should be installed in gitbin"
+              fail_if_exit_zero("#{bin("git")} --help", failure_str)
+            end
           end
         end
       end
@@ -520,7 +519,7 @@ end
         c.gem_base_dir = "chef-sugar"
         c.smoke_test do
           tmpdir do |cwd|
-            with_file(File.join(cwd, 'foo.rb')) do |f|
+            with_file(File.join(cwd, "foo.rb")) do |f|
               f.write <<-EOF
 require 'chef/sugar'
 log 'something' do
@@ -593,7 +592,7 @@ end
               results << component.run_integration_test
             end
 
-            if results.any? {|r| r.exitstatus != 0 }
+            if results.any? { |r| r.exitstatus != 0 }
               component_status = 1
               @verification_status = 1
             else
@@ -603,7 +602,7 @@ end
             {
               :component => component,
               :results => results,
-              :component_status => component_status
+              :component_status => component_status,
             }
           end
 
@@ -612,7 +611,7 @@ end
       end
 
       def wait_for_tests
-        while !verification_threads.empty?
+        until verification_threads.empty?
           verification_threads.each do |t|
             if t.join(1)
               verification_threads.delete t

data/lib/chef-dk/commands_map.rb

@@ -74,7 +74,7 @@ module ChefDK
 
     def builtin(name, constant_name, require_path: NULL_ARG, desc: "")
       if null?(require_path)
-        snake_case_path = name.gsub("-", "_")
+        snake_case_path = name.tr("-", "_")
         require_path = "chef-dk/command/#{snake_case_path}"
       end
       command_specs[name] = CommandSpec.new(name, constant_name, require_path, desc)
@@ -111,5 +111,3 @@ module ChefDK
     yield commands_map
   end
 end
-
-

data/lib/chef-dk/component_test.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'chef-dk/exceptions'
-require 'chef-dk/helpers'
+require "chef-dk/exceptions"
+require "chef-dk/helpers"
 
 # https://github.com/bundler/bundler/issues/4368
 # As of rubygems 2.6.2, Rubygems will call Bundler::SpecSet#size, which does
@@ -107,7 +107,7 @@ module ChefDK
       File.join(omnibus_embedded_bin_dir, binary)
     end
 
-    def sh(command, options={})
+    def sh(command, options = {})
       combined_opts = default_command_options.merge(options)
 
       # Env is a hash, so it needs to be merged separately
@@ -132,15 +132,15 @@ module ChefDK
     # otherwise, if it returns non-zero or doesn't exist,
     # return a passing command so that the test parser doesn't
     # crash.
-    def fail_if_exit_zero(cmd_string, failure_string='')
+    def fail_if_exit_zero(cmd_string, failure_string = "")
       result = sh(cmd_string)
       if result.status.exitstatus == 0
-	raise failure_string
+        raise failure_string
       else
-	sh('true')
+        sh("true")
       end
     rescue Errno::ENOENT
-      sh('true')
+      sh("true")
     end
 
     def nix_platform_native_bin_dir
@@ -153,7 +153,7 @@ module ChefDK
       end
     end
 
-    def run_in_tmpdir(command, options={})
+    def run_in_tmpdir(command, options = {})
       tmpdir do |dir|
         options[:cwd] = dir
         sh(command, options)
@@ -180,9 +180,9 @@ module ChefDK
         :env => {
           # Add the embedded/bin to the PATH so that bundle executable can
           # be found while running the tests.
-          path_variable_key => omnibus_path
+          path_variable_key => omnibus_path,
         },
-        :timeout => 3600
+        :timeout => 3600,
       }
     end
 
@@ -203,7 +203,7 @@ module ChefDK
       # is a prerelease version.  ">= 0.a" is how we ask for a prerelease version, because a
       # prerelease version is defined as "any version with a letter in it."
       gem = Gem::Specification.find_by_name(@gem_name_for_base_dir)
-      gem ||= Gem::Specification.find_by_name(@gem_name_for_base_dir, '>= 0.a')
+      gem ||= Gem::Specification.find_by_name(@gem_name_for_base_dir, ">= 0.a")
       gem.gem_dir
     end
 
@@ -212,11 +212,11 @@ module ChefDK
     end
 
     def omnibus_root
-      @omnibus_root or raise "`omnibus_root` must be set before running tests"
+      @omnibus_root || raise("`omnibus_root` must be set before running tests")
     end
 
     def omnibus_path
-      [omnibus_bin_dir, omnibus_embedded_bin_dir, ENV['PATH']].join(File::PATH_SEPARATOR)
+      [omnibus_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"]].join(File::PATH_SEPARATOR)
     end
 
     def path_variable_key