chef 11.6.0.hotfix.1 → 11.6.0.rc.0

data/lib/chef/config.rb

@@ -189,7 +189,7 @@ class Chef
     chef_server_url   "https://localhost:443"
 
     rest_timeout 300
-    yum_timeout 900
+    yum_timeout 120
     solo  false
     splay nil
     why_run false

data/lib/chef/cookbook/cookbook_version_loader.rb

@@ -18,15 +18,14 @@ class Chef
                                       :provider_filenames]
 
 
-      attr_reader :cookbook_name
+      attr_reader :cookbook_pathname
       attr_reader :cookbook_settings
       attr_reader :metadata_filenames
 
       def initialize(path, chefignore=nil)
         @cookbook_path = File.expand_path( path )
-        @cookbook_name = File.basename( path )
+        @cookbook_pathname = File.basename( path )
         @chefignore = chefignore
-        @metadata = Hash.new
         @relative_path = /#{Regexp.escape(@cookbook_path)}\/(.+)$/
         @cookbook_settings = {
           :attribute_filenames  => {},
@@ -65,13 +64,18 @@ class Chef
         if empty?
           Chef::Log.warn "found a directory #{cookbook_name} in the cookbook path, but it contains no cookbook files. skipping."
         end
+
         @cookbook_settings
       end
 
+      def cookbook_name
+        metadata.name || @cookbook_pathname
+      end
+
       def cookbook_version
         return nil if empty?
 
-        Chef::CookbookVersion.new(@cookbook_name.to_sym).tap do |c|
+        Chef::CookbookVersion.new(@cookbook_pathname.to_sym).tap do |c|
           c.root_dir             = @cookbook_path
           c.attribute_filenames  = cookbook_settings[:attribute_filenames].values
           c.definition_filenames = cookbook_settings[:definition_filenames].values
@@ -83,12 +87,16 @@ class Chef
           c.provider_filenames   = cookbook_settings[:provider_filenames].values
           c.root_filenames       = cookbook_settings[:root_filenames].values
           c.metadata_filenames   = @metadata_filenames
-          c.metadata             = metadata(c)
+          c.metadata             = load_metadata(c)
         end
       end
 
+      def metadata
+        @metadata ||= load_metadata(nil)
+      end
+
       # Generates the Cookbook::Metadata object
-      def metadata(cookbook_version)
+      def load_metadata(cookbook_version)
         @metadata = Chef::Cookbook::Metadata.new(cookbook_version)
         @metadata_filenames.each do |metadata_file|
           case metadata_file
@@ -100,6 +108,7 @@ class Chef
             raise RuntimeError, "Invalid metadata file: #{metadata_file} for cookbook: #{cookbook_version}"
           end
         end
+        Chef::Log.warn "Inferring cookbook name from directory name (#@cookbook_pathname) is deprecated, please set a name in the metadata." unless @metadata.name
         @metadata
       end
 
@@ -150,18 +159,18 @@ class Chef
 
       def apply_ruby_metadata(file)
         begin
-          @metadata.from_file(file)
+          metadata.from_file(file)
         rescue JSON::ParserError
-          Chef::Log.error("Error evaluating metadata.rb for #@cookbook_name in " + file)
+          Chef::Log.error("Error evaluating metadata.rb for #{cookbook_name} in " + file)
           raise
         end
       end
 
       def apply_json_metadata(file)
         begin
-          @metadata.from_json(IO.read(file))
+          metadata.from_json(IO.read(file))
         rescue JSON::ParserError
-          Chef::Log.error("Couldn't parse cookbook metadata JSON for #@cookbook_name in " + file)
+          Chef::Log.error("Couldn't parse cookbook metadata JSON for #{cookbook_name} in " + file)
           raise
         end
       end

data/lib/chef/cookbook/file_system_file_vendor.rb

@@ -37,14 +37,17 @@ class Chef
         raise ArgumentError, "You must specify at least one repo path" if @repo_paths.empty?
       end
 
+      def cookbooks
+        @cookbooks ||= Chef::CookbookLoader.new(@repo_paths).load_cookbooks
+      end
+
       # Implements abstract base's requirement. It looks in the
       # Chef::Config.cookbook_path file hierarchy for the requested
       # file.
       def get_filename(filename)
-        location = @repo_paths.inject(nil) do |memo, basepath|
-          candidate_location = File.join(basepath, @cookbook_name, filename)
-          memo = candidate_location if File.exist?(candidate_location)
-          memo
+        if cookbooks.has_key?(@cookbook_name)
+          location = File.join(cookbooks[@cookbook_name].root_dir, filename)
+          location = nil unless File.exist?(location)
         end
         raise "File #{filename} does not exist for cookbook #{@cookbook_name}" unless location
 

data/lib/chef/cookbook/metadata.rb

@@ -91,7 +91,7 @@ class Chef
       # metadata<Chef::Cookbook::Metadata>
       def initialize(cookbook=nil, maintainer='YOUR_COMPANY_NAME', maintainer_email='YOUR_EMAIL', license='none')
         @cookbook = cookbook
-        @name = cookbook ? cookbook.name : ""
+        @name = cookbook ? cookbook.name : nil
         @long_description = ""
         self.maintainer(maintainer)
         self.maintainer_email(maintainer_email)
@@ -468,6 +468,15 @@ class Chef
         @groupings                    = o[GROUPINGS] if o.has_key?(GROUPINGS)
         @recipes                      = o[RECIPES] if o.has_key?(RECIPES)
         @version                      = o[VERSION] if o.has_key?(VERSION)
+        #
+        # XXX: When a client (berkshelf in particular) uploads metadata without a name field, the hosted chef
+        #      ruby server will subsequently return empty string ("") for the metadata.name.  In erchef uploading
+        #      metadata without a name field will simply not store or retrieve a name field so we get @name = nil.
+        #      During the migration from ruby to erchef, metadata.name of "" was migrated faithfully even though it
+        #      fails validation, and erchef will return this, so we still have to handle this case unless the
+        #      database is sanitized to remove metadata.name == "".
+        #
+        @name = nil if !@name.nil? && @name.empty?
         self
       end
 

data/lib/chef/cookbook/syntax_check.rb

@@ -85,14 +85,14 @@ class Chef
       # validated.
       attr_reader :validated_files
 
-      # Creates a new SyntaxCheck given the +cookbook_name+ and a +cookbook_path+.
+      # Creates a new SyntaxCheck given the +cookbook_pathname+ and a +cookbook_path+.
       # If no +cookbook_path+ is given, +Chef::Config.cookbook_path+ is used.
-      def self.for_cookbook(cookbook_name, cookbook_path=nil)
+      def self.for_cookbook(cookbook_pathname, cookbook_path=nil)
         cookbook_path ||= Chef::Config.cookbook_path
         unless cookbook_path
-          raise ArgumentError, "Cannot find cookbook #{cookbook_name} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
+          raise ArgumentError, "Cannot find cookbook #{cookbook_pathname} unless Chef::Config.cookbook_path is set or an explicit cookbook path is given"
         end
-        new(File.join(cookbook_path, cookbook_name.to_s))
+        new(File.join(cookbook_path, cookbook_pathname.to_s))
       end
 
       # Create a new SyntaxCheck object

data/lib/chef/cookbook_uploader.rb

@@ -159,7 +159,7 @@ class Chef
 
     def validate_cookbooks
       cookbooks.each do |cb|
-        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cb.name, @user_cookbook_path)
+        syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cb.pathname, @user_cookbook_path)
         Chef::Log.info("Validating ruby files")
         exit(1) unless syntax_checker.validate_ruby_files
         Chef::Log.info("Validating templates")

