chef-server-api 0.9.0.b01 → 0.9.0.b02

data/app/controllers/cookbooks.rb

@@ -48,7 +48,7 @@ class Cookbooks < Application
     display response
   end
 
-  #FIXME: this is different from the rest of our API, but in a useful way...
+  #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
@@ -59,7 +59,7 @@ class Cookbooks < Application
     display response
   end
 
-  def index_recipes #FIXME: is this cool to do w/ access control on platform?
+  def index_recipes
     all_cookbooks = Array(Chef::CookbookVersion.cdb_list_latest(true))
     all_cookbooks.map! do |cookbook|
       cookbook.manifest["recipes"].map { |r| "#{cookbook.name}::#{r['name']}" }
@@ -146,10 +146,14 @@ class Cookbooks < Application
   private
 
   def get_cookbook_version(name, version)
-    begin
-      Chef::CookbookVersion.cdb_load(name, version)
-    rescue Chef::Exceptions::CouchDBNotFound => e
+    Chef::CookbookVersion.cdb_load(name, version)
+  rescue Chef::Exceptions::CouchDBNotFound => e
+    raise NotFound, "Cannot find a cookbook named #{name} with version #{version}"
+  rescue Net::HTTPServerException => e
+    if e.to_s =~ /^404/
       raise NotFound, "Cannot find a cookbook named #{name} with version #{version}"
+    else
+      raise
     end
   end
   

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

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.9.0.b01'
+  VERSION = '0.9.0.b02'
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - b01
-  version: 0.9.0.b01
+  - b02
+  version: 0.9.0.b02
 platform: ruby
 authors: 
 - Opscode
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency