summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormwrock <matt@mattwrock.com>2020-09-24 16:54:21 -0700
committermwrock <matt@mattwrock.com>2020-09-24 16:54:21 -0700
commit288665d13858b3ee5f176d478862da6e3fb82779 (patch)
tree20678f7c2638441558c25f67bd57b5953862042a /lib
parenta1e8747af72cf91a7b5a729db647e158f46ad01f (diff)
downloadchef-288665d13858b3ee5f176d478862da6e3fb82779.tar.gz
autoload addressable/uri on :URI inside addressable module
Signed-off-by: mwrock <matt@mattwrock.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/mixin/uris.rb4
-rw-r--r--lib/chef/resource/apt_repository.rb4
-rw-r--r--lib/chef/search/query.rb4
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/chef/mixin/uris.rb b/lib/chef/mixin/uris.rb
index 74c2af73d8..13c4ee29b3 100644
--- a/lib/chef/mixin/uris.rb
+++ b/lib/chef/mixin/uris.rb
@@ -17,7 +17,9 @@
#
autoload :URI, "uri"
-autoload :Addressable, "addressable/uri"
+module Addressable
+ autoload :URI, "addressable/uri"
+end
class Chef
module Mixin
diff --git a/lib/chef/resource/apt_repository.rb b/lib/chef/resource/apt_repository.rb
index e4569561fc..0dc7f7d9b9 100644
--- a/lib/chef/resource/apt_repository.rb
+++ b/lib/chef/resource/apt_repository.rb
@@ -19,7 +19,9 @@
require_relative "../resource"
require_relative "../http/simple"
require "tmpdir" unless defined?(Dir.mktmpdir)
-autoload :Addressable, "addressable"
+module Addressable
+ autoload :URI, "addressable/uri"
+end
class Chef
class Resource
diff --git a/lib/chef/search/query.rb b/lib/chef/search/query.rb
index 70b31cd5e4..c278ea9a68 100644
--- a/lib/chef/search/query.rb
+++ b/lib/chef/search/query.rb
@@ -21,7 +21,9 @@ require_relative "../exceptions"
require_relative "../server_api"
autoload :URI, "uri"
-autoload :Addressable, "addressable/uri"
+module Addressable
+ autoload :URI, "addressable/uri"
+end
class Chef
class Search