diff options
| author | Tim Smith <tsmith@chef.io> | 2020-08-21 10:44:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 10:44:59 -0700 |
| commit | 27645457ddf6734428ad0d746c689cb24c9feb9b (patch) | |
| tree | 0e66b3acf39071d79328733a5205eae57b870190 /lib | |
| parent | c31e7b4960a8c50317248baeceb38b89f4205fff (diff) | |
| parent | 128e40d7f932bce64fa2862a4639dffdade15a78 (diff) | |
| download | chef-zero-27645457ddf6734428ad0d746c689cb24c9feb9b.tar.gz | |
Merge pull request #303 from chef/requires
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef_zero/chef_data/cookbook_data.rb | 2 | ||||
| -rw-r--r-- | lib/chef_zero/rest_request.rb | 2 | ||||
| -rw-r--r-- | lib/chef_zero/server.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef_zero/chef_data/cookbook_data.rb b/lib/chef_zero/chef_data/cookbook_data.rb index 747877a..86722d9 100644 --- a/lib/chef_zero/chef_data/cookbook_data.rb +++ b/lib/chef_zero/chef_data/cookbook_data.rb @@ -1,4 +1,4 @@ -require "digest/md5" +require "digest/md5" unless defined?(Digest::MD5) require "hashie" module ChefZero diff --git a/lib/chef_zero/rest_request.rb b/lib/chef_zero/rest_request.rb index c260316..2363b11 100644 --- a/lib/chef_zero/rest_request.rb +++ b/lib/chef_zero/rest_request.rb @@ -1,5 +1,5 @@ require "rack/request" -require "cgi" +require "cgi" unless defined?(CGI) module ChefZero class RestRequest diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 2d699aa..aac9c5e 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -17,7 +17,7 @@ # require "openssl" unless defined?(OpenSSL) -require "open-uri" +require "open-uri" unless defined?(OpenURI) require "rubygems" unless defined?(Gem) require "timeout" unless defined?(Timeout) require "stringio" unless defined?(StringIO) |