diff options
Diffstat (limited to 'lib/chef/chef_fs')
99 files changed, 282 insertions, 282 deletions
diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb index 3f8a047c6d..b00c28e252 100644 --- a/lib/chef/chef_fs/chef_fs_data_store.rb +++ b/lib/chef/chef_fs/chef_fs_data_store.rb @@ -16,14 +16,14 @@ # limitations under the License. # -require "chef/cookbook_manifest" +require_relative "../cookbook_manifest" require "chef_zero/data_store/memory_store" require "chef_zero/data_store/data_already_exists_error" require "chef_zero/data_store/data_not_found_error" -require "chef/chef_fs/file_pattern" -require "chef/chef_fs/file_system" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/file_system/memory/memory_root" +require_relative "file_pattern" +require_relative "file_system" +require_relative "file_system/exceptions" +require_relative "file_system/memory/memory_root" require "fileutils" class Chef diff --git a/lib/chef/chef_fs/command_line.rb b/lib/chef/chef_fs/command_line.rb index a61c68ceda..56c0c574e8 100644 --- a/lib/chef/chef_fs/command_line.rb +++ b/lib/chef/chef_fs/command_line.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system" -require "chef/chef_fs/file_system/exceptions" -require "chef/util/diff" +require_relative "file_system" +require_relative "file_system/exceptions" +require_relative "../util/diff" class Chef module ChefFS diff --git a/lib/chef/chef_fs/config.rb b/lib/chef/chef_fs/config.rb index 83efdad063..c6f6878c00 100644 --- a/lib/chef/chef_fs/config.rb +++ b/lib/chef/chef_fs/config.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/log" -require "chef/chef_fs/path_utils" +require_relative "../log" +require_relative "path_utils" class Chef module ChefFS @@ -172,7 +172,7 @@ class Chef end def create_chef_fs - require "chef/chef_fs/file_system/chef_server/chef_server_root_dir" + require_relative "file_system/chef_server/chef_server_root_dir" Chef::ChefFS::FileSystem::ChefServer::ChefServerRootDir.new("remote", @chef_config, cookbook_version: @cookbook_version) end @@ -181,7 +181,7 @@ class Chef end def create_local_fs - require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir" + require_relative "file_system/repository/chef_repository_file_system_root_dir" Chef::ChefFS::FileSystem::Repository::ChefRepositoryFileSystemRootDir.new(object_paths, Array(chef_config[:chef_repo_path]).flatten, @chef_config) end diff --git a/lib/chef/chef_fs/data_handler/acl_data_handler.rb b/lib/chef/chef_fs/data_handler/acl_data_handler.rb index 834fc5ca0b..e64f3d245c 100644 --- a/lib/chef/chef_fs/data_handler/acl_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/acl_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/client_data_handler.rb b/lib/chef/chef_fs/data_handler/client_data_handler.rb index 6c01d8d54c..3e5c4f1b84 100644 --- a/lib/chef/chef_fs/data_handler/client_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/client_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/api_client" +require_relative "data_handler_base" +require_relative "../../api_client" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/client_key_data_handler.rb b/lib/chef/chef_fs/data_handler/client_key_data_handler.rb index 6276413bcf..fc81a658cf 100644 --- a/lib/chef/chef_fs/data_handler/client_key_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/client_key_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/api_client" +require_relative "data_handler_base" +require_relative "../../api_client" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/container_data_handler.rb b/lib/chef/chef_fs/data_handler/container_data_handler.rb index a8bd5f084c..63663ea4ae 100644 --- a/lib/chef/chef_fs/data_handler/container_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/container_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb index 2861c5d3eb..222e6069f3 100644 --- a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/cookbook/metadata" +require_relative "data_handler_base" +require_relative "../../cookbook/metadata" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb index 1254d8543c..855bb06dd7 100644 --- a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/data_bag_item" +require_relative "data_handler_base" +require_relative "../../data_bag_item" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/environment_data_handler.rb b/lib/chef/chef_fs/data_handler/environment_data_handler.rb index ab8104b483..e3aa242fc9 100644 --- a/lib/chef/chef_fs/data_handler/environment_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/environment_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/environment" +require_relative "data_handler_base" +require_relative "../../environment" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/group_data_handler.rb b/lib/chef/chef_fs/data_handler/group_data_handler.rb index 8daced2e2e..3fffec5d11 100644 --- a/lib/chef/chef_fs/data_handler/group_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/group_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/api_client" +require_relative "data_handler_base" +require_relative "../../api_client" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/node_data_handler.rb b/lib/chef/chef_fs/data_handler/node_data_handler.rb index a0087ec5d6..c4698afd2b 100644 --- a/lib/chef/chef_fs/data_handler/node_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/node_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/node" +require_relative "data_handler_base" +require_relative "../../node" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/organization_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_data_handler.rb index 0a697ab69a..ebac7051f7 100644 --- a/lib/chef/chef_fs/data_handler/organization_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/organization_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb index 7ae08823b8..b3be2a962f 100644 --- a/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/organization_invites_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/organization_members_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_members_data_handler.rb index 8e452a413c..944d3fa0a5 100644 --- a/lib/chef/chef_fs/data_handler/organization_members_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/organization_members_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/policy_data_handler.rb b/lib/chef/chef_fs/data_handler/policy_data_handler.rb index 91c59f2a0b..082dc9ec09 100644 --- a/lib/chef/chef_fs/data_handler/policy_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/policy_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb b/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb index 397abdcc3e..bb0d4efb1c 100644 --- a/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/policy_group_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/role_data_handler.rb b/lib/chef/chef_fs/data_handler/role_data_handler.rb index b26271f3e8..1007a29c8a 100644 --- a/lib/chef/chef_fs/data_handler/role_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/role_data_handler.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/data_handler/data_handler_base" -require "chef/role" +require_relative "data_handler_base" +require_relative "../../role" class Chef module ChefFS diff --git a/lib/chef/chef_fs/data_handler/user_data_handler.rb b/lib/chef/chef_fs/data_handler/user_data_handler.rb index 4da2f8225d..50a0c0682d 100644 --- a/lib/chef/chef_fs/data_handler/user_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/user_data_handler.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/data_handler/data_handler_base" +require_relative "data_handler_base" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_pattern.rb b/lib/chef/chef_fs/file_pattern.rb index 835e06eab7..36001de877 100644 --- a/lib/chef/chef_fs/file_pattern.rb +++ b/lib/chef/chef_fs/file_pattern.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs" -require "chef/chef_fs/path_utils" +require_relative "" +require_relative "path_utils" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system.rb b/lib/chef/chef_fs/file_system.rb index cbd8aa71d9..ff85a4a1b1 100644 --- a/lib/chef/chef_fs/file_system.rb +++ b/lib/chef/chef_fs/file_system.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/path_utils" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/parallelizer" +require_relative "path_utils" +require_relative "file_system/exceptions" +require_relative "parallelizer" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/base_fs_dir.rb b/lib/chef/chef_fs/file_system/base_fs_dir.rb index 2827e5b384..2212d0b23f 100644 --- a/lib/chef/chef_fs/file_system/base_fs_dir.rb +++ b/lib/chef/chef_fs/file_system/base_fs_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_object" -require "chef/chef_fs/file_system/nonexistent_fs_object" +require_relative "base_fs_object" +require_relative "nonexistent_fs_object" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/base_fs_object.rb b/lib/chef/chef_fs/file_system/base_fs_object.rb index 9767b5b1ba..f7516232ac 100644 --- a/lib/chef/chef_fs/file_system/base_fs_object.rb +++ b/lib/chef/chef_fs/file_system/base_fs_object.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/path_utils" -require "chef/chef_fs/file_system/exceptions" +require_relative "../path_utils" +require_relative "exceptions" class Chef module ChefFS @@ -184,4 +184,4 @@ class Chef end end -require "chef/chef_fs/file_system/nonexistent_fs_object" +require_relative "nonexistent_fs_object" diff --git a/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb b/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb index 006098a0c9..8794d0dbb1 100644 --- a/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/acl_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/acl_entry" -require "chef/chef_fs/file_system/exceptions" +require_relative "../base_fs_dir" +require_relative "acl_entry" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb b/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb index 98091eaf9a..e08ac8f6fc 100644 --- a/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/exceptions" +require_relative "rest_list_entry" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb b/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb index dbc895f85e..03b003586b 100644 --- a/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/acl_dir" -require "chef/chef_fs/file_system/chef_server/cookbooks_acl_dir" -require "chef/chef_fs/file_system/chef_server/policies_acl_dir" -require "chef/chef_fs/file_system/chef_server/acl_entry" -require "chef/chef_fs/data_handler/acl_data_handler" +require_relative "../base_fs_dir" +require_relative "acl_dir" +require_relative "cookbooks_acl_dir" +require_relative "policies_acl_dir" +require_relative "acl_entry" +require_relative "../../data_handler/acl_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb index 3447e3500a..d1d92f508e 100644 --- a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb @@ -16,30 +16,30 @@ # limitations under the License. # -require "chef/server_api" -require "chef/chef_fs/file_system/chef_server/acls_dir" -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/chef_server/cookbooks_dir" -require "chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir" -require "chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir" -require "chef/chef_fs/file_system/chef_server/data_bags_dir" -require "chef/chef_fs/file_system/chef_server/nodes_dir" -require "chef/chef_fs/file_system/chef_server/org_entry" -require "chef/chef_fs/file_system/chef_server/organization_invites_entry" -require "chef/chef_fs/file_system/chef_server/organization_members_entry" -require "chef/chef_fs/file_system/chef_server/policies_dir" -require "chef/chef_fs/file_system/chef_server/policy_groups_dir" -require "chef/chef_fs/file_system/chef_server/environments_dir" -require "chef/chef_fs/data_handler/acl_data_handler" -require "chef/chef_fs/data_handler/client_data_handler" -require "chef/chef_fs/data_handler/environment_data_handler" -require "chef/chef_fs/data_handler/node_data_handler" -require "chef/chef_fs/data_handler/role_data_handler" -require "chef/chef_fs/data_handler/user_data_handler" -require "chef/chef_fs/data_handler/group_data_handler" -require "chef/chef_fs/data_handler/container_data_handler" -require "chef/chef_fs/data_handler/policy_group_data_handler" +require_relative "../../../server_api" +require_relative "acls_dir" +require_relative "../base_fs_dir" +require_relative "rest_list_dir" +require_relative "cookbooks_dir" +require_relative "cookbook_artifacts_dir" +require_relative "versioned_cookbooks_dir" +require_relative "data_bags_dir" +require_relative "nodes_dir" +require_relative "org_entry" +require_relative "organization_invites_entry" +require_relative "organization_members_entry" +require_relative "policies_dir" +require_relative "policy_groups_dir" +require_relative "environments_dir" +require_relative "../../data_handler/acl_data_handler" +require_relative "../../data_handler/client_data_handler" +require_relative "../../data_handler/environment_data_handler" +require_relative "../../data_handler/node_data_handler" +require_relative "../../data_handler/role_data_handler" +require_relative "../../data_handler/user_data_handler" +require_relative "../../data_handler/group_data_handler" +require_relative "../../data_handler/container_data_handler" +require_relative "../../data_handler/policy_group_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb index faea96e944..68468f62a0 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/cookbook_dir" +require_relative "cookbook_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb index e4df7858a7..6c1610876c 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/cookbooks_dir" -require "chef/chef_fs/file_system/chef_server/cookbook_artifact_dir" +require_relative "cookbooks_dir" +require_relative "cookbook_artifact_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb index a619dc75bf..b8e1b7b43c 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb @@ -16,13 +16,13 @@ # limitations under the License. # -require "chef/chef_fs/command_line" -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/chef_server/cookbook_subdir" -require "chef/chef_fs/file_system/chef_server/cookbook_file" -require "chef/chef_fs/file_system/exceptions" -require "chef/cookbook_version" -require "chef/cookbook_uploader" +require_relative "../../command_line" +require_relative "rest_list_dir" +require_relative "cookbook_subdir" +require_relative "cookbook_file" +require_relative "../exceptions" +require_relative "../../../cookbook_version" +require_relative "../../../cookbook_uploader" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb index a680daacc0..0ee277abea 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_object" -require "chef/http/simple" +require_relative "../base_fs_object" +require_relative "../../../http/simple" require "openssl" class Chef diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb index 01297a39ba..d1b415baf1 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" +require_relative "../base_fs_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbooks_acl_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbooks_acl_dir.rb index e020d0fb34..548eb0200a 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbooks_acl_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbooks_acl_dir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/acl_dir" +require_relative "acl_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb index 04d48d4e8e..c1bd3e5812 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/chef_server/cookbook_dir" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir" -require "chef/mixin/file_class" +require_relative "rest_list_dir" +require_relative "cookbook_dir" +require_relative "../exceptions" +require_relative "../repository/chef_repository_file_system_cookbook_dir" +require_relative "../../../mixin/file_class" require "tmpdir" diff --git a/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb b/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb index 0102ea2844..fb8a537596 100644 --- a/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/chef_server/data_bag_entry" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/data_handler/data_bag_item_data_handler" +require_relative "rest_list_dir" +require_relative "data_bag_entry" +require_relative "../exceptions" +require_relative "../../data_handler/data_bag_item_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/data_bag_entry.rb b/lib/chef/chef_fs/file_system/chef_server/data_bag_entry.rb index c0093058b7..19e0fb409e 100644 --- a/lib/chef/chef_fs/file_system/chef_server/data_bag_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/data_bag_entry.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/data_handler/data_bag_item_data_handler" +require_relative "rest_list_entry" +require_relative "../../data_handler/data_bag_item_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb b/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb index 6c7dd7b477..08793257dc 100644 --- a/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/chef_server/data_bag_dir" +require_relative "rest_list_dir" +require_relative "data_bag_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb b/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb index e4714cf089..09ab30c799 100644 --- a/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/exceptions" +require_relative "../base_fs_dir" +require_relative "rest_list_entry" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb index e56c68ffae..76897df093 100644 --- a/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/data_handler/node_data_handler" +require_relative "../base_fs_dir" +require_relative "rest_list_entry" +require_relative "../exceptions" +require_relative "../../data_handler/node_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/org_entry.rb b/lib/chef/chef_fs/file_system/chef_server/org_entry.rb index 7253de3449..f2dfc944cd 100644 --- a/lib/chef/chef_fs/file_system/chef_server/org_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/org_entry.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/data_handler/organization_data_handler" +require_relative "rest_list_entry" +require_relative "../../data_handler/organization_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb b/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb index 02cde95880..bcb6b94edf 100644 --- a/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb @@ -1,6 +1,6 @@ -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/data_handler/organization_invites_data_handler" -require "chef/json_compat" +require_relative "rest_list_entry" +require_relative "../../data_handler/organization_invites_data_handler" +require_relative "../../../json_compat" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb b/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb index a31922d7c8..31c5f880f8 100644 --- a/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb @@ -1,6 +1,6 @@ -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/data_handler/organization_members_data_handler" -require "chef/json_compat" +require_relative "rest_list_entry" +require_relative "../../data_handler/organization_members_data_handler" +require_relative "../../../json_compat" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/policies_acl_dir.rb b/lib/chef/chef_fs/file_system/chef_server/policies_acl_dir.rb index fa1d184b7d..ef9014505d 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policies_acl_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policies_acl_dir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/acl_dir" +require_relative "acl_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb b/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb index df589a6cc0..d0674075c6 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/chef_server/policy_revision_entry" +require_relative "rest_list_dir" +require_relative "policy_revision_entry" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb b/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb index f0d51a692f..3ecb7695cb 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policy_group_entry.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/exceptions" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb b/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb index 0452fa4573..23f7572a0b 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policy_groups_dir.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/file_system/chef_server/policy_group_entry" +require_relative "../base_fs_dir" +require_relative "rest_list_entry" +require_relative "../exceptions" +require_relative "policy_group_entry" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb b/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb index 325b18e429..9b99fea730 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policy_revision_entry.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/data_handler/policy_data_handler" +require_relative "rest_list_entry" +require_relative "../../data_handler/policy_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb index a58a01ae8c..7c5e01bf7e 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/rest_list_entry" -require "chef/chef_fs/file_system/exceptions" +require_relative "../base_fs_dir" +require_relative "rest_list_entry" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb index 9eaae9c73f..94c6ee0656 100644 --- a/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +++ b/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_object" -require "chef/chef_fs/file_system/exceptions" -require "chef/role" -require "chef/node" -require "chef/json_compat" +require_relative "../base_fs_object" +require_relative "../exceptions" +require_relative "../../../role" +require_relative "../../../node" +require_relative "../../../json_compat" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb index ae4422b82e..a091ddaf12 100644 --- a/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/cookbook_dir" +require_relative "cookbook_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb b/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb index 94c1a5b695..5973e01e41 100644 --- a/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/chef_server/cookbooks_dir" -require "chef/chef_fs/file_system/chef_server/versioned_cookbook_dir" +require_relative "cookbooks_dir" +require_relative "versioned_cookbook_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/memory/memory_dir.rb b/lib/chef/chef_fs/file_system/memory/memory_dir.rb index 6049f404b1..fdef10ff56 100644 --- a/lib/chef/chef_fs/file_system/memory/memory_dir.rb +++ b/lib/chef/chef_fs/file_system/memory/memory_dir.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/memory/memory_file" +require_relative "../base_fs_dir" +require_relative "memory_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/memory/memory_file.rb b/lib/chef/chef_fs/file_system/memory/memory_file.rb index 6dcefc72eb..9201893dda 100644 --- a/lib/chef/chef_fs/file_system/memory/memory_file.rb +++ b/lib/chef/chef_fs/file_system/memory/memory_file.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/file_system/base_fs_object" +require_relative "../base_fs_object" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/memory/memory_root.rb b/lib/chef/chef_fs/file_system/memory/memory_root.rb index 4881b3d951..4a8b281389 100644 --- a/lib/chef/chef_fs/file_system/memory/memory_root.rb +++ b/lib/chef/chef_fs/file_system/memory/memory_root.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/file_system/memory/memory_dir" +require_relative "memory_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/multiplexed_dir.rb b/lib/chef/chef_fs/file_system/multiplexed_dir.rb index 969a579532..2930dd5d8c 100644 --- a/lib/chef/chef_fs/file_system/multiplexed_dir.rb +++ b/lib/chef/chef_fs/file_system/multiplexed_dir.rb @@ -1,5 +1,5 @@ -require "chef/chef_fs/file_system/base_fs_object" -require "chef/chef_fs/file_system/nonexistent_fs_object" +require_relative "base_fs_object" +require_relative "nonexistent_fs_object" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb b/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb index 1a48d23047..e232c6bd07 100644 --- a/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb +++ b/lib/chef/chef_fs/file_system/nonexistent_fs_object.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_object" -require "chef/chef_fs/file_system/exceptions" +require_relative "base_fs_object" +require_relative "exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/acl.rb b/lib/chef/chef_fs/file_system/repository/acl.rb index 023ae11379..389c1fd38b 100644 --- a/lib/chef/chef_fs/file_system/repository/acl.rb +++ b/lib/chef/chef_fs/file_system/repository/acl.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/acl_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/acl_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/acls_dir.rb b/lib/chef/chef_fs/file_system/repository/acls_dir.rb index ef30bef725..f97796d6b5 100644 --- a/lib/chef/chef_fs/file_system/repository/acls_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/acls_dir.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/acl" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/repository/acls_sub_dir" -require "chef/chef_fs/file_system/chef_server/acls_dir" -require "chef/chef_fs/data_handler/acl_data_handler" +require_relative "acl" +require_relative "directory" +require_relative "acls_sub_dir" +require_relative "../chef_server/acls_dir" +require_relative "../../data_handler/acl_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb b/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb index 70c7d77480..2386a03d0e 100644 --- a/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/acls_sub_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/acl" -require "chef/chef_fs/data_handler/acl_data_handler" -require "chef/chef_fs/file_system/repository/directory" +require_relative "acl" +require_relative "../../data_handler/acl_data_handler" +require_relative "directory" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/base_file.rb b/lib/chef/chef_fs/file_system/repository/base_file.rb index 76d242eee5..ade5fc2039 100644 --- a/lib/chef/chef_fs/file_system/repository/base_file.rb +++ b/lib/chef/chef_fs/file_system/repository/base_file.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system_cache" +require_relative "../../file_system_cache" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb index 83c13e5e20..8a6e375fde 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir" +require_relative "chef_repository_file_system_cookbook_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb index 8e64e3ca06..5098d55727 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry" -require "chef/chef_fs/file_system/chef_server/cookbook_dir" -require "chef/chef_fs/file_system/chef_server/versioned_cookbook_dir" -require "chef/chef_fs/file_system/exceptions" -require "chef/cookbook/cookbook_version_loader" +require_relative "chef_repository_file_system_cookbook_entry" +require_relative "../chef_server/cookbook_dir" +require_relative "../chef_server/versioned_cookbook_dir" +require_relative "../exceptions" +require_relative "../../../cookbook/cookbook_version_loader" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb index c840fad126..a6cae64c6d 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/file_system_entry" -require "chef/chef_fs/file_system/repository/cookbooks_dir" -require "chef/chef_fs/file_system/exceptions" +require_relative "file_system_entry" +require_relative "cookbooks_dir" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb index 5abd1c238b..a180cd1e2e 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb @@ -16,34 +16,34 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/repository/acls_dir" -require "chef/chef_fs/file_system/repository/clients_dir" -require "chef/chef_fs/file_system/repository/cookbooks_dir" -require "chef/chef_fs/file_system/repository/cookbook_artifacts_dir" -require "chef/chef_fs/file_system/repository/containers_dir" -require "chef/chef_fs/file_system/repository/data_bags_dir" -require "chef/chef_fs/file_system/repository/environments_dir" -require "chef/chef_fs/file_system/repository/groups_dir" -require "chef/chef_fs/file_system/repository/nodes_dir" -require "chef/chef_fs/file_system/repository/policy_groups_dir" -require "chef/chef_fs/file_system/repository/roles_dir" -require "chef/chef_fs/file_system/repository/users_dir" -require "chef/chef_fs/file_system/repository/client_keys_dir" -require "chef/chef_fs/file_system/repository/file_system_entry" -require "chef/chef_fs/file_system/repository/policies_dir" -require "chef/chef_fs/file_system/repository/versioned_cookbooks_dir" -require "chef/chef_fs/file_system/multiplexed_dir" -require "chef/chef_fs/data_handler/client_data_handler" -require "chef/chef_fs/data_handler/client_key_data_handler" -require "chef/chef_fs/data_handler/environment_data_handler" -require "chef/chef_fs/data_handler/node_data_handler" -require "chef/chef_fs/data_handler/policy_data_handler" -require "chef/chef_fs/data_handler/policy_group_data_handler" -require "chef/chef_fs/data_handler/role_data_handler" -require "chef/chef_fs/data_handler/user_data_handler" -require "chef/chef_fs/data_handler/group_data_handler" -require "chef/chef_fs/data_handler/container_data_handler" +require_relative "../base_fs_dir" +require_relative "acls_dir" +require_relative "clients_dir" +require_relative "cookbooks_dir" +require_relative "cookbook_artifacts_dir" +require_relative "containers_dir" +require_relative "data_bags_dir" +require_relative "environments_dir" +require_relative "groups_dir" +require_relative "nodes_dir" +require_relative "policy_groups_dir" +require_relative "roles_dir" +require_relative "users_dir" +require_relative "client_keys_dir" +require_relative "file_system_entry" +require_relative "policies_dir" +require_relative "versioned_cookbooks_dir" +require_relative "../multiplexed_dir" +require_relative "../../data_handler/client_data_handler" +require_relative "../../data_handler/client_key_data_handler" +require_relative "../../data_handler/environment_data_handler" +require_relative "../../data_handler/node_data_handler" +require_relative "../../data_handler/policy_data_handler" +require_relative "../../data_handler/policy_group_data_handler" +require_relative "../../data_handler/role_data_handler" +require_relative "../../data_handler/user_data_handler" +require_relative "../../data_handler/group_data_handler" +require_relative "../../data_handler/container_data_handler" require "chef/win32/security" if Chef::Platform.windows? class Chef diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb index 5dc74d85da..4fb214cff8 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir" +require_relative "chef_repository_file_system_cookbook_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/client.rb b/lib/chef/chef_fs/file_system/repository/client.rb index 6a99b7f005..6d747aa6cc 100644 --- a/lib/chef/chef_fs/file_system/repository/client.rb +++ b/lib/chef/chef_fs/file_system/repository/client.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/client_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/client_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/client_key.rb b/lib/chef/chef_fs/file_system/repository/client_key.rb index 8ca4f85d2f..07b6bafafe 100644 --- a/lib/chef/chef_fs/file_system/repository/client_key.rb +++ b/lib/chef/chef_fs/file_system/repository/client_key.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/client_key_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/client_key_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/client_keys_dir.rb b/lib/chef/chef_fs/file_system/repository/client_keys_dir.rb index 9e7e7b3d5c..7b5b29ea02 100644 --- a/lib/chef/chef_fs/file_system/repository/client_keys_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/client_keys_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/client_keys_sub_dir" -require "chef/chef_fs/data_handler/client_key_data_handler" -require "chef/chef_fs/file_system/repository/directory" +require_relative "client_keys_sub_dir" +require_relative "../../data_handler/client_key_data_handler" +require_relative "directory" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb b/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb index 6aafcfe294..0c6ad449b3 100644 --- a/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/client_key" -require "chef/chef_fs/data_handler/client_key_data_handler" -require "chef/chef_fs/file_system/repository/directory" +require_relative "client_key" +require_relative "../../data_handler/client_key_data_handler" +require_relative "directory" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/clients_dir.rb b/lib/chef/chef_fs/file_system/repository/clients_dir.rb index 01027f83ac..e3e7979cd2 100644 --- a/lib/chef/chef_fs/file_system/repository/clients_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/clients_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/client" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "client" +require_relative "directory" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/container.rb b/lib/chef/chef_fs/file_system/repository/container.rb index e14a2ded73..7aefa3d482 100644 --- a/lib/chef/chef_fs/file_system/repository/container.rb +++ b/lib/chef/chef_fs/file_system/repository/container.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/container_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/container_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/containers_dir.rb b/lib/chef/chef_fs/file_system/repository/containers_dir.rb index 2af496f418..892fe73244 100644 --- a/lib/chef/chef_fs/file_system/repository/containers_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/containers_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/container" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "container" +require_relative "directory" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/cookbook_artifacts_dir.rb b/lib/chef/chef_fs/file_system/repository/cookbook_artifacts_dir.rb index 773d9a5e5a..c94430ea51 100644 --- a/lib/chef/chef_fs/file_system/repository/cookbook_artifacts_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/cookbook_artifacts_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/cookbooks_dir" -require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir" +require_relative "cookbooks_dir" +require_relative "chef_repository_file_system_cookbook_artifact_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/cookbooks_dir.rb b/lib/chef/chef_fs/file_system/repository/cookbooks_dir.rb index 86eca95ba8..1dfc1fcbc3 100644 --- a/lib/chef/chef_fs/file_system/repository/cookbooks_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/cookbooks_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir" -require "chef/cookbook/chefignore" +require_relative "directory" +require_relative "chef_repository_file_system_cookbook_dir" +require_relative "../../../cookbook/chefignore" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/data_bag.rb b/lib/chef/chef_fs/file_system/repository/data_bag.rb index fb3ad9da77..8d7fb977cf 100644 --- a/lib/chef/chef_fs/file_system/repository/data_bag.rb +++ b/lib/chef/chef_fs/file_system/repository/data_bag.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/repository/data_bag_item" +require_relative "directory" +require_relative "data_bag_item" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/data_bag_item.rb b/lib/chef/chef_fs/file_system/repository/data_bag_item.rb index 2e3fb39606..c88fc3c153 100644 --- a/lib/chef/chef_fs/file_system/repository/data_bag_item.rb +++ b/lib/chef/chef_fs/file_system/repository/data_bag_item.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/data_bag_item_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/data_bag_item_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/data_bags_dir.rb b/lib/chef/chef_fs/file_system/repository/data_bags_dir.rb index 666fede62b..8a0e03ae3f 100644 --- a/lib/chef/chef_fs/file_system/repository/data_bags_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/data_bags_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/repository/data_bag" +require_relative "directory" +require_relative "data_bag" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/directory.rb b/lib/chef/chef_fs/file_system/repository/directory.rb index d3f8d84324..f428e939d3 100644 --- a/lib/chef/chef_fs/file_system/repository/directory.rb +++ b/lib/chef/chef_fs/file_system/repository/directory.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs/file_system_cache" +require_relative "../../file_system_cache" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/environment.rb b/lib/chef/chef_fs/file_system/repository/environment.rb index 9ef9741308..bc34ec7e07 100644 --- a/lib/chef/chef_fs/file_system/repository/environment.rb +++ b/lib/chef/chef_fs/file_system/repository/environment.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/environment_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/environment_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/environments_dir.rb b/lib/chef/chef_fs/file_system/repository/environments_dir.rb index 4d04348d6e..3354f86329 100644 --- a/lib/chef/chef_fs/file_system/repository/environments_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/environments_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/environment" -require "chef/chef_fs/data_handler/environment_data_handler" -require "chef/chef_fs/file_system/repository/directory" +require_relative "environment" +require_relative "../../data_handler/environment_data_handler" +require_relative "directory" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/file_system_entry.rb b/lib/chef/chef_fs/file_system/repository/file_system_entry.rb index 183fcda26d..f015dc9e51 100644 --- a/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +++ b/lib/chef/chef_fs/file_system/repository/file_system_entry.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/chef_fs/file_system/base_fs_dir" -require "chef/chef_fs/file_system/chef_server/rest_list_dir" -require "chef/chef_fs/file_system/exceptions" -require "chef/chef_fs/path_utils" +require_relative "../base_fs_dir" +require_relative "../chef_server/rest_list_dir" +require_relative "../exceptions" +require_relative "../../path_utils" require "fileutils" class Chef diff --git a/lib/chef/chef_fs/file_system/repository/group.rb b/lib/chef/chef_fs/file_system/repository/group.rb index 302e72739b..231d8d1003 100644 --- a/lib/chef/chef_fs/file_system/repository/group.rb +++ b/lib/chef/chef_fs/file_system/repository/group.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/group_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/group_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/groups_dir.rb b/lib/chef/chef_fs/file_system/repository/groups_dir.rb index 20728d1248..0ecea2b87d 100644 --- a/lib/chef/chef_fs/file_system/repository/groups_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/groups_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/group" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "group" +require_relative "directory" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/node.rb b/lib/chef/chef_fs/file_system/repository/node.rb index d8f0dec7c4..d3b9c26533 100644 --- a/lib/chef/chef_fs/file_system/repository/node.rb +++ b/lib/chef/chef_fs/file_system/repository/node.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/node_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/node_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/nodes_dir.rb b/lib/chef/chef_fs/file_system/repository/nodes_dir.rb index a0dd0c9e51..267c255cf0 100644 --- a/lib/chef/chef_fs/file_system/repository/nodes_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/nodes_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/node" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "node" +require_relative "directory" +require_relative "../exceptions" require "chef/win32/security" if Chef::Platform.windows? class Chef diff --git a/lib/chef/chef_fs/file_system/repository/policies_dir.rb b/lib/chef/chef_fs/file_system/repository/policies_dir.rb index c74ea5469b..282a1db4ff 100644 --- a/lib/chef/chef_fs/file_system/repository/policies_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/policies_dir.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/policy" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/data_handler/policy_data_handler" +require_relative "policy" +require_relative "directory" +require_relative "../../data_handler/policy_data_handler" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/policy.rb b/lib/chef/chef_fs/file_system/repository/policy.rb index 695bf17e83..7cadd82498 100644 --- a/lib/chef/chef_fs/file_system/repository/policy.rb +++ b/lib/chef/chef_fs/file_system/repository/policy.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/policy_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/policy_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/policy_group.rb b/lib/chef/chef_fs/file_system/repository/policy_group.rb index e4182847b6..31fad664ef 100644 --- a/lib/chef/chef_fs/file_system/repository/policy_group.rb +++ b/lib/chef/chef_fs/file_system/repository/policy_group.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/policy_group_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/policy_group_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/policy_groups_dir.rb b/lib/chef/chef_fs/file_system/repository/policy_groups_dir.rb index 4db85a93f7..89c3f13d6c 100644 --- a/lib/chef/chef_fs/file_system/repository/policy_groups_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/policy_groups_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/policy_group" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "policy_group" +require_relative "directory" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/role.rb b/lib/chef/chef_fs/file_system/repository/role.rb index d97ae0e7a1..2d55ef152c 100644 --- a/lib/chef/chef_fs/file_system/repository/role.rb +++ b/lib/chef/chef_fs/file_system/repository/role.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/role_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/role_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/roles_dir.rb b/lib/chef/chef_fs/file_system/repository/roles_dir.rb index 42f4376e71..a18d2e9b70 100644 --- a/lib/chef/chef_fs/file_system/repository/roles_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/roles_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/role" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "role" +require_relative "directory" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/user.rb b/lib/chef/chef_fs/file_system/repository/user.rb index 59355cc303..31ca6e6423 100644 --- a/lib/chef/chef_fs/file_system/repository/user.rb +++ b/lib/chef/chef_fs/file_system/repository/user.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/data_handler/user_data_handler" -require "chef/chef_fs/file_system/repository/base_file" +require_relative "../../data_handler/user_data_handler" +require_relative "base_file" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/users_dir.rb b/lib/chef/chef_fs/file_system/repository/users_dir.rb index 9e8621575b..76a74e6a1f 100644 --- a/lib/chef/chef_fs/file_system/repository/users_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/users_dir.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/user" -require "chef/chef_fs/file_system/repository/directory" -require "chef/chef_fs/file_system/exceptions" +require_relative "user" +require_relative "directory" +require_relative "../exceptions" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system/repository/versioned_cookbooks_dir.rb b/lib/chef/chef_fs/file_system/repository/versioned_cookbooks_dir.rb index 80f77d02be..a792e5c64e 100644 --- a/lib/chef/chef_fs/file_system/repository/versioned_cookbooks_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/versioned_cookbooks_dir.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/chef_fs/file_system/repository/cookbooks_dir" -require "chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir" +require_relative "cookbooks_dir" +require_relative "chef_repository_file_system_versioned_cookbook_dir" class Chef module ChefFS diff --git a/lib/chef/chef_fs/file_system_cache.rb b/lib/chef/chef_fs/file_system_cache.rb index 7b6c4c148f..fe7c600ab3 100644 --- a/lib/chef/chef_fs/file_system_cache.rb +++ b/lib/chef/chef_fs/file_system_cache.rb @@ -16,7 +16,7 @@ # require "singleton" -require "chef/client" +require_relative "../client" class Chef module ChefFS diff --git a/lib/chef/chef_fs/knife.rb b/lib/chef/chef_fs/knife.rb index 36445e5680..47f34225b7 100644 --- a/lib/chef/chef_fs/knife.rb +++ b/lib/chef/chef_fs/knife.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/knife" +require_relative "../knife" require "pathname" class Chef @@ -25,11 +25,11 @@ class Chef # Workaround for CHEF-3932 def self.deps super do - require "chef/config" - require "chef/chef_fs/parallelizer" - require "chef/chef_fs/config" - require "chef/chef_fs/file_pattern" - require "chef/chef_fs/path_utils" + require_relative "../config" + require_relative "parallelizer" + require_relative "config" + require_relative "file_pattern" + require_relative "path_utils" yield end end diff --git a/lib/chef/chef_fs/parallelizer.rb b/lib/chef/chef_fs/parallelizer.rb index eee555fc93..be7d93c669 100644 --- a/lib/chef/chef_fs/parallelizer.rb +++ b/lib/chef/chef_fs/parallelizer.rb @@ -1,5 +1,5 @@ require "thread" -require "chef/chef_fs/parallelizer/parallel_enumerable" +require_relative "parallelizer/parallel_enumerable" class Chef module ChefFS diff --git a/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb b/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb index ab578bdb7f..2291220ef8 100644 --- a/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +++ b/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb @@ -1,4 +1,4 @@ -require "chef/chef_fs/parallelizer/flatten_enumerable" +require_relative "flatten_enumerable" class Chef module ChefFS diff --git a/lib/chef/chef_fs/path_utils.rb b/lib/chef/chef_fs/path_utils.rb index 4de23f8266..fe8343d94a 100644 --- a/lib/chef/chef_fs/path_utils.rb +++ b/lib/chef/chef_fs/path_utils.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/chef_fs" +require_relative "" require "pathname" class Chef |