data/lib/chef/cookbook_version.rb

@@ -50,7 +50,7 @@ class Chef
     attr_accessor :resource_filenames
     attr_accessor :provider_filenames
     attr_accessor :root_filenames
-    attr_accessor :name
+    attr_accessor :pathname
     attr_accessor :metadata
     attr_accessor :metadata_filenames
     attr_accessor :status
@@ -83,8 +83,8 @@ class Chef
     #
     # === Returns
     # object<Chef::CookbookVersion>:: Duh. :)
-    def initialize(name)
-      @name = name
+    def initialize(pathname)
+      @pathname = pathname
       @frozen = false
       @attribute_filenames = Array.new
       @definition_filenames = Array.new
@@ -104,6 +104,10 @@ class Chef
       @metadata = Chef::Cookbook::Metadata.new
     end
 
+    def name
+      metadata.name || @pathname
+    end
+
     def version
       metadata.version
     end
@@ -598,11 +602,11 @@ class Chef
           specificity = "default"
 
           if segment == :root_files
-            matcher = segment_file.match(".+/#{Regexp.escape(name.to_s)}/(.+)")
+            matcher = segment_file.match(".+/#{Regexp.escape(pathname.to_s)}/(.+)")
             file_name = matcher[1]
             path = file_name
           elsif segment == :templates || segment == :files
-            matcher = segment_file.match("/#{Regexp.escape(name.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+?)/(.+))")
+            matcher = segment_file.match("/#{Regexp.escape(pathname.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+?)/(.+))")
             unless matcher
               Chef::Log.debug("Skipping file #{segment_file}, as it isn't in any of the proper directories (platform-version, platform or default)")
               Chef::Log.debug("You probably need to move #{segment_file} into the 'default' sub-directory")
