add support for actual sandbox objects

Conflicts:
	chef/Gemfile

2 files changed, 105 insertions, 1 deletions

diff --git a/chef/Gemfile.lock b/chef/Gemfile.lock
new file mode 100644
index 0000000000..f964f4676f
--- /dev/null
+++ b/chef/Gemfile.lock
@@ -0,0 +1,101 @@
+GIT
+  remote: git@github.com:opscode/dep-selector.git
+  revision: 53f0db868a66785db61e9f7431106cbbe59073b4
+  tag: rel-0.1.0
+  specs:
+    dep_selector (0.1.0)
+
+PATH
+  remote: .
+  specs:
+    chef (0.10.0)
+      bunny (>= 0.6.0)
+      erubis
+      highline
+      json (>= 1.4.4, <= 1.5.2)
+      mixlib-authentication (>= 1.1.0)
+      mixlib-cli (>= 1.1.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.3.0)
+      moneta
+      net-ssh (~> 2.1.3)
+      net-ssh-multi (~> 1.1.0)
+      ohai (>= 0.6.0)
+      rest-client (>= 1.0.4, < 1.7.0)
+      treetop (~> 1.4.9)
+      uuidtools
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bunny (0.8.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    highline (1.6.15)
+    i18n (0.6.1)
+    ipaddress (0.8.0)
+    json (1.5.2)
+    mime-types (1.21)
+    mixlib-authentication (1.3.0)
+      mixlib-log
+    mixlib-cli (1.3.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.4.1)
+    mixlib-shellout (1.1.0)
+    moneta (0.6.0)
+    multi_json (1.5.1)
+    net-ssh (2.1.4)
+    net-ssh-gateway (1.1.0)
+      net-ssh (>= 1.99.1)
+    net-ssh-multi (1.1)
+      net-ssh (>= 2.1.4)
+      net-ssh-gateway (>= 0.99.0)
+    ohai (6.16.0)
+      ipaddress
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      mixlib-shellout
+      systemu
+      yajl-ruby
+    polyglot (0.3.3)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    systemu (2.5.2)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    uuidtools (2.1.3)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  chef!
+  dep_selector!
+  ffi (= 1.0.9)
+  moneta (= 0.6.0)
+  rdp-ruby-wmi (= 0.3.1)
+  rspec
+  win32-api (= 1.4.8)
+  win32-dir (= 0.3.7)
+  win32-event (= 0.5.2)
+  win32-mutex (= 0.3.1)
+  win32-open3 (= 0.3.2)
+  win32-process (= 0.6.5)
+  win32-service (= 0.7.2)
+  windows-api (= 0.4.0)
+  windows-pr (= 1.2.1)
diff --git a/chef/lib/chef/json_compat.rb b/chef/lib/chef/json_compat.rb
index f9e669ba24..e7c0a0e676 100644
--- a/chef/lib/chef/json_compat.rb
+++ b/chef/lib/chef/json_compat.rb
@@ -36,6 +36,7 @@ class Chef
     CHEF_SANDBOX            = "Chef::Sandbox".freeze
     CHEF_RESOURCE           = "Chef::Resource".freeze
     CHEF_RESOURCECOLLECTION = "Chef::ResourceCollection".freeze
+    CHEF_WEBUIUSER          = "Chef::WebUIUser".freeze
 
     class <<self
       # See CHEF-1292/PL-538. Increase the max nesting for JSON, which defaults
@@ -116,11 +117,13 @@ class Chef
         when CHEF_ROLE
           Chef::Role
         when CHEF_SANDBOX
-          false
+          Chef::Sandbox
         when CHEF_RESOURCE
           Chef::Resource
         when CHEF_RESOURCECOLLECTION
           Chef::ResourceCollection
+        when CHEF_WEBUIUSER
+          Chef::WebUIUser
         when /^Chef::Resource/
           Chef::Resource.find_subclass_by_name(json_class)
         else