chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/lib/chef/win32/memory.rb

@@ -67,7 +67,7 @@ class Chef
       # Free memory allocated using local_alloc
       def self.local_free(pointer)
         result = LocalFree(pointer)
-        if !result.null?
+        unless result.null?
           Chef::ReservedNames::Win32::Error.raise!
         end
       end

data/lib/chef/win32/net.rb

@@ -224,7 +224,8 @@ class Chef
         buf = FFI::MemoryPointer.new(LOCALGROUP_MEMBERS_INFO_3, members.size)
         Array.new(members.size) do |i|
           member_info = LOCALGROUP_MEMBERS_INFO_3.new(
-            buf + i * LOCALGROUP_MEMBERS_INFO_3.size)
+            buf + i * LOCALGROUP_MEMBERS_INFO_3.size
+          )
           member_info[:lgrmi3_domainandname] = FFI::MemoryPointer.from_string(wstring(members[i]))
           member_info
         end
@@ -236,7 +237,8 @@ class Chef
 
         lgrmi3s = members_to_lgrmi3(members)
         rc = NetLocalGroupAddMembers(
-          server_name, group_name, 3, lgrmi3s[0], members.size)
+          server_name, group_name, 3, lgrmi3s[0], members.size
+        )
 
         if rc != NERR_Success
           Chef::ReservedNames::Win32::Error.raise!(nil, rc)
@@ -249,7 +251,8 @@ class Chef
 
         lgrmi3s = members_to_lgrmi3(members)
         rc = NetLocalGroupSetMembers(
-          server_name, group_name, 3, lgrmi3s[0], members.size)
+          server_name, group_name, 3, lgrmi3s[0], members.size
+        )
 
         if rc != NERR_Success
           Chef::ReservedNames::Win32::Error.raise!(nil, rc)
@@ -262,7 +265,8 @@ class Chef
 
         lgrmi3s = members_to_lgrmi3(members)
         rc = NetLocalGroupDelMembers(
-          server_name, group_name, 3, lgrmi3s[0], members.size)
+          server_name, group_name, 3, lgrmi3s[0], members.size
+        )
 
         if rc != NERR_Success
           Chef::ReservedNames::Win32::Error.raise!(nil, rc)

data/lib/chef/win32/registry.rb

@@ -132,6 +132,7 @@ class Chef
         if has_subkeys?(key_path) && !recursive
           raise Chef::Exceptions::Win32RegNoRecursive, "Registry key #{key_path} has subkeys, and recursive not specified"
         end
+
         hive, key_including_parent = get_hive_and_key(key_path)
         # key_including_parent: Software\\Root\\Branch\\Fruit
         # key => Fruit
@@ -161,6 +162,7 @@ class Chef
         unless key_exists?(key_path)
           raise Chef::Exceptions::Win32RegKeyMissing, "Registry key #{key_path} does not exist"
         end
+
         true
       end
 
@@ -226,6 +228,7 @@ class Chef
         unless value_exists?(key_path, value)
           raise Chef::Exceptions::Win32RegValueMissing, "Registry key #{key_path} has no value named #{value[:name]}"
         end
+
         true
       end
 
@@ -233,6 +236,7 @@ class Chef
         unless data_exists?(key_path, value)
           raise Chef::Exceptions::Win32RegDataMissing, "Registry key #{key_path} has no value named #{value[:name]}, containing type #{value[:type]} and data #{value[:data]}"
         end
+
         true
       end
 
@@ -279,6 +283,7 @@ class Chef
         if val.is_a? String
           return val.downcase
         end
+
         val
       end
 
@@ -356,7 +361,7 @@ class Chef
         hive, key = get_hive_and_key(key_path)
         missing_key_arr.each do |intermediate_key|
           existing_key_path = existing_key_path << "\\" << intermediate_key
-          if !key_exists?(existing_key_path)
+          unless key_exists?(existing_key_path)
             Chef::Log.trace("Recursively creating registry key #{existing_key_path}")
             hive.create(get_key(existing_key_path), ::Win32::Registry::KEY_ALL_ACCESS | registry_system_architecture)
           end

data/lib/chef/win32/security.rb

@@ -56,8 +56,8 @@ class Chef
         granted_access_ptr = FFI::MemoryPointer.new(:ulong)
 
         unless AccessCheck(security_descriptor_ptr, token_handle, rights_ptr.read_ulong,
-                           generic_mapping, privileges, privileges_length_ptr, granted_access_ptr,
-                           result_ptr)
+          generic_mapping, privileges, privileges_length_ptr, granted_access_ptr,
+          result_ptr)
           Chef::ReservedNames::Win32::Error.raise!
         end
         result_ptr.read_ulong == 1
@@ -200,6 +200,7 @@ class Chef
           result = LsaEnumerateAccountRights(policy_handle.read_pointer, sid, privilege_pointer, privilege_length)
           win32_error = LsaNtStatusToWinError(result)
           return [] if win32_error == 2 # FILE_NOT_FOUND - No rights assigned
+
           test_and_raise_lsa_nt_status(result)
 
           privilege_length.read_ulong.times do |i|
@@ -327,6 +328,7 @@ class Chef
         elsif FFI::LastError.error != ERROR_INSUFFICIENT_BUFFER
           Chef::ReservedNames::Win32::Error.raise!
         end
+
         owner_result_storage = FFI::MemoryPointer.new owner_result_size.read_ulong
         unless GetTokenInformation(token.handle.handle, :TokenOwner, owner_result_storage, owner_result_size.read_ulong, owner_result_size)
           Chef::ReservedNames::Win32::Error.raise!
@@ -342,6 +344,7 @@ class Chef
         elsif FFI::LastError.error != ERROR_INSUFFICIENT_BUFFER
           Chef::ReservedNames::Win32::Error.raise!
         end
+
         group_result_storage = FFI::MemoryPointer.new group_result_size.read_ulong
         unless GetTokenInformation(token.handle.handle, :TokenPrimaryGroup, group_result_storage, group_result_size.read_ulong, group_result_size)
           Chef::ReservedNames::Win32::Error.raise!
@@ -357,6 +360,7 @@ class Chef
         elsif FFI::LastError.error != ERROR_INSUFFICIENT_BUFFER
           Chef::ReservedNames::Win32::Error.raise!
         end
+
         info_ptr = FFI::MemoryPointer.new(:pointer)
         token_info_pointer = TOKEN_ELEVATION_TYPE.new info_ptr
         token_info_length = 4
@@ -653,6 +657,7 @@ class Chef
           process_token = open_current_process_token(TOKEN_READ)
         rescue Exception => run_error
           return false if run_error.message =~ /Access is denied/
+
           Chef::ReservedNames::Win32::Error.raise!
         end
 

data/lib/chef/win32/security/acl.rb

@@ -45,6 +45,7 @@ class Chef
 
         def ==(other)
           return false if length != other.length
+
           0.upto(length - 1) do |i|
             return false if self[i] != other[i]
           end
@@ -88,7 +89,7 @@ class Chef
         end
 
         def to_s
-          "[#{collect { |ace| ace.to_s }.join(", ")}]"
+          "[#{collect(&:to_s).join(", ")}]"
         end
 
         def self.align_dword(size)

data/lib/chef/win32/security/security_descriptor.rb

@@ -41,7 +41,8 @@ class Chef
         end
 
         def dacl
-          raise "DACL not present" if !dacl_present?
+          raise "DACL not present" unless dacl_present?
+
           present, acl, defaulted = Chef::ReservedNames::Win32::Security.get_security_descriptor_dacl(self)
           acl
         end
@@ -65,7 +66,8 @@ class Chef
         end
 
         def sacl
-          raise "SACL not present" if !sacl_present?
+          raise "SACL not present" unless sacl_present?
+
           Security.with_privileges("SeSecurityPrivilege") do
             present, acl, defaulted = Chef::ReservedNames::Win32::Security.get_security_descriptor_sacl(self)
             acl

data/lib/chef/win32/security/sid.rb

@@ -231,33 +231,33 @@ class Chef
         end
 
         def self.None
-          SID.from_account("#{::ENV['COMPUTERNAME']}\\None")
+          SID.from_account("#{::ENV["COMPUTERNAME"]}\\None")
         end
 
         def self.Administrator
-          SID.from_account("#{::ENV['COMPUTERNAME']}\\#{SID.admin_account_name}")
+          SID.from_account("#{::ENV["COMPUTERNAME"]}\\#{SID.admin_account_name}")
         end
 
         def self.Guest
-          SID.from_account("#{::ENV['COMPUTERNAME']}\\Guest")
+          SID.from_account("#{::ENV["COMPUTERNAME"]}\\Guest")
         end
 
         def self.current_user
