Merge pull request #303 from chef/requires

Signed-off-by: Tim Smith <tsmith@chef.io>

7 files changed, 11 insertions, 11 deletions

diff --git a/Rakefile b/Rakefile
index 2dd1b28..b7342fa 100644
--- a/Rakefile
+++ b/Rakefile
@@ -61,7 +61,7 @@ rescue LoadError
 end
 
 begin
-  require "yard"
+  require "yard" unless defined?(YARD)
   YARD::Rake::YardocTask.new(:docs)
 rescue LoadError
   puts "yard is not available. bundle install first to make sure all dependencies are installed."
diff --git a/bin/chef-zero b/bin/chef-zero
index 0b4a99a..87c894a 100755
--- a/bin/chef-zero
+++ b/bin/chef-zero
@@ -3,7 +3,7 @@
 # Trap interrupts to quit cleanly.
 Signal.trap("INT") { exit 1 }
 
-require "rubygems"
+require "rubygems" unless defined?(Gem)
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
 require "chef_zero/log"
@@ -11,7 +11,7 @@ require "chef_zero/dist"
 require "chef_zero/version"
 require "chef_zero/server"
 require "chef_zero/data_store/raw_file_store"
-require "optparse"
+require "optparse" unless defined?(OptionParser)
 
 def parse_port(port)
   array = []
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)
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index b1760b6..13cfa5a 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require "json"
+require "json" unless defined?(JSON)
 require "bundler"
 require "bundler/setup"
 
@@ -93,7 +93,7 @@ begin
   tmpdir = nil
   server =
     if ENV["FILE_STORE"]
-      require "tmpdir"
+      require "tmpdir" unless defined?(Dir.mktmpdir)
       require "chef_zero/data_store/raw_file_store"
       tmpdir = Dir.mktmpdir
       data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
@@ -102,7 +102,7 @@ begin
       start_chef_server(data_store: data_store)
 
     elsif ENV["CHEF_FS"]
-      require "tmpdir"
+      require "tmpdir" unless defined?(Dir.mktmpdir)
       tmpdir = Dir.mktmpdir
       start_cheffs_server(tmpdir)
 
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index 2305880..75f31b9 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -1,6 +1,6 @@
 require "chef_zero/server"
-require "net/http"
-require "uri"
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
 
 describe ChefZero::Server do
   context "with a server bound to port 8889" do