chef 12.0.0.alpha.0-x86-mingw32 → 12.0.0.alpha.1-x86-mingw32

data/lib/chef/cookbook/metadata.rb

@@ -18,12 +18,14 @@
 # limitations under the License.
 #
 
+require 'chef/exceptions'
 require 'chef/mash'
 require 'chef/mixin/from_file'
 require 'chef/mixin/params_validate'
 require 'chef/log'
 require 'chef/version_class'
 require 'chef/version_constraint'
+require 'chef/json_compat'
 
 class Chef
   class Cookbook
@@ -66,18 +68,17 @@ class Chef
       include Chef::Mixin::ParamsValidate
       include Chef::Mixin::FromFile
 
-      attr_reader   :cookbook,
-                    :platforms,
-                    :dependencies,
-                    :recommendations,
-                    :suggestions,
-                    :conflicting,
-                    :providing,
-                    :replacing,
-                    :attributes,
-                    :groupings,
-                    :recipes,
-                    :version
+      attr_reader :platforms
+      attr_reader :dependencies
+      attr_reader :recommendations
+      attr_reader :suggestions
+      attr_reader :conflicting
+      attr_reader :providing
+      attr_reader :replacing
+      attr_reader :attributes
+      attr_reader :groupings
+      attr_reader :recipes
+      attr_reader :version
 
       # Builds a new Chef::Cookbook::Metadata object.
       #
@@ -89,14 +90,16 @@ class Chef
       #
       # === Returns
       # metadata<Chef::Cookbook::Metadata>
-      def initialize(cookbook=nil, maintainer='YOUR_COMPANY_NAME', maintainer_email='YOUR_EMAIL', license='none')
-        @cookbook = cookbook
-        @name = cookbook ? cookbook.name : ""
-        @long_description = ""
-        self.maintainer(maintainer)
-        self.maintainer_email(maintainer_email)
-        self.license(license)
-        self.description('A fabulous new cookbook')
+      def initialize
+        @name =  nil
+
+        @description = ''
+        @long_description = ''
+        @license = 'All rights reserved'
+
+        @maintainer = nil
+        @maintainer_email = nil
+
         @platforms = Mash.new
         @dependencies = Mash.new
         @recommendations = Mash.new
@@ -107,15 +110,9 @@ class Chef
         @attributes = Mash.new
         @groupings = Mash.new
         @recipes = Mash.new
-        @version = Version.new "0.0.0"
-        if cookbook
-          @recipes = cookbook.fully_qualified_recipe_names.inject({}) do |r, e|
-            e = self.name.to_s if e =~ /::default$/
-            r[e] ||= ""
-            self.provides e
-            r
-          end
-        end
+        @version = Version.new("0.0.0")
+
+        @errors = []
       end
 
       def ==(other)
@@ -124,6 +121,32 @@ class Chef
         end
       end
 
+      # Whether this metadata is valid. In order to be valid, all required
+      # fields must be set. Chef's validation implementation checks the content
+      # of a given field when setting (and raises an error if the content does
+      # not meet the criteria), so the content of the fields is not considered
+      # when checking validity.
+      #
+      # === Returns
+      # valid<Boolean>:: Whether this metadata object is valid
+      def valid?
+        run_validation
+        @errors.empty?
+      end
+
+      # A list of validation errors for this metadata object. See #valid? for
+      # comments about the validation criteria.
+      #
+      # If there are any validation errors, one or more error strings will be
+      # returned. Otherwise an empty array is returned.
+      #
+      # === Returns
+      # error messages<Array>:: Whether this metadata object is valid
+      def errors
+        run_validation
+        @errors
+      end
+
       # Sets the cookbooks maintainer, or returns it.
       #
       # === Parameters
@@ -242,8 +265,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def supports(platform, *version_args)
         version = new_args_format(:supports, platform, version_args)
-        normalized_version = normalize_version_constraint(:supports, platform, version)
-        @platforms[platform] = normalized_version
+        constraint = validate_version_constraint(:supports, platform, version)
+        @platforms[platform] = constraint.to_s
         @platforms[platform]
       end
 
