chef 12.5.1 → 12.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557c3370ca4b630b3b0d88a0e6d1dc537fe8eecd
-  data.tar.gz: 23e7884bba6c18220f795feeb56e0bf24529cdef
+  metadata.gz: df8a7b4dd38ea10e99495e4b17736c2376061c62
+  data.tar.gz: ca424df72ff1f6034a9911cc917c3d42e0d69d9b
 SHA512:
-  metadata.gz: 03db54c21bf46780976bdbf85ffd99229b4de092ffbe4c4ec4ac8e4eaee8228473df21bed284f73356528043d836a4d49d20381325def7b10f2cb9db6d843251
-  data.tar.gz: 48bdefe05abdfeb788440d6333538dbd9df996c9847a676b7360e7f42f9b238608819c2f9997d8dd8e469c635644c0ee0be1d75b878d5da7cc3796d01084c216
+  metadata.gz: 7b7dc5c9cb1bb123d3e1287d3ae4553989333531a08a0a686ae878ba86165316d1c1b4e49f20ba14ef9b31dd5e47b7756bd34e37955f66c289a2bca6963ce825
+  data.tar.gz: 8aea19d29a691a0045b32c9c6a7914b8a36ef6f731b5deb2871eb5e0328a0b1d1392035bafac1e1d15d1af502a4a498eaa1aa87f77a6b2c3a5eba65b3bf776e0

data/Gemfile

@@ -3,7 +3,7 @@ gemspec :name => "chef"
 
 gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
 
-gem 'chef-config', path: "chef-config"
+gem 'chef-config', path: "chef-config" if File.exists?(__FILE__ + '../chef-config')
 
 group(:docgen) do
   gem "yard"
@@ -17,6 +17,11 @@ group(:maintenance) do
   gem "netrc"
 end
 
+group(:ruby_prof) do
+  # may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
+  gem "ruby-prof"
+end
+
 group(:development, :test) do
 
   gem "simplecov"

data/README.md

