diff options
| author | danielsdeleo <dan@getchef.com> | 2014-11-26 13:27:18 -0800 |
|---|---|---|
| committer | danielsdeleo <dan@getchef.com> | 2014-11-26 13:27:18 -0800 |
| commit | 3ad740754507629a73525ffdcc0b3eb06f177001 (patch) | |
| tree | 5bbc3e4f50dcfb6297fe797f1cc937ba3af40ba9 | |
| parent | a0c294d8d1b6b0323d3c01265e824deb8a5d972d (diff) | |
| download | chef-3ad740754507629a73525ffdcc0b3eb06f177001.tar.gz | |
Ensure 'uri' is required where it's used.
URI previously was globally available because chef.rb loaded it via a
monkey patch for the URI class.
| -rw-r--r-- | lib/chef/application.rb | 1 | ||||
| -rw-r--r-- | lib/chef/application/windows_service.rb | 1 | ||||
| -rw-r--r-- | lib/chef/cookbook_site_streaming_uploader.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider/package/rubygems.rb | 1 | ||||
| -rw-r--r-- | lib/chef/resource/remote_file.rb | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/lib/chef/application.rb b/lib/chef/application.rb index 7214afc5be..5a67fc9091 100644 --- a/lib/chef/application.rb +++ b/lib/chef/application.rb @@ -17,6 +17,7 @@ # limitations under the License. require 'pp' +require 'uri' require 'socket' require 'chef/config' require 'chef/config_fetcher' diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb index bea5e9fcdc..ba7c6dab5a 100644 --- a/lib/chef/application/windows_service.rb +++ b/lib/chef/application/windows_service.rb @@ -26,6 +26,7 @@ require 'chef/log' require 'chef/rest' require 'mixlib/cli' require 'socket' +require 'uri' require 'win32/daemon' require 'chef/mixin/shell_out' diff --git a/lib/chef/cookbook_site_streaming_uploader.rb b/lib/chef/cookbook_site_streaming_uploader.rb index c444c8251b..879a578e15 100644 --- a/lib/chef/cookbook_site_streaming_uploader.rb +++ b/lib/chef/cookbook_site_streaming_uploader.rb @@ -18,6 +18,7 @@ # limitations under the License. # +require 'uri' require 'net/http' require 'mixlib/authentication/signedheaderauth' require 'openssl' diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index 21689503f0..1f33cc5a9b 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -17,6 +17,7 @@ # limitations under the License. # +require 'uri' require 'chef/provider/package' require 'chef/mixin/command' require 'chef/resource/package' diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb index 46516fd3fb..7ba98b9d3b 100644 --- a/lib/chef/resource/remote_file.rb +++ b/lib/chef/resource/remote_file.rb @@ -17,6 +17,7 @@ # limitations under the License. # +require 'uri' require 'chef/resource/file' require 'chef/provider/remote_file' require 'chef/mixin/securable' |