diff options
Diffstat (limited to 'lib/chef/provider')
121 files changed, 336 insertions, 336 deletions
diff --git a/lib/chef/provider/apt_preference.rb b/lib/chef/provider/apt_preference.rb index 416a1c0d1d..3d07438561 100644 --- a/lib/chef/provider/apt_preference.rb +++ b/lib/chef/provider/apt_preference.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/provider" -require "chef/dsl/declare_resource" -require "chef/provider/noop" -require "chef/log" +require_relative "" +require_relative "../dsl/declare_resource" +require_relative "noop" +require_relative "../log" class Chef class Provider diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb index 75c7112fb8..bba0b45038 100644 --- a/lib/chef/provider/apt_repository.rb +++ b/lib/chef/provider/apt_repository.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/resource" -require "chef/dsl/declare_resource" -require "chef/mixin/shell_out" -require "chef/http/simple" -require "chef/provider/noop" +require_relative "../resource" +require_relative "../dsl/declare_resource" +require_relative "../mixin/shell_out" +require_relative "../http/simple" +require_relative "noop" require "tmpdir" class Chef diff --git a/lib/chef/provider/apt_update.rb b/lib/chef/provider/apt_update.rb index eeafcba58b..925b378ea1 100644 --- a/lib/chef/provider/apt_update.rb +++ b/lib/chef/provider/apt_update.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider" -require "chef/provider/noop" -require "chef/dsl/declare_resource" +require_relative "" +require_relative "noop" +require_relative "../dsl/declare_resource" class Chef class Provider diff --git a/lib/chef/provider/batch.rb b/lib/chef/provider/batch.rb index dae1513a51..21dc8f84dd 100644 --- a/lib/chef/provider/batch.rb +++ b/lib/chef/provider/batch.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/windows_script" +require_relative "windows_script" class Chef class Provider diff --git a/lib/chef/provider/cookbook_file.rb b/lib/chef/provider/cookbook_file.rb index 92383fd5fa..b8ec86cd92 100644 --- a/lib/chef/provider/cookbook_file.rb +++ b/lib/chef/provider/cookbook_file.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/file" +require_relative "file" class Chef class Provider diff --git a/lib/chef/provider/cookbook_file/content.rb b/lib/chef/provider/cookbook_file/content.rb index 82e2cf4390..873f3bb394 100644 --- a/lib/chef/provider/cookbook_file/content.rb +++ b/lib/chef/provider/cookbook_file/content.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/file_content_management/content_base" -require "chef/file_content_management/tempfile" +require_relative "../../file_content_management/content_base" +require_relative "../../file_content_management/tempfile" class Chef class Provider diff --git a/lib/chef/provider/cron.rb b/lib/chef/provider/cron.rb index 00c04a73aa..009ce42fe5 100644 --- a/lib/chef/provider/cron.rb +++ b/lib/chef/provider/cron.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" +require_relative "../log" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/cron/aix.rb b/lib/chef/provider/cron/aix.rb index 015c1f2096..5d58e21bca 100644 --- a/lib/chef/provider/cron/aix.rb +++ b/lib/chef/provider/cron/aix.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/cron/unix" +require_relative "unix" class Chef class Provider diff --git a/lib/chef/provider/cron/solaris.rb b/lib/chef/provider/cron/solaris.rb index 58d6637674..0355077c5a 100644 --- a/lib/chef/provider/cron/solaris.rb +++ b/lib/chef/provider/cron/solaris.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/cron/unix" +require_relative "unix" # Just to create an alias so 'Chef::Provider::Cron::Solaris' is exposed and accessible to existing consumers of class. Chef::Provider::Cron::Solaris = Chef::Provider::Cron::Unix diff --git a/lib/chef/provider/cron/unix.rb b/lib/chef/provider/cron/unix.rb index 6539ccd7ca..7575ff866f 100644 --- a/lib/chef/provider/cron/unix.rb +++ b/lib/chef/provider/cron/unix.rb @@ -18,9 +18,9 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" -require "chef/provider/cron" +require_relative "../../log" +require_relative ".." +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/directory.rb b/lib/chef/provider/directory.rb index 3e816d5a06..9a1d29021e 100644 --- a/lib/chef/provider/directory.rb +++ b/lib/chef/provider/directory.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/config" -require "chef/log" -require "chef/resource/directory" -require "chef/provider" -require "chef/provider/file" +require_relative "../config" +require_relative "../log" +require_relative "../resource/directory" +require_relative "" +require_relative "file" require "fileutils" class Chef diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb index 864373f902..b7785a6660 100644 --- a/lib/chef/provider/dsc_resource.rb +++ b/lib/chef/provider/dsc_resource.rb @@ -15,10 +15,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef/util/powershell/cmdlet" -require "chef/util/dsc/local_configuration_manager" -require "chef/mixin/powershell_type_coercions" -require "chef/util/dsc/resource_store" +require_relative "../util/powershell/cmdlet" +require_relative "../util/dsc/local_configuration_manager" +require_relative "../mixin/powershell_type_coercions" +require_relative "../util/dsc/resource_store" class Chef class Provider diff --git a/lib/chef/provider/dsc_script.rb b/lib/chef/provider/dsc_script.rb index 4a44a9ea23..d7ac9689ef 100644 --- a/lib/chef/provider/dsc_script.rb +++ b/lib/chef/provider/dsc_script.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/util/powershell/cmdlet" -require "chef/util/dsc/configuration_generator" -require "chef/util/dsc/local_configuration_manager" -require "chef/util/path_helper" +require_relative "../util/powershell/cmdlet" +require_relative "../util/dsc/configuration_generator" +require_relative "../util/dsc/local_configuration_manager" +require_relative "../util/path_helper" class Chef class Provider diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb index 2d84ac317b..933519766f 100644 --- a/lib/chef/provider/execute.rb +++ b/lib/chef/provider/execute.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" +require_relative "../log" +require_relative "" require "forwardable" -require "chef/mixin/train_or_shell" +require_relative "../mixin/train_or_shell" class Chef class Provider diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index 02da092418..6c8582c05b 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -17,21 +17,21 @@ # limitations under the License. # -require "chef/config" -require "chef/log" -require "chef/resource/file" -require "chef/provider" +require_relative "../config" +require_relative "../log" +require_relative "../resource/file" +require_relative "" require "etc" require "fileutils" -require "chef/scan_access_control" -require "chef/mixin/checksum" -require "chef/mixin/file_class" -require "chef/mixin/enforce_ownership_and_permissions" -require "chef/util/backup" -require "chef/util/diff" -require "chef/util/selinux" -require "chef/file_content_management/deploy" -require "chef/dist" +require_relative "../scan_access_control" +require_relative "../mixin/checksum" +require_relative "../mixin/file_class" +require_relative "../mixin/enforce_ownership_and_permissions" +require_relative "../util/backup" +require_relative "../util/diff" +require_relative "../util/selinux" +require_relative "../file_content_management/deploy" +require_relative "../dist" # The Tao of File Providers: # - the content provider must always return a tempfile that we can delete/mv diff --git a/lib/chef/provider/file/content.rb b/lib/chef/provider/file/content.rb index 1b60e10fea..5ab27d3ec6 100644 --- a/lib/chef/provider/file/content.rb +++ b/lib/chef/provider/file/content.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/file_content_management/content_base" -require "chef/file_content_management/tempfile" +require_relative "../../file_content_management/content_base" +require_relative "../../file_content_management/tempfile" class Chef class Provider diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb index b1657b1c77..5696637de8 100644 --- a/lib/chef/provider/git.rb +++ b/lib/chef/provider/git.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/exceptions" -require "chef/log" -require "chef/provider" +require_relative "../exceptions" +require_relative "../log" +require_relative "" require "fileutils" class Chef diff --git a/lib/chef/provider/group.rb b/lib/chef/provider/group.rb index 51e4f280fe..d1d58a8bd5 100644 --- a/lib/chef/provider/group.rb +++ b/lib/chef/provider/group.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider" -require "chef/mixin/shell_out" +require_relative "" +require_relative "../mixin/shell_out" require "etc" class Chef diff --git a/lib/chef/provider/group/aix.rb b/lib/chef/provider/group/aix.rb index 7da07b8006..72bfc76d97 100644 --- a/lib/chef/provider/group/aix.rb +++ b/lib/chef/provider/group/aix.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/group/groupadd" +require_relative "groupadd" class Chef class Provider diff --git a/lib/chef/provider/group/gpasswd.rb b/lib/chef/provider/group/gpasswd.rb index a5d6a378c0..5d769befa4 100644 --- a/lib/chef/provider/group/gpasswd.rb +++ b/lib/chef/provider/group/gpasswd.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/group/groupadd" +require_relative "groupadd" class Chef class Provider diff --git a/lib/chef/provider/group/solaris.rb b/lib/chef/provider/group/solaris.rb index 4d913fba30..75768297db 100644 --- a/lib/chef/provider/group/solaris.rb +++ b/lib/chef/provider/group/solaris.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/group/groupadd" +require_relative "groupadd" class Chef class Provider diff --git a/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb index 3f4300278f..15360808c9 100644 --- a/lib/chef/provider/group/suse.rb +++ b/lib/chef/provider/group/suse.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/group/groupadd" +require_relative "groupadd" require "etc" class Chef diff --git a/lib/chef/provider/group/usermod.rb b/lib/chef/provider/group/usermod.rb index 06e05ff54d..79a774a4c3 100644 --- a/lib/chef/provider/group/usermod.rb +++ b/lib/chef/provider/group/usermod.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/group/groupadd" +require_relative "groupadd" class Chef class Provider diff --git a/lib/chef/provider/group/windows.rb b/lib/chef/provider/group/windows.rb index 6981c7126e..fc4d7df96b 100644 --- a/lib/chef/provider/group/windows.rb +++ b/lib/chef/provider/group/windows.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider/user" +require_relative "../user" if RUBY_PLATFORM =~ /mswin|mingw32|windows/ - require "chef/util/windows/net_group" + require_relative "../../util/windows/net_group" end class Chef diff --git a/lib/chef/provider/http_request.rb b/lib/chef/provider/http_request.rb index e8aad1e896..98f73e79c4 100644 --- a/lib/chef/provider/http_request.rb +++ b/lib/chef/provider/http_request.rb @@ -17,7 +17,7 @@ # require "tempfile" -require "chef/http/simple" +require_relative "../http/simple" class Chef class Provider diff --git a/lib/chef/provider/ifconfig.rb b/lib/chef/provider/ifconfig.rb index 070a4686ba..023bdb3e0e 100644 --- a/lib/chef/provider/ifconfig.rb +++ b/lib/chef/provider/ifconfig.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/log" -require "chef/mixin/shell_out" -require "chef/provider" -require "chef/resource/file" -require "chef/exceptions" +require_relative "../log" +require_relative "../mixin/shell_out" +require_relative "" +require_relative "../resource/file" +require_relative "../exceptions" require "erb" class Chef diff --git a/lib/chef/provider/ifconfig/aix.rb b/lib/chef/provider/ifconfig/aix.rb index 1fd172097a..e3a46c9a3a 100644 --- a/lib/chef/provider/ifconfig/aix.rb +++ b/lib/chef/provider/ifconfig/aix.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/ifconfig" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/ifconfig/debian.rb b/lib/chef/provider/ifconfig/debian.rb index e610bab5df..94ef10af63 100644 --- a/lib/chef/provider/ifconfig/debian.rb +++ b/lib/chef/provider/ifconfig/debian.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/ifconfig" -require "chef/util/file_edit" +require_relative "" +require_relative "../../util/file_edit" class Chef class Provider diff --git a/lib/chef/provider/ifconfig/redhat.rb b/lib/chef/provider/ifconfig/redhat.rb index 70d78bcfe9..402cd91580 100644 --- a/lib/chef/provider/ifconfig/redhat.rb +++ b/lib/chef/provider/ifconfig/redhat.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/ifconfig" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/launchd.rb b/lib/chef/provider/launchd.rb index 0bac995247..5028d1e3b1 100644 --- a/lib/chef/provider/launchd.rb +++ b/lib/chef/provider/launchd.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/provider" -require "chef/resource/file" -require "chef/resource/cookbook_file" -require "chef/resource/macosx_service" +require_relative "" +require_relative "../resource/file" +require_relative "../resource/cookbook_file" +require_relative "../resource/macosx_service" require "plist" require "forwardable" diff --git a/lib/chef/provider/link.rb b/lib/chef/provider/link.rb index 783d52d09a..8fcd83d092 100644 --- a/lib/chef/provider/link.rb +++ b/lib/chef/provider/link.rb @@ -16,13 +16,13 @@ # limitations under the License. # -require "chef/config" -require "chef/log" -require "chef/mixin/file_class" -require "chef/resource/link" -require "chef/provider" -require "chef/scan_access_control" -require "chef/util/path_helper" +require_relative "../config" +require_relative "../log" +require_relative "../mixin/file_class" +require_relative "../resource/link" +require_relative "" +require_relative "../scan_access_control" +require_relative "../util/path_helper" class Chef class Provider diff --git a/lib/chef/provider/lwrp_base.rb b/lib/chef/provider/lwrp_base.rb index 70f2af6539..17fd3e29d0 100644 --- a/lib/chef/provider/lwrp_base.rb +++ b/lib/chef/provider/lwrp_base.rb @@ -18,9 +18,9 @@ # limitations under the License. # -require "chef/provider" -require "chef/dsl/recipe" -require "chef/dsl/include_recipe" +require_relative "" +require_relative "../dsl/recipe" +require_relative "../dsl/include_recipe" class Chef class Provider diff --git a/lib/chef/provider/mdadm.rb b/lib/chef/provider/mdadm.rb index 10e814a79b..3a9935a2ea 100644 --- a/lib/chef/provider/mdadm.rb +++ b/lib/chef/provider/mdadm.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" +require_relative "../log" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/mount.rb b/lib/chef/provider/mount.rb index 994d67939b..7e7330dd6f 100644 --- a/lib/chef/provider/mount.rb +++ b/lib/chef/provider/mount.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/log" -require "chef/mixin/shell_out" -require "chef/provider" +require_relative "../log" +require_relative "../mixin/shell_out" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/mount/aix.rb b/lib/chef/provider/mount/aix.rb index 2d7fc1d9c3..015802f49e 100644 --- a/lib/chef/provider/mount/aix.rb +++ b/lib/chef/provider/mount/aix.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/provider/mount" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/mount/mount.rb b/lib/chef/provider/mount/mount.rb index 7852c8dfdf..01b27a05aa 100644 --- a/lib/chef/provider/mount/mount.rb +++ b/lib/chef/provider/mount/mount.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/mount" -require "chef/log" +require_relative "" +require_relative "../../log" class Chef class Provider diff --git a/lib/chef/provider/mount/solaris.rb b/lib/chef/provider/mount/solaris.rb index 48936c8057..1664f7d2b0 100644 --- a/lib/chef/provider/mount/solaris.rb +++ b/lib/chef/provider/mount/solaris.rb @@ -18,8 +18,8 @@ # limitations under the License. # -require "chef/provider/mount" -require "chef/log" +require_relative "" +require_relative "../../log" require "forwardable" class Chef diff --git a/lib/chef/provider/mount/windows.rb b/lib/chef/provider/mount/windows.rb index 1650d1e43a..2db5e36df4 100644 --- a/lib/chef/provider/mount/windows.rb +++ b/lib/chef/provider/mount/windows.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/provider/mount" +require_relative "" if RUBY_PLATFORM =~ /mswin|mingw32|windows/ - require "chef/util/windows/net_use" - require "chef/util/windows/volume" + require_relative "../../util/windows/net_use" + require_relative "../../util/windows/volume" end class Chef diff --git a/lib/chef/provider/osx_profile.rb b/lib/chef/provider/osx_profile.rb index 7a2f8ced20..3ef60b915b 100644 --- a/lib/chef/provider/osx_profile.rb +++ b/lib/chef/provider/osx_profile.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" -require "chef/resource" -require "chef/resource/file" +require_relative "../log" +require_relative "" +require_relative "../resource" +require_relative "../resource/file" require "uuidtools" class Chef diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb index d0fb216604..29c3a55a42 100644 --- a/lib/chef/provider/package.rb +++ b/lib/chef/provider/package.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/mixin/shell_out" -require "chef/mixin/subclass_directive" -require "chef/log" -require "chef/file_cache" -require "chef/platform" -require "chef/decorator/lazy_array" +require_relative "../mixin/shell_out" +require_relative "../mixin/subclass_directive" +require_relative "../log" +require_relative "../file_cache" +require_relative "../platform" +require_relative "../decorator/lazy_array" require "shellwords" class Chef diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb index 75c7935805..b712524e0e 100644 --- a/lib/chef/provider/package/apt.rb +++ b/lib/chef/provider/package/apt.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/provider/package/deb" -require "chef/resource/apt_package" +require_relative "" +require_relative "deb" +require_relative "../../resource/apt_package" class Chef class Provider diff --git a/lib/chef/provider/package/bff.rb b/lib/chef/provider/package/bff.rb index 652fad447b..23a197c60d 100644 --- a/lib/chef/provider/package/bff.rb +++ b/lib/chef/provider/package/bff.rb @@ -16,9 +16,9 @@ # limitations under the License. # # -require "chef/provider/package" -require "chef/resource/package" -require "chef/mixin/get_source_from_package" +require_relative "" +require_relative "../../resource/package" +require_relative "../../mixin/get_source_from_package" class Chef class Provider diff --git a/lib/chef/provider/package/cab.rb b/lib/chef/provider/package/cab.rb index cfc629b9ef..c7fad85b30 100644 --- a/lib/chef/provider/package/cab.rb +++ b/lib/chef/provider/package/cab.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/cab_package" -require "chef/mixin/shell_out" -require "chef/mixin/uris" -require "chef/mixin/checksum" +require_relative "" +require_relative "../../resource/cab_package" +require_relative "../../mixin/shell_out" +require_relative "../../mixin/uris" +require_relative "../../mixin/checksum" class Chef class Provider diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb index 773587dc2e..150c76c53d 100644 --- a/lib/chef/provider/package/chocolatey.rb +++ b/lib/chef/provider/package/chocolatey.rb @@ -15,9 +15,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/chocolatey_package" -require "chef/mixin/powershell_out" +require_relative "" +require_relative "../../resource/chocolatey_package" +require_relative "../../mixin/powershell_out" class Chef class Provider diff --git a/lib/chef/provider/package/deb.rb b/lib/chef/provider/package/deb.rb index 439127e18a..9bb49401a1 100644 --- a/lib/chef/provider/package/deb.rb +++ b/lib/chef/provider/package/deb.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/package" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/package/dnf.rb b/lib/chef/provider/package/dnf.rb index 76e9be8083..181b784e6a 100644 --- a/lib/chef/provider/package/dnf.rb +++ b/lib/chef/provider/package/dnf.rb @@ -15,13 +15,13 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/dnf_package" -require "chef/mixin/which" -require "chef/mixin/shell_out" -require "chef/mixin/get_source_from_package" -require "chef/provider/package/dnf/python_helper" -require "chef/provider/package/dnf/version" +require_relative "" +require_relative "../../resource/dnf_package" +require_relative "../../mixin/which" +require_relative "../../mixin/shell_out" +require_relative "../../mixin/get_source_from_package" +require_relative "dnf/python_helper" +require_relative "dnf/version" class Chef class Provider diff --git a/lib/chef/provider/package/dnf/python_helper.rb b/lib/chef/provider/package/dnf/python_helper.rb index 7cb4047f53..9a5db7d0ef 100644 --- a/lib/chef/provider/package/dnf/python_helper.rb +++ b/lib/chef/provider/package/dnf/python_helper.rb @@ -15,9 +15,9 @@ # limitations under the License. # -require "chef/mixin/which" -require "chef/mixin/shell_out" -require "chef/provider/package/dnf/version" +require_relative "../../../mixin/which" +require_relative "../../../mixin/shell_out" +require_relative "version" require "timeout" class Chef diff --git a/lib/chef/provider/package/dpkg.rb b/lib/chef/provider/package/dpkg.rb index 25878797c1..f504894c86 100644 --- a/lib/chef/provider/package/dpkg.rb +++ b/lib/chef/provider/package/dpkg.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/provider/package/deb" -require "chef/resource/package" +require_relative "" +require_relative "deb" +require_relative "../../resource/package" class Chef class Provider diff --git a/lib/chef/provider/package/freebsd/base.rb b/lib/chef/provider/package/freebsd/base.rb index bf704a5cae..a01825e2ef 100644 --- a/lib/chef/provider/package/freebsd/base.rb +++ b/lib/chef/provider/package/freebsd/base.rb @@ -19,9 +19,9 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/provider/package" -require "chef/mixin/get_source_from_package" +require_relative "../../../resource/package" +require_relative ".." +require_relative "../../../mixin/get_source_from_package" class Chef class Provider diff --git a/lib/chef/provider/package/freebsd/pkgng.rb b/lib/chef/provider/package/freebsd/pkgng.rb index 250baf0fac..a3d70ad9cd 100644 --- a/lib/chef/provider/package/freebsd/pkgng.rb +++ b/lib/chef/provider/package/freebsd/pkgng.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/package/freebsd/base" +require_relative "base" class Chef class Provider diff --git a/lib/chef/provider/package/freebsd/port.rb b/lib/chef/provider/package/freebsd/port.rb index e3174f7d8d..fabc736800 100644 --- a/lib/chef/provider/package/freebsd/port.rb +++ b/lib/chef/provider/package/freebsd/port.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/package/freebsd/base" +require_relative "base" class Chef class Provider diff --git a/lib/chef/provider/package/homebrew.rb b/lib/chef/provider/package/homebrew.rb index 1a7407486b..7fa27b9bb8 100644 --- a/lib/chef/provider/package/homebrew.rb +++ b/lib/chef/provider/package/homebrew.rb @@ -19,7 +19,7 @@ # require "etc" -require "chef/mixin/homebrew_user" +require_relative "../../mixin/homebrew_user" class Chef class Provider diff --git a/lib/chef/provider/package/ips.rb b/lib/chef/provider/package/ips.rb index f7fdb95e4d..8d8c2dcb7e 100644 --- a/lib/chef/provider/package/ips.rb +++ b/lib/chef/provider/package/ips.rb @@ -18,8 +18,8 @@ # require "open3" -require "chef/provider/package" -require "chef/resource/package" +require_relative "" +require_relative "../../resource/package" class Chef class Provider diff --git a/lib/chef/provider/package/msu.rb b/lib/chef/provider/package/msu.rb index 9dbea31c82..04cca39bf5 100644 --- a/lib/chef/provider/package/msu.rb +++ b/lib/chef/provider/package/msu.rb @@ -20,13 +20,13 @@ # The contents of msu file are extracted, which contains one or more cab files. # The extracted cab files are installed using Chef::Resource::Package::CabPackage # Reference: https://support.microsoft.com/en-in/kb/934307 -require "chef/provider/package" -require "chef/resource/msu_package" -require "chef/mixin/shell_out" -require "chef/provider/package/cab" -require "chef/util/path_helper" -require "chef/mixin/uris" -require "chef/mixin/checksum" +require_relative "" +require_relative "../../resource/msu_package" +require_relative "../../mixin/shell_out" +require_relative "cab" +require_relative "../../util/path_helper" +require_relative "../../mixin/uris" +require_relative "../../mixin/checksum" class Chef class Provider diff --git a/lib/chef/provider/package/openbsd.rb b/lib/chef/provider/package/openbsd.rb index 0332423e7c..641a3999e2 100644 --- a/lib/chef/provider/package/openbsd.rb +++ b/lib/chef/provider/package/openbsd.rb @@ -20,10 +20,10 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/provider/package" -require "chef/mixin/get_source_from_package" -require "chef/exceptions" +require_relative "../../resource/package" +require_relative "" +require_relative "../../mixin/get_source_from_package" +require_relative "../../exceptions" class Chef class Provider diff --git a/lib/chef/provider/package/pacman.rb b/lib/chef/provider/package/pacman.rb index 4a3b795700..fccfdca95a 100644 --- a/lib/chef/provider/package/pacman.rb +++ b/lib/chef/provider/package/pacman.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/package" +require_relative "" +require_relative "../../resource/package" class Chef class Provider diff --git a/lib/chef/provider/package/paludis.rb b/lib/chef/provider/package/paludis.rb index 3550b155d5..9af02cf46d 100644 --- a/lib/chef/provider/package/paludis.rb +++ b/lib/chef/provider/package/paludis.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/package" +require_relative "" +require_relative "../../resource/package" class Chef class Provider diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb index d9fc801225..39e546e3ef 100644 --- a/lib/chef/provider/package/portage.rb +++ b/lib/chef/provider/package/portage.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/portage_package" -require "chef/util/path_helper" +require_relative "" +require_relative "../../resource/portage_package" +require_relative "../../util/path_helper" class Chef class Provider diff --git a/lib/chef/provider/package/powershell.rb b/lib/chef/provider/package/powershell.rb index 9af1344138..5d338e97c2 100644 --- a/lib/chef/provider/package/powershell.rb +++ b/lib/chef/provider/package/powershell.rb @@ -15,9 +15,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/powershell_package" -require "chef/mixin/powershell_out" +require_relative "" +require_relative "../../resource/powershell_package" +require_relative "../../mixin/powershell_out" class Chef class Provider diff --git a/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb index 3d070cee17..75dd95151b 100644 --- a/lib/chef/provider/package/rpm.rb +++ b/lib/chef/provider/package/rpm.rb @@ -15,10 +15,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef/provider/package" -require "chef/resource/package" -require "chef/mixin/get_source_from_package" -require "chef/provider/package/yum/rpm_utils" +require_relative "" +require_relative "../../resource/package" +require_relative "../../mixin/get_source_from_package" +require_relative "yum/rpm_utils" class Chef class Provider diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index dc882e426c..55339cbdbb 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -18,10 +18,10 @@ # require "uri" -require "chef/provider/package" -require "chef/resource/package" -require "chef/mixin/get_source_from_package" -require "chef/mixin/which" +require_relative "" +require_relative "../../resource/package" +require_relative "../../mixin/get_source_from_package" +require_relative "../../mixin/which" # Class methods on Gem are defined in rubygems require "rubygems" diff --git a/lib/chef/provider/package/smartos.rb b/lib/chef/provider/package/smartos.rb index 4623196c13..2b6e1265aa 100644 --- a/lib/chef/provider/package/smartos.rb +++ b/lib/chef/provider/package/smartos.rb @@ -19,9 +19,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/package" -require "chef/mixin/get_source_from_package" +require_relative "" +require_relative "../../resource/package" +require_relative "../../mixin/get_source_from_package" class Chef class Provider diff --git a/lib/chef/provider/package/snap.rb b/lib/chef/provider/package/snap.rb index 691cfcd62e..73692966b8 100644 --- a/lib/chef/provider/package/snap.rb +++ b/lib/chef/provider/package/snap.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/snap_package" -require "chef/mixin/shell_out" +require_relative "" +require_relative "../../resource/snap_package" +require_relative "../../mixin/shell_out" require "socket" require "json" diff --git a/lib/chef/provider/package/solaris.rb b/lib/chef/provider/package/solaris.rb index 01958df1ee..d9e00bd989 100644 --- a/lib/chef/provider/package/solaris.rb +++ b/lib/chef/provider/package/solaris.rb @@ -15,9 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef/provider/package" -require "chef/resource/package" -require "chef/mixin/get_source_from_package" +require_relative "" +require_relative "../../resource/package" +require_relative "../../mixin/get_source_from_package" class Chef class Provider diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index cb8b5de151..56d0fb2e88 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/mixin/uris" -require "chef/resource/windows_package" -require "chef/provider/package" -require "chef/util/path_helper" -require "chef/mixin/checksum" +require_relative "../../mixin/uris" +require_relative "../../resource/windows_package" +require_relative "" +require_relative "../../util/path_helper" +require_relative "../../mixin/checksum" class Chef class Provider @@ -78,11 +78,11 @@ class Chef case installer_type when :msi logger.trace("#{new_resource} is MSI") - require "chef/provider/package/windows/msi" + require_relative "windows/msi" Chef::Provider::Package::Windows::MSI.new(resource_for_provider, uninstall_registry_entries) else logger.trace("#{new_resource} is EXE with type '#{installer_type}'") - require "chef/provider/package/windows/exe" + require_relative "windows/exe" Chef::Provider::Package::Windows::Exe.new(resource_for_provider, installer_type, uninstall_registry_entries) end end diff --git a/lib/chef/provider/package/windows/exe.rb b/lib/chef/provider/package/windows/exe.rb index e43cd02b08..7663bf0ad4 100644 --- a/lib/chef/provider/package/windows/exe.rb +++ b/lib/chef/provider/package/windows/exe.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/mixin/shell_out" +require_relative "../../../mixin/shell_out" class Chef class Provider diff --git a/lib/chef/provider/package/windows/msi.rb b/lib/chef/provider/package/windows/msi.rb index 51afcab2a2..464e15ada8 100644 --- a/lib/chef/provider/package/windows/msi.rb +++ b/lib/chef/provider/package/windows/msi.rb @@ -19,7 +19,7 @@ # TODO: Allow new_resource.source to be a Product Code as a GUID for uninstall / network install require "chef/win32/api/installer" if (RUBY_PLATFORM =~ /mswin|mingw32|windows/) && Chef::Platform.supports_msi? -require "chef/mixin/shell_out" +require_relative "../../../mixin/shell_out" class Chef class Provider diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb index ad045c77e6..e8fbd6fb1d 100644 --- a/lib/chef/provider/package/yum.rb +++ b/lib/chef/provider/package/yum.rb @@ -15,15 +15,15 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/yum_package" -require "chef/mixin/which" -require "chef/mixin/shell_out" -require "chef/mixin/get_source_from_package" -require "chef/provider/package/yum/python_helper" -require "chef/provider/package/yum/version" +require_relative "" +require_relative "../../resource/yum_package" +require_relative "../../mixin/which" +require_relative "../../mixin/shell_out" +require_relative "../../mixin/get_source_from_package" +require_relative "yum/python_helper" +require_relative "yum/version" # the stubs in the YumCache class are still an external API -require "chef/provider/package/yum/yum_cache" +require_relative "yum/yum_cache" class Chef class Provider diff --git a/lib/chef/provider/package/yum/python_helper.rb b/lib/chef/provider/package/yum/python_helper.rb index 6ae9cc911a..4641980be7 100644 --- a/lib/chef/provider/package/yum/python_helper.rb +++ b/lib/chef/provider/package/yum/python_helper.rb @@ -15,9 +15,9 @@ # limitations under the License. # -require "chef/mixin/which" -require "chef/mixin/shell_out" -require "chef/provider/package/yum/version" +require_relative "../../../mixin/which" +require_relative "../../../mixin/shell_out" +require_relative "version" require "singleton" require "timeout" diff --git a/lib/chef/provider/package/yum/rpm_utils.rb b/lib/chef/provider/package/yum/rpm_utils.rb index 22c0ff807b..89c03d1206 100644 --- a/lib/chef/provider/package/yum/rpm_utils.rb +++ b/lib/chef/provider/package/yum/rpm_utils.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/package" +require_relative ".." # # BUGGY AND DEPRECATED: This ruby code is known to not match the python implementation for version comparisons. diff --git a/lib/chef/provider/package/yum/yum_cache.rb b/lib/chef/provider/package/yum/yum_cache.rb index fa0930109f..7af639d35a 100644 --- a/lib/chef/provider/package/yum/yum_cache.rb +++ b/lib/chef/provider/package/yum/yum_cache.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/package/yum/python_helper" -require "chef/provider/package" +require_relative "python_helper" +require_relative ".." require "singleton" # diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb index 2a333c4f5f..b40c52c737 100644 --- a/lib/chef/provider/package/zypper.rb +++ b/lib/chef/provider/package/zypper.rb @@ -19,8 +19,8 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/zypper_package" +require_relative "" +require_relative "../../resource/zypper_package" class Chef class Provider diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb index 7430fabfec..418948e614 100644 --- a/lib/chef/provider/powershell_script.rb +++ b/lib/chef/provider/powershell_script.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/platform/query_helpers" -require "chef/provider/windows_script" +require_relative "../platform/query_helpers" +require_relative "windows_script" class Chef class Provider diff --git a/lib/chef/provider/reboot.rb b/lib/chef/provider/reboot.rb index dd07e7448d..fac82cdf8f 100644 --- a/lib/chef/provider/reboot.rb +++ b/lib/chef/provider/reboot.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" +require_relative "../log" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/registry_key.rb b/lib/chef/provider/registry_key.rb index 6b226cc991..39679ff119 100644 --- a/lib/chef/provider/registry_key.rb +++ b/lib/chef/provider/registry_key.rb @@ -17,15 +17,15 @@ # limitations under the License. # -require "chef/config" -require "chef/log" -require "chef/resource/file" -require "chef/mixin/checksum" -require "chef/provider" +require_relative "../config" +require_relative "../log" +require_relative "../resource/file" +require_relative "../mixin/checksum" +require_relative "" require "etc" require "fileutils" -require "chef/scan_access_control" -require "chef/win32/registry" +require_relative "../scan_access_control" +require_relative "../win32/registry" class Chef diff --git a/lib/chef/provider/remote_directory.rb b/lib/chef/provider/remote_directory.rb index 94de68c557..13088b3706 100644 --- a/lib/chef/provider/remote_directory.rb +++ b/lib/chef/provider/remote_directory.rb @@ -16,13 +16,13 @@ # limitations under the License. # -require "chef/provider/directory" -require "chef/resource/file" -require "chef/resource/directory" -require "chef/resource/cookbook_file" -require "chef/mixin/file_class" -require "chef/platform/query_helpers" -require "chef/util/path_helper" +require_relative "directory" +require_relative "../resource/file" +require_relative "../resource/directory" +require_relative "../resource/cookbook_file" +require_relative "../mixin/file_class" +require_relative "../platform/query_helpers" +require_relative "../util/path_helper" require "forwardable" diff --git a/lib/chef/provider/remote_file.rb b/lib/chef/provider/remote_file.rb index d2de3d0b5f..ba384ea3ba 100644 --- a/lib/chef/provider/remote_file.rb +++ b/lib/chef/provider/remote_file.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/provider/file" +require_relative "file" class Chef class Provider diff --git a/lib/chef/provider/remote_file/cache_control_data.rb b/lib/chef/provider/remote_file/cache_control_data.rb index 5c59d112db..974b229a45 100644 --- a/lib/chef/provider/remote_file/cache_control_data.rb +++ b/lib/chef/provider/remote_file/cache_control_data.rb @@ -20,10 +20,10 @@ # require "stringio" -require "chef/file_cache" -require "chef/json_compat" -require "chef/digester" -require "chef/exceptions" +require_relative "../../file_cache" +require_relative "../../json_compat" +require_relative "../../digester" +require_relative "../../exceptions" class Chef class Provider diff --git a/lib/chef/provider/remote_file/content.rb b/lib/chef/provider/remote_file/content.rb index b5f42749e7..3e1af01f22 100644 --- a/lib/chef/provider/remote_file/content.rb +++ b/lib/chef/provider/remote_file/content.rb @@ -19,8 +19,8 @@ require "uri" require "tempfile" -require "chef/file_content_management/content_base" -require "chef/mixin/uris" +require_relative "../../file_content_management/content_base" +require_relative "../../mixin/uris" class Chef class Provider diff --git a/lib/chef/provider/remote_file/ftp.rb b/lib/chef/provider/remote_file/ftp.rb index b382c20c31..a43209c693 100644 --- a/lib/chef/provider/remote_file/ftp.rb +++ b/lib/chef/provider/remote_file/ftp.rb @@ -19,8 +19,8 @@ require "uri" require "tempfile" require "net/ftp" -require "chef/provider/remote_file" -require "chef/file_content_management/tempfile" +require_relative "" +require_relative "../../file_content_management/tempfile" class Chef class Provider diff --git a/lib/chef/provider/remote_file/http.rb b/lib/chef/provider/remote_file/http.rb index 2122142608..6e1e1a479f 100644 --- a/lib/chef/provider/remote_file/http.rb +++ b/lib/chef/provider/remote_file/http.rb @@ -17,10 +17,10 @@ # limitations under the License. # -require "chef/http/simple" -require "chef/digester" -require "chef/provider/remote_file" -require "chef/provider/remote_file/cache_control_data" +require_relative "../../http/simple" +require_relative "../../digester" +require_relative "" +require_relative "cache_control_data" class Chef class Provider diff --git a/lib/chef/provider/remote_file/local_file.rb b/lib/chef/provider/remote_file/local_file.rb index 0719e5dbf7..e51cfb0782 100644 --- a/lib/chef/provider/remote_file/local_file.rb +++ b/lib/chef/provider/remote_file/local_file.rb @@ -18,7 +18,7 @@ require "uri" require "tempfile" -require "chef/provider/remote_file" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/remote_file/network_file.rb b/lib/chef/provider/remote_file/network_file.rb index ffd2d0bbce..933429d9b6 100644 --- a/lib/chef/provider/remote_file/network_file.rb +++ b/lib/chef/provider/remote_file/network_file.rb @@ -18,8 +18,8 @@ require "uri" require "tempfile" -require "chef/provider/remote_file" -require "chef/mixin/user_context" +require_relative "" +require_relative "../../mixin/user_context" class Chef class Provider diff --git a/lib/chef/provider/remote_file/sftp.rb b/lib/chef/provider/remote_file/sftp.rb index 66540fea8c..adc646d09a 100644 --- a/lib/chef/provider/remote_file/sftp.rb +++ b/lib/chef/provider/remote_file/sftp.rb @@ -19,8 +19,8 @@ require "uri" require "tempfile" require "net/sftp" -require "chef/provider/remote_file" -require "chef/file_content_management/tempfile" +require_relative "" +require_relative "../../file_content_management/tempfile" class Chef class Provider diff --git a/lib/chef/provider/route.rb b/lib/chef/provider/route.rb index e20102e2f3..9917a12c20 100644 --- a/lib/chef/provider/route.rb +++ b/lib/chef/provider/route.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/log" -require "chef/provider" +require_relative "../log" +require_relative "" require "ipaddr" class Chef diff --git a/lib/chef/provider/script.rb b/lib/chef/provider/script.rb index b54965be45..7c55cff167 100644 --- a/lib/chef/provider/script.rb +++ b/lib/chef/provider/script.rb @@ -17,7 +17,7 @@ # require "tempfile" -require "chef/provider/execute" +require_relative "execute" require "chef/win32/security" if Chef::Platform.windows? require "forwardable" diff --git a/lib/chef/provider/service.rb b/lib/chef/provider/service.rb index c116d321f1..0ffcdbd7d1 100644 --- a/lib/chef/provider/service.rb +++ b/lib/chef/provider/service.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/provider" +require_relative "" class Chef class Provider @@ -232,15 +232,15 @@ class Chef # Linux # - require "chef/chef_class" - require "chef/provider/service/systemd" - require "chef/provider/service/insserv" - require "chef/provider/service/redhat" - require "chef/provider/service/arch" - require "chef/provider/service/gentoo" - require "chef/provider/service/upstart" - require "chef/provider/service/debian" - require "chef/provider/service/invokercd" + require_relative "../chef_class" + require_relative "service/systemd" + require_relative "service/insserv" + require_relative "service/redhat" + require_relative "service/arch" + require_relative "service/gentoo" + require_relative "service/upstart" + require_relative "service/debian" + require_relative "service/invokercd" Chef.set_provider_priority_array :service, [ Systemd, Arch ], platform_family: "arch" Chef.set_provider_priority_array :service, [ Systemd, Gentoo ], platform_family: "gentoo" diff --git a/lib/chef/provider/service/aix.rb b/lib/chef/provider/service/aix.rb index 10ea06152b..6c56beb5b6 100644 --- a/lib/chef/provider/service/aix.rb +++ b/lib/chef/provider/service/aix.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/service" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/service/aixinit.rb b/lib/chef/provider/service/aixinit.rb index 43e6b3ac1b..6469b6389c 100644 --- a/lib/chef/provider/service/aixinit.rb +++ b/lib/chef/provider/service/aixinit.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/service/init" +require_relative "init" class Chef class Provider diff --git a/lib/chef/provider/service/arch.rb b/lib/chef/provider/service/arch.rb index e34227036a..fd1b54a302 100644 --- a/lib/chef/provider/service/arch.rb +++ b/lib/chef/provider/service/arch.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/service/init" +require_relative "init" class Chef::Provider::Service::Arch < Chef::Provider::Service::Init diff --git a/lib/chef/provider/service/debian.rb b/lib/chef/provider/service/debian.rb index b6a938a7e8..059b9777d9 100644 --- a/lib/chef/provider/service/debian.rb +++ b/lib/chef/provider/service/debian.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/service/init" +require_relative "init" class Chef class Provider diff --git a/lib/chef/provider/service/freebsd.rb b/lib/chef/provider/service/freebsd.rb index 83aa42903a..ee0cad53f3 100644 --- a/lib/chef/provider/service/freebsd.rb +++ b/lib/chef/provider/service/freebsd.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/service" -require "chef/provider/service/init" +require_relative "../../resource/service" +require_relative "init" class Chef class Provider diff --git a/lib/chef/provider/service/gentoo.rb b/lib/chef/provider/service/gentoo.rb index 69b3d20a3f..88616c4947 100644 --- a/lib/chef/provider/service/gentoo.rb +++ b/lib/chef/provider/service/gentoo.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/provider/service/init" -require "chef/util/path_helper" +require_relative "init" +require_relative "../../util/path_helper" class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init diff --git a/lib/chef/provider/service/init.rb b/lib/chef/provider/service/init.rb index 6d150513cc..3911ae3216 100644 --- a/lib/chef/provider/service/init.rb +++ b/lib/chef/provider/service/init.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/service/simple" -require "chef/platform/service_helpers" +require_relative "simple" +require_relative "../../platform/service_helpers" class Chef class Provider diff --git a/lib/chef/provider/service/insserv.rb b/lib/chef/provider/service/insserv.rb index a8e841f8b3..b61ec8d686 100644 --- a/lib/chef/provider/service/insserv.rb +++ b/lib/chef/provider/service/insserv.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/service/init" -require "chef/util/path_helper" +require_relative "init" +require_relative "../../util/path_helper" class Chef class Provider diff --git a/lib/chef/provider/service/invokercd.rb b/lib/chef/provider/service/invokercd.rb index 9477afec48..a6e744ba8e 100644 --- a/lib/chef/provider/service/invokercd.rb +++ b/lib/chef/provider/service/invokercd.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/service/init" +require_relative "init" class Chef class Provider diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb index 2a01b742c7..0e8a29ce32 100644 --- a/lib/chef/provider/service/macosx.rb +++ b/lib/chef/provider/service/macosx.rb @@ -18,10 +18,10 @@ require "etc" require "rexml/document" -require "chef/resource/service" -require "chef/resource/macosx_service" -require "chef/provider/service/simple" -require "chef/util/path_helper" +require_relative "../../resource/service" +require_relative "../../resource/macosx_service" +require_relative "simple" +require_relative "../../util/path_helper" class Chef class Provider diff --git a/lib/chef/provider/service/openbsd.rb b/lib/chef/provider/service/openbsd.rb index 34e05df504..3f28e69ce3 100644 --- a/lib/chef/provider/service/openbsd.rb +++ b/lib/chef/provider/service/openbsd.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/mixin/shell_out" -require "chef/provider/service/init" -require "chef/resource/service" +require_relative "../../mixin/shell_out" +require_relative "init" +require_relative "../../resource/service" class Chef class Provider diff --git a/lib/chef/provider/service/redhat.rb b/lib/chef/provider/service/redhat.rb index 9e8ff30216..f3c081534c 100644 --- a/lib/chef/provider/service/redhat.rb +++ b/lib/chef/provider/service/redhat.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/service/init" +require_relative "init" class Chef class Provider diff --git a/lib/chef/provider/service/simple.rb b/lib/chef/provider/service/simple.rb index 9bfcbb1410..3348cf05cc 100644 --- a/lib/chef/provider/service/simple.rb +++ b/lib/chef/provider/service/simple.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/service" -require "chef/resource/service" +require_relative "" +require_relative "../../resource/service" class Chef class Provider diff --git a/lib/chef/provider/service/solaris.rb b/lib/chef/provider/service/solaris.rb index 51105bd06f..6979064e56 100644 --- a/lib/chef/provider/service/solaris.rb +++ b/lib/chef/provider/service/solaris.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/service" -require "chef/resource/service" +require_relative "" +require_relative "../../resource/service" class Chef class Provider diff --git a/lib/chef/provider/service/systemd.rb b/lib/chef/provider/service/systemd.rb index 6d5bc338c7..e15eab23bd 100644 --- a/lib/chef/provider/service/systemd.rb +++ b/lib/chef/provider/service/systemd.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/resource/service" -require "chef/provider/service/simple" -require "chef/mixin/which" +require_relative "../../resource/service" +require_relative "simple" +require_relative "../../mixin/which" require "shellwords" class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple diff --git a/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb index 96ed16dc8f..f4ca45f8ea 100644 --- a/lib/chef/provider/service/upstart.rb +++ b/lib/chef/provider/service/upstart.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/resource/service" -require "chef/provider/service/simple" -require "chef/util/file_edit" +require_relative "../../resource/service" +require_relative "simple" +require_relative "../../util/file_edit" class Chef class Provider diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb index 4759e34153..d4f649ae28 100644 --- a/lib/chef/provider/service/windows.rb +++ b/lib/chef/provider/service/windows.rb @@ -18,10 +18,10 @@ # limitations under the License. # -require "chef/provider/service/simple" -require "chef/win32_service_constants" +require_relative "simple" +require_relative "../../win32_service_constants" if RUBY_PLATFORM =~ /mswin|mingw32|windows/ - require "chef/win32/error" + require_relative "../../win32/error" require "win32/service" end diff --git a/lib/chef/provider/subversion.rb b/lib/chef/provider/subversion.rb index adea6a6428..67aec8d510 100644 --- a/lib/chef/provider/subversion.rb +++ b/lib/chef/provider/subversion.rb @@ -18,8 +18,8 @@ # TODO subversion and git should both extend from a base SCM provider. -require "chef/log" -require "chef/provider" +require_relative "../log" +require_relative "" require "chef-config/mixin/fuzzy_hostname_matcher" require "fileutils" diff --git a/lib/chef/provider/systemd_unit.rb b/lib/chef/provider/systemd_unit.rb index 328540764c..96068c1575 100644 --- a/lib/chef/provider/systemd_unit.rb +++ b/lib/chef/provider/systemd_unit.rb @@ -16,11 +16,11 @@ # limitations under the License. # -require "chef/provider" -require "chef/mixin/which" -require "chef/mixin/shell_out" -require "chef/resource/file" -require "chef/resource/file/verification/systemd_unit" +require_relative "" +require_relative "../mixin/which" +require_relative "../mixin/shell_out" +require_relative "../resource/file" +require_relative "../resource/file/verification/systemd_unit" require "iniparse" require "shellwords" diff --git a/lib/chef/provider/template.rb b/lib/chef/provider/template.rb index 05cdbdbf62..4aab1697f2 100644 --- a/lib/chef/provider/template.rb +++ b/lib/chef/provider/template.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/provider/template_finder" -require "chef/provider/file" +require_relative "template_finder" +require_relative "file" class Chef class Provider diff --git a/lib/chef/provider/template/content.rb b/lib/chef/provider/template/content.rb index 9ac5a89b3e..6a9da01127 100644 --- a/lib/chef/provider/template/content.rb +++ b/lib/chef/provider/template/content.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/mixin/template" -require "chef/file_content_management/content_base" +require_relative "../../mixin/template" +require_relative "../../file_content_management/content_base" class Chef class Provider diff --git a/lib/chef/provider/user.rb b/lib/chef/provider/user.rb index 7145045785..d6c3b34f41 100644 --- a/lib/chef/provider/user.rb +++ b/lib/chef/provider/user.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider" +require_relative "" require "etc" class Chef diff --git a/lib/chef/provider/user/aix.rb b/lib/chef/provider/user/aix.rb index aca0511e41..be926d6789 100644 --- a/lib/chef/provider/user/aix.rb +++ b/lib/chef/provider/user/aix.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/provider/user" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb index 12be6ffb7e..26268160f2 100644 --- a/lib/chef/provider/user/dscl.rb +++ b/lib/chef/provider/user/dscl.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/mixin/shell_out" -require "chef/provider/user" -require "chef/resource/user/dscl_user" +require_relative "../../mixin/shell_out" +require_relative "" +require_relative "../../resource/user/dscl_user" require "openssl" require "plist" -require "chef/util/path_helper" +require_relative "../../util/path_helper" class Chef class Provider diff --git a/lib/chef/provider/user/linux.rb b/lib/chef/provider/user/linux.rb index 7d3a3c1163..40d40320f1 100644 --- a/lib/chef/provider/user/linux.rb +++ b/lib/chef/provider/user/linux.rb @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/provider/user" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/user/pw.rb b/lib/chef/provider/user/pw.rb index 42d44bab51..483161c136 100644 --- a/lib/chef/provider/user/pw.rb +++ b/lib/chef/provider/user/pw.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/provider/user" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/user/solaris.rb b/lib/chef/provider/user/solaris.rb index 2c3222534d..2278e745ad 100644 --- a/lib/chef/provider/user/solaris.rb +++ b/lib/chef/provider/user/solaris.rb @@ -18,7 +18,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/provider/user" +require_relative "" class Chef class Provider diff --git a/lib/chef/provider/user/windows.rb b/lib/chef/provider/user/windows.rb index 6cb9cbdb19..59cb17c6b3 100644 --- a/lib/chef/provider/user/windows.rb +++ b/lib/chef/provider/user/windows.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/user" -require "chef/exceptions" +require_relative "" +require_relative "../../exceptions" require "chef/util/windows/net_user" if Chef::Platform.windows? class Chef diff --git a/lib/chef/provider/windows_env.rb b/lib/chef/provider/windows_env.rb index e5af49fa8f..3f61884c68 100644 --- a/lib/chef/provider/windows_env.rb +++ b/lib/chef/provider/windows_env.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider" -require "chef/resource/windows_env" -require "chef/mixin/windows_env_helper" +require_relative "" +require_relative "../resource/windows_env" +require_relative "../mixin/windows_env_helper" class Chef class Provider diff --git a/lib/chef/provider/windows_path.rb b/lib/chef/provider/windows_path.rb index 1c78e20606..e0c686d025 100644 --- a/lib/chef/provider/windows_path.rb +++ b/lib/chef/provider/windows_path.rb @@ -17,8 +17,8 @@ # require "chef/mixin/windows_env_helper" if Chef::Platform.windows? -require "chef/mixin/wide_string" -require "chef/exceptions" +require_relative "../mixin/wide_string" +require_relative "../exceptions" class Chef class Provider diff --git a/lib/chef/provider/windows_script.rb b/lib/chef/provider/windows_script.rb index 3b0202790c..56651a23a6 100644 --- a/lib/chef/provider/windows_script.rb +++ b/lib/chef/provider/windows_script.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/provider/script" -require "chef/mixin/windows_architecture_helper" +require_relative "script" +require_relative "../mixin/windows_architecture_helper" class Chef class Provider diff --git a/lib/chef/provider/windows_task.rb b/lib/chef/provider/windows_task.rb index 34c64199bf..adf4f6a0f9 100644 --- a/lib/chef/provider/windows_task.rb +++ b/lib/chef/provider/windows_task.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/mixin/shell_out" +require_relative "../mixin/shell_out" require "rexml/document" require "iso8601" if Chef::Platform.windows? -require "chef/mixin/powershell_out" -require "chef/provider" -require "chef/util/path_helper" +require_relative "../mixin/powershell_out" +require_relative "" +require_relative "../util/path_helper" require "win32/taskscheduler" if Chef::Platform.windows? class Chef diff --git a/lib/chef/provider/yum_repository.rb b/lib/chef/provider/yum_repository.rb index 20a7a8e3d2..f70ec2bbd9 100644 --- a/lib/chef/provider/yum_repository.rb +++ b/lib/chef/provider/yum_repository.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/resource" -require "chef/dsl/declare_resource" -require "chef/mixin/which" -require "chef/provider/noop" +require_relative "../resource" +require_relative "../dsl/declare_resource" +require_relative "../mixin/which" +require_relative "noop" class Chef class Provider diff --git a/lib/chef/provider/zypper_repository.rb b/lib/chef/provider/zypper_repository.rb index 369d23a396..49c880a8d0 100644 --- a/lib/chef/provider/zypper_repository.rb +++ b/lib/chef/provider/zypper_repository.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/resource" -require "chef/dsl/declare_resource" -require "chef/provider/noop" -require "chef/mixin/shell_out" +require_relative "../resource" +require_relative "../dsl/declare_resource" +require_relative "noop" +require_relative "../mixin/shell_out" require "shellwords" class Chef |