chef-server-api 0.10.4 → 0.10.6.beta.1

data/app/controllers/clients.rb

@@ -49,13 +49,13 @@ class Clients < Application
     exists = true 
     if params.has_key?(:inflated_object)
       params[:name] ||= params[:inflated_object].name
-      # We can only get here if we're admin or the validator. Only
-      # allow creating admin clients if we're already an admin.
-      if @auth_user.admin
-        params[:admin] ||= params[:inflated_object].admin
-      else
-        params[:admin] = false
-      end
+      params[:admin] ||= params[:inflated_object].admin
+    end
+
+    # We can only create clients if we're the admin or the validator.
+    # But only allow creating admin clients if we're already an admin.
+    if params[:admin] == true && @auth_user.admin != true
+      raise Forbidden, "You are not allowed to take this action."
     end
 
     begin

data/app/controllers/cookbooks.rb

@@ -139,10 +139,13 @@ class Cookbooks < Application
     checksum = params[:checksum]
     raise NotFound, "Cookbook #{cookbook_name} version #{cookbook_version} does not contain a file with checksum #{checksum}" unless cookbook.checksums.keys.include?(checksum)
 
-    filename = Chef::Checksum.new(checksum).file_location
-    raise InternalServerError, "File with checksum #{checksum} not found in the repository (this should not happen)" unless File.exists?(filename)
+    begin
+      filename = Chef::Checksum.new(checksum).storage.file_location
 
-    send_file(filename)
+      send_file(filename)
+    rescue Errno::ENOENT => e
+      raise InternalServerError, "File with checksum #{checksum} not found in the repository (this should not happen)"
+    end
   end
 
   def update

data/app/controllers/sandboxes.rb

@@ -103,9 +103,12 @@ class Sandboxes < Application
   def update
     # look up the sandbox by its guid
     existing_sandbox = Chef::Sandbox.cdb_load(params[:sandbox_id])
-    raise NotFound, "cannot find sandbox with guid #{sandbox_id}" unless existing_sandbox
+    raise NotFound, "cannot find sandbox with guid #{params[:sandbox_id]}" unless existing_sandbox
     
-    raise BadRequest, "cannot update sandbox #{sandbox_id}: already complete" if existing_sandbox.is_completed
+    if existing_sandbox.is_completed
+      Chef::Log.warn("Sandbox finalization: #{params[:sandbox_id]} is already complete, ignoring")
+      return display(existing_sandbox)
+    end
 
     if params[:is_completed]
       existing_sandbox.is_completed = (params[:is_completed] == true)

data/lib/chef-server-api/version.rb

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.10.4'
+  VERSION = '0.10.6.beta.1'
 end

data/spec/spec_model_helper.rb

@@ -53,6 +53,22 @@ def make_runlist(*items)
   res
 end
 
+def stub_checksum(checksum, present = true)
+  Chef::Checksum.should_receive(:new).with(checksum).and_return do
+    obj = stub(Chef::Checksum)
+    obj.should_receive(:storage).and_return do
+      storage = stub("storage")
+      if present
+        storage.should_receive(:file_location).and_return("/var/chef/checksums/#{checksum[0..1]}/#{checksum}")
+      else
+        storage.should_receive(:file_location).and_raise(Errno::ENOENT)
+      end
+      storage
+    end
+    obj
+  end
+end
+
 # Take an Array of cookbook_versions,
 # And return a hash like:
 # {

data/spec/unit/cookbooks_controller_spec.rb

@@ -21,7 +21,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_model_helper')
 require 'chef/node'
 require 'pp'
 
-describe "Coobkooks Controller" do
+describe "Cookbooks Controller" do
   before do
     Merb.logger.set_log(StringIO.new)
   end
@@ -51,6 +51,37 @@ describe "Coobkooks Controller" do
         expected['cookbook-a'] = {"url" => "#{root_url}/cookbooks/cookbook-a", "versions" => expected_cookbook_a_data}
         get_json('/cookbooks/cookbook-a').should == expected
       end
