diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-08 17:03:26 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-08 17:03:26 -0700 |
| commit | bc7687e56763cedbd010cfd566aa2fc0c53bb194 (patch) | |
| tree | 3d3e3eec51c847f23dc2955f9d058777bdea9a91 /lib/chef/knife | |
| parent | e793c825c857af87e745a8af479af71522ff20db (diff) | |
| download | chef-bc7687e56763cedbd010cfd566aa2fc0c53bb194.tar.gz | |
Convert require to require_relative
This gives a speed boost since rubygems does not have to scan through
every gem in the gemset in order to find the file.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/knife')
135 files changed, 359 insertions, 359 deletions
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 6f6b31f2ec..0b9431c96f 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/data_bag_secret_options" -require "chef/dist" +require_relative "" +require_relative "data_bag_secret_options" +require_relative "../dist" require "license_acceptance/cli_flags/mixlib_cli" require "license_acceptance/acceptor" @@ -403,11 +403,11 @@ class Chef deps do require "erubis" - require "chef/json_compat" - require "chef/util/path_helper" - require "chef/knife/bootstrap/chef_vault_handler" - require "chef/knife/bootstrap/client_builder" - require "chef/knife/bootstrap/train_connector" + require_relative "../json_compat" + require_relative "../util/path_helper" + require_relative "bootstrap/chef_vault_handler" + require_relative "bootstrap/client_builder" + require_relative "bootstrap/train_connector" end banner "knife bootstrap [PROTOCOL://][USER@]FQDN (options)" @@ -516,10 +516,10 @@ class Chef def bootstrap_context @bootstrap_context ||= if connection.windows? - require "chef/knife/core/windows_bootstrap_context" + require_relative "core/windows_bootstrap_context" Knife::Core::WindowsBootstrapContext.new(config, config[:run_list], Chef::Config, secret) else - require "chef/knife/core/bootstrap_context" + require_relative "core/bootstrap_context" Knife::Core::BootstrapContext.new(config, config[:run_list], Chef::Config, secret) end end diff --git a/lib/chef/knife/bootstrap/client_builder.rb b/lib/chef/knife/bootstrap/client_builder.rb index 09f4f67ced..1864297053 100644 --- a/lib/chef/knife/bootstrap/client_builder.rb +++ b/lib/chef/knife/bootstrap/client_builder.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/node" -require "chef/server_api" -require "chef/api_client/registration" -require "chef/api_client" +require_relative "../../node" +require_relative "../../server_api" +require_relative "../../api_client/registration" +require_relative "../../api_client" require "tmpdir" class Chef diff --git a/lib/chef/knife/client_bulk_delete.rb b/lib/chef/knife/client_bulk_delete.rb index a4777a4a16..9019abe6c0 100644 --- a/lib/chef/knife/client_bulk_delete.rb +++ b/lib/chef/knife/client_bulk_delete.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class ClientBulkDelete < Knife deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end option :delete_validators, diff --git a/lib/chef/knife/client_create.rb b/lib/chef/knife/client_create.rb index d87951555f..871b4e2aa5 100644 --- a/lib/chef/knife/client_create.rb +++ b/lib/chef/knife/client_create.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" -require "chef/dist" +require_relative "" +require_relative "../dist" class Chef class Knife class ClientCreate < Knife deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end option :file, diff --git a/lib/chef/knife/client_delete.rb b/lib/chef/knife/client_delete.rb index b2e34352a2..05125df38c 100644 --- a/lib/chef/knife/client_delete.rb +++ b/lib/chef/knife/client_delete.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class ClientDelete < Knife deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end option :delete_validators, diff --git a/lib/chef/knife/client_edit.rb b/lib/chef/knife/client_edit.rb index 21fd3f457d..34b8014b69 100644 --- a/lib/chef/knife/client_edit.rb +++ b/lib/chef/knife/client_edit.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class ClientEdit < Knife deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end banner "knife client edit CLIENT (options)" diff --git a/lib/chef/knife/client_key_create.rb b/lib/chef/knife/client_key_create.rb index 1f209ec879..469e7ee19f 100644 --- a/lib/chef/knife/client_key_create.rb +++ b/lib/chef/knife/client_key_create.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_create" -require "chef/knife/key_create_base" +require_relative "" +require_relative "key_create" +require_relative "key_create_base" class Chef class Knife diff --git a/lib/chef/knife/client_key_delete.rb b/lib/chef/knife/client_key_delete.rb index 3463389a05..fb5357f398 100644 --- a/lib/chef/knife/client_key_delete.rb +++ b/lib/chef/knife/client_key_delete.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_delete" +require_relative "" +require_relative "key_delete" class Chef class Knife diff --git a/lib/chef/knife/client_key_edit.rb b/lib/chef/knife/client_key_edit.rb index 1a685b7a56..11fb97994a 100644 --- a/lib/chef/knife/client_key_edit.rb +++ b/lib/chef/knife/client_key_edit.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_edit" -require "chef/knife/key_edit_base" +require_relative "" +require_relative "key_edit" +require_relative "key_edit_base" class Chef class Knife diff --git a/lib/chef/knife/client_key_list.rb b/lib/chef/knife/client_key_list.rb index aa63c1196b..438649fbad 100644 --- a/lib/chef/knife/client_key_list.rb +++ b/lib/chef/knife/client_key_list.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_list" -require "chef/knife/key_list_base" +require_relative "" +require_relative "key_list" +require_relative "key_list_base" class Chef class Knife diff --git a/lib/chef/knife/client_key_show.rb b/lib/chef/knife/client_key_show.rb index 49bc9d3596..58e3d02431 100644 --- a/lib/chef/knife/client_key_show.rb +++ b/lib/chef/knife/client_key_show.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_show" +require_relative "" +require_relative "key_show" class Chef class Knife diff --git a/lib/chef/knife/client_list.rb b/lib/chef/knife/client_list.rb index 49d833353d..bf3e4862b0 100644 --- a/lib/chef/knife/client_list.rb +++ b/lib/chef/knife/client_list.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class ClientList < Knife deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end banner "knife client list (options)" diff --git a/lib/chef/knife/client_reregister.rb b/lib/chef/knife/client_reregister.rb index 37ef259cad..7ad6cd1890 100644 --- a/lib/chef/knife/client_reregister.rb +++ b/lib/chef/knife/client_reregister.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class ClientReregister < Knife deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end banner "knife client reregister CLIENT (options)" diff --git a/lib/chef/knife/client_show.rb b/lib/chef/knife/client_show.rb index 5a07ff7af1..945267e924 100644 --- a/lib/chef/knife/client_show.rb +++ b/lib/chef/knife/client_show.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -25,7 +25,7 @@ class Chef include Knife::Core::MultiAttributeReturnOption deps do - require "chef/api_client_v1" + require_relative "../api_client_v1" end banner "knife client show CLIENT (options)" diff --git a/lib/chef/knife/config_get.rb b/lib/chef/knife/config_get.rb index c687e39a29..914633b4be 100644 --- a/lib/chef/knife/config_get.rb +++ b/lib/chef/knife/config_get.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/config_get_profile.rb b/lib/chef/knife/config_get_profile.rb index 309b7f81e8..6d89ebfeb5 100644 --- a/lib/chef/knife/config_get_profile.rb +++ b/lib/chef/knife/config_get_profile.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/config_list_profiles.rb b/lib/chef/knife/config_list_profiles.rb index 5b971345c6..4ccd96f5ef 100644 --- a/lib/chef/knife/config_list_profiles.rb +++ b/lib/chef/knife/config_list_profiles.rb @@ -15,8 +15,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/workstation_config_loader" +require_relative "" +require_relative "../workstation_config_loader" class Chef class Knife diff --git a/lib/chef/knife/config_use_profile.rb b/lib/chef/knife/config_use_profile.rb index 515c4a5336..1502b48063 100644 --- a/lib/chef/knife/config_use_profile.rb +++ b/lib/chef/knife/config_use_profile.rb @@ -17,7 +17,7 @@ require "fileutils" -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb index e24958e1fc..7570e2a177 100644 --- a/lib/chef/knife/configure.rb +++ b/lib/chef/knife/configure.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/util/path_helper" +require_relative "" +require_relative "../util/path_helper" class Chef class Knife diff --git a/lib/chef/knife/configure_client.rb b/lib/chef/knife/configure_client.rb index c015687ac7..e99d263d5f 100644 --- a/lib/chef/knife/configure_client.rb +++ b/lib/chef/knife/configure_client.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/cookbook_bulk_delete.rb b/lib/chef/knife/cookbook_bulk_delete.rb index d895797598..3fb8e6d4ed 100644 --- a/lib/chef/knife/cookbook_bulk_delete.rb +++ b/lib/chef/knife/cookbook_bulk_delete.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class CookbookBulkDelete < Knife deps do - require "chef/knife/cookbook_delete" - require "chef/cookbook_version" + require_relative "cookbook_delete" + require_relative "../cookbook_version" end option :purge, short: "-p", long: "--purge", boolean: true, description: "Permanently remove files from backing data store." diff --git a/lib/chef/knife/cookbook_delete.rb b/lib/chef/knife/cookbook_delete.rb index 3de35d0a72..4f3b1a91bc 100644 --- a/lib/chef/knife/cookbook_delete.rb +++ b/lib/chef/knife/cookbook_delete.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -25,7 +25,7 @@ class Chef attr_accessor :cookbook_name, :version deps do - require "chef/cookbook_version" + require_relative "../cookbook_version" end option :all, short: "-a", long: "--all", boolean: true, description: "Delete all versions of the cookbook." diff --git a/lib/chef/knife/cookbook_download.rb b/lib/chef/knife/cookbook_download.rb index d5b1040e3e..5d121df847 100644 --- a/lib/chef/knife/cookbook_download.rb +++ b/lib/chef/knife/cookbook_download.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -27,7 +27,7 @@ class Chef attr_accessor :cookbook_name deps do - require "chef/cookbook_version" + require_relative "../cookbook_version" end banner "knife cookbook download COOKBOOK [VERSION] (options)" diff --git a/lib/chef/knife/cookbook_list.rb b/lib/chef/knife/cookbook_list.rb index c5a5bd5835..c77c45a971 100644 --- a/lib/chef/knife/cookbook_list.rb +++ b/lib/chef/knife/cookbook_list.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/cookbook_metadata.rb b/lib/chef/knife/cookbook_metadata.rb index 2b25f505a0..a0560be029 100644 --- a/lib/chef/knife/cookbook_metadata.rb +++ b/lib/chef/knife/cookbook_metadata.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class CookbookMetadata < Knife deps do - require "chef/cookbook_loader" - require "chef/cookbook/metadata" + require_relative "../cookbook_loader" + require_relative "../cookbook/metadata" end banner "knife cookbook metadata COOKBOOK (options)" diff --git a/lib/chef/knife/cookbook_metadata_from_file.rb b/lib/chef/knife/cookbook_metadata_from_file.rb index 1f98f28aff..7f90e6f54d 100644 --- a/lib/chef/knife/cookbook_metadata_from_file.rb +++ b/lib/chef/knife/cookbook_metadata_from_file.rb @@ -18,14 +18,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class CookbookMetadataFromFile < Knife deps do - require "chef/cookbook/metadata" + require_relative "../cookbook/metadata" end banner "knife cookbook metadata from FILE (options)" diff --git a/lib/chef/knife/cookbook_show.rb b/lib/chef/knife/cookbook_show.rb index d42c114556..70dd6d762c 100644 --- a/lib/chef/knife/cookbook_show.rb +++ b/lib/chef/knife/cookbook_show.rb @@ -16,16 +16,16 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class CookbookShow < Knife deps do - require "chef/json_compat" + require_relative "../json_compat" require "uri" - require "chef/cookbook_version" + require_relative "../cookbook_version" end banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)" diff --git a/lib/chef/knife/cookbook_site_download.rb b/lib/chef/knife/cookbook_site_download.rb index e288bcaf4f..bc412dbc86 100644 --- a/lib/chef/knife/cookbook_site_download.rb +++ b/lib/chef/knife/cookbook_site_download.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_download" +require_relative "" +require_relative "supermarket_download" class Chef class Knife diff --git a/lib/chef/knife/cookbook_site_install.rb b/lib/chef/knife/cookbook_site_install.rb index 433e572533..fd29bd76a5 100644 --- a/lib/chef/knife/cookbook_site_install.rb +++ b/lib/chef/knife/cookbook_site_install.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_install" +require_relative "" +require_relative "supermarket_install" class Chef class Knife diff --git a/lib/chef/knife/cookbook_site_list.rb b/lib/chef/knife/cookbook_site_list.rb index 5b65420e4f..95cd88892d 100644 --- a/lib/chef/knife/cookbook_site_list.rb +++ b/lib/chef/knife/cookbook_site_list.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_list" +require_relative "" +require_relative "supermarket_list" class Chef class Knife diff --git a/lib/chef/knife/cookbook_site_search.rb b/lib/chef/knife/cookbook_site_search.rb index 21ea045ed3..e12329f8a4 100644 --- a/lib/chef/knife/cookbook_site_search.rb +++ b/lib/chef/knife/cookbook_site_search.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_search" +require_relative "" +require_relative "supermarket_search" class Chef class Knife diff --git a/lib/chef/knife/cookbook_site_share.rb b/lib/chef/knife/cookbook_site_share.rb index 6fe4bbb520..d6a5278e2a 100644 --- a/lib/chef/knife/cookbook_site_share.rb +++ b/lib/chef/knife/cookbook_site_share.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_share" +require_relative "" +require_relative "supermarket_share" class Chef class Knife diff --git a/lib/chef/knife/cookbook_site_show.rb b/lib/chef/knife/cookbook_site_show.rb index 4a8d7c090e..7616d8129c 100644 --- a/lib/chef/knife/cookbook_site_show.rb +++ b/lib/chef/knife/cookbook_site_show.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_show" +require_relative "" +require_relative "supermarket_show" class Chef class Knife diff --git a/lib/chef/knife/cookbook_site_unshare.rb b/lib/chef/knife/cookbook_site_unshare.rb index 850511e650..fa8c5b78c9 100644 --- a/lib/chef/knife/cookbook_site_unshare.rb +++ b/lib/chef/knife/cookbook_site_unshare.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/supermarket_unshare" +require_relative "" +require_relative "supermarket_unshare" class Chef class Knife diff --git a/lib/chef/knife/cookbook_upload.rb b/lib/chef/knife/cookbook_upload.rb index d2a140540e..90a044addc 100644 --- a/lib/chef/knife/cookbook_upload.rb +++ b/lib/chef/knife/cookbook_upload.rb @@ -18,8 +18,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/cookbook_uploader" +require_relative "" +require_relative "../cookbook_uploader" class Chef class Knife @@ -29,9 +29,9 @@ class Chef MATCH_CHECKSUM = /[0-9a-f]{32,}/.freeze deps do - require "chef/exceptions" - require "chef/cookbook_loader" - require "chef/cookbook_uploader" + require_relative "../exceptions" + require_relative "../cookbook_loader" + require_relative "../cookbook_uploader" end banner "knife cookbook upload [COOKBOOKS...] (options)" diff --git a/lib/chef/knife/core/bootstrap_context.rb b/lib/chef/knife/core/bootstrap_context.rb index 0f6dc0aedf..759fb043c0 100644 --- a/lib/chef/knife/core/bootstrap_context.rb +++ b/lib/chef/knife/core/bootstrap_context.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/run_list" -require "chef/util/path_helper" +require_relative "../../run_list" +require_relative "../../util/path_helper" require "pathname" -require "chef/dist" +require_relative "../../dist" class Chef class Knife diff --git a/lib/chef/knife/core/cookbook_scm_repo.rb b/lib/chef/knife/core/cookbook_scm_repo.rb index ba3a40207a..f97923d96b 100644 --- a/lib/chef/knife/core/cookbook_scm_repo.rb +++ b/lib/chef/knife/core/cookbook_scm_repo.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/mixin/shell_out" +require_relative "../../mixin/shell_out" class Chef class Knife diff --git a/lib/chef/knife/core/gem_glob_loader.rb b/lib/chef/knife/core/gem_glob_loader.rb index 987aef754f..b5b9143552 100644 --- a/lib/chef/knife/core/gem_glob_loader.rb +++ b/lib/chef/knife/core/gem_glob_loader.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/version" -require "chef/util/path_helper" +require_relative "../../version" +require_relative "../../util/path_helper" class Chef class Knife class SubcommandLoader diff --git a/lib/chef/knife/core/generic_presenter.rb b/lib/chef/knife/core/generic_presenter.rb index 8995f1f85d..77c874e71a 100644 --- a/lib/chef/knife/core/generic_presenter.rb +++ b/lib/chef/knife/core/generic_presenter.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife/core/text_formatter" +require_relative "text_formatter" class Chef class Knife diff --git a/lib/chef/knife/core/hashed_command_loader.rb b/lib/chef/knife/core/hashed_command_loader.rb index dff4ae50ab..66856b6414 100644 --- a/lib/chef/knife/core/hashed_command_loader.rb +++ b/lib/chef/knife/core/hashed_command_loader.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/version" +require_relative "../../version" class Chef class Knife class SubcommandLoader diff --git a/lib/chef/knife/core/node_editor.rb b/lib/chef/knife/core/node_editor.rb index b009bf8652..753ee01704 100644 --- a/lib/chef/knife/core/node_editor.rb +++ b/lib/chef/knife/core/node_editor.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/json_compat" -require "chef/node" +require_relative "../../json_compat" +require_relative "../../node" class Chef class Knife diff --git a/lib/chef/knife/core/node_presenter.rb b/lib/chef/knife/core/node_presenter.rb index b46ff2ae77..a77e9d7a65 100644 --- a/lib/chef/knife/core/node_presenter.rb +++ b/lib/chef/knife/core/node_presenter.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife/core/text_formatter" -require "chef/knife/core/generic_presenter" +require_relative "text_formatter" +require_relative "generic_presenter" class Chef class Knife diff --git a/lib/chef/knife/core/object_loader.rb b/lib/chef/knife/core/object_loader.rb index b08483f9a2..d87b3eaf71 100644 --- a/lib/chef/knife/core/object_loader.rb +++ b/lib/chef/knife/core/object_loader.rb @@ -17,8 +17,8 @@ # require "ffi_yajl" -require "chef/util/path_helper" -require "chef/data_bag_item" +require_relative "../../util/path_helper" +require_relative "../../data_bag_item" class Chef class Knife diff --git a/lib/chef/knife/core/status_presenter.rb b/lib/chef/knife/core/status_presenter.rb index dfd8eb8956..820c572f1f 100644 --- a/lib/chef/knife/core/status_presenter.rb +++ b/lib/chef/knife/core/status_presenter.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife/core/text_formatter" -require "chef/knife/core/generic_presenter" +require_relative "text_formatter" +require_relative "generic_presenter" class Chef class Knife diff --git a/lib/chef/knife/core/subcommand_loader.rb b/lib/chef/knife/core/subcommand_loader.rb index fb3723de50..bb84c55dd9 100644 --- a/lib/chef/knife/core/subcommand_loader.rb +++ b/lib/chef/knife/core/subcommand_loader.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/version" -require "chef/util/path_helper" -require "chef/knife/core/gem_glob_loader" -require "chef/knife/core/hashed_command_loader" +require_relative "../../version" +require_relative "../../util/path_helper" +require_relative "gem_glob_loader" +require_relative "hashed_command_loader" class Chef class Knife diff --git a/lib/chef/knife/core/ui.rb b/lib/chef/knife/core/ui.rb index 9801b8d033..cbda9c20f5 100644 --- a/lib/chef/knife/core/ui.rb +++ b/lib/chef/knife/core/ui.rb @@ -19,8 +19,8 @@ # require "forwardable" -require "chef/platform/query_helpers" -require "chef/knife/core/generic_presenter" +require_relative "../../platform/query_helpers" +require_relative "generic_presenter" require "tempfile" class Chef diff --git a/lib/chef/knife/core/windows_bootstrap_context.rb b/lib/chef/knife/core/windows_bootstrap_context.rb index 285afe8969..b06ddd9fcc 100644 --- a/lib/chef/knife/core/windows_bootstrap_context.rb +++ b/lib/chef/knife/core/windows_bootstrap_context.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife/core/bootstrap_context" -require "chef/util/path_helper" -require "chef/dist" +require_relative "bootstrap_context" +require_relative "../../util/path_helper" +require_relative "../../dist" class Chef class Knife diff --git a/lib/chef/knife/data_bag_create.rb b/lib/chef/knife/data_bag_create.rb index bf90fb81b3..71572c32a1 100644 --- a/lib/chef/knife/data_bag_create.rb +++ b/lib/chef/knife/data_bag_create.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/data_bag_secret_options" +require_relative "" +require_relative "data_bag_secret_options" class Chef class Knife @@ -26,8 +26,8 @@ class Chef include DataBagSecretOptions deps do - require "chef/data_bag" - require "chef/encrypted_data_bag_item" + require_relative "../data_bag" + require_relative "../encrypted_data_bag_item" end banner "knife data bag create BAG [ITEM] (options)" diff --git a/lib/chef/knife/data_bag_delete.rb b/lib/chef/knife/data_bag_delete.rb index c1ea2013c8..5b1f9aa1c9 100644 --- a/lib/chef/knife/data_bag_delete.rb +++ b/lib/chef/knife/data_bag_delete.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class DataBagDelete < Knife deps do - require "chef/data_bag" + require_relative "../data_bag" end banner "knife data bag delete BAG [ITEM] (options)" diff --git a/lib/chef/knife/data_bag_edit.rb b/lib/chef/knife/data_bag_edit.rb index 6c7f73ad6c..bd3ec7121f 100644 --- a/lib/chef/knife/data_bag_edit.rb +++ b/lib/chef/knife/data_bag_edit.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/data_bag_secret_options" +require_relative "" +require_relative "data_bag_secret_options" class Chef class Knife @@ -26,8 +26,8 @@ class Chef include DataBagSecretOptions deps do - require "chef/data_bag_item" - require "chef/encrypted_data_bag_item" + require_relative "../data_bag_item" + require_relative "../encrypted_data_bag_item" end banner "knife data bag edit BAG ITEM (options)" diff --git a/lib/chef/knife/data_bag_from_file.rb b/lib/chef/knife/data_bag_from_file.rb index 1cf7a07a36..33d37210fa 100644 --- a/lib/chef/knife/data_bag_from_file.rb +++ b/lib/chef/knife/data_bag_from_file.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/util/path_helper" -require "chef/knife/data_bag_secret_options" +require_relative "" +require_relative "../util/path_helper" +require_relative "data_bag_secret_options" class Chef class Knife @@ -27,10 +27,10 @@ class Chef include DataBagSecretOptions deps do - require "chef/data_bag" - require "chef/data_bag_item" - require "chef/knife/core/object_loader" - require "chef/encrypted_data_bag_item" + require_relative "../data_bag" + require_relative "../data_bag_item" + require_relative "core/object_loader" + require_relative "../encrypted_data_bag_item" end banner "knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)" diff --git a/lib/chef/knife/data_bag_list.rb b/lib/chef/knife/data_bag_list.rb index d6f6142136..566aa406a4 100644 --- a/lib/chef/knife/data_bag_list.rb +++ b/lib/chef/knife/data_bag_list.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class DataBagList < Knife deps do - require "chef/data_bag" + require_relative "../data_bag" end banner "knife data bag list (options)" diff --git a/lib/chef/knife/data_bag_secret_options.rb b/lib/chef/knife/data_bag_secret_options.rb index 5f49b5f137..19b0dfca38 100644 --- a/lib/chef/knife/data_bag_secret_options.rb +++ b/lib/chef/knife/data_bag_secret_options.rb @@ -17,8 +17,8 @@ # require "mixlib/cli" -require "chef/config" -require "chef/encrypted_data_bag_item/check_encrypted" +require_relative "../config" +require_relative "../encrypted_data_bag_item/check_encrypted" class Chef class Knife @@ -65,7 +65,7 @@ class Chef def read_secret # Moving the non 'compile-time' requires into here to speed up knife command loading # IE, if we are not running 'knife data bag *' we don't need to load 'chef/encrypted_data_bag_item' - require "chef/encrypted_data_bag_item" + require_relative "../encrypted_data_bag_item" if has_cl_secret? config[:secret] diff --git a/lib/chef/knife/data_bag_show.rb b/lib/chef/knife/data_bag_show.rb index eeebd11832..ef707d6b79 100644 --- a/lib/chef/knife/data_bag_show.rb +++ b/lib/chef/knife/data_bag_show.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/data_bag_secret_options" +require_relative "" +require_relative "data_bag_secret_options" class Chef class Knife @@ -26,8 +26,8 @@ class Chef include DataBagSecretOptions deps do - require "chef/data_bag" - require "chef/encrypted_data_bag_item" + require_relative "../data_bag" + require_relative "../encrypted_data_bag_item" end banner "knife data bag show BAG [ITEM] (options)" diff --git a/lib/chef/knife/delete.rb b/lib/chef/knife/delete.rb index 7d2f4c405f..d1888e127a 100644 --- a/lib/chef/knife/delete.rb +++ b/lib/chef/knife/delete.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,7 +24,7 @@ class Chef category "path-based" deps do - require "chef/chef_fs/file_system" + require_relative "../chef_fs/file_system" end option :recurse, diff --git a/lib/chef/knife/deps.rb b/lib/chef/knife/deps.rb index 8efa0d0b65..bc4b853879 100644 --- a/lib/chef/knife/deps.rb +++ b/lib/chef/knife/deps.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,8 +24,8 @@ class Chef category "path-based" deps do - require "chef/chef_fs/file_system" - require "chef/run_list" + require_relative "../chef_fs/file_system" + require_relative "../run_list" end option :recurse, diff --git a/lib/chef/knife/diff.rb b/lib/chef/knife/diff.rb index bd75d31194..3e9336aacc 100644 --- a/lib/chef/knife/diff.rb +++ b/lib/chef/knife/diff.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,7 +24,7 @@ class Chef category "path-based" deps do - require "chef/chef_fs/command_line" + require_relative "../chef_fs/command_line" end option :recurse, diff --git a/lib/chef/knife/download.rb b/lib/chef/knife/download.rb index 57e0aee3e9..b3cf61430f 100644 --- a/lib/chef/knife/download.rb +++ b/lib/chef/knife/download.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,7 +24,7 @@ class Chef category "path-based" deps do - require "chef/chef_fs/command_line" + require_relative "../chef_fs/command_line" end option :recurse, diff --git a/lib/chef/knife/edit.rb b/lib/chef/knife/edit.rb index fabc282cc2..406782ef85 100644 --- a/lib/chef/knife/edit.rb +++ b/lib/chef/knife/edit.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,8 +24,8 @@ class Chef category "path-based" deps do - require "chef/chef_fs/file_system" - require "chef/chef_fs/file_system/exceptions" + require_relative "../chef_fs/file_system" + require_relative "../chef_fs/file_system/exceptions" end option :local, diff --git a/lib/chef/knife/environment_compare.rb b/lib/chef/knife/environment_compare.rb index b5f1c9be7e..22bd373680 100644 --- a/lib/chef/knife/environment_compare.rb +++ b/lib/chef/knife/environment_compare.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class EnvironmentCompare < Knife deps do - require "chef/environment" + require_relative "../environment" end banner "knife environment compare [ENVIRONMENT..] (options)" diff --git a/lib/chef/knife/environment_create.rb b/lib/chef/knife/environment_create.rb index 6d8321b9b7..97de87caa1 100644 --- a/lib/chef/knife/environment_create.rb +++ b/lib/chef/knife/environment_create.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class EnvironmentCreate < Knife deps do - require "chef/environment" + require_relative "../environment" end banner "knife environment create ENVIRONMENT (options)" diff --git a/lib/chef/knife/environment_delete.rb b/lib/chef/knife/environment_delete.rb index 8368ce9dcd..b7f8d0c358 100644 --- a/lib/chef/knife/environment_delete.rb +++ b/lib/chef/knife/environment_delete.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class EnvironmentDelete < Knife deps do - require "chef/environment" + require_relative "../environment" end banner "knife environment delete ENVIRONMENT (options)" diff --git a/lib/chef/knife/environment_edit.rb b/lib/chef/knife/environment_edit.rb index 29f1467626..a6884804d4 100644 --- a/lib/chef/knife/environment_edit.rb +++ b/lib/chef/knife/environment_edit.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class EnvironmentEdit < Knife deps do - require "chef/environment" + require_relative "../environment" end banner "knife environment edit ENVIRONMENT (options)" diff --git a/lib/chef/knife/environment_from_file.rb b/lib/chef/knife/environment_from_file.rb index c533a7351d..6a35e07efe 100644 --- a/lib/chef/knife/environment_from_file.rb +++ b/lib/chef/knife/environment_from_file.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class EnvironmentFromFile < Knife deps do - require "chef/environment" - require "chef/knife/core/object_loader" + require_relative "../environment" + require_relative "core/object_loader" end banner "knife environment from file FILE [FILE..] (options)" diff --git a/lib/chef/knife/environment_list.rb b/lib/chef/knife/environment_list.rb index 6b4b8508fa..01646cd40f 100644 --- a/lib/chef/knife/environment_list.rb +++ b/lib/chef/knife/environment_list.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class EnvironmentList < Knife deps do - require "chef/environment" + require_relative "../environment" end banner "knife environment list (options)" diff --git a/lib/chef/knife/environment_show.rb b/lib/chef/knife/environment_show.rb index 04d17ed1f4..7c5d2a5482 100644 --- a/lib/chef/knife/environment_show.rb +++ b/lib/chef/knife/environment_show.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -25,7 +25,7 @@ class Chef include Knife::Core::MultiAttributeReturnOption deps do - require "chef/environment" + require_relative "../environment" end banner "knife environment show ENVIRONMENT (options)" diff --git a/lib/chef/knife/exec.rb b/lib/chef/knife/exec.rb index 63598923de..009a13e816 100644 --- a/lib/chef/knife/exec.rb +++ b/lib/chef/knife/exec.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/util/path_helper" +require_relative "" +require_relative "../util/path_helper" class Chef::Knife::Exec < Chef::Knife @@ -35,7 +35,7 @@ class Chef::Knife::Exec < Chef::Knife proc: lambda { |o| o.split(":") } deps do - require "chef/shell/ext" + require_relative "../shell/ext" end def run diff --git a/lib/chef/knife/key_create.rb b/lib/chef/knife/key_create.rb index f278af8b77..a16e07d086 100644 --- a/lib/chef/knife/key_create.rb +++ b/lib/chef/knife/key_create.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/key" -require "chef/json_compat" -require "chef/exceptions" +require_relative "../key" +require_relative "../json_compat" +require_relative "../exceptions" class Chef class Knife diff --git a/lib/chef/knife/key_delete.rb b/lib/chef/knife/key_delete.rb index a798e06475..154fb5abcb 100644 --- a/lib/chef/knife/key_delete.rb +++ b/lib/chef/knife/key_delete.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/key" +require_relative "../key" class Chef class Knife diff --git a/lib/chef/knife/key_edit.rb b/lib/chef/knife/key_edit.rb index 4e36bdfded..c6c67a18ee 100644 --- a/lib/chef/knife/key_edit.rb +++ b/lib/chef/knife/key_edit.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/key" -require "chef/json_compat" -require "chef/exceptions" +require_relative "../key" +require_relative "../json_compat" +require_relative "../exceptions" class Chef class Knife diff --git a/lib/chef/knife/key_list.rb b/lib/chef/knife/key_list.rb index 3078ca44d3..5295238f6f 100644 --- a/lib/chef/knife/key_list.rb +++ b/lib/chef/knife/key_list.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/key" -require "chef/json_compat" -require "chef/exceptions" +require_relative "../key" +require_relative "../json_compat" +require_relative "../exceptions" class Chef class Knife diff --git a/lib/chef/knife/key_show.rb b/lib/chef/knife/key_show.rb index 851db7208b..a208fc04a6 100644 --- a/lib/chef/knife/key_show.rb +++ b/lib/chef/knife/key_show.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/key" -require "chef/json_compat" -require "chef/exceptions" +require_relative "../key" +require_relative "../json_compat" +require_relative "../exceptions" class Chef class Knife diff --git a/lib/chef/knife/list.rb b/lib/chef/knife/list.rb index 10018ff74c..08bb73e489 100644 --- a/lib/chef/knife/list.rb +++ b/lib/chef/knife/list.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,7 +24,7 @@ class Chef category "path-based" deps do - require "chef/chef_fs/file_system" + require_relative "../chef_fs/file_system" require "tty-screen" end diff --git a/lib/chef/knife/node_bulk_delete.rb b/lib/chef/knife/node_bulk_delete.rb index 2ca63da512..071f4b3478 100644 --- a/lib/chef/knife/node_bulk_delete.rb +++ b/lib/chef/knife/node_bulk_delete.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeBulkDelete < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node bulk delete REGEX (options)" diff --git a/lib/chef/knife/node_create.rb b/lib/chef/knife/node_create.rb index f80ac9e87c..a5bd121f53 100644 --- a/lib/chef/knife/node_create.rb +++ b/lib/chef/knife/node_create.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeCreate < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node create NODE (options)" diff --git a/lib/chef/knife/node_delete.rb b/lib/chef/knife/node_delete.rb index 52b8d122ca..cb2081b865 100644 --- a/lib/chef/knife/node_delete.rb +++ b/lib/chef/knife/node_delete.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeDelete < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node delete [NODE [NODE]] (options)" diff --git a/lib/chef/knife/node_edit.rb b/lib/chef/knife/node_edit.rb index b97302a3da..551db055ea 100644 --- a/lib/chef/knife/node_edit.rb +++ b/lib/chef/knife/node_edit.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -24,9 +24,9 @@ class Chef class NodeEdit < Knife deps do - require "chef/node" - require "chef/json_compat" - require "chef/knife/core/node_editor" + require_relative "../node" + require_relative "../json_compat" + require_relative "core/node_editor" end banner "knife node edit NODE (options)" diff --git a/lib/chef/knife/node_environment_set.rb b/lib/chef/knife/node_environment_set.rb index ecba01be29..b5f8a6ed7d 100644 --- a/lib/chef/knife/node_environment_set.rb +++ b/lib/chef/knife/node_environment_set.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeEnvironmentSet < Knife deps do - require "chef/node" + require_relative "../node" end banner "knife node environment set NODE ENVIRONMENT" diff --git a/lib/chef/knife/node_from_file.rb b/lib/chef/knife/node_from_file.rb index 61b83edd92..dc8ebff81b 100644 --- a/lib/chef/knife/node_from_file.rb +++ b/lib/chef/knife/node_from_file.rb @@ -16,16 +16,16 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeFromFile < Knife deps do - require "chef/node" - require "chef/json_compat" - require "chef/knife/core/object_loader" + require_relative "../node" + require_relative "../json_compat" + require_relative "core/object_loader" end banner "knife node from file FILE (options)" diff --git a/lib/chef/knife/node_list.rb b/lib/chef/knife/node_list.rb index 651f30862d..9513cbc966 100644 --- a/lib/chef/knife/node_list.rb +++ b/lib/chef/knife/node_list.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeList < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node list (options)" diff --git a/lib/chef/knife/node_policy_set.rb b/lib/chef/knife/node_policy_set.rb index 404446fe0e..191fc06245 100644 --- a/lib/chef/knife/node_policy_set.rb +++ b/lib/chef/knife/node_policy_set.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodePolicySet < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node policy set NODE POLICY_GROUP POLICY_NAME (options)" diff --git a/lib/chef/knife/node_run_list_add.rb b/lib/chef/knife/node_run_list_add.rb index eed9343e0a..6fc94422c0 100644 --- a/lib/chef/knife/node_run_list_add.rb +++ b/lib/chef/knife/node_run_list_add.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeRunListAdd < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node run_list add [NODE] [ENTRY [ENTRY]] (options)" diff --git a/lib/chef/knife/node_run_list_remove.rb b/lib/chef/knife/node_run_list_remove.rb index df50818c23..11ca4a4e51 100644 --- a/lib/chef/knife/node_run_list_remove.rb +++ b/lib/chef/knife/node_run_list_remove.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeRunListRemove < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node run_list remove [NODE] [ENTRY [ENTRY]] (options)" diff --git a/lib/chef/knife/node_run_list_set.rb b/lib/chef/knife/node_run_list_set.rb index 2d68c88415..ffe5877bb3 100644 --- a/lib/chef/knife/node_run_list_set.rb +++ b/lib/chef/knife/node_run_list_set.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class NodeRunListSet < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node run_list set NODE ENTRIES (options)" diff --git a/lib/chef/knife/node_show.rb b/lib/chef/knife/node_show.rb index 90cdbdb641..38ab60576d 100644 --- a/lib/chef/knife/node_show.rb +++ b/lib/chef/knife/node_show.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/core/node_presenter" +require_relative "" +require_relative "core/node_presenter" class Chef class Knife @@ -27,8 +27,8 @@ class Chef include Knife::Core::MultiAttributeReturnOption deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife node show NODE (options)" diff --git a/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb index a9a757069b..476ab52880 100644 --- a/lib/chef/knife/raw.rb +++ b/lib/chef/knife/raw.rb @@ -14,8 +14,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/http" +require_relative "" +require_relative "../http" class Chef class Knife @@ -23,13 +23,13 @@ class Chef banner "knife raw REQUEST_PATH (options)" deps do - require "chef/json_compat" - require "chef/config" - require "chef/http" - require "chef/http/authenticator" - require "chef/http/cookie_manager" - require "chef/http/decompressor" - require "chef/http/json_output" + require_relative "../json_compat" + require_relative "../config" + require_relative "../http" + require_relative "../http/authenticator" + require_relative "../http/cookie_manager" + require_relative "../http/decompressor" + require_relative "../http/json_output" end option :method, diff --git a/lib/chef/knife/recipe_list.rb b/lib/chef/knife/recipe_list.rb index 8f76e494ad..8f2c6354ad 100644 --- a/lib/chef/knife/recipe_list.rb +++ b/lib/chef/knife/recipe_list.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef::Knife::RecipeList < Chef::Knife banner "knife recipe list [PATTERN]" diff --git a/lib/chef/knife/rehash.rb b/lib/chef/knife/rehash.rb index 79286368f8..8e4bbdd323 100644 --- a/lib/chef/knife/rehash.rb +++ b/lib/chef/knife/rehash.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/core/subcommand_loader" +require_relative "" +require_relative "core/subcommand_loader" class Chef class Knife diff --git a/lib/chef/knife/role_bulk_delete.rb b/lib/chef/knife/role_bulk_delete.rb index 0726454da3..2fdcf9d673 100644 --- a/lib/chef/knife/role_bulk_delete.rb +++ b/lib/chef/knife/role_bulk_delete.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleBulkDelete < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role bulk delete REGEX (options)" diff --git a/lib/chef/knife/role_create.rb b/lib/chef/knife/role_create.rb index f271dddd98..bd6248d120 100644 --- a/lib/chef/knife/role_create.rb +++ b/lib/chef/knife/role_create.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleCreate < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role create ROLE (options)" diff --git a/lib/chef/knife/role_delete.rb b/lib/chef/knife/role_delete.rb index 5c10a05d85..6114804f2e 100644 --- a/lib/chef/knife/role_delete.rb +++ b/lib/chef/knife/role_delete.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleDelete < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role delete ROLE (options)" diff --git a/lib/chef/knife/role_edit.rb b/lib/chef/knife/role_edit.rb index d3697849ad..8e9803a10c 100644 --- a/lib/chef/knife/role_edit.rb +++ b/lib/chef/knife/role_edit.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleEdit < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role edit ROLE (options)" diff --git a/lib/chef/knife/role_env_run_list_add.rb b/lib/chef/knife/role_env_run_list_add.rb index 884f104e65..83e3e1e39d 100644 --- a/lib/chef/knife/role_env_run_list_add.rb +++ b/lib/chef/knife/role_env_run_list_add.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleEnvRunListAdd < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role env_run_list add [ROLE] [ENVIRONMENT] [ENTRY [ENTRY]] (options)" diff --git a/lib/chef/knife/role_env_run_list_clear.rb b/lib/chef/knife/role_env_run_list_clear.rb index ecc41347eb..c7f90be22a 100644 --- a/lib/chef/knife/role_env_run_list_clear.rb +++ b/lib/chef/knife/role_env_run_list_clear.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleEnvRunListClear < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role env_run_list clear [ROLE] [ENVIRONMENT] (options)" diff --git a/lib/chef/knife/role_env_run_list_remove.rb b/lib/chef/knife/role_env_run_list_remove.rb index 9b627a00fc..91dd00cceb 100644 --- a/lib/chef/knife/role_env_run_list_remove.rb +++ b/lib/chef/knife/role_env_run_list_remove.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleEnvRunListRemove < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role env_run_list remove [ROLE] [ENVIRONMENT] [ENTRIES] (options)" diff --git a/lib/chef/knife/role_env_run_list_replace.rb b/lib/chef/knife/role_env_run_list_replace.rb index f4e4dfec66..1ca5701bc2 100644 --- a/lib/chef/knife/role_env_run_list_replace.rb +++ b/lib/chef/knife/role_env_run_list_replace.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleEnvRunListReplace < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role env_run_list replace [ROLE] [ENVIRONMENT] [OLD_ENTRY] [NEW_ENTRY] (options)" diff --git a/lib/chef/knife/role_env_run_list_set.rb b/lib/chef/knife/role_env_run_list_set.rb index fd8afd6652..a15097f851 100644 --- a/lib/chef/knife/role_env_run_list_set.rb +++ b/lib/chef/knife/role_env_run_list_set.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleEnvRunListSet < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role env_run_list set [ROLE] [ENVIRONMENT] [ENTRIES] (optionss)" diff --git a/lib/chef/knife/role_from_file.rb b/lib/chef/knife/role_from_file.rb index bf21a38fd7..3b04c3e1f6 100644 --- a/lib/chef/knife/role_from_file.rb +++ b/lib/chef/knife/role_from_file.rb @@ -16,16 +16,16 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleFromFile < Knife deps do - require "chef/role" - require "chef/knife/core/object_loader" - require "chef/json_compat" + require_relative "../role" + require_relative "core/object_loader" + require_relative "../json_compat" end banner "knife role from file FILE [FILE..] (options)" diff --git a/lib/chef/knife/role_list.rb b/lib/chef/knife/role_list.rb index 41261e09ee..0445dd343c 100644 --- a/lib/chef/knife/role_list.rb +++ b/lib/chef/knife/role_list.rb @@ -16,15 +16,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleList < Knife deps do - require "chef/node" - require "chef/json_compat" + require_relative "../node" + require_relative "../json_compat" end banner "knife role list (options)" diff --git a/lib/chef/knife/role_run_list_add.rb b/lib/chef/knife/role_run_list_add.rb index ad79434c32..01ed32e920 100644 --- a/lib/chef/knife/role_run_list_add.rb +++ b/lib/chef/knife/role_run_list_add.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleRunListAdd < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role run_list add [ROLE] [ENTRY [ENTRY]] (options)" diff --git a/lib/chef/knife/role_run_list_clear.rb b/lib/chef/knife/role_run_list_clear.rb index a3fde43875..f4ba318f60 100644 --- a/lib/chef/knife/role_run_list_clear.rb +++ b/lib/chef/knife/role_run_list_clear.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleRunListClear < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role run_list clear [ROLE] (options)" diff --git a/lib/chef/knife/role_run_list_remove.rb b/lib/chef/knife/role_run_list_remove.rb index 39e935605e..b37fd2ebaf 100644 --- a/lib/chef/knife/role_run_list_remove.rb +++ b/lib/chef/knife/role_run_list_remove.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleRunListRemove < Knife deps do - require "chef/role" + require_relative "../role" end banner "knife role run_list remove [ROLE] [ENTRY] (options)" diff --git a/lib/chef/knife/role_run_list_replace.rb b/lib/chef/knife/role_run_list_replace.rb index bb93661548..01334e7658 100644 --- a/lib/chef/knife/role_run_list_replace.rb +++ b/lib/chef/knife/role_run_list_replace.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleRunListReplace < Knife deps do - require "chef/role" - require "chef/json_compat" + require_relative "../role" + require_relative "../json_compat" end banner "knife role run_list replace [ROLE] [OLD_ENTRY] [NEW_ENTRY] (options)" diff --git a/lib/chef/knife/role_run_list_set.rb b/lib/chef/knife/role_run_list_set.rb index d424bad7e6..3bc8ad2d0c 100644 --- a/lib/chef/knife/role_run_list_set.rb +++ b/lib/chef/knife/role_run_list_set.rb @@ -17,14 +17,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class RoleRunListSet < Knife deps do - require "chef/role" + require_relative "../role" end banner "knife role run_list set [ROLE] [ENTRIES] (options)" diff --git a/lib/chef/knife/role_show.rb b/lib/chef/knife/role_show.rb index cad0344eca..bc99a9ea72 100644 --- a/lib/chef/knife/role_show.rb +++ b/lib/chef/knife/role_show.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -25,7 +25,7 @@ class Chef include Knife::Core::MultiAttributeReturnOption deps do - require "chef/role" + require_relative "../role" end banner "knife role show ROLE (options)" diff --git a/lib/chef/knife/search.rb b/lib/chef/knife/search.rb index 168db6da1a..9f3ce15041 100644 --- a/lib/chef/knife/search.rb +++ b/lib/chef/knife/search.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/core/node_presenter" +require_relative "" +require_relative "core/node_presenter" require "addressable/uri" class Chef @@ -27,10 +27,10 @@ class Chef include Knife::Core::MultiAttributeReturnOption deps do - require "chef/node" - require "chef/environment" - require "chef/api_client" - require "chef/search/query" + require_relative "../node" + require_relative "../environment" + require_relative "../api_client" + require_relative "../search/query" end include Knife::Core::NodeFormattingOptions diff --git a/lib/chef/knife/serve.rb b/lib/chef/knife/serve.rb index 0a731bfa38..dfa7e1522d 100644 --- a/lib/chef/knife/serve.rb +++ b/lib/chef/knife/serve.rb @@ -14,8 +14,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/local_mode" +require_relative "" +require_relative "../local_mode" class Chef class Knife diff --git a/lib/chef/knife/show.rb b/lib/chef/knife/show.rb index 10a1d521e3..0e5ab9d0fe 100644 --- a/lib/chef/knife/show.rb +++ b/lib/chef/knife/show.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,8 +24,8 @@ class Chef category "path-based" deps do - require "chef/chef_fs/file_system" - require "chef/chef_fs/file_system/exceptions" + require_relative "../chef_fs/file_system" + require_relative "../chef_fs/file_system/exceptions" end option :local, diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index ab7623a4d8..0f69044461 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/mixin/shell_out" -require "chef/knife" +require_relative "../mixin/shell_out" +require_relative "" class Chef class Knife @@ -27,9 +27,9 @@ class Chef require "net/ssh" require "net/ssh/multi" require "readline" - require "chef/exceptions" - require "chef/search/query" - require "chef/util/path_helper" + require_relative "../exceptions" + require_relative "../search/query" + require_relative "../util/path_helper" require "mixlib/shellout" end diff --git a/lib/chef/knife/ssl_check.rb b/lib/chef/knife/ssl_check.rb index 6508c5f02d..a952688144 100644 --- a/lib/chef/knife/ssl_check.rb +++ b/lib/chef/knife/ssl_check.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/config" +require_relative "" +require_relative "../config" class Chef class Knife @@ -27,9 +27,9 @@ class Chef require "pp" require "socket" require "uri" - require "chef/http/ssl_policies" + require_relative "../http/ssl_policies" require "openssl" - require "chef/mixin/proxified_socket" + require_relative "../mixin/proxified_socket" include Chef::Mixin::ProxifiedSocket end diff --git a/lib/chef/knife/ssl_fetch.rb b/lib/chef/knife/ssl_fetch.rb index 9e1579a5f8..c0a7df84bd 100644 --- a/lib/chef/knife/ssl_fetch.rb +++ b/lib/chef/knife/ssl_fetch.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/config" +require_relative "" +require_relative "../config" class Chef class Knife @@ -28,7 +28,7 @@ class Chef require "socket" require "uri" require "openssl" - require "chef/mixin/proxified_socket" + require_relative "../mixin/proxified_socket" include Chef::Mixin::ProxifiedSocket end diff --git a/lib/chef/knife/status.rb b/lib/chef/knife/status.rb index 471c47b9f9..f0ed45e4c2 100644 --- a/lib/chef/knife/status.rb +++ b/lib/chef/knife/status.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/core/status_presenter" -require "chef/knife/core/node_presenter" +require_relative "" +require_relative "core/status_presenter" +require_relative "core/node_presenter" class Chef class Knife @@ -26,7 +26,7 @@ class Chef include Knife::Core::NodeFormattingOptions deps do - require "chef/search/query" + require_relative "../search/query" end banner "knife status QUERY (options)" diff --git a/lib/chef/knife/supermarket_download.rb b/lib/chef/knife/supermarket_download.rb index dc0c50ab92..09a08ef722 100644 --- a/lib/chef/knife/supermarket_download.rb +++ b/lib/chef/knife/supermarket_download.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/supermarket_install.rb b/lib/chef/knife/supermarket_install.rb index 5a72e6184d..03b8ce6b2a 100644 --- a/lib/chef/knife/supermarket_install.rb +++ b/lib/chef/knife/supermarket_install.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/exceptions" +require_relative "" +require_relative "../exceptions" class Chef class Knife @@ -26,8 +26,8 @@ class Chef deps do require "shellwords" require "mixlib/archive" - require "chef/knife/core/cookbook_scm_repo" - require "chef/cookbook/metadata" + require_relative "core/cookbook_scm_repo" + require_relative "../cookbook/metadata" end banner "knife supermarket install COOKBOOK [VERSION] (options)" diff --git a/lib/chef/knife/supermarket_list.rb b/lib/chef/knife/supermarket_list.rb index 837379845a..6a76f88cd9 100644 --- a/lib/chef/knife/supermarket_list.rb +++ b/lib/chef/knife/supermarket_list.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/supermarket_search.rb b/lib/chef/knife/supermarket_search.rb index 3dd7f95f2e..7c4da6f05b 100644 --- a/lib/chef/knife/supermarket_search.rb +++ b/lib/chef/knife/supermarket_search.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/supermarket_share.rb b/lib/chef/knife/supermarket_share.rb index f3f6a8ec38..a93086d2f1 100644 --- a/lib/chef/knife/supermarket_share.rb +++ b/lib/chef/knife/supermarket_share.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -25,10 +25,10 @@ class Chef include Chef::Mixin::ShellOut deps do - require "chef/cookbook_loader" - require "chef/cookbook_uploader" - require "chef/cookbook_site_streaming_uploader" - require "chef/mixin/shell_out" + require_relative "../cookbook_loader" + require_relative "../cookbook_uploader" + require_relative "../cookbook_site_streaming_uploader" + require_relative "../mixin/shell_out" end banner "knife supermarket share COOKBOOK [CATEGORY] (options)" diff --git a/lib/chef/knife/supermarket_show.rb b/lib/chef/knife/supermarket_show.rb index 4fe8ef25fb..ace5b2b76f 100644 --- a/lib/chef/knife/supermarket_show.rb +++ b/lib/chef/knife/supermarket_show.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife diff --git a/lib/chef/knife/supermarket_unshare.rb b/lib/chef/knife/supermarket_unshare.rb index 98b6fa5789..c494ff1382 100644 --- a/lib/chef/knife/supermarket_unshare.rb +++ b/lib/chef/knife/supermarket_unshare.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class SupermarketUnshare < Knife deps do - require "chef/json_compat" + require_relative "../json_compat" end banner "knife supermarket unshare COOKBOOK" diff --git a/lib/chef/knife/tag_create.rb b/lib/chef/knife/tag_create.rb index e8cfe11303..3e596c741d 100644 --- a/lib/chef/knife/tag_create.rb +++ b/lib/chef/knife/tag_create.rb @@ -18,14 +18,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class TagCreate < Knife deps do - require "chef/node" + require_relative "../node" end banner "knife tag create NODE TAG ..." diff --git a/lib/chef/knife/tag_delete.rb b/lib/chef/knife/tag_delete.rb index d00ec2f60b..460478e142 100644 --- a/lib/chef/knife/tag_delete.rb +++ b/lib/chef/knife/tag_delete.rb @@ -18,14 +18,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class TagDelete < Knife deps do - require "chef/node" + require_relative "../node" end banner "knife tag delete NODE TAG ..." diff --git a/lib/chef/knife/tag_list.rb b/lib/chef/knife/tag_list.rb index 2665e53bf4..4823b1023c 100644 --- a/lib/chef/knife/tag_list.rb +++ b/lib/chef/knife/tag_list.rb @@ -18,14 +18,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class TagList < Knife deps do - require "chef/node" + require_relative "../node" end banner "knife tag list NODE" diff --git a/lib/chef/knife/upload.rb b/lib/chef/knife/upload.rb index 25dcd81004..190549d86a 100644 --- a/lib/chef/knife/upload.rb +++ b/lib/chef/knife/upload.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,7 +24,7 @@ class Chef category "path-based" deps do - require "chef/chef_fs/command_line" + require_relative "../chef_fs/command_line" end option :recurse, diff --git a/lib/chef/knife/user_create.rb b/lib/chef/knife/user_create.rb index 2381ffbdbd..5c7d14e2f8 100644 --- a/lib/chef/knife/user_create.rb +++ b/lib/chef/knife/user_create.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/dist" +require_relative "" +require_relative "../dist" class Chef class Knife @@ -27,7 +27,7 @@ class Chef attr_accessor :user_field deps do - require "chef/user_v1" + require_relative "../user_v1" end option :file, diff --git a/lib/chef/knife/user_delete.rb b/lib/chef/knife/user_delete.rb index 2638d2cce3..efc20a60b6 100644 --- a/lib/chef/knife/user_delete.rb +++ b/lib/chef/knife/user_delete.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class UserDelete < Knife deps do - require "chef/user_v1" + require_relative "../user_v1" end banner "knife user delete USER (options)" diff --git a/lib/chef/knife/user_edit.rb b/lib/chef/knife/user_edit.rb index a039525001..7d0409b642 100644 --- a/lib/chef/knife/user_edit.rb +++ b/lib/chef/knife/user_edit.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class UserEdit < Knife deps do - require "chef/user_v1" + require_relative "../user_v1" end banner "knife user edit USER (options)" diff --git a/lib/chef/knife/user_key_create.rb b/lib/chef/knife/user_key_create.rb index 1cceb886c4..267b198823 100644 --- a/lib/chef/knife/user_key_create.rb +++ b/lib/chef/knife/user_key_create.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_create" -require "chef/knife/key_create_base" +require_relative "" +require_relative "key_create" +require_relative "key_create_base" class Chef class Knife diff --git a/lib/chef/knife/user_key_delete.rb b/lib/chef/knife/user_key_delete.rb index 2a0c958ed9..ebb41e2c37 100644 --- a/lib/chef/knife/user_key_delete.rb +++ b/lib/chef/knife/user_key_delete.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_delete" +require_relative "" +require_relative "key_delete" class Chef class Knife diff --git a/lib/chef/knife/user_key_edit.rb b/lib/chef/knife/user_key_edit.rb index ca056e3650..5849434249 100644 --- a/lib/chef/knife/user_key_edit.rb +++ b/lib/chef/knife/user_key_edit.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_edit" -require "chef/knife/key_edit_base" +require_relative "" +require_relative "key_edit" +require_relative "key_edit_base" class Chef class Knife diff --git a/lib/chef/knife/user_key_list.rb b/lib/chef/knife/user_key_list.rb index 10583f4a3c..b8a1a6f4f1 100644 --- a/lib/chef/knife/user_key_list.rb +++ b/lib/chef/knife/user_key_list.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_list" -require "chef/knife/key_list_base" +require_relative "" +require_relative "key_list" +require_relative "key_list_base" class Chef class Knife diff --git a/lib/chef/knife/user_key_show.rb b/lib/chef/knife/user_key_show.rb index b3a6ee73dc..bfc8a10d40 100644 --- a/lib/chef/knife/user_key_show.rb +++ b/lib/chef/knife/user_key_show.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/knife" -require "chef/knife/key_show" +require_relative "" +require_relative "key_show" class Chef class Knife diff --git a/lib/chef/knife/user_list.rb b/lib/chef/knife/user_list.rb index 31758ce117..83efa3a97f 100644 --- a/lib/chef/knife/user_list.rb +++ b/lib/chef/knife/user_list.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class UserList < Knife deps do - require "chef/user_v1" + require_relative "../user_v1" end banner "knife user list (options)" diff --git a/lib/chef/knife/user_reregister.rb b/lib/chef/knife/user_reregister.rb index 7530327131..46d7e76c2a 100644 --- a/lib/chef/knife/user_reregister.rb +++ b/lib/chef/knife/user_reregister.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife class UserReregister < Knife deps do - require "chef/user_v1" + require_relative "../user_v1" end banner "knife user reregister USER (options)" diff --git a/lib/chef/knife/user_show.rb b/lib/chef/knife/user_show.rb index a27549aea7..038f297dc4 100644 --- a/lib/chef/knife/user_show.rb +++ b/lib/chef/knife/user_show.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "" class Chef class Knife @@ -25,7 +25,7 @@ class Chef include Knife::Core::MultiAttributeReturnOption deps do - require "chef/user_v1" + require_relative "../user_v1" end banner "knife user show USER (options)" diff --git a/lib/chef/knife/xargs.rb b/lib/chef/knife/xargs.rb index 603279bcdd..a8ec99920b 100644 --- a/lib/chef/knife/xargs.rb +++ b/lib/chef/knife/xargs.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/chef_fs/knife" +require_relative "../chef_fs/knife" class Chef class Knife @@ -24,8 +24,8 @@ class Chef category "path-based" deps do - require "chef/chef_fs/file_system" - require "chef/chef_fs/file_system/exceptions" + require_relative "../chef_fs/file_system" + require_relative "../chef_fs/file_system/exceptions" end # TODO modify to remote-only / local-only pattern (more like delete) |