chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32

data/lib/chef/config.rb

@@ -25,11 +25,13 @@ require 'mixlib/config'
 require 'chef/util/selinux'
 require 'chef/util/path_helper'
 require 'pathname'
+require 'chef/mixin/shell_out'
 
 class Chef
   class Config
 
     extend Mixlib::Config
+    extend Chef::Mixin::ShellOut
 
     PathHelper = Chef::Util::PathHelper
 
@@ -76,6 +78,10 @@ class Chef
       formatters << [name, file_path]
     end
 
+    def self.add_event_logger(logger)
+      event_handlers << logger
+    end
+
     # Config file to load (client.rb, knife.rb, etc. defaults set differently in knife, chef-client, etc.)
     configurable(:config_file)
 
@@ -331,10 +337,11 @@ class Chef
     default :ssl_client_cert, nil
     default :ssl_client_key, nil
 
-    # Whether or not to verify the SSL cert for all HTTPS requests. If set to
-    # :verify_peer, all HTTPS requests will be validated regardless of other
-    # SSL verification settings.
-    default :ssl_verify_mode, :verify_none
+    # Whether or not to verify the SSL cert for all HTTPS requests. When set to
+    # :verify_peer (default), all HTTPS requests will be validated regardless of other
+    # SSL verification settings. When set to :verify_none no HTTPS requests will
+    # be validated.
+    default :ssl_verify_mode, :verify_peer
 
     # Whether or not to verify the SSL cert for HTTPS requests to the Chef
     # server API. If set to `true`, the server's cert will be validated
@@ -448,6 +455,15 @@ class Chef
     # Event Handlers
     default :event_handlers, []
 
+    default :disable_event_loggers, false
+    default :event_loggers do
+      evt_loggers = []
+      if Chef::Platform::windows? and not Chef::Platform::windows_server_2003?
+        evt_loggers << :win_evt
+      end
+      evt_loggers
+    end
+
     # Exception Handlers
     default :exception_handlers, []
 
@@ -603,22 +619,38 @@ class Chef
     # available English UTF-8 locale.  However, all modern POSIXen should support 'locale -a'.
     default :internal_locale do
       begin
-        locales = `locale -a`.split
+        # https://github.com/opscode/chef/issues/2181
+        # Some systems have the `locale -a` command, but the result has
+        # invalid characters for the default encoding.
+        #
+        # For example, on CentOS 6 with ENV['LANG'] = "en_US.UTF-8",
+        # `locale -a`.split fails with ArgumentError invalid UTF-8 encoding.
+        locales = shell_out_with_systems_locale("locale -a").stdout.split
         case
         when locales.include?('C.UTF-8')
           'C.UTF-8'
-        when locales.include?('en_US.UTF-8')
+        when locales.include?('en_US.UTF-8'), locales.include?('en_US.utf8')
           'en_US.UTF-8'
         when locales.include?('en.UTF-8')
           'en.UTF-8'
-        when guesses = locales.select { |l| l =~ /^en_.*UTF-8$'/ }
-          guesses.first
         else
-          Chef::Log.warn "Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support."
-          'C'
+          # Will match en_ZZ.UTF-8, en_ZZ.utf-8, en_ZZ.UTF8, en_ZZ.utf8
+          guesses = locales.select { |l| l =~ /^en_.*UTF-?8$/i }
+          unless guesses.empty?
+            guessed_locale = guesses.first
+            # Transform into the form en_ZZ.UTF-8
+            guessed_locale.gsub(/UTF-?8$/i, "UTF-8")
+          else
+            Chef::Log.warn "Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support."
+            'C'
+          end
         end
       rescue
-        Chef::Log.warn "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+        if Chef::Platform.windows?
+          Chef::Log.debug "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else."
+        else
+          Chef::Log.debug "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+        end
         'en_US.UTF-8'
       end
     end

data/lib/chef/cookbook/cookbook_version_loader.rb

@@ -2,6 +2,7 @@
 require 'chef/cookbook_version'
 require 'chef/cookbook/chefignore'
 require 'chef/cookbook/metadata'
+require 'chef/util/path_helper'
 
 class Chef
   class Cookbook
@@ -80,7 +81,7 @@ class Chef
         load_as(:attribute_filenames, 'attributes', '*.rb')
         load_as(:definition_filenames, 'definitions', '*.rb')
         load_as(:recipe_filenames, 'recipes', '*.rb')
-        load_as(:library_filenames, 'libraries', '*.rb')
+        load_recursively_as(:library_filenames, 'libraries', '*.rb')
         load_recursively_as(:template_filenames, "templates", "*")
         load_recursively_as(:file_filenames, "files", "*")
         load_recursively_as(:resource_filenames, "resources", "*.rb")
@@ -212,24 +213,30 @@ class Chef
       end
 
       def load_root_files
-        Dir.glob(File.join(cookbook_path, '*'), File::FNM_DOTMATCH).each do |file|
+        Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(cookbook_path), '*'), File::FNM_DOTMATCH).each do |file|
+          file = Chef::Util::PathHelper.cleanpath(file)
           next if File.directory?(file)
           next if File.basename(file) == UPLOADED_COOKBOOK_VERSION_FILE
