Prepare files for knife-gem split

Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/chef/knife/raw.rb b/lib/chef/knife/raw.rb
index 5adb36ea70..d288e3f3e4 100644
--- a/lib/chef/knife/raw.rb
+++ b/lib/chef/knife/raw.rb
@@ -22,13 +22,14 @@ class Chef
       banner "knife raw REQUEST_PATH (options)"
 
       deps do
-        require_relative "../json_compat"
-        require_relative "../config"
-        require_relative "../http"
-        require_relative "../http/authenticator"
-        require_relative "../http/cookie_manager"
-        require_relative "../http/decompressor"
-        require_relative "../http/json_output"
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+        require "chef/config" unless defined?(Chef::Config)
+        # MPTD - most of these are alrady included via ../knife
+        require "chef/http" unless defined?(Chef::HTTP)
+        require "chef/http/authenticator" unless defined?(Chef::HTTP::Authenticator)
+        require "chef/http/cookie_manager" unless defined?(Chef::HTTP::CookieManager)
+        require "chef/http/decompressor" unless defined?(Chef::HTTP::Decompressor)
+        require "chef/http/json_output" unless defined?(Chef::HTTP::JSONOutput)
       end
 
       option :method,