+
+      it "downloads a file from a cookbook" do
+        cookbook = make_cookbook("cookbook-a", "2.0.3")
+        cookbook.checksums["1234"] = nil
+        stub_checksum("1234")
+        Chef::CookbookVersion.should_receive(:cdb_load).with("cookbook-a", "2.0.3").and_return(cookbook)
+        expected = {}
+        expected_cookbook_a_data = @cookbook_a_versions.map {|v| {"url" => "#{root_url}/cookbooks/cookbook-a/#{v}", "version" => v}}.reverse
+        expected['cookbook-a'] = {"url" => "#{root_url}/cookbooks/cookbook-a", "versions" => expected_cookbook_a_data}
+        response = get("/cookbooks/cookbook-a/2.0.3/files/1234") do |controller|
+          stub_authentication(controller)
+          controller.should_receive(:send_file).with("/var/chef/checksums/12/1234").and_return("file-content")
+        end
+        response.status.should == 200
+        response.body.should == "file-content"
+      end
+
+      it "gets an error in case of missing file on download" do
+        cookbook = make_cookbook("cookbook-a", "2.0.3")
+        cookbook.checksums["1234"] = nil
+        stub_checksum("1234", false)
+        Chef::CookbookVersion.should_receive(:cdb_load).with("cookbook-a", "2.0.3").and_return(cookbook)
+        expected = {}
+        expected_cookbook_a_data = @cookbook_a_versions.map {|v| {"url" => "#{root_url}/cookbooks/cookbook-a/#{v}", "version" => v}}.reverse
+        expected['cookbook-a'] = {"url" => "#{root_url}/cookbooks/cookbook-a", "versions" => expected_cookbook_a_data}
+        lambda do
+          response = get("/cookbooks/cookbook-a/2.0.3/files/1234") do |controller|
+            stub_authentication(controller)
+          end
+        end.should raise_error(Merb::ControllerExceptions::InternalServerError, /File with checksum 1234 not found in the repository/)
+      end
     end
 
     describe "when handling requests from 0.9 clients" do

data/spec/unit/environments_controller_spec.rb

@@ -27,17 +27,21 @@ describe "Environments controller" do
 
     @env1 = make_environment("env1")
 
-    @filtered_cookbook_list_env1 = make_filtered_cookbook_hash(make_cookbook("cookbook1", "1.0.0"),
-                                                               make_cookbook("cookbook2", "1.0.0"))
+    @cookbook1_v1 = make_cookbook("cookbook1", "1.0.0")
+    @cookbook2_v1 = make_cookbook("cookbook2", "1.0.0")
+    @filtered_cookbook_list_env1 = make_filtered_cookbook_hash(@cookbook1_v1, @cookbook2_v1)
     @filtered_cookbook_list_env1["cookbook_noversions"] = Array.new
 
-    @filtered_cookbook_list_env2 = make_filtered_cookbook_hash(make_cookbook("cookbook1", "2.0.0"),
-                                                               make_cookbook("cookbook2", "2.0.0"))
+    @cookbook1_v2 = make_cookbook("cookbook1", "2.0.0")
+    @cookbook2_v2 = make_cookbook("cookbook2", "2.0.0")
+    @filtered_cookbook_list_env2 = make_filtered_cookbook_hash(@cookbook1_v2, @cookbook2_v2)
 
-    @filtered_cookbook_list_env_many_versions = make_filtered_cookbook_hash(make_cookbook("cookbook1", "1.0.0"),
-                                                                            make_cookbook("cookbook1", "2.0.0"),
-                                                                            make_cookbook("cookbook1", "3.0.0"),
-                                                                            make_cookbook("cookbook1", "4.0.0"))
+    @cookbook1_v3 = make_cookbook("cookbook1", "3.0.0")
+    @cookbook1_v4 = make_cookbook("cookbook1", "4.0.0")
+    @filtered_cookbook_list_env_many_versions = make_filtered_cookbook_hash(@cookbook1_v1,
+                                                                            @cookbook1_v2,
+                                                                            @cookbook1_v3,
+                                                                            @cookbook1_v4)
 
     @cookbook_deps_on_nosuch = make_cookbook("cookbook_deps_on_nosuch", "1.0.0")
     @cookbook_deps_on_nosuch.metadata.depends("cookbook_nosuch")