@@ -259,8 +282,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def depends(cookbook, *version_args)
         version = new_args_format(:depends, cookbook, version_args)
-        normalized_version = normalize_version_constraint(:depends, cookbook, version)
-        @dependencies[cookbook] = normalized_version
+        constraint = validate_version_constraint(:depends, cookbook, version)
+        @dependencies[cookbook] = constraint.to_s
         @dependencies[cookbook]
       end
 
@@ -276,8 +299,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def recommends(cookbook, *version_args)
         version = new_args_format(:recommends, cookbook,  version_args)
-        normalized_version = normalize_version_constraint(:recommends, cookbook, version)
-        @recommendations[cookbook] = normalized_version
+        constraint = validate_version_constraint(:recommends, cookbook, version)
+        @recommendations[cookbook] = constraint.to_s
         @recommendations[cookbook]
       end
 
@@ -293,8 +316,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def suggests(cookbook, *version_args)
         version = new_args_format(:suggests, cookbook, version_args)
-        normalized_version = normalize_version_constraint(:suggests, cookbook, version)
-        @suggestions[cookbook] = normalized_version
+        constraint = validate_version_constraint(:suggests, cookbook, version)
+        @suggestions[cookbook] = constraint.to_s
         @suggestions[cookbook]
       end
 
@@ -310,8 +333,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def conflicts(cookbook, *version_args)
         version = new_args_format(:conflicts, cookbook, version_args)
-        normalized_version = normalize_version_constraint(:conflicts, cookbook, version)
-        @conflicting[cookbook] = normalized_version
+        constraint = validate_version_constraint(:conflicts, cookbook, version)
+        @conflicting[cookbook] = constraint.to_s
         @conflicting[cookbook]
       end
 
@@ -331,8 +354,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def provides(cookbook, *version_args)
         version = new_args_format(:provides, cookbook, version_args)
-        normalized_version = normalize_version_constraint(:provides, cookbook, version)
-        @providing[cookbook] = normalized_version
+        constraint = validate_version_constraint(:provides, cookbook, version)
+        @providing[cookbook] = constraint.to_s
         @providing[cookbook]
       end
 
@@ -347,8 +370,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def replaces(cookbook, *version_args)
         version = new_args_format(:replaces, cookbook, version_args)
-        normalized_version = normalize_version_constraint(:replaces, cookbook, version)
-        @replacing[cookbook] = normalized_version
+        constraint = validate_version_constraint(:replaces, cookbook, version)
+        @replacing[cookbook] = constraint.to_s
         @replacing[cookbook]
       end
 
@@ -364,6 +387,32 @@ class Chef
         @recipes[name] = description
       end
 
+      # Sets the cookbook's recipes to the list of recipes in the given
+      # +cookbook+. Any recipe that already has a description (if set by the
+      # #recipe method) will not be updated.
+      #
+      # === Parameters
+      # cookbook<CookbookVersion>:: CookbookVersion object representing the cookbook
+      # description<String>:: The description of the recipe
+      #
+      # === Returns
+      # recipe_unqualified_names<Array>:: An array of the recipe names given by the cookbook
+      def recipes_from_cookbook_version(cookbook)
+        cookbook.fully_qualified_recipe_names.map do |recipe_name|
+          unqualified_name =
+            if recipe_name =~ /::default$/
+              self.name.to_s
+            else
+              recipe_name
+            end
+
+          @recipes[unqualified_name] ||= ""
+          provides(unqualified_name)
+
+          unqualified_name
+        end
+      end
+
       # Adds an attribute )hat a user needs to configure for this cookbook. Takes
       # a name (with the / notation for a nested attribute), followed by any of
       # these options
@@ -441,7 +490,7 @@ class Chef
       end
 
       def to_json(*a)
-        self.to_hash.to_json(*a)
+        Chef::JSONCompat.to_json(to_hash, *a)
       end
 
       def self.from_hash(o)
