chef-server-api 0.10.0.beta.1 → 0.10.0.beta.2

data/Rakefile

@@ -18,6 +18,22 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
+begin
+  require 'rspec/core/rake_task'
+
+  desc "Run all specs in spec directory"
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = FileList['spec/unit/**/*_spec.rb']
+  end
+rescue LoadError
+  desc "Install rspec to run the specs"
+  task :spec do
+    abort "rspec is not available, (sudo) gem install rspec to run tests"
+  end
+end
+
+
+task :default => :spec
 desc "Install the gem"
 task :install => :package do
   sh %{gem install pkg/#{GEM_NAME}-#{ChefServerApi::VERSION} --no-rdoc --no-ri}

data/app/controllers/cookbooks.rb

@@ -41,13 +41,22 @@ class Cookbooks < Application
   include Chef::Mixin::Checksum
   include Merb::TarballHelper
 
+  def index
+    if request.env['HTTP_X_CHEF_VERSION'] =~ /0\.9/
+      index_09
+    else
+      index_010
+    end
+  end
+
+  # GET /cookbooks
   # returns data in the format of:
   # {"apache2" => {
   #     :url => "http://url",
   #     :versions => [{:url => "http://url/1.0.0", :version => "1.0.0"}, {:url => "http://url/0.0.1", :version=>"0.0.1"}]
   #   }
   # }
-  def index
+  def index_010
     cookbook_list = Chef::CookbookVersion.cdb_list
     # cookbook_list is in the format of {"apache2" => [0.0.1, 0.0.0]} where the version numbers are DepSelector::Version objects
     num_versions = num_versions!
@@ -58,6 +67,22 @@ class Cookbooks < Application
     })
   end
 
+  # GET /cookbooks
+  #
+  # returns data in the format of:
+  # {
+  #   "apache2" => "http://url/apache2",
+  #   "python" => "http://url/python"
+  # }
+  def index_09
+    cookbook_list = Chef::CookbookVersion.cdb_list_latest(false).keys.sort
+    response = Hash.new
+    cookbook_list.map! do |cookbook_name|
+      response[cookbook_name] = absolute_url(:cookbook, :cookbook_name => cookbook_name)
+    end
+    display response
+  end
+
   def index_recipes
     recipes_with_versions = Chef::CookbookVersion.cdb_list(true).inject({}) do|memo, f|
       memo[f.name] ||= {}
@@ -67,6 +92,14 @@ class Cookbooks < Application
     display recipes_with_versions
   end
 
+  def show_versions
+    if request.env['HTTP_X_CHEF_VERSION'] =~ /0\.9/
+      show_versions_09
+    else
+      show_versions_010
+    end
+  end
+
   # GET /cookbooks/:cookbook_name
   #
   # returns data in the format of:
@@ -75,7 +108,7 @@ class Cookbooks < Application
   #     :versions => [{:url => "http://url/1.0.0", :version => "1.0.0"}, {:url => "http://url/0.0.1", :version=>"0.0.1"}]
   #   }
   # }
-  def show_versions
+  def show_versions_010
     versions = Chef::CookbookVersion.cdb_by_name(cookbook_name)
     raise NotFound, "Cannot find a cookbook named #{cookbook_name}" unless versions && versions.size > 0
     num_versions = num_versions!("all")
@@ -83,6 +116,17 @@ class Cookbooks < Application
     display({ cookbook_name => expand_cookbook_urls(cookbook_name, cb_versions, num_versions) })
   end
 
+  # GET /cookbooks/:cookbook_name
+  #
+  # returns data in the format of:
+  # {"apache2" => ["1.0.0", "0.0.1"]}
+  def show_versions_09
+    versions = Chef::CookbookVersion.cdb_by_name(cookbook_name)
+    raise NotFound, "Cannot find a cookbook named #{requested_cookbook_name}" unless versions && versions.size > 0
+
+    display versions
+  end
+
   def show
     cookbook = get_cookbook_version(cookbook_name, cookbook_version)
     display cookbook.generate_manifest_with_urls { |opts| absolute_url(:cookbook_file, opts) }

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

@@ -1,3 +1,3 @@
 module ChefServerApi
-  VERSION = '0.10.0.beta.1'
+  VERSION = '0.10.0.beta.2'
 end

data/spec/spec_helper.rb

@@ -23,6 +23,8 @@ require "rspec"
 Merb.push_path(:spec_helpers, "spec" / "spec_helpers", "**/*.rb")
 Merb.push_path(:spec_fixtures, "spec" / "fixtures", "**/*.rb")
 
+$:.unshift(File.expand_path('../../app/', __FILE__))
+
 Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
 
 RSpec.configure do |config|

data/spec/unit/cookbooks_controller_spec.rb