-          SID.from_account("#{::ENV['USERDOMAIN']}\\#{::ENV['USERNAME']}")
+          SID.from_account("#{::ENV["USERDOMAIN"]}\\#{::ENV["USERNAME"]}")
         end
 
         SERVICE_ACCOUNT_USERS = [self.LocalSystem,
                                  self.NtLocal,
                                  self.NtNetwork].flat_map do |user_type|
-          [user_type.account_simple_name.upcase,
-           user_type.account_name.upcase]
-        end.freeze
+                                   [user_type.account_simple_name.upcase,
+                                    user_type.account_name.upcase]
+                                 end.freeze
 
         BUILT_IN_GROUPS = [self.BuiltinAdministrators,
                            self.BuiltinUsers, self.Guests].flat_map do |user_type|
-          [user_type.account_simple_name.upcase,
-           user_type.account_name.upcase]
-        end.freeze
+                             [user_type.account_simple_name.upcase,
+                              user_type.account_name.upcase]
+                           end.freeze
 
         SYSTEM_USER = SERVICE_ACCOUNT_USERS + BUILT_IN_GROUPS
 
@@ -338,6 +338,7 @@ class Chef
             end
 
             raise "Can not determine the administrator account name." if admin_account_name.nil?
+
             admin_account_name
           end
         end

data/lib/chef/win32/security/token.rb

@@ -35,7 +35,8 @@ class Chef
         def enable_privileges(*privilege_names)
           # Build the list of privileges we want to set
           new_privileges = Chef::ReservedNames::Win32::API::Security::TOKEN_PRIVILEGES.new(
-            FFI::MemoryPointer.new(Chef::ReservedNames::Win32::API::Security::TOKEN_PRIVILEGES.size_with_privileges(privilege_names.length)))
+            FFI::MemoryPointer.new(Chef::ReservedNames::Win32::API::Security::TOKEN_PRIVILEGES.size_with_privileges(privilege_names.length))
+          )
           new_privileges[:PrivilegeCount] = 0
           privilege_names.each do |privilege_name|
             luid = Chef::ReservedNames::Win32::API::Security::LUID.new
@@ -64,6 +65,7 @@ class Chef
           unless Chef::ReservedNames::Win32::API::Security.DuplicateToken(handle.handle, security_impersonation_level, duplicate_token_handle)
             raise Chef::ReservedNames::Win32::Error.raise!
           end
+
           Token.new(Handle.new(duplicate_token_handle.read_ulong))
         end
       end

data/lib/chef/win32/version.rb

@@ -43,7 +43,7 @@ class Chef
       private_class_method :get_system_metrics
 
       def self.method_name_from_marketing_name(marketing_name)
-        "#{marketing_name.gsub(/\s/, '_').tr('.', '_').downcase}?"
+        "#{marketing_name.gsub(/\s/, "_").tr(".", "_").downcase}?"
       end
 
       private_class_method :method_name_from_marketing_name
@@ -80,7 +80,7 @@ class Chef
         @sku = get_product_info(@major_version, @minor_version, @sp_major_version, @sp_minor_version)
       end
 
-      marketing_names = Array.new
+      marketing_names = []
 
       # General Windows checks
       WIN_VERSIONS.each do |k, v|
@@ -128,7 +128,7 @@ class Chef
         # The operating system version is a string in the following form
         # that can be split into components based on the '.' delimiter:
         # MajorVersionNumber.MinorVersionNumber.BuildNumber
-        os_version.split(".").collect { |version_string| version_string.to_i }
+        os_version.split(".").collect(&:to_i)
       end
 
       def get_version_ex

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -36,7 +36,7 @@ describe Chef::DSL::RebootPending, :windows_only do
     let(:reg_key) { nil }
     let(:original_set) { false }
 
-    before(:all) { @any_flag = Hash.new }
+    before(:all) { @any_flag = {} }
 
     after { @any_flag[reg_key] = original_set }
 