-          cookbook_settings[:root_filenames][file[@relative_path, 1]] = file
+          name = Chef::Util::PathHelper.relative_path_from(@cookbook_path, file)
+          cookbook_settings[:root_filenames][name] = file
         end
       end
 
       def load_recursively_as(category, category_dir, glob)
-        file_spec = File.join(cookbook_path, category_dir, '**', glob)
+        file_spec = File.join(Chef::Util::PathHelper.escape_glob(cookbook_path, category_dir), '**', glob)
         Dir.glob(file_spec, File::FNM_DOTMATCH).each do |file|
+          file = Chef::Util::PathHelper.cleanpath(file)
           next if File.directory?(file)
-          cookbook_settings[category][file[@relative_path, 1]] = file
+          name = Chef::Util::PathHelper.relative_path_from(@cookbook_path, file)
+          cookbook_settings[category][name] = file
         end
       end
 
       def load_as(category, *path_glob)
-        Dir[File.join(cookbook_path, *path_glob)].each do |file|
-          cookbook_settings[category][file[@relative_path, 1]] = file
+        Dir[File.join(Chef::Util::PathHelper.escape_glob(cookbook_path), *path_glob)].each do |file|
+          file = Chef::Util::PathHelper.cleanpath(file)
+          name = Chef::Util::PathHelper.relative_path_from(@cookbook_path, file)
+          cookbook_settings[category][name] = file
         end
       end
 

data/lib/chef/cookbook/metadata.rb

@@ -35,28 +35,31 @@ class Chef
     # about Chef Cookbooks.
     class Metadata
 
-      NAME              = 'name'.freeze
-      DESCRIPTION       = 'description'.freeze
-      LONG_DESCRIPTION  = 'long_description'.freeze
-      MAINTAINER        = 'maintainer'.freeze
-      MAINTAINER_EMAIL  = 'maintainer_email'.freeze
-      LICENSE           = 'license'.freeze
-      PLATFORMS         = 'platforms'.freeze
-      DEPENDENCIES      = 'dependencies'.freeze
-      RECOMMENDATIONS   = 'recommendations'.freeze
-      SUGGESTIONS       = 'suggestions'.freeze
-      CONFLICTING       = 'conflicting'.freeze
-      PROVIDING         = 'providing'.freeze
-      REPLACING         = 'replacing'.freeze
-      ATTRIBUTES        = 'attributes'.freeze
-      GROUPINGS         = 'groupings'.freeze
-      RECIPES           = 'recipes'.freeze
-      VERSION           = 'version'.freeze
+      NAME                   = 'name'.freeze
+      DESCRIPTION            = 'description'.freeze
+      LONG_DESCRIPTION       = 'long_description'.freeze
+      MAINTAINER             = 'maintainer'.freeze
+      MAINTAINER_EMAIL       = 'maintainer_email'.freeze
+      LICENSE                = 'license'.freeze
+      PLATFORMS              = 'platforms'.freeze
+      DEPENDENCIES           = 'dependencies'.freeze
+      RECOMMENDATIONS        = 'recommendations'.freeze
+      SUGGESTIONS            = 'suggestions'.freeze
+      CONFLICTING            = 'conflicting'.freeze
+      PROVIDING              = 'providing'.freeze
+      REPLACING              = 'replacing'.freeze
+      ATTRIBUTES             = 'attributes'.freeze
+      GROUPINGS              = 'groupings'.freeze
+      RECIPES                = 'recipes'.freeze
+      VERSION                = 'version'.freeze
+      SOURCE_URL             = 'source_url'.freeze
+      ISSUES_URL             = 'issues_url'.freeze
 
       COMPARISON_FIELDS = [ :name, :description, :long_description, :maintainer,
                             :maintainer_email, :license, :platforms, :dependencies,
                             :recommendations, :suggestions, :conflicting, :providing,
-                            :replacing, :attributes, :groupings, :recipes, :version]
+                            :replacing, :attributes, :groupings, :recipes, :version,
+                            :source_url, :issues_url ]
 
       VERSION_CONSTRAINTS = {:depends     => DEPENDENCIES,
                              :recommends  => RECOMMENDATIONS,
@@ -111,6 +114,8 @@ class Chef
         @groupings = Mash.new
         @recipes = Mash.new
         @version = Version.new("0.0.0")
+        @source_url = ''
+        @issues_url = ''
 
         @errors = []
       end
@@ -413,7 +418,7 @@ class Chef
         end
       end
 
-      # Adds an attribute )hat a user needs to configure for this cookbook. Takes
+      # Adds an attribute that a user needs to configure for this cookbook. Takes
       # a name (with the / notation for a nested attribute), followed by any of
       # these options
       #
@@ -443,7 +448,9 @@ class Chef
             :type => { :equal_to => [ "string", "array", "hash", "symbol", "boolean", "numeric" ], :default => "string" },
             :required => { :equal_to => [ "required", "recommended", "optional", true, false ], :default => "optional" },
             :recipes => { :kind_of => [ Array ], :default => [] },
-            :default => { :kind_of => [ String, Array, Hash, Symbol, Numeric, TrueClass, FalseClass ] }
+            :default => { :kind_of => [ String, Array, Hash, Symbol, Numeric, TrueClass, FalseClass ] },
+            :source_url => { :kind_of => String },
+            :issues_url => { :kind_of => String }
           }
         )
         options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil?
@@ -469,23 +476,25 @@ class Chef
 
       def to_hash
         {
-          NAME             => self.name,
-          DESCRIPTION      => self.description,
-          LONG_DESCRIPTION => self.long_description,
-          MAINTAINER       => self.maintainer,
-          MAINTAINER_EMAIL => self.maintainer_email,
-          LICENSE          => self.license,
-          PLATFORMS        => self.platforms,
-          DEPENDENCIES     => self.dependencies,
-          RECOMMENDATIONS  => self.recommendations,
-          SUGGESTIONS      => self.suggestions,
-          CONFLICTING      => self.conflicting,
-          PROVIDING        => self.providing,
-          REPLACING        => self.replacing,
-          ATTRIBUTES       => self.attributes,
-          GROUPINGS        => self.groupings,
-          RECIPES          => self.recipes,
-          VERSION          => self.version
+          NAME                   => self.name,
+          DESCRIPTION            => self.description,
+          LONG_DESCRIPTION       => self.long_description,
+          MAINTAINER             => self.maintainer,
+          MAINTAINER_EMAIL       => self.maintainer_email,
+          LICENSE                => self.license,
+          PLATFORMS              => self.platforms,
+          DEPENDENCIES           => self.dependencies,
+          RECOMMENDATIONS        => self.recommendations,
+          SUGGESTIONS            => self.suggestions,
+          CONFLICTING            => self.conflicting,
+          PROVIDING              => self.providing,
+          REPLACING              => self.replacing,
+          ATTRIBUTES             => self.attributes,
+          GROUPINGS              => self.groupings,
+          RECIPES                => self.recipes,
+          VERSION                => self.version,
+          SOURCE_URL             => self.source_url,
+          ISSUES_URL             => self.issues_url
         }
       end
 
@@ -517,6 +526,8 @@ 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)
+        @source_url                   = o[SOURCE_URL] if o.has_key?(SOURCE_URL)
+        @issues_url                   = o[ISSUES_URL] if o.has_key?(ISSUES_URL)
         self
       end
 
@@ -531,7 +542,9 @@ class Chef
         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))
+             if metadata.respond_to?(method_name)
+               metadata.public_send(method_name, cb_name, *Array(constraints))
+             end
            end
           end
         end
@@ -543,6 +556,36 @@ class Chef
         from_hash(o)
       end
 