@@ -479,9 +528,9 @@ class Chef
       def self.validate_json(json_str)
         o = Chef::JSONCompat.from_json(json_str)
         metadata = new()
-        VERSION_CONSTRAINTS.each do |method_name, hash_key|
-          if constraints = o[hash_key]
-           constraints.each do |cb_name, constraints|
+        VERSION_CONSTRAINTS.each do |dependency_type, hash_key|
+          if dependency_group = o[hash_key]
+           dependency_group.each do |cb_name, constraints|
              metadata.send(method_name, cb_name, *Array(constraints))
            end
           end
@@ -496,6 +545,12 @@ class Chef
 
     private
 
+      def run_validation
+        if name.nil?
+          @errors = ["The `name' attribute is required in cookbook metadata"]
+        end
+      end
+
       def new_args_format(caller_name, dep_name, version_constraints)
         if version_constraints.empty?
           ">= 0.0.0"
@@ -533,11 +588,6 @@ INVALID
         raise Exceptions::InvalidVersionConstraint, msg
       end
 
-      def normalize_version_constraint(caller_name, dep_name, constraint_str)
-        version_constraint = validate_version_constraint(caller_name, dep_name, constraint_str)
-        "#{version_constraint.op} #{version_constraint.raw_version}"
-      end
-
       # Verify that the given array is an array of strings
       #
       # Raise an exception if the members of the array are not Strings
@@ -656,6 +706,5 @@ INVALID
       end
     end
 
-
   end
 end

data/lib/chef/cookbook/syntax_check.rb

@@ -125,7 +125,7 @@ class Chef
       end
 
       def template_files
-        remove_ignored_files Dir[File.join(cookbook_path, '**', '*.erb')]
+        remove_ignored_files Dir[File.join(cookbook_path, '**/templates/**', '*.erb')]
       end
 
       def untested_template_files

data/lib/chef/cookbook_loader.rb

@@ -50,6 +50,9 @@ class Chef
         repo_path = File.expand_path(repo_path)
       end
 
+      @preloaded_cookbooks = false
+      @loaders_by_name = {}
+
       # Used to track which cookbooks appear in multiple places in the cookbook repos
       # and are merged in to a single cookbook by file shadowing. This behavior is
       # deprecated, so users of this class may issue warnings to the user by checking
@@ -64,25 +67,25 @@ class Chef
     end
 
     def load_cookbooks
-      @repo_paths.each do |repo_path|
-        Dir[File.join(repo_path, "*")].each do |cookbook_path|
-          load_cookbook(File.basename(cookbook_path), [repo_path])
-        end
+      preload_cookbooks
+      @loaders_by_name.each do |cookbook_name, _loaders|
+        load_cookbook(cookbook_name)
       end
       @cookbooks_by_name
     end
 
-    def load_cookbook(cookbook_name, repo_paths=nil)
-      repo_paths ||= @repo_paths
-      repo_paths.each do |repo_path|
-        @chefignores[repo_path] ||= Cookbook::Chefignore.new(repo_path)
-        cookbook_path = File.join(repo_path, cookbook_name.to_s)
-        next unless File.directory?(cookbook_path) and Dir[File.join(repo_path, "*")].include?(cookbook_path)
-        loader = Cookbook::CookbookVersionLoader.new(cookbook_path, @chefignores[repo_path])
-        loader.load_cookbooks
+    def load_cookbook(cookbook_name)
+      preload_cookbooks
+
+      return nil unless @loaders_by_name.key?(cookbook_name.to_s)
+
+      cookbook_loaders_for(cookbook_name).each do |loader|
+        loader.load
+
         next if loader.empty?
-        cookbook_name = loader.cookbook_name
-        @cookbooks_paths[cookbook_name] << cookbook_path # for deprecation warnings
+
+        @cookbooks_paths[cookbook_name] << loader.cookbook_path # for deprecation warnings
+
         if @loaded_cookbooks.key?(cookbook_name)
           @merged_cookbooks << cookbook_name # for deprecation warnings
           @loaded_cookbooks[cookbook_name].merge!(loader)
