chef 14.14.29-universal-mingw32 → 14.15.6-universal-mingw32

data/spec/support/mock/platform.rb

@@ -19,7 +19,7 @@ def platform_mock(platform = :unix)
     mock_constants({ "RUBY_PLATFORM" => (platform == :windows ? "i386-mingw32" : "x86_64-darwin11.2.0"),
                      "File::PATH_SEPARATOR" => (platform == :windows ? ";" : ":"),
                      "File::ALT_SEPARATOR" => (platform == :windows ? "\\" : nil) }) do
-      yield
-    end
+                       yield
+                     end
   end
 end

data/spec/support/platform_helpers.rb

@@ -46,6 +46,7 @@ require "wmi-lite/wmi" if windows?
 
 def windows_domain_joined?
   return false unless windows?
+
   wmi = WmiLite::Wmi.new
   computer_system = wmi.first_of("Win32_ComputerSystem")
   computer_system["partofdomain"]
@@ -54,19 +55,20 @@ end
 def windows_2008r2_or_later?
   return false unless windows?
   return false unless host_version
-  components = host_version.split(".").map do |component|
-    component.to_i
-  end
+
+  components = host_version.split(".").map(&:to_i)
   components.length >= 2 && components[0] >= 6 && components[1] >= 1
 end
 
 def windows_2012r2?
   return false unless windows?
+
   (host_version && host_version.start_with?("6.3"))
 end
 
 def windows_gte_10?
   return false unless windows?
+
   Gem::Requirement.new(">= 10").satisfied_by?(Gem::Version.new(host_version))
 end
 
@@ -80,6 +82,7 @@ end
 
 def windows_powershell_dsc?
   return false unless windows?
+
   supports_dsc = false
   begin
     wmi = WmiLite::Wmi.new("root/microsoft/windows/desiredstateconfiguration")
@@ -97,6 +100,7 @@ end
 
 def windows_user_right?(right)
   return false unless windows?
+
   require "chef/win32/security"
   Chef::ReservedNames::Win32::Security.get_account_right(ENV["USERNAME"]).include?(right)
 end
@@ -238,6 +242,7 @@ end
 
 def root?
   return false if windows?
+
   Process.euid == 0
 end
 
@@ -270,6 +275,10 @@ rescue SocketError
   false
 end
 
+def ifconfig?
+  which("ifconfig")
+end
+
 def choco_installed?
   result = ShellHelpers.powershell_out("choco --version")
   result.stderr.empty? ? true : false

data/spec/support/platforms/win32/spec_service.rb

@@ -20,12 +20,12 @@ require "win32/daemon"
 
 class SpecService < ::Win32::Daemon
   def service_init
-    @test_service_file = "#{ENV['TMP']}/spec_service_file"
+    @test_service_file = "#{ENV["TMP"]}/spec_service_file"
   end
 
   def service_main(*startup_parameters)
     while running?
-      if !File.exists?(@test_service_file)
+      unless File.exists?(@test_service_file)
         File.open(@test_service_file, "wb") do |f|
           f.write("This file is created by SpecService")
         end
@@ -39,17 +39,13 @@ class SpecService < ::Win32::Daemon
   # Control Signal Callback Methods
   ################################################################################
 
-  def service_stop
-  end
+  def service_stop; end
 
-  def service_pause
-  end
+  def service_pause; end
 
-  def service_resume
-  end
+  def service_resume; end
 
-  def service_shutdown
-  end
+  def service_shutdown; end
 end
 
 # To run this file as a service, it must be called as a script from within

data/spec/support/shared/context/client.rb

@@ -251,7 +251,8 @@ end
 shared_context "audit phase completed with failed controls" do
   let(:audit_runner) do
     instance_double("Chef::Audit::Runner", failed?: true,
-                                           num_failed: 1, num_total: 3) end
+                                           num_failed: 1, num_total: 3)
+  end
 
   let(:audit_error) do
     err = Chef::Exceptions::AuditsFailed.new(audit_runner.num_failed, audit_runner.num_total)

data/spec/support/shared/functional/execute_resource.rb

@@ -21,7 +21,7 @@ shared_context "a non-admin Windows user" do
 
   let(:windows_nonadmin_user_domain) { ENV["COMPUTERNAME"] }
   let(:windows_nonadmin_user_qualified) { "#{windows_nonadmin_user_domain}\\#{windows_nonadmin_user}" }
-  let(:temp_profile_path) { "#{ENV['USERPROFILE']}\\..\\cheftesttempuser" }
+  let(:temp_profile_path) { "#{ENV["USERPROFILE"]}\\..\\cheftesttempuser" }
   before do
     shell_out!("net.exe user /delete #{windows_nonadmin_user}", returns: [0, 2])
 