+      # Sets the cookbook's source URL, or returns it.
+      #
+      # === Parameters
+      # maintainer<String>:: The source URL
+      #
+      # === Returns
+      # source_url<String>:: Returns the current source URL.
+      def source_url(arg=nil)
+        set_or_return(
+          :source_url,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # Sets the cookbook's issues URL, or returns it.
+      #
+      # === Parameters
+      # issues_url<String>:: The issues URL
+      #
+      # === Returns
+      # issues_url<String>:: Returns the current issues URL.
+      def issues_url(arg=nil)
+        set_or_return(
+          :issues_url,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
     private
 
       def run_validation

data/lib/chef/cookbook/syntax_check.rb

@@ -21,6 +21,7 @@ require 'stringio'
 require 'erubis'
 require 'chef/mixin/shell_out'
 require 'chef/mixin/checksum'
+require 'chef/util/path_helper'
 
 class Chef
   class Cookbook
@@ -100,17 +101,24 @@ class Chef
       end
 
       def remove_ignored_files(file_list)
-        return file_list unless chefignore.ignores.length > 0
+        return file_list if chefignore.ignores.empty?
+
         file_list.reject do |full_path|
-          cookbook_pn = Pathname.new cookbook_path
-          full_pn = Pathname.new full_path
-          relative_pn = full_pn.relative_path_from cookbook_pn
-          chefignore.ignored? relative_pn.to_s
+          relative_pn = Chef::Util::PathHelper.relative_path_from(cookbook_path, full_path)
+          chefignore.ignored?(relative_pn.to_s)
         end
       end
 
+      def remove_uninteresting_ruby_files(file_list)
+        file_list.reject { |f| f =~ %r{#{cookbook_path}/(files|templates)/} }
+      end
+
       def ruby_files
-        remove_ignored_files Dir[File.join(cookbook_path, '**', '*.rb')]
+        path  = Chef::Util::PathHelper.escape_glob(cookbook_path)
+        files = Dir[File.join(path, '**', '*.rb')]
+        files = remove_ignored_files(files)
+        files = remove_uninteresting_ruby_files(files)
+        files
       end
 
       def untested_ruby_files
@@ -125,7 +133,7 @@ class Chef
       end
 
       def template_files
-        remove_ignored_files Dir[File.join(cookbook_path, '**/templates/**', '*.erb')]
+        remove_ignored_files Dir[File.join(Chef::Util::PathHelper.escape_glob(cookbook_path), '**/templates/**', '*.erb')]
       end
 
       def untested_template_files
@@ -163,31 +171,16 @@ class Chef
 
       def validate_template(erb_file)
         Chef::Log.debug("Testing template #{erb_file} for syntax errors...")
-        if validate_inline?
-          validate_erb_file_inline(erb_file)
-        else
-          validate_erb_via_subcommand(erb_file)
-        end
+        validate_erb_file_inline(erb_file)
       end
 
       def validate_ruby_file(ruby_file)
         Chef::Log.debug("Testing #{ruby_file} for syntax errors...")
-        if validate_inline?
-          validate_ruby_file_inline(ruby_file)
-        else
-          validate_ruby_by_subcommand(ruby_file)
-        end
-      end
-
-      # Whether or not we're running on a version of ruby that can support
-      # inline validation. Inline validation relies on the `RubyVM` features
-      # introduced with ruby 1.9, so 1.8 cannot be supported.
-      def validate_inline?
-        defined?(RubyVM::InstructionSequence)
+        validate_ruby_file_inline(ruby_file)
       end
 
       # Validate the ruby code in an erb template. Uses RubyVM to do syntax
-      # checking, so callers should check #validate_inline? before calling.
+      # checking.
       def validate_erb_file_inline(erb_file)
         old_stderr = $stderr
 
@@ -214,20 +207,6 @@ class Chef
         $stderr = old_stderr if defined?(old_stderr) && old_stderr
       end
 
-      # Validate the ruby code in an erb template. Pipes the output of `erubis
-      # -x` to `ruby -c`, so it works with any ruby version, but is much slower
-      # than the inline version.
-      # --
-      # TODO: This can be removed when ruby 1.8 support is dropped.
-      def validate_erb_via_subcommand(erb_file)
-        result = shell_out("erubis -x #{erb_file} | #{ruby} -c")
-        result.error!
-        true
-      rescue Mixlib::ShellOut::ShellCommandFailed
-        invalid_erb_file(erb_file, result.stderr)
-        false
-      end
-
       # Debug a syntax error in a template.
       def invalid_erb_file(erb_file, error_message)
         file_relative_path = erb_file[/^#{Regexp.escape(cookbook_path+File::Separator)}(.*)/, 1]
@@ -238,7 +217,6 @@ class Chef
 
       # Validate the syntax of a ruby file. Uses (Ruby 1.9+ only) RubyVM to
       # compile the code without evaluating it or spawning a new process.
-      # Callers should check #validate_inline? before calling.
       def validate_ruby_file_inline(ruby_file)
         # Even when we're compiling the code w/ RubyVM, syntax errors just
         # print to $stderr. We want to capture this and handle the printing
@@ -263,18 +241,6 @@ class Chef
         $stderr = old_stderr if defined?(old_stderr) && old_stderr
       end
 
-      # Validate the syntax of a ruby file by shelling out to `ruby -c`. Should
-      # work for all ruby versions, but is slower and uses more resources than
-      # the inline strategy.
-      def validate_ruby_by_subcommand(ruby_file)
-        result = shell_out("#{ruby} -c #{ruby_file}")
-        result.error!
-        true
-      rescue Mixlib::ShellOut::ShellCommandFailed
-        invalid_ruby_file(ruby_file, result.stderr)
-        false
-      end
-
       # Debugs ruby syntax errors by printing the path to the file and any
       # diagnostic info given in +error_message+
       def invalid_ruby_file(ruby_file, error_message)