diff options
-rw-r--r-- | Rakefile | 2 | ||||
-rwxr-xr-x | bin/chef-zero | 2 | ||||
-rw-r--r-- | lib/chef_zero/chef_data/cookbook_data.rb | 2 | ||||
-rw-r--r-- | lib/chef_zero/rest_request.rb | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -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 56050ef..87c894a 100755 --- a/bin/chef-zero +++ b/bin/chef-zero @@ -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 |