@@ -40,7 +40,7 @@ end
 shared_context "alternate user identity" do
   let(:windows_alternate_user) { "chef%02d%02d%02d" % [Time.now.year % 100, Time.now.month, Time.now.day] }
   let(:windows_alternate_user_password) { "lj28;fx3T!x,2" }
-  let(:windows_alternate_user_qualified) { "#{ENV['COMPUTERNAME']}\\#{windows_alternate_user}" }
+  let(:windows_alternate_user_qualified) { "#{ENV["COMPUTERNAME"]}\\#{windows_alternate_user}" }
 
   let(:windows_nonadmin_user) { windows_alternate_user }
   let(:windows_nonadmin_user_password) { windows_alternate_user_password }
@@ -58,7 +58,7 @@ shared_context "a command that can be executed as an alternate user" do
   include Chef::Mixin::ShellOut
 
   before do
-    shell_out!("icacls \"#{script_output_dir.gsub(/\//, '\\')}\" /grant \"authenticated users:(F)\"")
+    shell_out!("icacls \"#{script_output_dir.gsub(%r{/}, '\\')}\" /grant \"authenticated users:(F)\"")
   end
 
   after do
@@ -73,7 +73,7 @@ shared_examples_for "an execute resource that supports alternate user identity"
     include_context "a command that can be executed as an alternate user"
 
     let(:windows_current_user) { ENV["USERNAME"] }
-    let(:windows_current_user_qualified) { "#{ENV['USERDOMAIN'] || ENV['COMPUTERNAME']}\\#{windows_current_user}" }
+    let(:windows_current_user_qualified) { "#{ENV["USERDOMAIN"] || ENV["COMPUTERNAME"]}\\#{windows_current_user}" }
     let(:resource_identity_command) { "powershell.exe -noprofile -command \"import-module microsoft.powershell.utility;([Security.Principal.WindowsPrincipal]([Security.Principal.WindowsIdentity]::GetCurrent())).identity.name | out-file -encoding ASCII '#{script_output_path}'\"" }
 
     let(:execute_resource) do

data/spec/support/shared/functional/file_resource.rb

@@ -392,9 +392,7 @@ shared_examples_for "a configured file resource" do
   end
 
   def binread(file)
-    content = File.open(file, "rb") do |f|
-      f.read
-    end
+    content = File.open(file, "rb", &:read)
     content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
     content
   end

data/spec/support/shared/functional/http.rb

@@ -30,9 +30,7 @@ module ChefHTTPShared
   end
 
   def binread(file)
-    content = File.open(file, "rb") do |f|
-      f.read
-    end
+    content = File.open(file, "rb", &:read)
     content.force_encoding(Encoding::BINARY) if "".respond_to?(:force_encoding)
     content
   end
@@ -53,25 +51,19 @@ module ChefHTTPShared
     # just a normal file
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat.png", 200) do
-      File.open(nyan_uncompressed_filename, "rb") do |f|
-        f.read
-      end
+      File.open(nyan_uncompressed_filename, "rb", &:read)
     end
 
     # this ends in .gz, we do not uncompress it and drop it on the filesystem as a .gz file (the internet often lies)
     # (expected_content should be compressed)
     @api.get("/nyan_cat.png.gz", 200, nil, { "Content-Type" => "application/gzip", "Content-Encoding" => "gzip" } ) do
-      File.open(nyan_compressed_filename, "rb") do |f|
-        f.read
-      end
+      File.open(nyan_compressed_filename, "rb", &:read)
     end
 
     # this is an uncompressed file that was compressed by some mod_gzip-ish webserver thingy, so we will expand it
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat_compressed.png", 200, nil, { "Content-Type" => "application/gzip", "Content-Encoding" => "gzip" } ) do
-      File.open(nyan_compressed_filename, "rb") do |f|
-        f.read
-      end
+      File.open(nyan_compressed_filename, "rb", &:read)
     end
 
     #
@@ -82,25 +74,19 @@ module ChefHTTPShared
     @api.get("/nyan_cat_content_length.png", 200, nil,
       {
         "Content-Length" => nyan_uncompressed_size.to_s,
-      }
-    ) do
-      File.open(nyan_uncompressed_filename, "rb") do |f|
-        f.read
+      }) do
+        File.open(nyan_uncompressed_filename, "rb", &:read)
       end
