diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-08 17:03:26 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-05-08 17:03:26 -0700 |
commit | bc7687e56763cedbd010cfd566aa2fc0c53bb194 (patch) | |
tree | 3d3e3eec51c847f23dc2955f9d058777bdea9a91 /lib/chef/resource | |
parent | e793c825c857af87e745a8af479af71522ff20db (diff) | |
download | chef-bc7687e56763cedbd010cfd566aa2fc0c53bb194.tar.gz |
Convert require to require_relative
This gives a speed boost since rubygems does not have to scan through
every gem in the gemset in order to find the file.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/resource')
140 files changed, 229 insertions, 229 deletions
diff --git a/lib/chef/resource/action_class.rb b/lib/chef/resource/action_class.rb index 1c25e3278e..03756062ef 100644 --- a/lib/chef/resource/action_class.rb +++ b/lib/chef/resource/action_class.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/provider" -require "chef/exceptions" -require "chef/dsl/recipe" +require_relative "../provider" +require_relative "../exceptions" +require_relative "../dsl/recipe" class Chef class Resource diff --git a/lib/chef/resource/apt_package.rb b/lib/chef/resource/apt_package.rb index 4ee636062d..c142c142ce 100644 --- a/lib/chef/resource/apt_package.rb +++ b/lib/chef/resource/apt_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/apt_preference.rb b/lib/chef/resource/apt_preference.rb index caa0f01305..3a2299a510 100644 --- a/lib/chef/resource/apt_preference.rb +++ b/lib/chef/resource/apt_preference.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/apt_repository.rb b/lib/chef/resource/apt_repository.rb index 145b515a41..c62cdfb61c 100644 --- a/lib/chef/resource/apt_repository.rb +++ b/lib/chef/resource/apt_repository.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/apt_update.rb b/lib/chef/resource/apt_update.rb index 680806bc26..203e1e2468 100644 --- a/lib/chef/resource/apt_update.rb +++ b/lib/chef/resource/apt_update.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/archive_file.rb b/lib/chef/resource/archive_file.rb index f6adfda083..67105df1f3 100644 --- a/lib/chef/resource/archive_file.rb +++ b/lib/chef/resource/archive_file.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/bash.rb b/lib/chef/resource/bash.rb index 22a84f4134..0e11dcb8b1 100644 --- a/lib/chef/resource/bash.rb +++ b/lib/chef/resource/bash.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/script" -require "chef/provider/script" +require_relative "script" +require_relative "../provider/script" class Chef class Resource diff --git a/lib/chef/resource/batch.rb b/lib/chef/resource/batch.rb index e3bff8145c..fc8c892a3b 100644 --- a/lib/chef/resource/batch.rb +++ b/lib/chef/resource/batch.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/windows_script" +require_relative "windows_script" class Chef class Resource diff --git a/lib/chef/resource/bff_package.rb b/lib/chef/resource/bff_package.rb index 8750cb0b2b..819d0a8eb8 100644 --- a/lib/chef/resource/bff_package.rb +++ b/lib/chef/resource/bff_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/breakpoint.rb b/lib/chef/resource/breakpoint.rb index 820ac70c09..be81814cba 100644 --- a/lib/chef/resource/breakpoint.rb +++ b/lib/chef/resource/breakpoint.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/dist" +require_relative "" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/build_essential.rb b/lib/chef/resource/build_essential.rb index e9cb656ca6..f5f98c459a 100644 --- a/lib/chef/resource/build_essential.rb +++ b/lib/chef/resource/build_essential.rb @@ -14,7 +14,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/cab_package.rb b/lib/chef/resource/cab_package.rb index 501a0dfa26..1c1907801c 100644 --- a/lib/chef/resource/cab_package.rb +++ b/lib/chef/resource/cab_package.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/mixin/uris" +require_relative "package" +require_relative "../mixin/uris" class Chef class Resource diff --git a/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb index 7655d6651c..2410a316fd 100644 --- a/lib/chef/resource/chef_gem.rb +++ b/lib/chef/resource/chef_gem.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/resource/gem_package" -require "chef/dist" +require_relative "package" +require_relative "gem_package" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/chef_handler.rb b/lib/chef/resource/chef_handler.rb index 2bac109697..87d2d5323f 100644 --- a/lib/chef/resource/chef_handler.rb +++ b/lib/chef/resource/chef_handler.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/chocolatey_package.rb b/lib/chef/resource/chocolatey_package.rb index c7d5a8a680..04e5f3602c 100644 --- a/lib/chef/resource/chocolatey_package.rb +++ b/lib/chef/resource/chocolatey_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/conditional.rb b/lib/chef/resource/conditional.rb index 452718cae8..c35099e7e8 100644 --- a/lib/chef/resource/conditional.rb +++ b/lib/chef/resource/conditional.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/mixin/shell_out" -require "chef/guard_interpreter" +require_relative "../mixin/shell_out" +require_relative "../guard_interpreter" class Chef class Resource diff --git a/lib/chef/resource/cookbook_file.rb b/lib/chef/resource/cookbook_file.rb index bee4a5f3f4..68f1e810df 100644 --- a/lib/chef/resource/cookbook_file.rb +++ b/lib/chef/resource/cookbook_file.rb @@ -18,10 +18,10 @@ # limitations under the License. # -require "chef/resource/file" -require "chef/provider/cookbook_file" -require "chef/mixin/securable" -require "chef/dist" +require_relative "file" +require_relative "../provider/cookbook_file" +require_relative "../mixin/securable" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/cron.rb b/lib/chef/resource/cron.rb index 7e9f3022a7..5025965a44 100644 --- a/lib/chef/resource/cron.rb +++ b/lib/chef/resource/cron.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" require "chef/provider/cron" # do not remove. we actually need this below class Chef diff --git a/lib/chef/resource/cron_access.rb b/lib/chef/resource/cron_access.rb index 5785eddbe5..1f63b42eab 100644 --- a/lib/chef/resource/cron_access.rb +++ b/lib/chef/resource/cron_access.rb @@ -18,7 +18,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/cron_d.rb b/lib/chef/resource/cron_d.rb index f42318b574..edd152c182 100644 --- a/lib/chef/resource/cron_d.rb +++ b/lib/chef/resource/cron_d.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" require "shellwords" class Chef diff --git a/lib/chef/resource/csh.rb b/lib/chef/resource/csh.rb index 0938a19cb1..c3b03e846e 100644 --- a/lib/chef/resource/csh.rb +++ b/lib/chef/resource/csh.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/script" -require "chef/provider/script" +require_relative "script" +require_relative "../provider/script" class Chef class Resource diff --git a/lib/chef/resource/directory.rb b/lib/chef/resource/directory.rb index f2e1aef254..882be9b752 100644 --- a/lib/chef/resource/directory.rb +++ b/lib/chef/resource/directory.rb @@ -18,8 +18,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/mixin/securable" +require_relative "" +require_relative "../mixin/securable" class Chef class Resource diff --git a/lib/chef/resource/dmg_package.rb b/lib/chef/resource/dmg_package.rb index 97329042a6..1d30d2db88 100644 --- a/lib/chef/resource/dmg_package.rb +++ b/lib/chef/resource/dmg_package.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/dnf_package.rb b/lib/chef/resource/dnf_package.rb index 6590c6c003..616d79a337 100644 --- a/lib/chef/resource/dnf_package.rb +++ b/lib/chef/resource/dnf_package.rb @@ -15,10 +15,10 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/mixin/which" -require "chef/mixin/shell_out" -require "chef/dist" +require_relative "package" +require_relative "../mixin/which" +require_relative "../mixin/shell_out" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/dpkg_package.rb b/lib/chef/resource/dpkg_package.rb index f5b9e5f14a..2072ad8cfc 100644 --- a/lib/chef/resource/dpkg_package.rb +++ b/lib/chef/resource/dpkg_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/dsc_resource.rb b/lib/chef/resource/dsc_resource.rb index 06c4103bc3..a378b6f685 100644 --- a/lib/chef/resource/dsc_resource.rb +++ b/lib/chef/resource/dsc_resource.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef/dsl/powershell" +require_relative "../dsl/powershell" class Chef class Resource diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb index d98c74ccc3..92afd4efd4 100644 --- a/lib/chef/resource/dsc_script.rb +++ b/lib/chef/resource/dsc_script.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/resource" -require "chef/exceptions" -require "chef/dsl/powershell" +require_relative "" +require_relative "../exceptions" +require_relative "../dsl/powershell" class Chef class Resource diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb index 295cf357cb..dea652a0e6 100644 --- a/lib/chef/resource/execute.rb +++ b/lib/chef/resource/execute.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/dist" +require_relative "" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb index 1875846d79..84d60accb2 100644 --- a/lib/chef/resource/file.rb +++ b/lib/chef/resource/file.rb @@ -17,12 +17,12 @@ # limitations under the License. # -require "chef/resource" -require "chef/platform/query_helpers" -require "chef/mixin/securable" -require "chef/resource/file/verification" +require_relative "" +require_relative "../platform/query_helpers" +require_relative "../mixin/securable" +require_relative "file/verification" require "pathname" -require "chef/dist" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/file/verification.rb b/lib/chef/resource/file/verification.rb index ae4f9043b2..c0739a6d44 100644 --- a/lib/chef/resource/file/verification.rb +++ b/lib/chef/resource/file/verification.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/exceptions" -require "chef/guard_interpreter" -require "chef/mixin/descendants_tracker" +require_relative "../../exceptions" +require_relative "../../guard_interpreter" +require_relative "../../mixin/descendants_tracker" class Chef class Resource diff --git a/lib/chef/resource/file/verification/systemd_unit.rb b/lib/chef/resource/file/verification/systemd_unit.rb index b492b32d39..7e4090b5ac 100644 --- a/lib/chef/resource/file/verification/systemd_unit.rb +++ b/lib/chef/resource/file/verification/systemd_unit.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/mixin/which" +require_relative "../../../mixin/which" class Chef class Resource diff --git a/lib/chef/resource/freebsd_package.rb b/lib/chef/resource/freebsd_package.rb index 0f92d7c229..dccb1e1a4f 100644 --- a/lib/chef/resource/freebsd_package.rb +++ b/lib/chef/resource/freebsd_package.rb @@ -18,10 +18,10 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/provider/package/freebsd/port" -require "chef/provider/package/freebsd/pkgng" -require "chef/mixin/shell_out" +require_relative "package" +require_relative "../provider/package/freebsd/port" +require_relative "../provider/package/freebsd/pkgng" +require_relative "../mixin/shell_out" class Chef class Resource diff --git a/lib/chef/resource/gem_package.rb b/lib/chef/resource/gem_package.rb index e057cbd485..e736920811 100644 --- a/lib/chef/resource/gem_package.rb +++ b/lib/chef/resource/gem_package.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/dist" +require_relative "package" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/git.rb b/lib/chef/resource/git.rb index d0a78adc0e..95c5aa346a 100644 --- a/lib/chef/resource/git.rb +++ b/lib/chef/resource/git.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/scm" +require_relative "scm" class Chef class Resource diff --git a/lib/chef/resource/homebrew_cask.rb b/lib/chef/resource/homebrew_cask.rb index 1f5a9afa81..d017a97355 100644 --- a/lib/chef/resource/homebrew_cask.rb +++ b/lib/chef/resource/homebrew_cask.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/mixin/homebrew_user" +require_relative "" +require_relative "../mixin/homebrew_user" class Chef class Resource diff --git a/lib/chef/resource/homebrew_package.rb b/lib/chef/resource/homebrew_package.rb index 930e25d820..50bbfb0847 100644 --- a/lib/chef/resource/homebrew_package.rb +++ b/lib/chef/resource/homebrew_package.rb @@ -18,9 +18,9 @@ # limitations under the License. # -require "chef/provider/package" -require "chef/resource/package" -require "chef/dist" +require_relative "../provider/package" +require_relative "package" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/homebrew_tap.rb b/lib/chef/resource/homebrew_tap.rb index bbcc0b1463..0de7771cf5 100644 --- a/lib/chef/resource/homebrew_tap.rb +++ b/lib/chef/resource/homebrew_tap.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/mixin/homebrew_user" +require_relative "" +require_relative "../mixin/homebrew_user" class Chef class Resource diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb index d0bf9b9a4b..46e047dfa0 100644 --- a/lib/chef/resource/hostname.rb +++ b/lib/chef/resource/hostname.rb @@ -12,7 +12,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/http_request.rb b/lib/chef/resource/http_request.rb index 455d032819..ef9884fcd7 100644 --- a/lib/chef/resource/http_request.rb +++ b/lib/chef/resource/http_request.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/ifconfig.rb b/lib/chef/resource/ifconfig.rb index 7ca90eb935..d9dfd18831 100644 --- a/lib/chef/resource/ifconfig.rb +++ b/lib/chef/resource/ifconfig.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/ips_package.rb b/lib/chef/resource/ips_package.rb index ff154e8bd8..495cb2bc5a 100644 --- a/lib/chef/resource/ips_package.rb +++ b/lib/chef/resource/ips_package.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/provider/package/ips" +require_relative "package" +require_relative "../provider/package/ips" class Chef class Resource diff --git a/lib/chef/resource/kernel_module.rb b/lib/chef/resource/kernel_module.rb index 39c792cf3b..48c4958af5 100644 --- a/lib/chef/resource/kernel_module.rb +++ b/lib/chef/resource/kernel_module.rb @@ -6,7 +6,7 @@ # Copyright 2016-2018, Shopify Inc. # Copyright 2018, Chef Software, Inc. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/ksh.rb b/lib/chef/resource/ksh.rb index f0bc277d17..a150efe330 100644 --- a/lib/chef/resource/ksh.rb +++ b/lib/chef/resource/ksh.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/script" +require_relative "script" class Chef class Resource diff --git a/lib/chef/resource/launchd.rb b/lib/chef/resource/launchd.rb index df01675de1..2dea1da733 100644 --- a/lib/chef/resource/launchd.rb +++ b/lib/chef/resource/launchd.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/link.rb b/lib/chef/resource/link.rb index adb8e10533..a58728d8a5 100644 --- a/lib/chef/resource/link.rb +++ b/lib/chef/resource/link.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/mixin/securable" +require_relative "" +require_relative "../mixin/securable" class Chef class Resource @@ -78,7 +78,7 @@ class Chef # sure we are not on such a platform. def verify_links_supported! if Chef::Platform.windows? - require "chef/win32/file" + require_relative "../win32/file" begin Chef::ReservedNames::Win32::File.verify_links_supported! rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e diff --git a/lib/chef/resource/locale.rb b/lib/chef/resource/locale.rb index 52170e8765..083cf2b900 100644 --- a/lib/chef/resource/locale.rb +++ b/lib/chef/resource/locale.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/log.rb b/lib/chef/resource/log.rb index b97b5c9e66..d38644778d 100644 --- a/lib/chef/resource/log.rb +++ b/lib/chef/resource/log.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/lwrp_base.rb b/lib/chef/resource/lwrp_base.rb index ed8a3b205d..9d60c7cce3 100644 --- a/lib/chef/resource/lwrp_base.rb +++ b/lib/chef/resource/lwrp_base.rb @@ -18,13 +18,13 @@ # limitations under the License. # -require "chef/resource" -require "chef/resource_resolver" -require "chef/node" -require "chef/log" -require "chef/exceptions" -require "chef/mixin/convert_to_class_name" -require "chef/mixin/from_file" +require_relative "" +require_relative "../resource_resolver" +require_relative "../node" +require_relative "../log" +require_relative "../exceptions" +require_relative "../mixin/convert_to_class_name" +require_relative "../mixin/from_file" require "chef/mixin/params_validate" # for DelayedEvaluator class Chef diff --git a/lib/chef/resource/macos_userdefaults.rb b/lib/chef/resource/macos_userdefaults.rb index 5eed3f8648..401fa38947 100644 --- a/lib/chef/resource/macos_userdefaults.rb +++ b/lib/chef/resource/macos_userdefaults.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/macosx_service.rb b/lib/chef/resource/macosx_service.rb index 37681ca930..f6b463e61b 100644 --- a/lib/chef/resource/macosx_service.rb +++ b/lib/chef/resource/macosx_service.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/service" +require_relative "service" class Chef class Resource diff --git a/lib/chef/resource/macports_package.rb b/lib/chef/resource/macports_package.rb index 254d7e7c5f..a1eff28051 100644 --- a/lib/chef/resource/macports_package.rb +++ b/lib/chef/resource/macports_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/mdadm.rb b/lib/chef/resource/mdadm.rb index 382573791e..5160449f93 100644 --- a/lib/chef/resource/mdadm.rb +++ b/lib/chef/resource/mdadm.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb index 4c20a62cf8..bf636e2b55 100644 --- a/lib/chef/resource/mount.rb +++ b/lib/chef/resource/mount.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/msu_package.rb b/lib/chef/resource/msu_package.rb index 9fd39491c9..628af49184 100644 --- a/lib/chef/resource/msu_package.rb +++ b/lib/chef/resource/msu_package.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/mixin/uris" +require_relative "package" +require_relative "../mixin/uris" class Chef class Resource diff --git a/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb index 59f2967a2f..538f7f56cb 100644 --- a/lib/chef/resource/ohai.rb +++ b/lib/chef/resource/ohai.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/dist" +require_relative "" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/ohai_hint.rb b/lib/chef/resource/ohai_hint.rb index e8de5f602a..2c6c91ff4f 100644 --- a/lib/chef/resource/ohai_hint.rb +++ b/lib/chef/resource/ohai_hint.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/openbsd_package.rb b/lib/chef/resource/openbsd_package.rb index 85109de9e8..b1321970b9 100644 --- a/lib/chef/resource/openbsd_package.rb +++ b/lib/chef/resource/openbsd_package.rb @@ -19,9 +19,9 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/provider/package/openbsd" -require "chef/mixin/shell_out" +require_relative "package" +require_relative "../provider/package/openbsd" +require_relative "../mixin/shell_out" class Chef class Resource diff --git a/lib/chef/resource/openssl_dhparam.rb b/lib/chef/resource/openssl_dhparam.rb index 05347ec494..a4f5a6d12b 100644 --- a/lib/chef/resource/openssl_dhparam.rb +++ b/lib/chef/resource/openssl_dhparam.rb @@ -15,12 +15,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslDhparam < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_dhparam diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb index dc8cd060d6..46a8541fb7 100644 --- a/lib/chef/resource/openssl_ec_private_key.rb +++ b/lib/chef/resource/openssl_ec_private_key.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslEcPrivateKey < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_ec_private_key diff --git a/lib/chef/resource/openssl_ec_public_key.rb b/lib/chef/resource/openssl_ec_public_key.rb index fad7fd9713..9a06f82082 100644 --- a/lib/chef/resource/openssl_ec_public_key.rb +++ b/lib/chef/resource/openssl_ec_public_key.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslEcPublicKey < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_ec_public_key diff --git a/lib/chef/resource/openssl_rsa_private_key.rb b/lib/chef/resource/openssl_rsa_private_key.rb index fb19e8ff99..7e46d3e757 100644 --- a/lib/chef/resource/openssl_rsa_private_key.rb +++ b/lib/chef/resource/openssl_rsa_private_key.rb @@ -15,12 +15,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslRsaPrivateKey < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_rsa_private_key diff --git a/lib/chef/resource/openssl_rsa_public_key.rb b/lib/chef/resource/openssl_rsa_public_key.rb index be7f25030f..21e5e8810d 100644 --- a/lib/chef/resource/openssl_rsa_public_key.rb +++ b/lib/chef/resource/openssl_rsa_public_key.rb @@ -15,12 +15,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslRsaPublicKey < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_rsa_public_key diff --git a/lib/chef/resource/openssl_x509_certificate.rb b/lib/chef/resource/openssl_x509_certificate.rb index 71a1f8d6d7..15c57b7662 100644 --- a/lib/chef/resource/openssl_x509_certificate.rb +++ b/lib/chef/resource/openssl_x509_certificate.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslX509Certificate < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_x509_certificate diff --git a/lib/chef/resource/openssl_x509_crl.rb b/lib/chef/resource/openssl_x509_crl.rb index c6a2918320..dff8be02c6 100644 --- a/lib/chef/resource/openssl_x509_crl.rb +++ b/lib/chef/resource/openssl_x509_crl.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslX509Crl < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_x509_crl diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb index affc761723..0cb0e5a58f 100644 --- a/lib/chef/resource/openssl_x509_request.rb +++ b/lib/chef/resource/openssl_x509_request.rb @@ -16,12 +16,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class OpensslX509Request < Chef::Resource - require "chef/mixin/openssl_helper" + require_relative "../mixin/openssl_helper" include Chef::Mixin::OpenSSLHelper resource_name :openssl_x509_request diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb index 90166cc338..cfd319cf59 100644 --- a/lib/chef/resource/osx_profile.rb +++ b/lib/chef/resource/osx_profile.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/package.rb b/lib/chef/resource/package.rb index 67b01402a7..b459e23646 100644 --- a/lib/chef/resource/package.rb +++ b/lib/chef/resource/package.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/pacman_package.rb b/lib/chef/resource/pacman_package.rb index 4661b6f07d..71177a42aa 100644 --- a/lib/chef/resource/pacman_package.rb +++ b/lib/chef/resource/pacman_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/paludis_package.rb b/lib/chef/resource/paludis_package.rb index f7f9187826..88d4be6894 100644 --- a/lib/chef/resource/paludis_package.rb +++ b/lib/chef/resource/paludis_package.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/provider/package/paludis" +require_relative "package" +require_relative "../provider/package/paludis" class Chef class Resource diff --git a/lib/chef/resource/perl.rb b/lib/chef/resource/perl.rb index f3079eb40e..58e21c4915 100644 --- a/lib/chef/resource/perl.rb +++ b/lib/chef/resource/perl.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/script" -require "chef/provider/script" +require_relative "script" +require_relative "../provider/script" class Chef class Resource diff --git a/lib/chef/resource/portage_package.rb b/lib/chef/resource/portage_package.rb index 5e954581c7..b7b434804b 100644 --- a/lib/chef/resource/portage_package.rb +++ b/lib/chef/resource/portage_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/powershell_package.rb b/lib/chef/resource/powershell_package.rb index 28dabc82b0..53be107ebc 100644 --- a/lib/chef/resource/powershell_package.rb +++ b/lib/chef/resource/powershell_package.rb @@ -15,8 +15,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/mixin/uris" +require_relative "package" +require_relative "../mixin/uris" class Chef class Resource diff --git a/lib/chef/resource/powershell_package_source.rb b/lib/chef/resource/powershell_package_source.rb index 061b9e632d..cbacc685d6 100644 --- a/lib/chef/resource/powershell_package_source.rb +++ b/lib/chef/resource/powershell_package_source.rb @@ -15,8 +15,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/json_compat" +require_relative "" +require_relative "../json_compat" class Chef class Resource diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb index 53290c54f8..6cb1453376 100644 --- a/lib/chef/resource/powershell_script.rb +++ b/lib/chef/resource/powershell_script.rb @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -require "chef/resource/windows_script" +require_relative "windows_script" class Chef class Resource diff --git a/lib/chef/resource/python.rb b/lib/chef/resource/python.rb index f6c259b858..b1e059a66f 100644 --- a/lib/chef/resource/python.rb +++ b/lib/chef/resource/python.rb @@ -15,8 +15,8 @@ # limitations under the License. # -require "chef/resource/script" -require "chef/provider/script" +require_relative "script" +require_relative "../provider/script" class Chef class Resource diff --git a/lib/chef/resource/reboot.rb b/lib/chef/resource/reboot.rb index b9f748978f..68a328ece2 100644 --- a/lib/chef/resource/reboot.rb +++ b/lib/chef/resource/reboot.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/registry_key.rb b/lib/chef/resource/registry_key.rb index 30233ddc8b..1a60097c14 100644 --- a/lib/chef/resource/registry_key.rb +++ b/lib/chef/resource/registry_key.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/digester" +require_relative "" +require_relative "../digester" class Chef class Resource diff --git a/lib/chef/resource/remote_directory.rb b/lib/chef/resource/remote_directory.rb index dd7077b9ae..50c183fbc5 100644 --- a/lib/chef/resource/remote_directory.rb +++ b/lib/chef/resource/remote_directory.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/resource/directory" -require "chef/provider/remote_directory" -require "chef/mixin/securable" +require_relative "directory" +require_relative "../provider/remote_directory" +require_relative "../mixin/securable" class Chef class Resource diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb index 3607a3cbc5..b6566aa619 100644 --- a/lib/chef/resource/remote_file.rb +++ b/lib/chef/resource/remote_file.rb @@ -18,10 +18,10 @@ # require "uri" -require "chef/resource/file" -require "chef/provider/remote_file" -require "chef/mixin/securable" -require "chef/mixin/uris" +require_relative "file" +require_relative "../provider/remote_file" +require_relative "../mixin/securable" +require_relative "../mixin/uris" class Chef class Resource diff --git a/lib/chef/resource/resource_notification.rb b/lib/chef/resource/resource_notification.rb index a3475e3301..3c5a3f0be9 100644 --- a/lib/chef/resource/resource_notification.rb +++ b/lib/chef/resource/resource_notification.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/rhsm_errata.rb b/lib/chef/resource/rhsm_errata.rb index e37278de79..4609342a2a 100644 --- a/lib/chef/resource/rhsm_errata.rb +++ b/lib/chef/resource/rhsm_errata.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/rhsm_errata_level.rb b/lib/chef/resource/rhsm_errata_level.rb index 1e82ee73aa..bfa9d395f6 100644 --- a/lib/chef/resource/rhsm_errata_level.rb +++ b/lib/chef/resource/rhsm_errata_level.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/rhsm_register.rb b/lib/chef/resource/rhsm_register.rb index 4e10e3a03d..6a898cd702 100644 --- a/lib/chef/resource/rhsm_register.rb +++ b/lib/chef/resource/rhsm_register.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" require "shellwords" class Chef diff --git a/lib/chef/resource/rhsm_repo.rb b/lib/chef/resource/rhsm_repo.rb index 943abc3331..7bcd1778b0 100644 --- a/lib/chef/resource/rhsm_repo.rb +++ b/lib/chef/resource/rhsm_repo.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/rhsm_subscription.rb b/lib/chef/resource/rhsm_subscription.rb index 52f4c41653..242d5d8c81 100644 --- a/lib/chef/resource/rhsm_subscription.rb +++ b/lib/chef/resource/rhsm_subscription.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/route.rb b/lib/chef/resource/route.rb index 45a1266fd7..164ba4dfce 100644 --- a/lib/chef/resource/route.rb +++ b/lib/chef/resource/route.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/rpm_package.rb b/lib/chef/resource/rpm_package.rb index cf408cd094..3a171057e5 100644 --- a/lib/chef/resource/rpm_package.rb +++ b/lib/chef/resource/rpm_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/ruby.rb b/lib/chef/resource/ruby.rb index b5f36bb0e9..63bdd12630 100644 --- a/lib/chef/resource/ruby.rb +++ b/lib/chef/resource/ruby.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/script" -require "chef/provider/script" +require_relative "script" +require_relative "../provider/script" class Chef class Resource diff --git a/lib/chef/resource/ruby_block.rb b/lib/chef/resource/ruby_block.rb index 0ec6647fd8..bfba0a6bde 100644 --- a/lib/chef/resource/ruby_block.rb +++ b/lib/chef/resource/ruby_block.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/resource" -require "chef/provider/ruby_block" -require "chef/dist" +require_relative "" +require_relative "../provider/ruby_block" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb index fb0e70ad44..a485dd1a25 100644 --- a/lib/chef/resource/scm.rb +++ b/lib/chef/resource/scm.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/script.rb b/lib/chef/resource/script.rb index 0d7e6a10d5..6d40061f8f 100644 --- a/lib/chef/resource/script.rb +++ b/lib/chef/resource/script.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource/execute" +require_relative "execute" class Chef class Resource diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb index 20bf9ecc65..93e19b7420 100644 --- a/lib/chef/resource/service.rb +++ b/lib/chef/resource/service.rb @@ -17,9 +17,9 @@ # limitations under the License. # -require "chef/resource" +require_relative "" require "shellwords" -require "chef/dist" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/smartos_package.rb b/lib/chef/resource/smartos_package.rb index d9ef55c50f..510e1ccc7b 100644 --- a/lib/chef/resource/smartos_package.rb +++ b/lib/chef/resource/smartos_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/snap_package.rb b/lib/chef/resource/snap_package.rb index 080b604d28..a8be77d5ce 100644 --- a/lib/chef/resource/snap_package.rb +++ b/lib/chef/resource/snap_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/solaris_package.rb b/lib/chef/resource/solaris_package.rb index 435a6ecc44..163621ec5b 100644 --- a/lib/chef/resource/solaris_package.rb +++ b/lib/chef/resource/solaris_package.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/ssh_known_hosts_entry.rb b/lib/chef/resource/ssh_known_hosts_entry.rb index c986e1127d..be11a1ede5 100644 --- a/lib/chef/resource/ssh_known_hosts_entry.rb +++ b/lib/chef/resource/ssh_known_hosts_entry.rb @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/subversion.rb b/lib/chef/resource/subversion.rb index 4febb9353c..c60f03710f 100644 --- a/lib/chef/resource/subversion.rb +++ b/lib/chef/resource/subversion.rb @@ -17,8 +17,8 @@ # limitations under the License. # -require "chef/resource/scm" -require "chef/dist" +require_relative "scm" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/sudo.rb b/lib/chef/resource/sudo.rb index 74dd9d1a55..18a03f2046 100644 --- a/lib/chef/resource/sudo.rb +++ b/lib/chef/resource/sudo.rb @@ -19,7 +19,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/swap_file.rb b/lib/chef/resource/swap_file.rb index 93c3f0906b..d865d4410f 100644 --- a/lib/chef/resource/swap_file.rb +++ b/lib/chef/resource/swap_file.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/sysctl.rb b/lib/chef/resource/sysctl.rb index 08f4bf716c..4fb6971ece 100644 --- a/lib/chef/resource/sysctl.rb +++ b/lib/chef/resource/sysctl.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/systemd_unit.rb b/lib/chef/resource/systemd_unit.rb index 89bc30b9d1..7e5e127552 100644 --- a/lib/chef/resource/systemd_unit.rb +++ b/lib/chef/resource/systemd_unit.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" require "iniparse" class Chef diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb index b08bf0b8fb..7ca22f5b63 100644 --- a/lib/chef/resource/template.rb +++ b/lib/chef/resource/template.rb @@ -18,9 +18,9 @@ # limitations under the License. # -require "chef/resource/file" -require "chef/mixin/securable" -require "chef/dist" +require_relative "file" +require_relative "../mixin/securable" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/timezone.rb b/lib/chef/resource/timezone.rb index 6ad7f5a521..ace0502f03 100644 --- a/lib/chef/resource/timezone.rb +++ b/lib/chef/resource/timezone.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user.rb b/lib/chef/resource/user.rb index bef1f5f620..b4b23cba4f 100644 --- a/lib/chef/resource/user.rb +++ b/lib/chef/resource/user.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user/aix_user.rb b/lib/chef/resource/user/aix_user.rb index d5f1829b63..426687e720 100644 --- a/lib/chef/resource/user/aix_user.rb +++ b/lib/chef/resource/user/aix_user.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource/user" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user/dscl_user.rb b/lib/chef/resource/user/dscl_user.rb index 0afc504c1d..22faf273b7 100644 --- a/lib/chef/resource/user/dscl_user.rb +++ b/lib/chef/resource/user/dscl_user.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource/user" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user/linux_user.rb b/lib/chef/resource/user/linux_user.rb index 056a421197..6873ab0b8c 100644 --- a/lib/chef/resource/user/linux_user.rb +++ b/lib/chef/resource/user/linux_user.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource/user" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user/pw_user.rb b/lib/chef/resource/user/pw_user.rb index 3672943f5c..f903e3fdf5 100644 --- a/lib/chef/resource/user/pw_user.rb +++ b/lib/chef/resource/user/pw_user.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource/user" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user/solaris_user.rb b/lib/chef/resource/user/solaris_user.rb index cca90e6743..1cf9d1f875 100644 --- a/lib/chef/resource/user/solaris_user.rb +++ b/lib/chef/resource/user/solaris_user.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource/user" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/user/windows_user.rb b/lib/chef/resource/user/windows_user.rb index e10ef3881c..9c20029598 100644 --- a/lib/chef/resource/user/windows_user.rb +++ b/lib/chef/resource/user/windows_user.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource/user" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb index 3b0ae343a9..d75d6570b2 100644 --- a/lib/chef/resource/windows_ad_join.rb +++ b/lib/chef/resource/windows_ad_join.rb @@ -15,8 +15,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/mixin/powershell_out" +require_relative "" +require_relative "../mixin/powershell_out" class Chef class Resource diff --git a/lib/chef/resource/windows_auto_run.rb b/lib/chef/resource/windows_auto_run.rb index 34f3443323..924109c699 100644 --- a/lib/chef/resource/windows_auto_run.rb +++ b/lib/chef/resource/windows_auto_run.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_certificate.rb b/lib/chef/resource/windows_certificate.rb index c530d3b67d..de28e0b984 100644 --- a/lib/chef/resource/windows_certificate.rb +++ b/lib/chef/resource/windows_certificate.rb @@ -17,11 +17,11 @@ # limitations under the License. # -require "chef/util/path_helper" -require "chef/resource" +require_relative "../util/path_helper" +require_relative "" require "win32-certstore" if Chef::Platform.windows? require "openssl" -require "chef/dist" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/windows_dfs_folder.rb b/lib/chef/resource/windows_dfs_folder.rb index fb6ddf8ef5..40fcd9d718 100644 --- a/lib/chef/resource/windows_dfs_folder.rb +++ b/lib/chef/resource/windows_dfs_folder.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_dfs_namespace.rb b/lib/chef/resource/windows_dfs_namespace.rb index fe168f25ce..bd2fffdd9a 100644 --- a/lib/chef/resource/windows_dfs_namespace.rb +++ b/lib/chef/resource/windows_dfs_namespace.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_dfs_server.rb b/lib/chef/resource/windows_dfs_server.rb index a36263baa5..e9ed8a08b6 100644 --- a/lib/chef/resource/windows_dfs_server.rb +++ b/lib/chef/resource/windows_dfs_server.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_dns_record.rb b/lib/chef/resource/windows_dns_record.rb index 89ea2f74f3..03c5fab6b6 100644 --- a/lib/chef/resource/windows_dns_record.rb +++ b/lib/chef/resource/windows_dns_record.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_dns_zone.rb b/lib/chef/resource/windows_dns_zone.rb index 391d05757a..883e0939a2 100644 --- a/lib/chef/resource/windows_dns_zone.rb +++ b/lib/chef/resource/windows_dns_zone.rb @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_env.rb b/lib/chef/resource/windows_env.rb index f67013965b..32ed92f70b 100644 --- a/lib/chef/resource/windows_env.rb +++ b/lib/chef/resource/windows_env.rb @@ -17,7 +17,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_feature.rb b/lib/chef/resource/windows_feature.rb index 6641242148..6f23133954 100644 --- a/lib/chef/resource/windows_feature.rb +++ b/lib/chef/resource/windows_feature.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_feature_dism.rb b/lib/chef/resource/windows_feature_dism.rb index b6bd4ccb8a..e43bd32f81 100644 --- a/lib/chef/resource/windows_feature_dism.rb +++ b/lib/chef/resource/windows_feature_dism.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/platform/query_helpers" +require_relative "" +require_relative "../platform/query_helpers" class Chef class Resource diff --git a/lib/chef/resource/windows_feature_powershell.rb b/lib/chef/resource/windows_feature_powershell.rb index a0d4c1ae64..bc486218b2 100644 --- a/lib/chef/resource/windows_feature_powershell.rb +++ b/lib/chef/resource/windows_feature_powershell.rb @@ -16,10 +16,10 @@ # limitations under the License. # -require "chef/mixin/powershell_out" -require "chef/json_compat" -require "chef/resource" -require "chef/platform/query_helpers" +require_relative "../mixin/powershell_out" +require_relative "../json_compat" +require_relative "" +require_relative "../platform/query_helpers" class Chef class Resource diff --git a/lib/chef/resource/windows_firewall_rule.rb b/lib/chef/resource/windows_firewall_rule.rb index 0096a89123..3dbc5d6b0f 100644 --- a/lib/chef/resource/windows_firewall_rule.rb +++ b/lib/chef/resource/windows_firewall_rule.rb @@ -19,7 +19,7 @@ # limitations under the License. # -require "chef/json_compat" +require_relative "../json_compat" class Chef class Resource diff --git a/lib/chef/resource/windows_font.rb b/lib/chef/resource/windows_font.rb index 5657bce390..aa7caa6847 100644 --- a/lib/chef/resource/windows_font.rb +++ b/lib/chef/resource/windows_font.rb @@ -15,12 +15,12 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource class WindowsFont < Chef::Resource - require "chef/util/path_helper" + require_relative "../util/path_helper" resource_name :windows_font provides(:windows_font) { true } diff --git a/lib/chef/resource/windows_package.rb b/lib/chef/resource/windows_package.rb index 9bfa51b9fd..46409265b3 100644 --- a/lib/chef/resource/windows_package.rb +++ b/lib/chef/resource/windows_package.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/mixin/uris" -require "chef/resource/package" -require "chef/provider/package/windows" +require_relative "../mixin/uris" +require_relative "package" +require_relative "../provider/package/windows" require "chef/win32/error" if RUBY_PLATFORM =~ /mswin|mingw|windows/ class Chef diff --git a/lib/chef/resource/windows_pagefile.rb b/lib/chef/resource/windows_pagefile.rb index a41e598bd9..3b5d077a3c 100644 --- a/lib/chef/resource/windows_pagefile.rb +++ b/lib/chef/resource/windows_pagefile.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_path.rb b/lib/chef/resource/windows_path.rb index e0af92f551..ceaa9f95a2 100644 --- a/lib/chef/resource/windows_path.rb +++ b/lib/chef/resource/windows_path.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_printer.rb b/lib/chef/resource/windows_printer.rb index b5c963c85b..e5ca7e2187 100644 --- a/lib/chef/resource/windows_printer.rb +++ b/lib/chef/resource/windows_printer.rb @@ -17,7 +17,7 @@ # See here for more info: # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394492(v=vs.85).aspx -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_printer_port.rb b/lib/chef/resource/windows_printer_port.rb index 799a37a651..4a47c22443 100644 --- a/lib/chef/resource/windows_printer_port.rb +++ b/lib/chef/resource/windows_printer_port.rb @@ -17,7 +17,7 @@ # See here for more info: # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394492(v=vs.85).aspx -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_script.rb b/lib/chef/resource/windows_script.rb index fe3e37989d..3177a32090 100644 --- a/lib/chef/resource/windows_script.rb +++ b/lib/chef/resource/windows_script.rb @@ -16,9 +16,9 @@ # limitations under the License. # -require "chef/platform/query_helpers" -require "chef/resource/script" -require "chef/mixin/windows_architecture_helper" +require_relative "../platform/query_helpers" +require_relative "script" +require_relative "../mixin/windows_architecture_helper" class Chef class Resource diff --git a/lib/chef/resource/windows_service.rb b/lib/chef/resource/windows_service.rb index 33805ed482..6853d539ab 100644 --- a/lib/chef/resource/windows_service.rb +++ b/lib/chef/resource/windows_service.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/service" -require "chef/win32_service_constants" +require_relative "service" +require_relative "../win32_service_constants" class Chef class Resource diff --git a/lib/chef/resource/windows_share.rb b/lib/chef/resource/windows_share.rb index 52ed6120f8..4e59bad407 100644 --- a/lib/chef/resource/windows_share.rb +++ b/lib/chef/resource/windows_share.rb @@ -19,9 +19,9 @@ # limitations under the License. # -require "chef/resource" -require "chef/json_compat" -require "chef/util/path_helper" +require_relative "" +require_relative "../json_compat" +require_relative "../util/path_helper" class Chef class Resource diff --git a/lib/chef/resource/windows_shortcut.rb b/lib/chef/resource/windows_shortcut.rb index 34e080283b..5031fc23c8 100644 --- a/lib/chef/resource/windows_shortcut.rb +++ b/lib/chef/resource/windows_shortcut.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_task.rb b/lib/chef/resource/windows_task.rb index c60515a0ee..952767ff03 100644 --- a/lib/chef/resource/windows_task.rb +++ b/lib/chef/resource/windows_task.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" require "chef/win32/security" if Chef::Platform.windows? class Chef diff --git a/lib/chef/resource/windows_uac.rb b/lib/chef/resource/windows_uac.rb index d41bcf7d4d..707ac65391 100644 --- a/lib/chef/resource/windows_uac.rb +++ b/lib/chef/resource/windows_uac.rb @@ -15,7 +15,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/windows_workgroup.rb b/lib/chef/resource/windows_workgroup.rb index 6bf6e96d18..d1f9729c76 100644 --- a/lib/chef/resource/windows_workgroup.rb +++ b/lib/chef/resource/windows_workgroup.rb @@ -15,8 +15,8 @@ # limitations under the License. # -require "chef/resource" -require "chef/mixin/powershell_out" +require_relative "" +require_relative "../mixin/powershell_out" class Chef class Resource diff --git a/lib/chef/resource/yum_package.rb b/lib/chef/resource/yum_package.rb index 8f088371ed..85efab633b 100644 --- a/lib/chef/resource/yum_package.rb +++ b/lib/chef/resource/yum_package.rb @@ -16,8 +16,8 @@ # limitations under the License. # -require "chef/resource/package" -require "chef/dist" +require_relative "package" +require_relative "../dist" class Chef class Resource diff --git a/lib/chef/resource/yum_repository.rb b/lib/chef/resource/yum_repository.rb index 0a9747c266..fd99a2b3ba 100644 --- a/lib/chef/resource/yum_repository.rb +++ b/lib/chef/resource/yum_repository.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource diff --git a/lib/chef/resource/zypper_package.rb b/lib/chef/resource/zypper_package.rb index c8d776cebb..f3b19846dc 100644 --- a/lib/chef/resource/zypper_package.rb +++ b/lib/chef/resource/zypper_package.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource/package" +require_relative "package" class Chef class Resource diff --git a/lib/chef/resource/zypper_repository.rb b/lib/chef/resource/zypper_repository.rb index d1683d5fd0..59bc81465d 100644 --- a/lib/chef/resource/zypper_repository.rb +++ b/lib/chef/resource/zypper_repository.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "chef/resource" +require_relative "" class Chef class Resource |