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/application/apply.rb | 4 ++-- lib/chef/application/client.rb | 4 ++-- lib/chef/application/solo.rb | 6 +++--- lib/chef/application/windows_service.rb | 6 +++--- lib/chef/application/windows_service_manager.rb | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lib/chef/application') diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb index 275fe19f93..1a9b115632 100644 --- a/lib/chef/application/apply.rb +++ b/lib/chef/application/apply.rb @@ -22,8 +22,8 @@ require_relative "../application" require_relative "../client" require_relative "../config" require_relative "../log" -require "fileutils" -require "tempfile" +require "fileutils" unless defined?(FileUtils) +require "tempfile" unless defined?(Tempfile) require_relative "../providers" require_relative "../resources" require_relative "../dist" diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index ab358fdcb6..9ba1502409 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -27,8 +27,8 @@ require_relative "../handler/error_report" require_relative "../workstation_config_loader" require_relative "../mixin/shell_out" require "chef-config/mixin/dot_d" -require "mixlib/archive" -require "uri" +require "mixlib/archive" unless defined?(Mixlib::Archive) +require "uri" unless defined?(URI) require_relative "../dist" require "license_acceptance/cli_flags/mixlib_cli" diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index 5cfcce9553..f11654ddd5 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -24,11 +24,11 @@ require_relative "../config" require_relative "../daemon" require_relative "../log" require_relative "../config_fetcher" -require "fileutils" +require "fileutils" unless defined?(FileUtils) require_relative "../mixin/shell_out" -require "pathname" +require "pathname" unless defined?(Pathname) require "chef-config/mixin/dot_d" -require "mixlib/archive" +require "mixlib/archive" unless defined?(Mixlib::Archive) require_relative "../dist" require "license_acceptance/cli_flags/mixlib_cli" diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index ebf7533956..e0df23371c 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -24,9 +24,9 @@ require_relative "../config" require_relative "../handler/error_report" require_relative "../log" require_relative "../http" -require "mixlib/cli" -require "socket" -require "uri" +require "mixlib/cli" unless defined?(Mixlib::CLI) +require "socket" unless defined?(Socket) +require "uri" unless defined?(URI) require "win32/daemon" require_relative "../mixin/shell_out" require_relative "../dist" diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb index 4a2bfa258e..2921c3d964 100644 --- a/lib/chef/application/windows_service_manager.rb +++ b/lib/chef/application/windows_service_manager.rb @@ -20,7 +20,7 @@ if RUBY_PLATFORM =~ /mswin|mingw32|windows/ require "win32/service" end require_relative "../config" -require "mixlib/cli" +require "mixlib/cli" unless defined?(Mixlib::CLI) require_relative "../dist" class Chef -- cgit v1.2.1