@@ -48,10 +52,10 @@ describe "Environments controller" do
 
   describe "when handling Environments API calls" do
     it "should expand the passed-in run_list using the correct environment: one run_list item" do
-
       # Env1 pins both versions at 1.0.0. Expect only the one we ask for, cookbook1,
       # back in the result.
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cookbook1_v1], nil).and_return([@cookbook1_v1])
       response = post_json("/environments/env1/cookbook_versions", {"run_list" => ["recipe[cookbook1]"]})
       response.should be_kind_of(Hash)
       response.keys.size.should == 1
@@ -62,7 +66,8 @@ describe "Environments controller" do
     it "should expect the passed-in run_list using the correct environment: two run_list items" do
       # Ask for both cookbook1 and cookbook2 back. Expect version 2.0.0 for
       # each, as those are what's appropriate for the environment.
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env2", nil).and_return(@filtered_cookbook_list_env2)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env2", nil).and_return(@filtered_cookbook_list_env2)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cookbook2_v2, @cookbook1_v2], nil).and_return([@cookbook2_v2, @cookbook1_v2])
       response = post_json("/environments/env2/cookbook_versions", {"run_list" => ["recipe[cookbook2]", "recipe[cookbook1]"]})
       response.should be_kind_of(Hash)
       response.keys.size.should == 2
@@ -73,7 +78,8 @@ describe "Environments controller" do
     end
 
     it "should return the newest version of a cookbook when given multiple versions" do
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_many_versions", nil).and_return(@filtered_cookbook_list_env_many_versions)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env_many_versions", nil).and_return(@filtered_cookbook_list_env_many_versions)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cookbook1_v4], nil).and_return([@cookbook1_v4])
       response = post_json("/environments/env_many_versions/cookbook_versions", {"run_list" => ["recipe[cookbook1]"]})
 
       response.should be_kind_of(Hash)
@@ -83,7 +89,8 @@ describe "Environments controller" do
     end
 
     it "should return the asked-for, older version of a cookbook if the version is specified in the run_list" do
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_many_versions", nil).and_return(@filtered_cookbook_list_env_many_versions)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env_many_versions", nil).and_return(@filtered_cookbook_list_env_many_versions)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cookbook1_v1], nil).and_return([@cookbook1_v1])
       response = post_json("/environments/env_many_versions/cookbook_versions", {"run_list" => ["recipe[cookbook1@1.0.0]"]})
 
       response.should be_kind_of(Hash)