@@ -612,7 +616,7 @@ class Chef
             specificity = matcher[2]
             file_name = matcher[3]
           else
-            matcher = segment_file.match("/#{Regexp.escape(name.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+))")
+            matcher = segment_file.match("/#{Regexp.escape(pathname.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+))")
             path = matcher[1]
             file_name = matcher[2]
           end

data/lib/chef/deprecation/provider/template.rb

@@ -33,7 +33,7 @@ class Chef
 
         def template_finder
           @template_finder ||= begin
-            Chef::Provider::TemplateFinder.new(run_context, cookbook_name, node)
+            TemplateFinder.new(run_context, cookbook_name, node)
           end
         end
 

data/lib/chef/exceptions.rb

@@ -160,8 +160,6 @@ class Chef
     # the symlink that is there either loops or points to a nonexistent file
     class InvalidSymlink < RuntimeError; end
 
-    class ChildConvergeError < RuntimeError; end
-
     class MissingRole < RuntimeError
       NULL = Object.new
 

data/lib/chef/formatters/error_descriptor.rb

@@ -31,7 +31,7 @@ class Chef
       end
 
       def section(heading, text)
-        @sections << {heading => text}
+        @sections << [heading, text]
       end
 
       def display(out)
@@ -40,9 +40,7 @@ class Chef
         out.puts "=" * 80
         out.puts "\n"
         sections.each do |section|
-          section.each do |heading, text|
-            display_section(heading, text, out)
-          end
+          display_section(section, out)
         end
       end
 
@@ -55,7 +53,8 @@ class Chef
 
       private
 
-      def display_section(heading, text, out)
+      def display_section(section, out)
+        heading, text = section
         out.puts heading
         out.puts "-" * heading.size
         out.puts text

data/lib/chef/knife/cookbook_site_share.rb

@@ -23,7 +23,6 @@ class Chef
     class CookbookSiteShare < Knife
 
       deps do
-        require 'chef/cookbook_loader'
         require 'chef/cookbook_uploader'
         require 'chef/cookbook_site_streaming_uploader'
       end

data/lib/chef/knife/cookbook_test.rb

@@ -25,7 +25,6 @@ class Chef
     class CookbookTest < Knife
 
       deps do
-        require 'chef/cookbook_loader'
         require 'chef/cookbook/syntax_check'
       end
 

data/lib/chef/provider/file.rb

@@ -74,7 +74,7 @@ class Chef
         # Let children resources override constructing the @current_resource
         @current_resource ||= Chef::Resource::File.new(@new_resource.name)
         @current_resource.path(@new_resource.path)
-        if ::File.exists?(@current_resource.path) && ::File.file?(::File.realpath(@current_resource.path))
+        if real_file?(@current_resource.path) && ::File.exists?(@current_resource.path)
           if @action != :create_if_missing && @current_resource.respond_to?(:checksum)
             @current_resource.checksum(checksum(@current_resource.path))
           end
@@ -292,7 +292,6 @@ class Chef
             converge_by(description) do
               unlink(@new_resource.path)
             end
-            @current_resource.checksum = nil
             @file_unlinked = true
           end
         end

data/lib/chef/provider/package/yum.rb

@@ -759,7 +759,7 @@ class Chef
                 @rpmdb << pkg
               end
 
-              error = status.stderr
+              error = status.stderr.readlines
             rescue Mixlib::ShellOut::CommandTimeout => e
               Chef::Log.error("#{helper} exceeded timeout #{Chef::Config[:yum_timeout]}")
               raise(e)
@@ -947,7 +947,6 @@ class Chef
         end # YumCache
 
         include Chef::Mixin::GetSourceFromPackage
-        include Chef::Mixin::ShellOut
 
         def initialize(new_resource, run_context)
           super

data/lib/chef/provider/remote_file/cache_control_data.rb

@@ -87,12 +87,11 @@ class Chef
         end
 
         def load
-          if previous_cc_data = load_data
-            apply(previous_cc_data)
-            self
-          else
-            false
-          end
+          previous_cc_data = load_data
+          apply(previous_cc_data)
+          self
+        rescue Chef::Exceptions::FileNotFound
+          false
         end
 
         def validate!(current_copy_checksum)
@@ -140,8 +139,6 @@ class Chef
 
         def load_data
           Chef::JSONCompat.from_json(load_json_data)
-        rescue Chef::Exceptions::FileNotFound, Yajl::ParseError
-          false
         end
 
         def load_json_data
@@ -149,10 +146,7 @@ class Chef
         end
 
         def sanitized_cache_file_basename
