return all cookbooks available for an environment

Author: sdelano

chef-server-api/app/controllers/environments.rb

@@ -93,7 +93,14 @@ def list_cookbooks
     rescue Chef::Exceptions::CouchDBNotFound
       raise NotFound, "Cannot load environment #{params[:environment_id]}"
     end
-    display(filtered_cookbooks.inject({}) {|res, (k,v)| res[v.name] = absolute_url(:cookbook_version, :cookbook_name=>v.name, :cookbook_version=>v.version); res})
+    display(filtered_cookbooks.inject({}) {|res, (cookbook_name,versions)|
+      # TODO:
+      # For now, we are only displaying the last cookbook in the sorted list (the newest version).
+      # We should display every cookbook version that is available in a given environment
+      # [stephen 9/2/10]
+      res[cookbook_name] = absolute_url(:cookbook_version, :cookbook_name=>cookbook_name, :cookbook_version=>versions.last.version)
+      res
+    })
   end
 
   # GET /environments/:environment_id/nodes

chef/lib/chef/cookbook_version.rb

@@ -823,6 +823,11 @@ def couchdb_id=(value)
       @index_id = value
     end
 
+    def <=>(o)
+      raise Chef::Exceptions::CookbookVersionNameMismatch if self.name != o.name
+      Gem::Version.new(self.version) <=> Gem::Version.new(o.version)
+    end
+
     private
 
     # For each filename, produce a mapping of base filename (i.e. recipe name

chef/lib/chef/environment.rb

@@ -210,21 +210,30 @@ def self.create_design_document(couchdb=nil)
       (couchdb || Chef::CouchDB.new).create_design_document("environments", DESIGN_DOCUMENT)
     end
 
+    # Loads the set of Chef::CookbookVersion objects available to a given environment
+    # === Returns
+    # Hash
+    # i.e.
+    # {
+    #   "coobook_name" => [ Chef::CookbookVersion ... ] ## the array of CookbookVersions is sorted lowest to highest
+    # }
     def self.cdb_load_filtered_cookbook_versions(name, couchdb=nil)
       cvs = begin
               Chef::Environment.cdb_load(name, couchdb).cookbook_versions.inject({}) {|res, (k,v)| res[k] = Gem::Requirement.new(v); res}
             rescue Chef::Exceptions::CouchDBNotFound => e
               raise e
             end
 
-      # inject all cookbooks into the hash while filtering out restricted versions
-      Chef::CookbookVersion.cdb_list(true, couchdb).inject({}) do |res, cookbook|
+      # inject all cookbooks into the hash while filtering out restricted versions, then sort the individual arrays
+      Chef::CookbookVersion.cdb_list(true, couchdb).inject({}) {|res, cookbook|
         version               = Gem::Version.new(cookbook.version)
         requirement_satisfied = cvs.has_key?(cookbook.name) ? cvs[cookbook.name].satisfied_by?(version) : true
-        newest_version        = res.has_key?(cookbook.name) ? version > Gem::Version.new(res[cookbook.name].version) : true
-        res[cookbook.name]    = cookbook if requirement_satisfied && newest_version
+        res[cookbook.name]    = (res[cookbook.name] || []) << cookbook if requirement_satisfied
         res
-      end
+      }.inject({}) {|res, (cookbook_name, versions)|
+        res[cookbook_name] = versions.sort
+        res
+      }
     end
 
     def to_s

chef/spec/unit/cookbook_version_spec.rb

@@ -263,5 +263,23 @@
 
   end
 
+  describe "<=>" do
+    it "should sort based on the version number" do
+      one = Chef::CookbookVersion.new("apt")
+      one.version = "1.0"
+      two = Chef::CookbookVersion.new("apt")
+      two.version = "2.0"
+      (one <=> two).should == -1
+      (two <=> one).should == 1
+    end
+
+    it "should not allow you to sort cookbooks with different names" do
+      apt = Chef::CookbookVersion.new "apt"
+      apt.version = "1.0"
+      god = Chef::CookbookVersion.new "god"
+      god.version = "2.0"
+      lambda {apt <=> god}.should raise_error(Chef::Exceptions::CookbookVersionNameMismatch)
+    end
+  end
 
 end

chef/spec/unit/environment_spec.rb

@@ -248,9 +248,9 @@
 
     it "should restrict the cookbook versions, as specified in the environment" do
       res = Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      res["apt"].version.should == "1.0.0"
-      res["apache2"].version.should == "2.0.0"
-      res["god"].version.should == "4.2.0"
+      res["apt"].detect {|cb| cb.version == "1.0.0"}.should_not == nil
+      res["apache2"].detect {|cb| cb.version == "2.0.0"}.should_not == nil
+      res["god"].detect {|cb| cb.version == "4.2.0"}.should_not == nil
     end
 
     it "should produce correct results, regardless of the cookbook order in couch" do
@@ -263,9 +263,16 @@
         cv
       end
       res = Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
-      res["apt"].version.should == "1.0.0"
-      res["apache2"].version.should == "2.0.0"
-      res["god"].version.should == "4.2.0"
+      res["apt"].detect {|cb| cb.version == "1.0.0"}.should_not == nil
+      res["apache2"].detect {|cb| cb.version == "2.0.0"}.should_not == nil
+      res["god"].detect {|cb| cb.version == "4.2.0"}.should_not == nil
+    end
+
+    it "should return all versions of a cookbook that meet the version requirement" do
+      @environment.cookbook "apt", ">= 1.0.0"
+      res = Chef::Environment.cdb_load_filtered_cookbook_versions("prod")
+      res["apt"].detect {|cb| cb.version == "1.0.0"}.should_not == nil
+      res["apt"].detect {|cb| cb.version == "1.1.0"}.should_not == nil
     end
   end