From 9dbdb769bfd963f82eb4bfea53c83501d0193766 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 20 May 2019 18:05:36 -0700 Subject: This hits the ones that are most frequently required. Stops the kernel from scanning through all the activated gems every time in order to resolve names into pathnames. See rubygems/rubygems#2762 Signed-off-by: Lamont Granquist --- lib/chef/win32/api.rb | 2 +- lib/chef/win32/api/installer.rb | 2 +- lib/chef/win32/process.rb | 2 +- lib/chef/win32/registry.rb | 2 +- lib/chef/win32/security/ace.rb | 2 +- lib/chef/win32/security/acl.rb | 2 +- lib/chef/win32/security/token.rb | 2 +- lib/chef/win32/system.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/chef/win32') diff --git a/lib/chef/win32/api.rb b/lib/chef/win32/api.rb index 6bfa287249..e32828673a 100644 --- a/lib/chef/win32/api.rb +++ b/lib/chef/win32/api.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "ffi" +require "ffi" unless defined?(FFI) require_relative "../reserved_names" require_relative "../exceptions" diff --git a/lib/chef/win32/api/installer.rb b/lib/chef/win32/api/installer.rb index 2ad23be960..118afe8c8f 100644 --- a/lib/chef/win32/api/installer.rb +++ b/lib/chef/win32/api/installer.rb @@ -19,7 +19,7 @@ require_relative "../../exceptions" require_relative "../api" require_relative "../error" -require "pathname" +require "pathname" unless defined?(Pathname) class Chef module ReservedNames::Win32 diff --git a/lib/chef/win32/process.rb b/lib/chef/win32/process.rb index 85f3faea64..d2267cc76d 100644 --- a/lib/chef/win32/process.rb +++ b/lib/chef/win32/process.rb @@ -20,7 +20,7 @@ require_relative "api/process" require_relative "api/psapi" require_relative "error" require_relative "handle" -require "ffi" +require "ffi" unless defined?(FFI) class Chef module ReservedNames::Win32 diff --git a/lib/chef/win32/registry.rb b/lib/chef/win32/registry.rb index b1a2258975..c0efa68464 100644 --- a/lib/chef/win32/registry.rb +++ b/lib/chef/win32/registry.rb @@ -23,7 +23,7 @@ require_relative "../mixin/wide_string" if RUBY_PLATFORM =~ /mswin|mingw32|windows/ require_relative "../monkey_patches/win32/registry" require_relative "api/registry" - require "win32/registry" + require "win32/registry" unless defined?(Win32::Registry) require "win32/api" end diff --git a/lib/chef/win32/security/ace.rb b/lib/chef/win32/security/ace.rb index c890cc90e5..6e8c1ec418 100644 --- a/lib/chef/win32/security/ace.rb +++ b/lib/chef/win32/security/ace.rb @@ -20,7 +20,7 @@ require_relative "../security" require_relative "sid" require_relative "../memory" -require "ffi" +require "ffi" unless defined?(FFI) class Chef module ReservedNames::Win32 diff --git a/lib/chef/win32/security/acl.rb b/lib/chef/win32/security/acl.rb index a8c1c59051..a2700b36ac 100644 --- a/lib/chef/win32/security/acl.rb +++ b/lib/chef/win32/security/acl.rb @@ -18,7 +18,7 @@ require_relative "../security" require_relative "ace" -require "ffi" +require "ffi" unless defined?(FFI) class Chef module ReservedNames::Win32 diff --git a/lib/chef/win32/security/token.rb b/lib/chef/win32/security/token.rb index 9a1ac51def..dfd1e31241 100644 --- a/lib/chef/win32/security/token.rb +++ b/lib/chef/win32/security/token.rb @@ -19,7 +19,7 @@ require_relative "../security" require_relative "../api/security" require_relative "../unicode" -require "ffi" +require "ffi" unless defined?(FFI) class Chef module ReservedNames::Win32 diff --git a/lib/chef/win32/system.rb b/lib/chef/win32/system.rb index 63616fa397..db641670b2 100644 --- a/lib/chef/win32/system.rb +++ b/lib/chef/win32/system.rb @@ -18,7 +18,7 @@ require_relative "api/system" require_relative "error" -require "ffi" +require "ffi" unless defined?(FFI) class Chef module ReservedNames::Win32 -- cgit v1.2.1