@@ -93,7 +100,7 @@ describe "Environments controller" do
     end
 
     it "should report no_such_cookbook if given a dependency on a non-existant cookbook" do
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
       expected_error = {
         "message" => "Run list contains invalid items: no such cookbook cookbook_nosuch.",
         "non_existent_cookbooks" => ["cookbook_nosuch"],
@@ -106,7 +113,7 @@ describe "Environments controller" do
     end
 
     it "should report no_such_version if given a dependency on a cookbook that doesn't have any valid versions for an environment" do
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
       expected_error = {
         "message" => "Run list contains invalid items: no versions match the constraints on cookbook cookbook_noversions.",
         "non_existent_cookbooks" => [],
@@ -121,7 +128,7 @@ describe "Environments controller" do
     # TODO; have top-level cookbooks depend on other, non-existent cookbooks,
     # to get the other kind of exceptions.
     it "should report multiple failures (compound exceptions) if there is more than one error in dependencies" do
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
 
       expected_error = {
         "message" => "Run list contains invalid items: no such cookbooks cookbook_nosuch_1, cookbook_nosuch_2; no versions match the constraints on cookbook cookbook_noversions.",

data/spec/unit/nodes_controller_environments_spec.rb

@@ -50,9 +50,10 @@ describe "Nodes controller - environments and run_list expansion" do
     @role_containing_nosuch_cookbook = make_role("role_containing_nosuch_cookbook")
     @role_containing_nosuch_cookbook.env_run_lists({"_default" => make_runlist("recipe[cookbook_nosuch]")})
 
+    @cb_for_default = make_cookbook("cb_for_default", "1.0.0")
+    @cb_for_env1 = make_cookbook("cb_for_env1", "1.0.0")
     @all_filtered_cookbook_list = 
-      make_filtered_cookbook_hash(make_cookbook("cb_for_default", "1.0.0"),
-                                  make_cookbook("cb_for_env1", "1.0.0"))
+      make_filtered_cookbook_hash(@cb_for_default, @cb_for_env1)
   end
 
   describe "when handling Node API calls" do
@@ -60,7 +61,8 @@ describe "Nodes controller - environments and run_list expansion" do
       # Test that node@_default resolves to use cookbook cb_for_default
       Chef::Node.should_receive(:cdb_load).with("node1").and_return(@node1)
       Chef::Role.should_receive(:cdb_load).with("role1", nil).and_return(@role1)
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cb_for_default], nil).and_return([@cb_for_default])
 
       response = get_json("/nodes/node1/cookbooks")
       response.should be_kind_of(Hash)
@@ -73,7 +75,8 @@ describe "Nodes controller - environments and run_list expansion" do
       @node1.chef_environment("env1")
       Chef::Node.should_receive(:cdb_load).with("node1").and_return(@node1)
       Chef::Role.should_receive(:cdb_load).with("role1", nil).and_return(@role1)
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env1", nil).and_return(@all_filtered_cookbook_list)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cb_for_env1], nil).and_return([@cb_for_env1])
 
       response = get_json("/nodes/node1/cookbooks")
       response.should be_kind_of(Hash)
@@ -87,7 +90,8 @@ describe "Nodes controller - environments and run_list expansion" do
       @node1.chef_environment("env_fallback")
       Chef::Node.should_receive(:cdb_load).with("node1").and_return(@node1)
       Chef::Role.should_receive(:cdb_load).with("role1", nil).and_return(@role1)
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_fallback", nil).and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("env_fallback", nil).and_return(@all_filtered_cookbook_list)
+      Chef::MinimalCookbookVersion.should_receive(:load_full_versions_of).with([@cb_for_default], nil).and_return([@cb_for_default])
 
       response = get_json("/nodes/node1/cookbooks")
       response.should be_kind_of(Hash)
@@ -103,7 +107,7 @@ describe "Nodes controller - environments and run_list expansion" do
       }.to_json
 
       Chef::Node.should_receive(:cdb_load).with("node_containing_nosuch_cookbook").and_return(@node_containing_nosuch_cookbook)
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
 
       lambda {
         response = get_json("/nodes/node_containing_nosuch_cookbook/cookbooks")
@@ -120,7 +124,7 @@ describe "Nodes controller - environments and run_list expansion" do
 
       Chef::Node.should_receive(:cdb_load).with("node_containing_role_containing_nosuch_cookbook").and_return(@node_containing_role_containing_nosuch_cookbook)
       Chef::Role.should_receive(:cdb_load).with("role_containing_nosuch_cookbook", nil).and_return(@role_containing_nosuch_cookbook)
-      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_minimal_filtered_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
 
       lambda {
         response = get_json("/nodes/node_containing_role_containing_nosuch_cookbook/cookbooks")

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 4
-  version: 0.10.4
+  prerelease: 7
+  version: 0.10.6.beta.1
 platform: ruby
 authors: 
 - Opscode
@@ -15,158 +10,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-10-31 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: merb-core
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
-  version_requirements: *id001
-  name: merb-core
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: merb-assets
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
-  version_requirements: *id002
-  name: merb-assets
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: merb-helpers
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
-  version_requirements: *id003
-  name: merb-helpers
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: merb-param-protection
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
-  version_requirements: *id004
-  name: merb-param-protection
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: mixlib-authentication
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
         version: 1.1.3
-  version_requirements: *id005
-  name: mixlib-authentication
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: dep_selector
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
         version: 0.0.3
-  version_requirements: *id006
-  name: dep_selector
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
-    - - <=
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  version_requirements: *id007
-  name: json
   prerelease: false
-  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: uuidtools
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
         version: 2.1.1
-  version_requirements: *id008
-  name: uuidtools
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: thin
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id009
-  name: thin
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id008
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: chef@opscode.com
 executables: 
@@ -182,59 +116,60 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- config/environments/development.rb
 - config/init.rb
-- config/router.rb
 - config/rack.rb
-- config/environments/development.rb
+- config/router.rb
 - lib/chef-server-api/version.rb
 - lib/chef-server-api.rb
-- spec/unit/sandbox_file_spec.rb
-- spec/unit/nodes_controller_environments_spec.rb
-- spec/unit/environments_controller_spec.rb
-- spec/unit/cookbooks_controller_spec.rb
-- spec/unit/nodes_controller_spec.rb
-- spec/spec_helper.rb
 - spec/spec.opts
+- spec/spec_helper.rb
 - spec/spec_model_helper.rb
-- app/views/layout/application.html.erb
-- app/views/main/index.html.erb
-- app/views/exceptions/not_found.html.erb
-- app/views/exceptions/bad_request.json.erb
-- app/views/exceptions/internal_server_error.html.erb
-- app/views/exceptions/standard_error.html.erb
-- app/views/exceptions/not_acceptable.html.haml
-- app/controllers/search.rb
-- app/controllers/exceptions.rb
-- app/controllers/nodes.rb
+- spec/unit/cookbooks_controller_spec.rb
+- spec/unit/environments_controller_spec.rb
+- spec/unit/nodes_controller_environments_spec.rb
+- spec/unit/nodes_controller_spec.rb
+- spec/unit/sandbox_file_spec.rb
 - app/controllers/application.rb
+- app/controllers/clients.rb
+- app/controllers/cookbooks.rb
+- app/controllers/data_bags.rb
 - app/controllers/data_item.rb
+- app/controllers/environments.rb
+- app/controllers/exceptions.rb
 - app/controllers/main.rb
+- app/controllers/nodes.rb
 - app/controllers/roles.rb
-- app/controllers/users.rb
-- app/controllers/clients.rb
 - app/controllers/sandboxes.rb
-- app/controllers/environments.rb
-- app/controllers/data_bags.rb
-- app/controllers/cookbooks.rb
-- app/helpers/tarball_helper.rb
+- app/controllers/search.rb
+- app/controllers/users.rb
 - app/helpers/cookbook_version_helper.rb
+- app/helpers/tarball_helper.rb
 - app/models/sandbox_file.rb
+- app/views/exceptions/bad_request.json.erb
+- app/views/exceptions/internal_server_error.html.erb
+- app/views/exceptions/not_acceptable.html.haml
+- app/views/exceptions/not_found.html.erb
+- app/views/exceptions/standard_error.html.erb
+- app/views/layout/application.html.erb
+- app/views/main/index.html.erb
 - public/images/avatar.png
 - public/images/indicator.gif
 - public/images/merb.jpg
 - public/stylesheets/base.css
 - public/stylesheets/chef.css
+- public/stylesheets/themes/bec/style.css
+- public/stylesheets/themes/bec-green/style.css
+- public/stylesheets/themes/blue/style.css
 - public/stylesheets/themes/default/style.css
-- public/stylesheets/themes/kathleene/style.css
 - public/stylesheets/themes/djime-cerulean/style.css
-- public/stylesheets/themes/blue/style.css
-- public/stylesheets/themes/bec-green/style.css
-- public/stylesheets/themes/reidb-greenish/style.css
+- public/stylesheets/themes/kathleene/style.css
 - public/stylesheets/themes/orange/style.css
-- public/stylesheets/themes/bec/style.css
+- public/stylesheets/themes/reidb-greenish/style.css
 - bin/chef-server
 - config.ru
 - development.ru
+has_rdoc: true
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 
@@ -248,23 +183,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.