chef-server-api 0.9.8 → 0.9.10.rc.0

data/Rakefile

@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency "mixlib-authentication", '>= 1.1.3'
 
-  s.add_dependency "json", "<= 1.4.2"
+  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
 
   s.add_dependency "uuidtools", "~> 2.1.1"
 

data/app/controllers/cookbooks.rb

@@ -48,13 +48,11 @@ class Cookbooks < Application
     display response
   end
 
-  #FIXME: this is different from the rest of the API, but in a useful way...
   def index_latest
     cookbook_list = Chef::CookbookVersion.cdb_list_latest(true)
-    response = Hash.new
-    cookbook_list.map! do |cookbook_name, cookbook_version|
-      response[cookbook_name]={ :url=>absolute_url(:cookbook, :cookbook_name => cookbook_name, :cookbook_version => cookbook_version),
-                                :cookbook_name => cookbook_name, :cookbook_version=>cookbook_version}
+    response = cookbook_list.inject({}) do |res, cv|
+      res[cv.name] = absolute_url(:cookbook_version, :cookbook_name => cv.name, :cookbook_version => cv.version)
+      res
     end
     display response
   end
@@ -86,7 +84,7 @@ 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 = checksum_location(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)
 
     send_file(filename)
@@ -140,7 +138,11 @@ class Cookbooks < Application
       raise NotFound, "Cannot find a cookbook named #{cookbook_name} with version #{cookbook_version}"
     end
 
-    display cookbook.cdb_destroy
+    if params["purge"] == "true"
+      display cookbook.purge
+    else
+      display cookbook.cdb_destroy
+    end
   end
 
   private

data/app/controllers/nodes.rb

@@ -97,7 +97,12 @@ class Nodes < Application
   private
 
   def load_all_files(node_name)
-    all_cookbooks = Chef::CookbookVersion.cdb_list(true).inject({}) {|hsh,record| hsh[record.name] = record ; hsh}
+    all_cookbooks = Chef::CookbookVersion.cdb_list(true).inject({}) do |res, cookbook|
+      version            = Gem::Version.new cookbook.version
+      newest_version     = res.has_key?(cookbook.name) ? version > Gem::Version.new(res[cookbook.name].version) : true
+      res[cookbook.name] = cookbook if newest_version
+      res
+    end
 
     included_cookbooks = cookbooks_for_node(node_name, all_cookbooks)
     nodes_cookbooks = Hash.new

data/app/controllers/sandboxes.rb

@@ -125,21 +125,13 @@ class Sandboxes < Application
         # we will undo the successful steps that came before it
         begin
           undo_steps = Array.new
-          existing_sandbox.checksums.each do |checksum|
-            checksum_filename_in_sandbox = sandbox_checksum_location(existing_sandbox.guid, checksum)
-            checksum_filename_final = checksum_location(checksum)
-            FileUtils.mkdir_p File.dirname(checksum_filename_final)
-            
-            Chef::Log.info("sandbox finalization: move #{checksum_filename_in_sandbox} to #{checksum_filename_final}")
-            File.rename(checksum_filename_in_sandbox, checksum_filename_final)
-            
-            # mark the checksum as successfully updated
-            Chef::Checksum.new(checksum).cdb_save
+          existing_sandbox.checksums.each do |file_checksum|
+            checksum_filename_in_sandbox = sandbox_checksum_location(existing_sandbox.guid, file_checksum)
+            checksum = Chef::Checksum.new(file_checksum)
+
+            checksum.commit_sandbox_file(checksum_filename_in_sandbox)
             
-            undo_steps << proc {
-              Chef::Log.warn("sandbox finalization undo: moving #{checksum_filename_final} back to #{checksum_filename_in_sandbox}")
-              File.rename(checksum_filename_final, checksum_filename_in_sandbox)
-            }
+            undo_steps << proc { checksum.revert_sandbox_file_commit }
           end
         rescue
           # undo the successful moves we did before

data/app/helpers/tarball_helper.rb

@@ -42,14 +42,6 @@ module Merb
       File.join(sandbox_location(sandbox_guid), checksum)
     end
 
-    def checksum_base
-      Chef::Config.checksum_path
-    end
-    
-    def checksum_location(checksum)
-      File.join(checksum_base, checksum[0..1], checksum)
-    end
-    
     def cookbook_base
       [Chef::Config.cookbook_path].flatten.first
     end

data/app/models/sandbox_file.rb

@@ -18,7 +18,7 @@
 
 require 'chef/sandbox'
 require 'chef/exceptions'
-require 'chef/cache/checksum'
+require 'chef/checksum_cache'
 
 module ChefServerApi
   class SandboxFile
@@ -57,7 +57,7 @@ module ChefServerApi
     def actual_checksum
       @actual_checksum ||= begin
         @input.rewind
-        Chef::Cache::Checksum.instance.generate_md5_checksum(@input)
+        Chef::ChecksumCache.instance.generate_md5_checksum(@input)
       end
     end
 

data/bin/chef-server

@@ -79,4 +79,13 @@ end
 Chef::Log.init(Chef::Config[:log_location])
 Chef::Log.level = Chef::Config[:log_level]
 
-Merb.start
+begin
+  Merb.start
+rescue RuntimeError => e
+  if e.message =~ /no acceptor/
+    Chef::Log.fatal("Another process is already listening on port #{Merb::Config[:port]}. Is chef-server already running?")
+    exit 127
+  else
+    raise
+  end
+end

data/config/router.rb

@@ -50,6 +50,8 @@ Merb::Router.prepare do
         :method => 'get'
         ).to(:controller => "cookbooks", :action => "index")
 
+  match("/cookbooks/_latest", :method=>'get').to(:controller=>'cookbooks',:action=>'index_latest')
+
   match("/cookbooks/_recipes", :method=>'get').to(:controller=>'cookbooks',:action=>'index_recipes')
 
   match("/cookbooks/:cookbook_name/:cookbook_version",
@@ -62,7 +64,7 @@ Merb::Router.prepare do
         :method => 'get',
         :cookbook_name => /[\w\.]+/,
         :cookbook_version => /(\d+\.\d+\.\d+|_latest)/
-        ).to(:controller => "cookbooks", :action => "show")
+        ).to(:controller => "cookbooks", :action => "show").name(:cookbook_version)
 
   match("/cookbooks/:cookbook_name/:cookbook_version",
         :method => 'delete',

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

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.9.8'
+  VERSION = '0.9.10.rc.0'
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-api
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 10
+  - rc
+  - 0
+  version: 0.9.10.rc.0
 platform: ruby
 authors: 
 - Opscode
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,13 +99,20 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 4
+        version: 1.4.4
     - - <=
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 4
-        - 2
-        version: 1.4.2
+        - 6
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -216,11 +225,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: