chef-server-api 0.10.8 → 0.10.10.beta.1

data/app/controllers/cookbooks.rb

@@ -162,13 +162,17 @@ class Cookbooks < Application
     begin
       cookbook = Chef::CookbookVersion.cdb_load(cookbook_name, cookbook_version)
       cookbook.manifest = params['inflated_object'].manifest
+      new_cookbook = false
     rescue Chef::Exceptions::CouchDBNotFound => e
       Chef::Log.debug("Cookbook #{cookbook_name} version #{cookbook_version} does not exist")
       cookbook = params['inflated_object']
+      new_cookbook = true
     end
 
-    if cookbook.frozen_version? && params[:force].nil?
-      raise Conflict, "The cookbook #{cookbook.name} at version #{cookbook.version} is frozen. Use the 'force' option to override."
+    unless new_cookbook
+      if cookbook.frozen_version? && params[:force].nil?
+        raise Conflict, "The cookbook #{cookbook.name} at version #{cookbook.version} is frozen. Use the 'force' option to override."
+      end
     end
 
     cookbook.freeze_version if params["inflated_object"].frozen_version?

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

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.10.8'
+  VERSION = '0.10.10.beta.1'
 end

data/spec/spec_helper.rb

@@ -49,6 +49,19 @@ def post_json(path, post_body, env = {}, &block)
   end
 end
 
+def put_json(path, put_body, env = {}, &block)
+  request_json("PUT", path, {}, env) do |controller|
+    # Merb FakeRequest allows me no way to pass JSON across the
+    # FakeRequest/StringIO boundary, so we hack it here.
+    if put_body.is_a?(Hash)
+      controller.params.merge!(put_body)
+    else
+      controller.params['inflated_object'] = put_body
+    end
+    block.call if block
+  end
+end
+
 # Make an HTTP call of <method>, assign the accept header to
 # application/json, and return the JSON-parsed output.
 #

data/spec/unit/cookbooks_controller_spec.rb

@@ -98,4 +98,48 @@ describe "Cookbooks Controller" do
       end
     end
   end
+
+  describe "when uploading a cookbook" do
+    before do
+      @cookbook = make_cookbook("cookbook1", "1.0.0")
+    end
+
+    describe "and the cookbook is new" do
+      it "should upload a standard cookbook" do
+        Chef::CookbookVersion.stub!(:cdb_load).and_raise(Chef::Exceptions::CouchDBNotFound)
+        @cookbook.should_receive(:cdb_save).and_return(true)
+        response = put_json("/cookbooks/#{@cookbook.name}/#{@cookbook.version}", @cookbook)
+      end
+
+      it "should upload a frozen cookbook" do
+        @cookbook.freeze_version
+        Chef::CookbookVersion.stub!(:cdb_load).and_raise(Chef::Exceptions::CouchDBNotFound)
+        @cookbook.should_receive(:cdb_save).and_return(true)
+        response = put_json("/#{@cookbook.save_url}", @cookbook)
+      end
+    end
+
+    describe "and the cookbook already exists" do
+      it "should overwrite the existing version" do
+        Chef::CookbookVersion.stub!(:cdb_load).and_return(@cookbook)
+        @cookbook.should_receive(:cdb_save).and_return(true)
+        response = put_json("/#{@cookbook.save_url}", @cookbook)
+      end
+
+      it "should not overwrite a frozen version" do
+        @cookbook.freeze_version
+        Chef::CookbookVersion.stub!(:cdb_load).and_return(@cookbook)
+        lambda do
+          put_json("/#{@cookbook.save_url}", @cookbook)
+        end.should raise_error(Merb::ControllerExceptions::Conflict, /The cookbook (\S+) at version (\S+) is frozen/)
+      end
+
+      it "should overwrite a frozen version if forced" do
+        @cookbook.freeze_version
+        Chef::CookbookVersion.stub!(:cdb_load).and_return(@cookbook)
+        @cookbook.should_receive(:cdb_save).and_return(true)
+        response = put_json("/#{@cookbook.force_save_url}", @cookbook)
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 8
-  version: 0.10.8
+  prerelease: 8
+  version: 0.10.10.beta.1
 platform: ruby
 authors: 
 - Opscode
@@ -15,134 +10,96 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 Z
+date: 2012-04-06 00:00:00 Z
 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
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  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: *id007
-  name: uuidtools
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: thin
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  version_requirements: *id008
-  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: 
@@ -224,19 +181,13 @@ 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: