More fixes for CHEF-1292: updated comments, refactored feature tests. Added

some require's

4 files changed, 17 insertions, 9 deletions

diff --git a/chef/lib/chef/json.rb b/chef/lib/chef/json.rb
index f83700dc40..24020356ba 100644
--- a/chef/lib/chef/json.rb
+++ b/chef/lib/chef/json.rb
@@ -41,7 +41,6 @@ class Chef
       end
 
       def to_json(obj, opts = nil)
-        #::JSON.generate(obj, opts_add_max_nesting(opts))
         obj.to_json(opts_add_max_nesting(opts))
       end
 
diff --git a/chef/lib/chef/provider/deploy/revision.rb b/chef/lib/chef/provider/deploy/revision.rb
index 18c2c03f8a..6b5848827a 100644
--- a/chef/lib/chef/provider/deploy/revision.rb
+++ b/chef/lib/chef/provider/deploy/revision.rb
@@ -1,6 +1,9 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Author:: Seth Falcon (<seth@opscode.com>)
 # Copyright:: Copyright (c) 2009 Daniel DeLeo
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +19,10 @@
 # limitations under the License.
 #
 
+require 'chef/provider'
+require 'chef/provider/deploy'
+require 'chef/json'
+
 class Chef
   class Provider
     class Deploy
diff --git a/chef/lib/chef/shef.rb b/chef/lib/chef/shef.rb
index bcab49fb4b..2710e7fbb1 100644
--- a/chef/lib/chef/shef.rb
+++ b/chef/lib/chef/shef.rb
@@ -15,17 +15,18 @@
 # limitations under the License.
 #
 
-require "singleton"
-require "pp"
-require "etc"
-require "mixlib/cli"
+require 'singleton'
+require 'pp'
+require 'etc'
+require 'mixlib/cli'
 
 require 'chef/version'
-require "chef/client"
-require "chef/config"
+require 'chef/client'
+require 'chef/config'
 
-require "chef/shef/shef_session"
-require "chef/shef/ext"
+require 'chef/shef/shef_session'
+require 'chef/shef/ext'
+require 'chef/json'
 
 # = Shef
 # Shef is Chef in an IRB session. Shef can interact with a Chef server via the
diff --git a/chef/lib/chef/shef/ext.rb b/chef/lib/chef/shef/ext.rb
index 77c63cfc07..6c5116f4a5 100644
--- a/chef/lib/chef/shef/ext.rb
+++ b/chef/lib/chef/shef/ext.rb
@@ -23,6 +23,7 @@ require 'chef/version'
 require 'chef/shef/shef_session'
 require 'chef/shef/model_wrapper'
 require 'chef/shef/shef_rest'
+require 'chef/json'
 
 module Shef
   module Extensions