@@ -47,7 +47,7 @@ describe Chef::DSL::RebootPending, :windows_only do
       it "returns true if the registry value exists" do
         skip "found existing registry key" if original_set
         registry.set_value(reg_key,
-            { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
+          { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
 
         expect(recipe.reboot_pending?).to be_truthy
       end

data/spec/functional/event_loggers/windows_eventlog_spec.rb

@@ -49,16 +49,18 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_start(version, run_status)
 
     expect(event_log.read(flags, offset).any? do |e|
-             e.source == Chef::Dist::PRODUCT && e.event_id == 10000 &&
-                                               e.string_inserts[0].include?(version) end).to be_truthy
+      e.source == Chef::Dist::PRODUCT && e.event_id == 10000 &&
+                                        e.string_inserts[0].include?(version)
+    end ).to be_truthy
   end
 
   it "writes run_started event with event_id 10001 and contains the run_id" do
     logger.run_started(run_status)
 
     expect(event_log.read(flags, offset).any? do |e|
-             e.source == Chef::Dist::PRODUCT && e.event_id == 10001 &&
-                                               e.string_inserts[0].include?(run_id) end).to be_truthy
+      e.source == Chef::Dist::PRODUCT && e.event_id == 10001 &&
+                                        e.string_inserts[0].include?(run_id)
+    end ).to be_truthy
   end
 
   it "writes run_completed event with event_id 10002 and contains the run_id and elapsed time" do

data/spec/functional/file_content_management/deploy_strategies_spec.rb

@@ -175,20 +175,20 @@ end
 describe Chef::FileContentManagement::Deploy::Cp do
 
   let(:unix_invariants) do
-    [
-      :uid,
-      :gid,
-      :mode,
-      :ino,
-    ]
+    %i{
+      uid
+      gid
+      mode
+      ino
+    }
   end
 
   let(:security_descriptor_invariants) do
-    [
-      :owner,
-      :group,
-      :dacl,
-    ]
+    %i{
+      owner
+      group
+      dacl
+    }
   end
 
   it_should_behave_like "a content deploy strategy"
@@ -198,11 +198,11 @@ end
 describe Chef::FileContentManagement::Deploy::MvUnix, :unix_only do
 
   let(:unix_invariants) do
-    [
-      :uid,
-      :gid,
-      :mode,
-    ]
+    %i{
+      uid
+      gid
+      mode
+    }
   end
 
   it_should_behave_like "a content deploy strategy"
@@ -216,11 +216,11 @@ describe Chef::FileContentManagement::Deploy::MvWindows, :windows_only do
   context "when a file has no sacl" do
 
     let(:security_descriptor_invariants) do
-      [
-       :owner,
-       :group,
-       :dacl,
-      ]
+      %i{
+       owner
+       group
+       dacl
+      }
     end
 
     it_should_behave_like "a content deploy strategy"

data/spec/functional/knife/exec_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Knife::Exec do
     code = "$output.puts nodes.all"
     @knife.config[:exec] = code
     @knife.run
-    expect($output.string).to match(%r{node\[ohai-world\]})
+    expect($output.string).to match(/node\[ohai-world\]/)
   end
 
 end

data/spec/functional/knife/ssh_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Knife::Ssh do
     @server.stop
   end
 
-  let(:ssh_config) { Hash.new }
+  let(:ssh_config) { {} }
   before do
     allow(Net::SSH).to receive(:configuration_for).and_return(ssh_config)
   end
@@ -301,7 +301,7 @@ describe Chef::Knife::Ssh do
       end
 
       it "uses the ssh_gateway_identity file" do
-        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV["HOME"]}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
         @knife.run
         expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
       end
@@ -315,7 +315,7 @@ describe Chef::Knife::Ssh do
       end
 
       it "uses the ssh_gateway_identity file" do
-        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV["HOME"]}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
         @knife.run
         expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
       end

data/spec/functional/mixin/user_context_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Mixin::UserContext, windows_only: true do
 
   let(:get_user_name_a) do
     FFI.ffi_lib "advapi32.dll"
-    FFI.attach_function :GetUserNameA, [ :pointer, :pointer ], :bool
+    FFI.attach_function :GetUserNameA, %i{pointer pointer}, :bool
   end
 
   let(:process_username) do
@@ -36,12 +36,14 @@ describe Chef::Mixin::UserContext, windows_only: true do
     if succeeded || last_error != Chef::ReservedNames::Win32::API::Error::ERROR_INSUFFICIENT_BUFFER
       raise Chef::Exceptions::Win32APIError, "Expected ERROR_INSUFFICIENT_BUFFER from GetUserNameA but it returned the following error: #{last_error}"
     end
+
     user_name = FFI::MemoryPointer.new :char, (name_size.read_long)
     succeeded = get_user_name_a.call(user_name, name_size)
     last_error = FFI::LastError.error
     if succeeded == 0 || last_error != 0
       raise Chef::Exceptions::Win32APIError, "GetUserNameA failed with #{lasterror}"
     end
+
     user_name.read_string
   end