-          # Scrub and truncate in accordance with the goals of keeping the name
-          # human-readable but within the bounds of local file system
-          # path length limits
-          scrubbed_uri = uri.gsub(/\W/, '_')[0..63]
+          scrubbed_uri = uri.gsub(/\W/, '_')
           uri_md5 = Chef::Digester.instance.generate_md5_checksum(StringIO.new(uri))
           "#{scrubbed_uri}-#{uri_md5}.json"
         end

data/lib/chef/resource/file.rb

@@ -36,8 +36,6 @@ class Chef
         state_attrs :checksum, :owner, :group, :mode
       end
 
-      attr_writer :checksum
-
       provides :file, :on_platforms => :all
 
       def initialize(name, run_context=nil)

data/lib/chef/resource_reporter.rb

@@ -64,11 +64,8 @@ class Chef
         else
           #as_hash["result"] = "failed"
         end
-        if new_resource.cookbook_name
-          as_hash["cookbook_name"] = new_resource.cookbook_name
-          as_hash["cookbook_version"] = new_resource.cookbook_version.version
-        end
-
+        as_hash["cookbook_name"] = new_resource.cookbook_name
+        as_hash["cookbook_version"] = new_resource.cookbook_version.version
         as_hash
       end
 

data/lib/chef/scan_access_control.rb

@@ -127,12 +127,7 @@ class Chef
     end
 
     def stat
-      @stat ||= if @new_resource.instance_of?(Chef::Resource::Link)
-        ::File.lstat(@new_resource.path)
-      else
-        realpath = ::File.realpath(@new_resource.path)
-        ::File.stat(realpath)
-      end
+      @stat ||= @new_resource.instance_of?(Chef::Resource::Link) ? ::File.lstat(@new_resource.path) : ::File.stat(@new_resource.path)
     end
   end
 end

data/lib/chef/util/diff.rb

@@ -22,10 +22,6 @@ class Chef
     class Diff
       include Chef::Mixin::ShellOut
 
-      # @todo: to_a, to_s, to_json, inspect defs, accessors for @diff and @error
-      # @todo: move coercion to UTF-8 into to_json
-      # @todo: replace shellout to diff -u with diff-lcs gem
-
       def for_output
         # formatted output to a terminal uses arrays of strings and returns error strings
         @diff.nil? ? [ @error ] : @diff
@@ -79,13 +75,8 @@ class Chef
 
         begin
           # -u: Unified diff format
-          # LC_ALL: in ruby 1.9 we want to set nil which is a magic option to mixlib-shellout to
-          #         pass through the LC_ALL locale.  in ruby 1.8 we force to 7-bit 'C' locale
-          #         (which is the mixlib-shellout default for all rubies all the time).
           Chef::Log.debug("running: diff -u #{old_file} #{new_file}")
-          locale = ( Object.const_defined? :Encoding ) ? nil : 'C'
-          result = shell_out("diff -u #{old_file} #{new_file}", :env => {'LC_ALL' => locale})
-
+          result = shell_out("diff -u #{old_file} #{new_file}")
         rescue Exception => e
           # Should *not* receive this, but in some circumstances it seems that
           # an exception can be thrown even using shell_out instead of shell_out!
@@ -103,18 +94,7 @@ class Chef
           if result.stdout.length > diff_output_threshold
             return "(long diff of over #{diff_output_threshold} characters, diff output suppressed)"
           else
-            diff_str = result.stdout
-            if  Object.const_defined? :Encoding  # ruby >= 1.9
-              if ( diff_str.encoding == Encoding::ASCII_8BIT &&
-                diff_str.encoding != Encoding.default_external &&
-                RUBY_VERSION.to_f < 2.0 )
-                # @todo mixlib-shellout under ruby 1.9 hands back an ASCII-8BIT encoded string, which needs to
-                # be fixed to the default external encoding -- this should be moved into mixlib-shellout
-                diff_str = diff_str.force_encoding(Encoding.default_external)
-              end
-              diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
-            end
-            @diff = diff_str.split("\n")
+            @diff = result.stdout.split("\n")
             @diff.delete("\")
             return "(diff available)"
           end
@@ -126,16 +106,10 @@ class Chef
       end
 
       def is_binary?(path)
-        File.open(path) do |file|
-          # XXX: this slurps into RAM, but we should have already checked our diff has a reasonable size
-          buff = file.read
+        ::File.open(path) do |file|
+          buff = file.read(Chef::Config[:diff_filesize_threshold])
           buff = "" if buff.nil?
-          begin
-            return buff !~ /\A[\s[:print:]]*\z/m
-          rescue ArgumentError => e
-            return true if e.message =~ /invalid byte sequence/
-            raise
-          end
+          return buff !~ /^[\r[:print:]]*$/
         end
       end