@@ -1,5 +1,5 @@
-# Chef 
-[![Code Climate](https://codeclimate.com/github/opscode/chef.png)](https://codeclimate.com/github/opscode/chef)
+# Chef
+[![Code Climate](https://codeclimate.com/github/chef/chef.png)](https://codeclimate.com/github/chef/chef)
 [![Build Status Master](https://travis-ci.org/chef/chef.svg?branch=master)](https://travis-ci.org/chef/chef)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
 
@@ -9,7 +9,9 @@ Want to try Chef? Get started with [learnchef](https://learn.chef.io)
 * Source: [http://github.com/chef/chef/tree/master](http://github.com/chef/chef/tree/master)
 * Tickets/Issues: [https://github.com/chef/chef/issues](https://github.com/chef/chef/issues)
 * IRC: `#chef` and `#chef-hacking` on Freenode
-* Mailing list: [http://lists.opscode.com](http://lists.opscode.com)
+  - Join via browser: [#chef](https://webchat.freenode.net/?channels=chef), [#chef-hacking](https://webchat.freenode.net/?channels=chef-hacking)
+  - View logs: [#chef](https://botbot.me/freenode/chef/), [#chef-hacking](https://botbot.me/freenode/chef-hacking/)
+* Mailing list: [https://discourse.chef.io](https://discourse.chef.io)
 
 Chef is a configuration management tool designed to bring automation to your
 entire infrastructure.
@@ -46,7 +48,7 @@ Then get the source and install it:
 
     # Clone this repo
     git clone https://github.com/chef/chef.git
-    
+
     # cd into the source tree
     cd chef
 

data/Rakefile

@@ -31,9 +31,7 @@ ChefConfig::PackageTask.new(File.expand_path('..', __FILE__), 'Chef') do |packag
   package.generate_version_class = true
 end
 
-task :pedant do
-  require File.expand_path('spec/support/pedant/run_pedant')
-end
+task :pedant, :chef_zero_spec
 
 task :build_eventlog do
   Dir.chdir 'ext/win32-eventlog/' do
@@ -62,4 +60,3 @@ begin
 rescue LoadError
   puts "yard is not available. (sudo) gem install yard to generate yard documentation."
 end
-

data/chef-windows.gemspec

@@ -0,0 +1,21 @@
+gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
+
+gemspec.platform = Gem::Platform.new(["universal", "mingw32"])
+
+gemspec.add_dependency "ffi", "~> 1.9"
+gemspec.add_dependency "win32-api", "~> 1.5.3"
+gemspec.add_dependency "win32-dir", "~> 0.5.0"
+gemspec.add_dependency "win32-event", "~> 0.6.1"
+gemspec.add_dependency "win32-eventlog", "0.6.3"
+gemspec.add_dependency "win32-mmap", "~> 0.4.1"
+gemspec.add_dependency "win32-mutex", "~> 0.4.2"
+gemspec.add_dependency "win32-process", "~> 0.8.2"
+gemspec.add_dependency "win32-service", "~> 0.8.7"
+gemspec.add_dependency "windows-api", "~> 0.4.4"
+gemspec.add_dependency "wmi-lite", "~> 1.0"
+gemspec.extensions << "ext/win32-eventlog/Rakefile"
+gemspec.files += %w(ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man)
+
+gemspec.executables += %w( chef-service-manager chef-windows-service )
+
+gemspec

data/chef.gemspec

@@ -0,0 +1,58 @@
+$:.unshift(File.dirname(__FILE__) + '/lib')
+require 'chef/version'
+
+Gem::Specification.new do |s|
+  s.name = 'chef'
+  s.version = Chef::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "LICENSE" ]
+  s.summary = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
+  s.description = s.summary
+  s.license = "Apache-2.0"
+  s.author = "Adam Jacob"
+  s.email = "adam@chef.io"
+  s.homepage = "http://www.chef.io"
+
+  s.required_ruby_version = ">= 2.0.0"
+
+  s.add_dependency "chef-config", "= #{Chef::VERSION}"
+
+  s.add_dependency "mixlib-cli", "~> 1.4"
+  s.add_dependency "mixlib-log", "~> 1.3"
+  s.add_dependency "mixlib-authentication", "~> 1.3"
+  s.add_dependency "mixlib-shellout", "~> 2.0"
+  s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 9"
+
+  s.add_dependency "ffi-yajl", "~> 2.2"
+  s.add_dependency "net-ssh", "~> 2.6"
+  s.add_dependency "net-ssh-multi", "~> 1.1"
+  s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
+  s.add_dependency "erubis", "~> 2.7"
+  s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
+
+  s.add_dependency "chef-zero", "~> 4.2", ">= 4.2.2"
+  s.add_dependency "pry", "~> 0.9"
+
+  s.add_dependency 'plist', '~> 3.1.0'
+
+  # Audit mode requires these, so they are non-developmental dependencies now
+  %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_dependency gem, "~> 3.4" }
+  s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
+  s.add_dependency "serverspec", "~> 2.7"
+  s.add_dependency "specinfra", "~> 2.10"
+
+  s.add_dependency "syslog-logger", "~> 1.6"
+
+  s.add_dependency "proxifier", "~> 1.0"
+
+  s.add_development_dependency "rack"
+  s.add_development_dependency "cheffish", "~> 1.1"
+
+  s.add_development_dependency "rake", "~> 10.1"
+
+  s.bindir       = "bin"
+  s.executables  = %w( chef-client chef-solo knife chef-shell chef-apply )
+
+  s.require_path = 'lib'
+  s.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md) + Dir.glob("{distro,lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject {|f| File.directory?(f) } + Dir.glob("*.gemspec")
+end

data/lib/chef/api_client/registration.rb

@@ -68,7 +68,8 @@ class Chef
 
       def assert_destination_writable!
         if (File.exists?(destination) && !File.writable?(destination)) or !File.writable?(File.dirname(destination))
-          raise Chef::Exceptions::CannotWritePrivateKey, "I cannot write your private key to #{destination} - check permissions?"
+          abs_path = File.expand_path(destination)
+          raise Chef::Exceptions::CannotWritePrivateKey, "I can't write your private key to #{abs_path} - check permissions?"
         end
       end
 
@@ -122,9 +123,13 @@ class Chef
       end
 
       def http_api
-        @http_api ||= Chef::REST.new(Chef::Config[:chef_server_url],
-                                     Chef::Config[:validation_client_name],
-                                     Chef::Config[:validation_key])
+        @http_api ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url],
+                                          {
+                                            :api_version => "0",
+                                            :client_name => Chef::Config[:validation_client_name],
+                                            :signing_key_filename => Chef::Config[:validation_key]
+                                          }
+                                         )
       end
 
       # Whether or not to generate keys locally and post the public key to the

data/lib/chef/application.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@opscode.com>)
 # Author:: Mark Mzyk (mmzyk@opscode.com)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,6 @@
 # limitations under the License.
 
 require 'pp'
-require 'uri'
 require 'socket'
 require 'chef/config'
 require 'chef/config_fetcher'
@@ -47,7 +46,6 @@ class Chef
     def reconfigure
       configure_chef
       configure_logging
-      configure_proxy_environment_variables
       configure_encoding
       emit_warnings
     end
@@ -85,6 +83,7 @@ class Chef
     def configure_chef
       parse_options
       load_config_file
+      Chef::Config.export_proxies
     end
 
     # Parse the config file
@@ -180,14 +179,6 @@ class Chef
       end
     end
 
-    # Configure and set any proxy environment variables according to the config.
-    def configure_proxy_environment_variables
-      configure_http_proxy
-      configure_https_proxy
-      configure_ftp_proxy
-      configure_no_proxy
-    end
-
     # Sets the default external encoding to UTF-8 (users can change this, but they shouldn't)
     def configure_encoding
       Encoding.default_external = Chef::Config[:ruby_encoding]
@@ -302,79 +293,6 @@ class Chef
       Chef::Application.fatal!("Aborting due to error in '#{config_file_path}'", 2)
     end
 
-    # Set ENV['http_proxy']
-    def configure_http_proxy
-      if http_proxy = Chef::Config[:http_proxy]
-        http_proxy_string = configure_proxy("http", http_proxy,
-          Chef::Config[:http_proxy_user], Chef::Config[:http_proxy_pass])
-        env['http_proxy'] = http_proxy_string unless env['http_proxy']
-        env['HTTP_PROXY'] = http_proxy_string unless env['HTTP_PROXY']
-      end
-    end
-
-    # Set ENV['https_proxy']
-    def configure_https_proxy
-      if https_proxy = Chef::Config[:https_proxy]
-        https_proxy_string = configure_proxy("https", https_proxy,
-          Chef::Config[:https_proxy_user], Chef::Config[:https_proxy_pass])
-        env['https_proxy'] = https_proxy_string unless env['https_proxy']
-        env['HTTPS_PROXY'] = https_proxy_string unless env['HTTPS_PROXY']
-      end
-    end
-
-    # Set ENV['ftp_proxy']
-    def configure_ftp_proxy
-      if ftp_proxy = Chef::Config[:ftp_proxy]
-        ftp_proxy_string = configure_proxy("ftp", ftp_proxy,
-          Chef::Config[:ftp_proxy_user], Chef::Config[:ftp_proxy_pass])
-        env['ftp_proxy'] = ftp_proxy_string unless env['ftp_proxy']
-        env['FTP_PROXY'] = ftp_proxy_string unless env['FTP_PROXY']
-      end
-    end
-
-    # Set ENV['no_proxy']
-    def configure_no_proxy
-      if Chef::Config[:no_proxy]
-        env['no_proxy'] = Chef::Config[:no_proxy] unless env['no_proxy']
-        env['NO_PROXY'] = Chef::Config[:no_proxy] unless env['NO_PROXY']
-      end
-    end
-
-    # Builds a proxy uri. Examples:
-    #   http://username:password@hostname:port
-    #   https://username@hostname:port
-    #   ftp://hostname:port
-    # when
-    #   scheme = "http", "https", or "ftp"
-    #   hostport = hostname:port
-    #   user = username
-    #   pass = password
-    def configure_proxy(scheme, path, user, pass)
-      begin
-        path = "#{scheme}://#{path}" unless path.include?('://')
-        # URI.split returns the following parts:
-        # [scheme, userinfo, host, port, registry, path, opaque, query, fragment]
-        parts = URI.split(URI.encode(path))
-        # URI::Generic.build requires an integer for the port, but URI::split gives
-        # returns a string for the port.
-        parts[3] = parts[3].to_i if parts[3]
-        if user
-          userinfo = URI.encode(URI.encode(user), '@:')
-          if pass
-            userinfo << ":#{URI.encode(URI.encode(pass), '@:')}"
-          end
-          parts[1] = userinfo
-        end
-
-        return URI::Generic.build(parts).to_s
-      rescue URI::Error => e
-        # URI::Error messages generally include the offending string. Including a message
-        # for which proxy config item has the issue should help deduce the issue when
-        # the URI::Error message is vague.
-        raise Chef::Exceptions::BadProxyURI, "Cannot configure #{scheme} proxy. Does not comply with URI scheme. #{e.message}"
-      end
-    end
-
     # This is a hook for testing
     def env
       ENV
@@ -394,6 +312,7 @@ class Chef
 
         Chef::FileCache.store("chef-stacktrace.out", chef_stacktrace_out)
         Chef::Log.fatal("Stacktrace dumped to #{Chef::FileCache.load("chef-stacktrace.out", false)}")
+        Chef::Log.fatal("Please provide the contents of the stacktrace.out file if you file a bug report")
         Chef::Log.debug(message)
         true
       end

data/lib/chef/application/apply.rb

@@ -29,7 +29,7 @@ require 'chef/resources'
 
 class Chef::Application::Apply < Chef::Application
 
-  banner "Usage: chef-apply [RECIPE_FILE] [-e RECIPE_TEXT] [-s]"
+  banner "Usage: chef-apply [RECIPE_FILE | -e RECIPE_TEXT | -s] [OPTIONS]"
 
   option :execute,
     :short        => "-e RECIPE_TEXT",
@@ -97,6 +97,12 @@ class Chef::Application::Apply < Chef::Application
     :description  => 'Enable whyrun mode',
     :boolean      => true
 
+  option :profile_ruby,
+    :long         => "--[no-]profile-ruby",
+    :description  => "Dump complete Ruby call graph stack of entire Chef run (expert only)",
+    :boolean      => true,
+    :default      => false
+
   option :color,
     :long         => '--[no-]color',
     :boolean      => true,
@@ -118,7 +124,7 @@ class Chef::Application::Apply < Chef::Application
     parse_options
     Chef::Config.merge!(config)
     configure_logging
-    configure_proxy_environment_variables
+    Chef::Config.export_proxies
     parse_json
   end
 
@@ -190,6 +196,7 @@ class Chef::Application::Apply < Chef::Application
     ensure
       @recipe_fh.close
     end
+    Chef::Platform::Rebooter.reboot_if_needed!(runner)
   end
 
   def run_application

data/lib/chef/application/client.rb

@@ -2,7 +2,7 @@
 # Author:: AJ Christensen (<aj@opscode.com)
 # Author:: Christopher Brown (<cb@opscode.com>)
 # Author:: Mark Mzyk (mmzyk@opscode.com)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,6 +55,12 @@ class Chef::Application::Client < Chef::Application
     :boolean      => true,
     :default      => false
 
+  option :profile_ruby,
+    :long         => "--[no-]profile-ruby",
+    :description  => "Dump complete Ruby call graph stack of entire Chef run (expert only)",
+    :boolean      => true,
+    :default      => false
+
   option :color,
     :long         => '--[no-]color',
     :boolean      => true,
@@ -163,8 +169,7 @@ class Chef::Application::Client < Chef::Application
   option :named_run_list,
     :short        => "-n NAMED_RUN_LIST",
     :long         => "--named-run-list NAMED_RUN_LIST",
-    :description  => "Use a policyfile's named run list instead of the default run list",
-    :default      => nil
+    :description  => "Use a policyfile's named run list instead of the default run list"
 
   option :environment,
     :short        => '-E ENVIRONMENT',

data/lib/chef/application/solo.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@opscode.com>)
 # Author:: Mark Mzyk (mmzyk@opscode.com)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,6 +52,12 @@ class Chef::Application::Solo < Chef::Application
     :boolean      => true,
     :default      => false
 
+  option :profile_ruby,
+    :long         => "--[no-]profile-ruby",
+    :description  => "Dump complete Ruby call graph stack of entire Chef run (expert only)",
+    :boolean      => true,
+    :default      => false
+
   option :color,
     :long         => '--[no-]color',
     :boolean      => true,

data/lib/chef/application/windows_service.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Christopher Maier (<maier@lambda.local>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,8 +45,7 @@ class Chef
       option :log_location,
         :short        => "-L LOGLOCATION",
         :long         => "--logfile LOGLOCATION",
-        :description  => "Set the log file location",
-        :default => "#{ENV['SYSTEMDRIVE']}/chef/client.log"
+        :description  => "Set the log file location"
 
       option :splay,
         :short        => "-s SECONDS",
@@ -60,6 +59,8 @@ class Chef
         :description  => "Set the number of seconds to wait between chef-client runs",
         :proc         => lambda { |s| s.to_i }
 
+      DEFAULT_LOG_LOCATION ||= "#{ENV['SYSTEMDRIVE']}/chef/client.log"
+
       def service_init
         @service_action_mutex = Mutex.new
         @service_signal = ConditionVariable.new
@@ -187,9 +188,18 @@ class Chef
           # Pass config params to the new process
           config_params = " --no-fork"
           config_params += " -c #{Chef::Config[:config_file]}" unless  Chef::Config[:config_file].nil?
-          config_params += " -L #{Chef::Config[:log_location]}" unless Chef::Config[:log_location] == STDOUT
+          # log_location might be an event logger and if so we cannot pass as a command argument
+          # but shed no tears! If the logger is an event logger, it must have been configured
+          # as such in the config file and chef-client will use that when no arg is passed here
+          config_params += " -L #{resolve_log_location}" if resolve_log_location.is_a?(String)
+          
           # Starts a new process and waits till the process exits
-          result = shell_out("chef-client #{config_params}", :timeout => Chef::Config[:windows_service][:watchdog_timeout])
+
+          result = shell_out(
+            "chef-client #{config_params}",
+            :timeout => Chef::Config[:windows_service][:watchdog_timeout],
+            :logger => Chef::Log
+          )
           Chef::Log.debug "#{result.stdout}"
           Chef::Log.debug "#{result.stderr}"
         rescue Mixlib::ShellOut::CommandTimeout => e
@@ -231,7 +241,7 @@ class Chef
       # See application.rb for related comments.
 
       def configure_logging
-        Chef::Log.init(MonoLogger.new(Chef::Config[:log_location]))
+        Chef::Log.init(MonoLogger.new(resolve_log_location))
         if want_additional_logger?
           configure_stdout_logger
         end
@@ -260,6 +270,11 @@ class Chef
         Chef::Config[:log_level] == :auto
       end
 
+      def resolve_log_location
+        # STDOUT is the default log location, but makes no sense for a windows service
+        Chef::Config[:log_location] == STDOUT ? DEFAULT_LOG_LOCATION : Chef::Config[:log_location]
+      end
+
       # if log_level is `:auto`, convert it to :warn (when using output formatter)
       # or :info (no output formatter). See also +using_output_formatter?+
       def resolve_log_level