@@ -0,0 +1,70 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_model_helper')
+require 'chef/node'
+require 'pp'
+
+describe "Coobkooks Controller" do
+  before do
+    Merb.logger.set_log(StringIO.new)
+  end
+
+  describe "when several versions of multiple cookbooks exist" do
+    before do
+      @cookbook_a_versions = (0...7).map { |i| "1.0.#{i}"}
+      @cookbook_b_versions = (0...3).map { |i| "2.0.#{i}" }
+      Chef::CookbookVersion.stub!(:cdb_list).and_return("cookbook-a" => @cookbook_a_versions, "cookbook-b" => @cookbook_b_versions)
+      Chef::CookbookVersion.stub!(:cdb_list_latest).and_return('cookbook-a' => '1.0.6', 'cookbook-b' => '2.0.2')
+      Chef::CookbookVersion.stub!(:cdb_by_name).with('cookbook-a').and_return("cookbook-a" => @cookbook_a_versions)
+    end
+
+    describe "when handling requests from 0.10 and newer clients" do
+      it "lists the latest version of all cookbooks" do
+        expected = {}
+        expected_cookbook_a_data = [ @cookbook_a_versions.map {|v| {"url" => "#{root_url}/cookbooks/cookbook-a/#{v}", "version" => v}}.last ]
+        expected['cookbook-a'] = {"url" => "#{root_url}/cookbooks/cookbook-a", "versions" =>  expected_cookbook_a_data}
+        expected_cookbook_b_data = [ @cookbook_b_versions.map {|v| {"url" => "#{root_url}/cookbooks/cookbook-b/#{v}", "version" => v}}.last ]
+        expected['cookbook-b'] = {"url" => "#{root_url}/cookbooks/cookbook-b", "versions" => expected_cookbook_b_data}
+        get_json('/cookbooks').should == expected
+      end
+
+      it "shows the versions of a cookbook" do
+        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}
+        get_json('/cookbooks/cookbook-a').should == expected
+      end
+    end
+
+    describe "when handling requests from 0.9 clients" do
+      it "lists the latest versions of cookbooks by URL" do
+        expected = {}
+        expected['cookbook-a'] = "#{root_url}/cookbooks/cookbook-a"
+        expected['cookbook-b'] = "#{root_url}/cookbooks/cookbook-b"
+        get_json('/cookbooks', {}, {'HTTP_X_CHEF_VERSION' => '0.9.14'} ).should == expected
+      end
+
+      it "shows the versions of a cookbook by URL" do
+        expected = {'cookbook-a' => @cookbook_a_versions}
+        get_json('/cookbooks/cookbook-a', {}, {'HTTP_X_CHEF_VERSION' => '0.9.14'}).should == expected
+      end
+    end
+  end
+end

data/spec/unit/environments_controller_spec.rb

@@ -26,7 +26,7 @@ describe "Environments controller" do
     Merb.logger.set_log(StringIO.new)
 
     @env1 = make_environment("env1")
-    
+
     @filtered_cookbook_list_env1 = make_filtered_cookbook_hash(make_cookbook("cookbook1", "1.0.0"),
                                                                make_cookbook("cookbook2", "1.0.0"))
     @filtered_cookbook_list_env1["cookbook_noversions"] = Array.new
@@ -51,7 +51,7 @@ describe "Environments controller" 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").and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@filtered_cookbook_list_env1)
       response = post_json("/environments/env1/cookbook_versions", {"run_list" => ["recipe[cookbook1]"]})
       response.should be_kind_of(Hash)
       response.keys.size.should == 1
@@ -62,7 +62,7 @@ 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").and_return(@filtered_cookbook_list_env2)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env2", nil).and_return(@filtered_cookbook_list_env2)
       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 +73,7 @@ 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").and_return(@filtered_cookbook_list_env_many_versions)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_many_versions", nil).and_return(@filtered_cookbook_list_env_many_versions)
       response = post_json("/environments/env_many_versions/cookbook_versions", {"run_list" => ["recipe[cookbook1]"]})
 
       response.should be_kind_of(Hash)
@@ -83,7 +83,7 @@ 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").and_return(@filtered_cookbook_list_env_many_versions)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_many_versions", nil).and_return(@filtered_cookbook_list_env_many_versions)
       response = post_json("/environments/env_many_versions/cookbook_versions", {"run_list" => ["recipe[cookbook1@1.0.0]"]})
 
       response.should be_kind_of(Hash)
@@ -93,7 +93,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").and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_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 +106,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").and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_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 +121,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").and_return(@filtered_cookbook_list_env1)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_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.",
@@ -130,7 +130,7 @@ describe "Environments controller" do
       }.to_json
 
       lambda {
-        response = post_json("/environments/env1/cookbook_versions", 
+        response = post_json("/environments/env1/cookbook_versions",
                              {"run_list" => ["recipe[cookbook_nosuch_1]", "recipe[cookbook_nosuch_2]", "recipe[cookbook_noversions]"]})
       }.should raise_error(Merb::ControllerExceptions::PreconditionFailed, expected_error)
     end

data/spec/unit/nodes_controller_environments_spec.rb

@@ -60,7 +60,7 @@ 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").and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
 
       response = get_json("/nodes/node1/cookbooks")
       response.should be_kind_of(Hash)
@@ -73,7 +73,7 @@ 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").and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env1", nil).and_return(@all_filtered_cookbook_list)
 
       response = get_json("/nodes/node1/cookbooks")
       response.should be_kind_of(Hash)
@@ -87,7 +87,7 @@ 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").and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("env_fallback", nil).and_return(@all_filtered_cookbook_list)
 
       response = get_json("/nodes/node1/cookbooks")
       response.should be_kind_of(Hash)
@@ -103,7 +103,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").and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
 
       lambda {
         response = get_json("/nodes/node_containing_nosuch_cookbook/cookbooks")
@@ -120,7 +120,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").and_return(@all_filtered_cookbook_list)
+      Chef::Environment.should_receive(:cdb_load_filtered_cookbook_versions).with("_default", nil).and_return(@all_filtered_cookbook_list)
 
       lambda {
         response = get_json("/nodes/node_containing_role_containing_nosuch_cookbook/cookbooks")

data/spec/unit/nodes_controller_spec.rb

@@ -34,7 +34,7 @@ describe "Nodes controller" do
       res = get_json("/nodes")
 
       expected_response = returned_node_list.inject({}) do |res,node_name|
-        res[node_name] = "#{root_url}/#{node_name}"
+        res[node_name] = "#{root_url}/nodes/#{node_name}"
         res
       end
       res.should == expected_response

metadata

@@ -2,7 +2,7 @@
 name: chef-server-api
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.1
+  version: 0.10.0.beta.2
 platform: ruby
 authors: 
 - Opscode
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,6 +150,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec_model_helper.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