@@ -130,5 +133,50 @@ class Chef
     end
     alias :cookbooks :values
 
+    private
+
+    def preload_cookbooks
+      return false if @preloaded_cookbooks
+
+      all_directories_in_repo_paths.each do |cookbook_path|
+        preload_cookbook(cookbook_path)
+      end
+      @preloaded_cookbooks = true
+      true
+    end
+
+    def preload_cookbook(cookbook_path)
+      repo_path = File.dirname(cookbook_path)
+      @chefignores[repo_path] ||= Cookbook::Chefignore.new(repo_path)
+      loader = Cookbook::CookbookVersionLoader.new(cookbook_path, @chefignores[repo_path])
+      add_cookbook_loader(loader)
+    end
+
+    def all_directories_in_repo_paths
+      @all_directories_in_repo_paths ||=
+        all_files_in_repo_paths.select { |path| File.directory?(path) }
+    end
+
+    def all_files_in_repo_paths
+      @all_files_in_repo_paths ||=
+        begin
+          @repo_paths.inject([]) do |all_children, repo_path|
+            all_children += Dir[File.join(repo_path, "*")]
+          end
+        end
+    end
+
+    def add_cookbook_loader(loader)
+      cookbook_name = loader.cookbook_name
+
+      @loaders_by_name[cookbook_name.to_s] ||= []
+      @loaders_by_name[cookbook_name.to_s] << loader
+      loader
+    end
+
+    def cookbook_loaders_for(cookbook_name)
+      @loaders_by_name[cookbook_name.to_s]
+    end
+
   end
 end

data/lib/chef/cookbook_site_streaming_uploader.rb

@@ -143,7 +143,7 @@ class Chef
         http = Net::HTTP.new(url.host, url.port)
         if url.scheme == "https"
           http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          http.verify_mode = verify_mode
         end
         res = http.request(req)
         #res = http.start {|http_proc| http_proc.request(req) }
@@ -165,6 +165,17 @@ class Chef
         res
       end
 
+      private
+
+      def verify_mode
+        verify_mode = Chef::Config[:ssl_verify_mode]
+        if verify_mode == :verify_none
+          OpenSSL::SSL::VERIFY_NONE
+        elsif verify_mode == :verify_peer
+          OpenSSL::SSL::VERIFY_PEER
+        end
+      end
+
     end
 
     class StreamPart

data/lib/chef/cookbook_version.rb

@@ -51,10 +51,14 @@ class Chef
     attr_accessor :provider_filenames
     attr_accessor :root_filenames
     attr_accessor :name
-    attr_accessor :metadata
     attr_accessor :metadata_filenames
     attr_accessor :status
 
+    # A Chef::Cookbook::Metadata object. It has a setter that fixes up the
+    # metadata to add descriptions of the recipes contained in this
+    # CookbookVersion.
+    attr_reader :metadata
+
     # attribute_filenames also has a setter that has non-default
     # functionality.
     attr_reader :attribute_filenames
@@ -195,6 +199,12 @@ class Chef
       attribute_filenames
     end
 
+    def metadata=(metadata)
+      @metadata = metadata
+      @metadata.recipes_from_cookbook_version(self)
+      @metadata
+    end
+
     ## BACKCOMPAT/DEPRECATED - Remove these and fix breakage before release [DAN - 5/20/2010]##
     alias :attribute_files :attribute_filenames
     alias :attribute_files= :attribute_filenames=
@@ -405,7 +415,6 @@ class Chef
       records_by_pref[best_pref]
     end
 
-
     # Given a node, segment and path (filename or directory name),
     # return the priority-ordered list of preference locations to
     # look.
@@ -458,9 +467,9 @@ class Chef
     end
 
     def to_json(*a)
-      result = self.to_hash
+      result = to_hash
       result['json_class'] = self.class.name
-      result.to_json(*a)
+      Chef::JSONCompat.to_json(result, *a)
     end
 
     def self.json_create(o)