-    end
 
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat_content_length_compressed.png", 200, nil,
       {
-        "Content-Length"   => nyan_compressed_size.to_s,
-        "Content-Type"     => "application/gzip",
+        "Content-Length" => nyan_compressed_size.to_s,
+        "Content-Type" => "application/gzip",
         "Content-Encoding" => "gzip",
-      }
-    ) do
-      File.open(nyan_compressed_filename, "rb") do |f|
-        f.read
+      }) do
+        File.open(nyan_compressed_filename, "rb", &:read)
       end
-    end
 
     #
     # endpoints that simulate truncated downloads (bad content-length header)
@@ -110,25 +96,19 @@ module ChefHTTPShared
     @api.get("/nyan_cat_truncated.png", 200, nil,
       {
         "Content-Length" => (nyan_uncompressed_size + 1).to_s,
-      }
-    ) do
-      File.open(nyan_uncompressed_filename, "rb") do |f|
-        f.read
+      }) do
+        File.open(nyan_uncompressed_filename, "rb", &:read)
       end
-    end
 
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat_truncated_compressed.png", 200, nil,
       {
-        "Content-Length"   => (nyan_compressed_size + 1).to_s,
-        "Content-Type"     => "application/gzip",
+        "Content-Length" => (nyan_compressed_size + 1).to_s,
+        "Content-Type" => "application/gzip",
         "Content-Encoding" => "gzip",
-      }
-    ) do
-      File.open(nyan_compressed_filename, "rb") do |f|
-        f.read
+      }) do
+        File.open(nyan_compressed_filename, "rb", &:read)
       end
-    end
 
     #
     # in the presence of a transfer-encoding header, we must ignore the content-length (this bad content-length should work)
@@ -137,14 +117,11 @@ module ChefHTTPShared
     # (expected_content should be uncompressed)
     @api.get("/nyan_cat_transfer_encoding.png", 200, nil,
       {
-        "Content-Length"    => (nyan_uncompressed_size + 1).to_s,
+        "Content-Length" => (nyan_uncompressed_size + 1).to_s,
         "Transfer-Encoding" => "anything",
-      }
-    ) do
-      File.open(nyan_uncompressed_filename, "rb") do |f|
-        f.read
+      }) do
+        File.open(nyan_uncompressed_filename, "rb", &:read)
       end
-    end
 
     #
     # 403 with a Content-Length
@@ -152,8 +129,7 @@ module ChefHTTPShared
     @api.get("/forbidden", 403, "Forbidden",
       {
         "Content-Length" => "Forbidden".bytesize.to_s,
-      }
-    )
+      })
 
     @api.post("/posty", 200, "Hi!")
 

data/spec/support/shared/functional/securable_resource.rb

@@ -89,7 +89,7 @@ shared_context "use Windows permissions", :windows_only do
   end
 
   def explicit_aces
-    descriptor.dacl.select { |ace| ace.explicit? }
+    descriptor.dacl.select(&:explicit?)
   end
 
   def extract_ace_properties(aces)
@@ -314,7 +314,7 @@ shared_examples_for "a securable resource without existing target" do
     end
 
     it "sets owner when owner is specified with a \\" do
-      resource.owner "#{ENV['COMPUTERNAME']}\\Guest"
+      resource.owner "#{ENV["COMPUTERNAME"]}\\Guest"
       resource.run_action(:create)
       expect(descriptor.owner).to eq(SID.Guest)
     end
@@ -560,16 +560,12 @@ shared_examples_for "a securable resource without existing target" do
 
       # On certain flavors of Windows the default list of ACLs sometimes includes
       # non-inherited ACLs. Filter them out here.
-      parent_inherited_acls = parent_acls.dacl.collect do |ace|
-        ace.inherited?
-      end
+      parent_inherited_acls = parent_acls.dacl.collect(&:inherited?)
 
       resource.run_action(:create)
 
       # Similarly filter out the non-inherited ACLs
-      resource_inherited_acls = descriptor.dacl.collect do |ace|
-        ace.inherited?
-      end
+      resource_inherited_acls = descriptor.dacl.collect(&:inherited?)
 
       expect(resource_inherited_acls).to eq(parent_inherited_acls)
     end

data/spec/support/shared/functional/win32_service.rb

@@ -52,6 +52,6 @@ shared_context "using Win32::Service" do
   # for the file it creates under SYSTEM temp directory
 
   let(:test_service_file) do
-    "#{ENV['SystemDrive']}\\windows\\temp\\spec_service_file"
+    "#{ENV["SystemDrive"]}\\windows\\temp\\spec_service_file"
   end
 end

data/spec/support/shared/functional/windows_script.rb

@@ -114,7 +114,8 @@ shared_context Chef::Resource::WindowsScript do
           resource.only_if resource_guard_command, architecture: guard_architecture
           expect { resource.run_action(:run) }.to raise_error(
             Chef::Exceptions::Win32ArchitectureIncorrect,
-            /cannot execute script with requested architecture 'i386' on Windows Nano Server/)
+            /cannot execute script with requested architecture 'i386' on Windows Nano Server/
+          )
         end
       end
     end

data/spec/support/shared/integration/app_server_support.rb

@@ -27,10 +27,9 @@ module AppServerSupport
       Rack::Handler::WEBrick.run(app,
         Port: 9018,
         AccessLog: [],
-        Logger: WEBrick::Log.new(StringIO.new, 7)
-      ) do |found_server|
-        server = found_server
-      end
+        Logger: WEBrick::Log.new(StringIO.new, 7)) do |found_server|
+          server = found_server
+        end
     end
     Timeout.timeout(30) do
       sleep(0.01) until server && server.status == :Running

data/spec/support/shared/integration/integration_helper.rb

@@ -111,6 +111,7 @@ module IntegrationSupport
   RSpec.shared_context "with a chef repo" do
     before :each do
       raise "Can only create one directory per test" if @repository_dir
+
       @repository_dir = Dir.mktmpdir("chef_repo")
       Chef::Config.chef_repo_path = @repository_dir
       %w{client cookbook data_bag environment node role user}.each do |object_name|

data/spec/support/shared/integration/knife_support.rb

@@ -58,7 +58,7 @@ module KnifeSupport
       old_loggers = Chef::Log.loggers
       old_log_level = Chef::Log.level
       begin
-        puts "knife: #{args.join(' ')}" if DEBUG
+        puts "knife: #{args.join(" ")}" if DEBUG
         subcommand_class = Chef::Knife.subcommand_class_from(args)
         subcommand_class.options = Chef::Application::Knife.options.merge(subcommand_class.options)
         subcommand_class.load_deps
@@ -150,7 +150,7 @@ module KnifeSupport
           expected[:stderr] = arg
         end
       end
-      expected[:exit_code] = 1 if !expected[:exit_code]
+      expected[:exit_code] = 1 unless expected[:exit_code]
       should_result_in(expected)
     end
 
@@ -169,9 +169,9 @@ module KnifeSupport
     private
 
     def should_result_in(expected)
-      expected[:stdout] = "" if !expected[:stdout]
-      expected[:stderr] = "" if !expected[:stderr]
-      expected[:exit_code] = 0 if !expected[:exit_code]
+      expected[:stdout] = "" unless expected[:stdout]
+      expected[:stderr] = "" unless expected[:stderr]
+      expected[:exit_code] = 0 unless expected[:exit_code]
       # TODO make this go away
       stderr_actual = @stderr.sub(/^WARNING: No knife configuration file found\n/, "")
 

data/spec/support/shared/unit/application_dot_d.rb

@@ -33,13 +33,15 @@ shared_examples_for "an application that loads a dot d" do
     # make sure that we are correctly globbing.
     let(:client_d_dir) do
       Chef::Util::PathHelper.cleanpath(
-      File.join(File.dirname(__FILE__), "../../../data/client.d_00")) end
+        File.join(File.dirname(__FILE__), "../../../data/client.d_00")
+      )
+    end
 
     it "loads the configuration in order" do
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_return("foo 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_return("bar 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_return("strings 0")
-      allow(app).to receive(:apply_config).with(anything(), Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_call_original.ordered
+      allow(app).to receive(:apply_config).with(anything, Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_call_original.ordered
       expect(app).to receive(:apply_config).with("foo 0", Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("bar 0", Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("strings 0", Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_call_original.ordered
@@ -50,7 +52,9 @@ shared_examples_for "an application that loads a dot d" do
   context "when client_d_dir is set to a directory without configuration" do
     let(:client_d_dir) do
       Chef::Util::PathHelper.cleanpath(
-      File.join(File.dirname(__FILE__), "../../data/client.d_01")) end
+        File.join(File.dirname(__FILE__), "../../data/client.d_01")
+      )
+    end
 
     # client.d_01 has a nested folder with a rb file that if
     # executed, would raise an exception. If it is executed,
@@ -66,7 +70,9 @@ shared_examples_for "an application that loads a dot d" do
     # foo.rb as a directory should be ignored
     let(:client_d_dir) do
       Chef::Util::PathHelper.cleanpath(
-      File.join(File.dirname(__FILE__), "../../data/client.d_02")) end
+        File.join(File.dirname(__FILE__), "../../data/client.d_02")
+      )
+    end
 
     it "does not raise an exception" do
       expect { app.reconfigure }.not_to raise_error