chef 11.8.4.ohai7.0 → 11.10.0.alpha.1

data/distro/common/html/knife-search.1.html

@@ -265,11 +265,11 @@ www.example.com:</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#97;&#100;&#x61;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;" data-bare-link="true">&#97;&#x64;&#x61;&#109;&#64;&#111;&#x70;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#64;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#106;&#x6f;&#x73;&#104;&#117;&#97;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#100;&#x65;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#x40;&#x6f;&#x70;&#115;&#x63;&#111;&#100;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#115;&#x63;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -278,7 +278,7 @@ www.example.com:</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.8.2</li>
+    <li class='tl'>Chef 11.10.0.alpha.1</li>
     <li class='tc'>December 2013</li>
     <li class='tr'>knife-search(1)</li>
   </ol>

data/distro/common/html/knife-ssh.1.html

@@ -133,11 +133,11 @@ option.</dd>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#x61;&#100;&#97;&#x6d;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#64;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#115;&#x63;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -146,7 +146,7 @@ option.</dd>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.8.2</li>
+    <li class='tl'>Chef 11.10.0.alpha.1</li>
     <li class='tc'>December 2013</li>
     <li class='tr'>knife-ssh(1)</li>
   </ol>

data/distro/common/html/knife-status.1.html

@@ -105,11 +105,11 @@ may not be publicly reachable.</p>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#x61;&#100;&#97;&#x6d;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#64;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#106;&#x6f;&#115;&#x68;&#x75;&#x61;&#64;&#x6f;&#112;&#x73;&#99;&#111;&#x64;&#101;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#106;&#x6f;&#115;&#104;&#x75;&#x61;&#x40;&#x6f;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a>.
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#115;&#x63;&#111;&#100;&#x65;&#46;&#x63;&#111;&#109;" data-bare-link="true">&#106;&#x6f;&#x73;&#104;&#117;&#x61;&#x40;&#x6f;&#112;&#x73;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -118,7 +118,7 @@ may not be publicly reachable.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.8.2</li>
+    <li class='tl'>Chef 11.10.0.alpha.1</li>
     <li class='tc'>December 2013</li>
     <li class='tr'>knife-status(1)</li>
   </ol>

data/distro/common/html/knife-tag.1.html

@@ -114,11 +114,11 @@
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#58;&#x61;&#100;&#97;&#x6d;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#101;&#46;&#x63;&#x6f;&#x6d;" data-bare-link="true">&#x61;&#x64;&#x61;&#109;&#x40;&#111;&#112;&#115;&#x63;&#x6f;&#100;&#x65;&#46;&#99;&#111;&#x6d;</a> with many contributions from the community.</p>
+<p>   Chef was written by Adam Jacob <a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#x61;&#109;&#64;&#111;&#112;&#x73;&#x63;&#111;&#x64;&#101;&#x2e;&#x63;&#111;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#109;&#64;&#111;&#112;&#x73;&#99;&#111;&#x64;&#x65;&#46;&#99;&#x6f;&#109;</a> with many contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Daniel DeLeo <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#100;&#x61;&#110;&#x40;&#x6f;&#x70;&#115;&#x63;&#111;&#x64;&#101;&#46;&#x63;&#111;&#x6d;" data-bare-link="true">&#x64;&#x61;&#110;&#64;&#x6f;&#112;&#115;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;</a>.
+<p>   This manual page was written by Daniel DeLeo <a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#100;&#x61;&#x6e;&#64;&#111;&#x70;&#115;&#x63;&#111;&#100;&#x65;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x64;&#97;&#110;&#64;&#x6f;&#x70;&#115;&#99;&#x6f;&#x64;&#x65;&#46;&#x63;&#111;&#x6d;</a>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.</p>
 
 <h2 id="CHEF">CHEF</h2>
@@ -127,7 +127,7 @@
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.8.2</li>
+    <li class='tl'>Chef 11.10.0.alpha.1</li>
     <li class='tc'>December 2013</li>
     <li class='tr'>knife-tag(1)</li>
   </ol>

data/distro/common/html/knife.1.html

@@ -286,12 +286,12 @@ data editing entirely.</dd>
 
 <h2 id="AUTHOR">AUTHOR</h2>
 
-<p>   Chef was written by Adam Jacob <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#97;&#100;&#x61;&#109;&#x40;&#111;&#x70;&#x73;&#99;&#x6f;&#x64;&#101;&#46;&#99;&#x6f;&#109;" data-bare-link="true">&#x61;&#x64;&#97;&#x6d;&#64;&#111;&#x70;&#115;&#99;&#x6f;&#x64;&#101;&#x2e;&#x63;&#111;&#x6d;</a> of Opscode
+<p>   Chef was written by Adam Jacob <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#x6f;&#x3a;&#97;&#x64;&#97;&#x6d;&#64;&#111;&#x70;&#x73;&#x63;&#111;&#100;&#x65;&#x2e;&#99;&#x6f;&#x6d;" data-bare-link="true">&#97;&#x64;&#97;&#x6d;&#64;&#x6f;&#112;&#115;&#99;&#111;&#100;&#101;&#x2e;&#99;&#x6f;&#x6d;</a> of Opscode
    (<a href="http://www.opscode.com" data-bare-link="true">http://www.opscode.com</a>), with contributions from the community.</p>
 
 <h2 id="DOCUMENTATION">DOCUMENTATION</h2>
 
-<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#106;&#111;&#x73;&#104;&#117;&#97;&#x40;&#111;&#x70;&#115;&#99;&#111;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#104;&#117;&#x61;&#64;&#x6f;&#112;&#x73;&#x63;&#x6f;&#x64;&#x65;&#x2e;&#x63;&#x6f;&#x6d;</a>.</p>
+<p>   This manual page was written by Joshua Timberman <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#111;&#58;&#x6a;&#111;&#115;&#x68;&#x75;&#97;&#64;&#111;&#112;&#115;&#99;&#111;&#100;&#101;&#46;&#99;&#111;&#109;" data-bare-link="true">&#x6a;&#111;&#x73;&#x68;&#x75;&#97;&#64;&#x6f;&#x70;&#x73;&#x63;&#x6f;&#x64;&#101;&#x2e;&#99;&#x6f;&#109;</a>.</p>
 
 <h2 id="LICENSE">LICENSE</h2>
 
@@ -305,7 +305,7 @@ data editing entirely.</dd>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>Chef 11.8.2</li>
+    <li class='tl'>Chef 11.10.0.alpha.1</li>
     <li class='tc'>December 2013</li>
     <li class='tr'>knife(1)</li>
   </ol>

data/distro/common/man/man8/chef-client.8

@@ -49,7 +49,7 @@ Looking for exceptions and notifications, handling each as required
 .sp
 The chef\-client executable can be run as a command\-line tool.
 .IP Note
-A client.rb file is used to specify the configuration details for the chef\-client. This file is the default configuration file and is loaded every time the chef\-client executable is run. The chef\-client executable can be run as a daemon. On UNIX\- and Linux\-based machines, the configuration file is located at: /etc/chef/client.rb. On Microsoft Windows machines, the configuration file is located at C:chefclient.rb.
+A client.rb file is used to specify the configuration details for the chef\-client. This file is the default configuration file and is loaded every time the chef\-client executable is run. The chef\-client executable can be run as a daemon. On UNIX\- and Linux\-based machines, the configuration file is located at: \fB/etc/chef/client.rb\fP. On Microsoft Windows machines, the configuration file is located at \fBC:\echef\eclient.rb\fP.
 .RE
 .SH OPTIONS
 .sp
@@ -80,7 +80,7 @@ The name of the environment.
 Indicates that a chef\-client run will be contained in a secondary process with dedicated RAM. When the chef\-client run is complete the RAM will be returned to the master process. This option helps ensure that a chef\-client will use a steady amount of RAM over time because the master process will not run recipes. This option will also help prevent memory leaks (such as those that can be introduced by the code contained within a poorly designed cookbook). Use \fB\-\-no\-fork\fP to disable running the chef\-client in fork node. Default value: \fB\-\-fork\fP.
 .TP
 .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
-The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
+The output format: \fBdoc\fP (default) or \fBmin\fP. Other formatting options are available by using 3rd party formatters.
 .TP
 .B \fB\-\-force\-formatter\fP
 Indicates that formatter output will be used instead of logger output.
@@ -95,7 +95,7 @@ The name of the group that owns a process. This is required when starting any ex
 Shows help for the command.
 .TP
 .B \fB\-i SECONDS\fP, \fB\-\-interval SECONDS\fP
-The frequency (in seconds) at which the chef\-client runs. This value is configured for the chef\-client application run time, rather than in \fBChef::Config\fP. Default value: \fB1800\fP.
+The frequency (in seconds) at which the chef\-client runs. Default value: \fB1800\fP.
 .TP
 .B \fB\-j PATH\fP, \fB\-\-json\-attributes PATH\fP
 The path to a file that contains JSON data. Use this option to override attributes that are set from other locations, such as from within a cookbook or by a role.

data/distro/common/man/man8/chef-solo.8

@@ -67,11 +67,14 @@ The configuration file to use.
 .B \fB\-d\fP, \fB\-\-daemonize\fP
 Indicates that the executable will be run as a daemon. This option is only available on machines that run in UNIX or Linux environments. For machines that are running Microsoft Windows that require similar functionality, use the \fBchef\-client::service\fP recipe in the \fBchef\-client\fP cookbook: \fI\%http://community.opscode.com/cookbooks/chef-client\fP. This will install a chef\-client service under Microsoft Windows using the Windows Service Wrapper.
 .TP
+.B \fB\-E ENVIRONMENT_NAME\fP, \fB\-\-environment ENVIRONMENT_NAME\fP
+The name of the environment.
+.TP
 .B \fB\-f\fP, \fB\-\-[no\-]fork\fP
 Indicates that a chef\-client run will be contained in a secondary process with dedicated RAM. When the chef\-client run is complete the RAM will be returned to the master process. This option helps ensure that a chef\-client will use a steady amount of RAM over time because the master process will not run recipes. This option will also help prevent memory leaks (such as those that can be introduced by the code contained within a poorly designed cookbook). Use \fB\-\-no\-fork\fP to disable running the chef\-client in fork node. Default value: \fB\-\-fork\fP.
 .TP
 .B \fB\-F FORMAT\fP, \fB\-\-format FORMAT\fP
-The output format: \fBsummary\fP (default), \fBtext\fP, \fBjson\fP, \fByaml\fP, and \fBpp\fP.
+The output format: \fBdoc\fP (default) or \fBmin\fP. Other formatting options are available by using 3rd party formatters.
 .TP
 .B \fB\-\-force\-formatter\fP
 Indicates that formatter output will be used instead of logger output.
@@ -86,7 +89,7 @@ The name of the group that owns a process. This is required when starting any ex
 Shows help for the command.
 .TP
 .B \fB\-i SECONDS\fP, \fB\-\-interval SECONDS\fP
-The frequency (in seconds) at which the chef\-client runs. This value is configured for the chef\-client application run time, rather than in \fBChef::Config\fP.
+The frequency (in seconds) at which the chef\-client runs.
 .TP
 .B \fB\-j PATH\fP, \fB\-\-json\-attributes PATH\fP
 The path to a file that contains JSON data. Use this option to override attributes that are set from other locations, such as from within a cookbook or by a role.

data/lib/chef.rb

@@ -37,3 +37,5 @@ require 'chef/monkey_patches/string'
 require 'chef/monkey_patches/numeric'
 require 'chef/monkey_patches/object'
 require 'chef/monkey_patches/file'
+require 'chef/monkey_patches/uri'
+

data/lib/chef/application.rb

@@ -196,12 +196,17 @@ class Chef::Application
   end
 
   # Initializes Chef::Client instance and runs it
-  def run_chef_client
+  def run_chef_client(specific_recipes = [])
     Chef::Application.setup_server_connectivity
 
+    override_runlist = config[:override_runlist]
+    if specific_recipes.size > 0
+      override_runlist ||= []
+    end
     @chef_client = Chef::Client.new(
       @chef_client_json,
-      :override_runlist => config[:override_runlist]
+      :override_runlist => config[:override_runlist],
+      :specific_recipes => specific_recipes
     )
     @chef_client_json = nil
 

data/lib/chef/application/apply.rb

@@ -74,6 +74,12 @@ class Chef::Application::Apply < Chef::Application
     :description  => 'Enable whyrun mode',
     :boolean      => true
 
+  option :color,
+    :long         => '--[no-]color',
+    :boolean      => true,
+    :default      => !Chef::Platform.windows?,
+    :description  => "Use colored output, defaults to enabled"
+
   def initialize
     super
   end

data/lib/chef/application/client.rb

@@ -230,6 +230,8 @@ class Chef::Application::Client < Chef::Application
   def reconfigure
     super
 
+    Chef::Config[:specific_recipes] = cli_arguments.map { |file| File.expand_path(file) }
+
     Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url
 
     Chef::Config.local_mode = config[:local_mode] if config.has_key?(:local_mode)
@@ -309,7 +311,7 @@ class Chef::Application::Client < Chef::Application
           Chef::Log.debug("Splay sleep #{splay} seconds")
           sleep splay
         end
-        run_chef_client
+        run_chef_client(Chef::Config[:specific_recipes])
         if Chef::Config[:interval]
           Chef::Log.debug("Sleeping for #{Chef::Config[:interval]} seconds")
           unless SELF_PIPE.empty?

data/lib/chef/application/knife.rb

@@ -19,6 +19,8 @@ require 'chef/knife'
 require 'chef/application'
 require 'mixlib/log'
 require 'ohai/config'
+require 'chef/monkey_patches/net_http.rb'
+require 'chef/monkey_patches/uri.rb'
 
 class Chef::Application::Knife < Chef::Application
 

data/lib/chef/application/solo.rb

@@ -55,7 +55,7 @@ class Chef::Application::Solo < Chef::Application
   option :color,
     :long         => '--[no-]color',
     :boolean      => true,
-    :default      => true,
+    :default      => !Chef::Platform.windows?,
     :description  => "Use colored output, defaults to enabled"
 
   option :log_level,

data/lib/chef/client.rb

@@ -146,6 +146,7 @@ class Chef
 
       @events = EventDispatch::Dispatcher.new(*event_handlers)
       @override_runlist = args.delete(:override_runlist)
+      @specific_recipes = args.delete(:specific_recipes)
       runlist_override_sanity_check!
     end
 
@@ -248,6 +249,11 @@ class Chef
       run_status.run_context = run_context
 
       run_context.load(@run_list_expansion)
+      if @specific_recipes
+        @specific_recipes.each do |recipe_file|
+          run_context.load_recipe_file(recipe_file)
+        end
+      end
       assert_cookbook_path_not_empty(run_context)
       run_context
     end
@@ -543,8 +549,8 @@ class Chef
       end
     end
 
-    def directory_not_empty?(path)
-      File.exists?(path) && (Dir.entries(path).size > 2)
+    def empty_directory?(path)
+      !File.exists?(path) || (Dir.entries(path).size <= 2)
     end
 
     def is_last_element?(index, object)
@@ -556,15 +562,12 @@ class Chef
         # Check for cookbooks in the path given
         # Chef::Config[:cookbook_path] can be a string or an array
         # if it's an array, go through it and check each one, raise error at the last one if no files are found
-        Chef::Log.debug "Loading from cookbook_path: #{Array(Chef::Config[:cookbook_path]).map { |path| File.expand_path(path) }.join(', ')}"
-        Array(Chef::Config[:cookbook_path]).each_with_index do |cookbook_path, index|
-          if directory_not_empty?(cookbook_path)
-            break
-          else
-            msg = "No cookbook found in #{Chef::Config[:cookbook_path].inspect}, make sure cookbook_path is set correctly."
-            Chef::Log.fatal(msg)
-            raise Chef::Exceptions::CookbookNotFound, msg if is_last_element?(index, Chef::Config[:cookbook_path])
-          end
+        cookbook_paths = Array(Chef::Config[:cookbook_path])
+        Chef::Log.debug "Loading from cookbook_path: #{cookbook_paths.map { |path| File.expand_path(path) }.join(', ')}"
+        if cookbook_paths.all? {|path| empty_directory?(path) }
+          msg = "None of the cookbook paths set in Chef::Config[:cookbook_path], #{cookbook_paths.inspect}, contain any cookbooks"
+          Chef::Log.fatal(msg)
+          raise Chef::Exceptions::CookbookNotFound, msg
         end
       else
         Chef::Log.warn("Node #{node_name} has an empty run list.") if run_context.node.run_list.empty?

data/lib/chef/config.rb

@@ -449,6 +449,9 @@ class Chef
     # Report Handlers
     default :report_handlers, []
 
+    # Event Handlers
+    default :event_handlers, []
+
     # Exception Handlers
     default :exception_handlers, []
 
@@ -494,7 +497,7 @@ class Chef
 
       default :fatal_windows_admin_check, false
     else
-      default :user_valid_regex, [ /^([-a-zA-Z0-9_.]+[\\@]?[-a-zA-Z0-9_.]+)$/, /^\d+$/ ]
+      default :user_valid_regex, [ /^([-a-zA-Z0-9_.]+[\\@]?[-a-zA-Z0-9_.]*)$/, /^\d+$/ ]
       default :group_valid_regex, [ /^([-a-zA-Z0-9_.\\@^ ]+)$/, /^\d+$/ ]
     end
 

data/lib/chef/cookbook_uploader.rb

@@ -8,6 +8,7 @@ require 'chef/cookbook_version'
 require 'chef/cookbook/syntax_check'
 require 'chef/cookbook/file_system_file_vendor'
 require 'chef/sandbox'
+require 'thread'
 
 class Chef
   class CookbookUploader
@@ -16,10 +17,10 @@ class Chef
       @work_queue ||= Queue.new
     end
 
-    def self.setup_worker_threads
+    def self.setup_worker_threads(concurrency=10)
       @worker_threads ||= begin
         work_queue
-        (1...10).map do
+        (1...concurrency).map do
           Thread.new do
             loop do
               work_queue.pop.call
@@ -33,6 +34,7 @@ class Chef
     attr_reader :path
     attr_reader :opts
     attr_reader :rest
+    attr_reader :concurrency
 
     # Creates a new CookbookUploader.
     # ===Arguments:
@@ -49,10 +51,13 @@ class Chef
     # * :rest   A Chef::REST object that you have configured the way you like it.
     #           If you don't provide this, one will be created using the values
     #           in Chef::Config.
+    # * :concurrency   An integer that decided how many threads will be used to
+    #           perform concurrent uploads
     def initialize(cookbooks, path, opts={})
       @path, @opts = path, opts
       @cookbooks = Array(cookbooks)
       @rest = opts[:rest] || Chef::REST.new(Chef::Config[:chef_server_url])
+      @concurrency = opts[:concurrency] || 10
     end
 
     def upload_cookbooks
@@ -72,7 +77,7 @@ class Chef
 
       Chef::Log.info("Uploading files")
 
-      self.class.setup_worker_threads
+      self.class.setup_worker_threads(concurrency)
 
       checksums_to_upload = Set.new
 
@@ -137,7 +142,7 @@ class Chef
         timestamp = Time.now.utc.iso8601
         file_contents = File.open(file, "rb") {|f| f.read}
         # TODO - 5/28/2010, cw: make signing and sending the request streaming
-        headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, :accept => 'application/json' }
+        headers = { 'content-type' => 'application/x-binary', 'content-md5' => checksum64, "accept" => 'application/json' }
         if rest.signing_key
           sign_obj = Mixlib::Authentication::SignedHeaderAuth.signing_object(
                                                                              :http_method => :put,
@@ -150,10 +155,12 @@ class Chef
         end
 
         begin
-          RestClient::Resource.new(url, :headers=>headers, :timeout=>1800, :open_timeout=>1800).put(file_contents)
+          Chef::HTTP::Simple.new(url, :headers=>headers).put(url, file_contents)
           checksums_to_upload.delete(checksum)
-        rescue RestClient::Exception => e
-          Chef::Knife.ui.error("Failed to upload #@cookbook : #{e.message}\n#{e.response.body}")
+        rescue Net::HTTPServerException, Net::HTTPFatalError, Errno::ECONNREFUSED, Timeout::Error, Errno::ETIMEDOUT, SocketError => e
+          error_message = "Failed to upload #{file} (#{checksum}) to #{url} : #{e.message}"
+          error_message << "\n#{e.response.body}" if e.respond_to?(:response)
+          Chef::Knife.ui.error(error_message)
           raise
         end
       end

data/lib/chef/encrypted_data_bag_item.rb

@@ -16,11 +16,10 @@
 # limitations under the License.
 #
 
-require 'base64'
-require 'openssl'
+require 'chef/config'
 require 'chef/data_bag_item'
-require 'yaml'
-require 'yajl'
+require 'chef/encrypted_data_bag_item/decryptor'
+require 'chef/encrypted_data_bag_item/encryptor'
 require 'open-uri'
 
 # An EncryptedDataBagItem represents a read-only data bag item where
@@ -50,305 +49,6 @@ require 'open-uri'
 class Chef::EncryptedDataBagItem
   ALGORITHM = 'aes-256-cbc'
 
-  class UnacceptableEncryptedDataBagItemFormat < StandardError
-  end
-
-  class UnsupportedEncryptedDataBagItemFormat < StandardError
-  end
-
-  class DecryptionFailure < StandardError
-  end
-
-  class UnsupportedCipher < StandardError
-  end
-
-  # Implementation class for converting plaintext data bag item values to an
-  # encrypted value, including any necessary wrappers and metadata.
-  module Encryptor
-
-    # "factory" method that creates an encryptor object with the proper class
-    # for the desired encrypted data bag format version.
-    #
-    # +Chef::Config[:data_bag_encrypt_version]+ determines which version is used.
-    def self.new(value, secret, iv=nil)
-      format_version = Chef::Config[:data_bag_encrypt_version]
-      case format_version
-      when 1
-        Version1Encryptor.new(value, secret, iv)
-      when 2
-        Version2Encryptor.new(value, secret, iv)
-      else
-        raise UnsupportedEncryptedDataBagItemFormat,
-          "Invalid encrypted data bag format version `#{format_version}'. Supported versions are '1', '2'"
-      end
-    end
-
-    class Version1Encryptor
-      attr_reader :key
-      attr_reader :plaintext_data
-
-      # Create a new Encryptor for +data+, which will be encrypted with the given
-      # +key+.
-      #
-      # === Arguments:
-      # * data: An object of any type that can be serialized to json
-      # * key: A String representing the desired passphrase
-      # * iv: The optional +iv+ parameter is intended for testing use only. When
-      # *not* supplied, Encryptor will use OpenSSL to generate a secure random
-      # IV, which is what you want.
-      def initialize(plaintext_data, key, iv=nil)
-        @plaintext_data = plaintext_data
-        @key = key
-        @iv = iv && Base64.decode64(iv)
-      end
-
-      # Returns a wrapped and encrypted version of +plaintext_data+ suitable for
-      # using as the value in an encrypted data bag item.
-      def for_encrypted_item
-        {
-          "encrypted_data" => encrypted_data,
-          "iv" => Base64.encode64(iv),
-          "version" => 1,
-          "cipher" => ALGORITHM
-        }
-      end
-
-      # Generates or returns the IV.
-      def iv
-        # Generated IV comes from OpenSSL::Cipher::Cipher#random_iv
-        # This gets generated when +openssl_encryptor+ gets created.
-        openssl_encryptor if @iv.nil?
-        @iv
-      end
-
-      # Generates (and memoizes) an OpenSSL::Cipher::Cipher object and configures
-      # it for the specified iv and encryption key.
-      def openssl_encryptor
-        @openssl_encryptor ||= begin
-          encryptor = OpenSSL::Cipher::Cipher.new(ALGORITHM)
-          encryptor.encrypt
-          @iv ||= encryptor.random_iv
-          encryptor.iv = @iv
-          encryptor.key = Digest::SHA256.digest(key)
-          encryptor
-        end
-      end
-
-      # Encrypts and Base64 encodes +serialized_data+
-      def encrypted_data
-        @encrypted_data ||= begin
-          enc_data = openssl_encryptor.update(serialized_data)
-          enc_data << openssl_encryptor.final
-          Base64.encode64(enc_data)
-        end
-      end
-
-      # Wraps the data in a single key Hash (JSON Object) and converts to JSON.
-      # The wrapper is required because we accept values (such as Integers or
-      # Strings) that do not produce valid JSON when serialized without the
-      # wrapper.
-      def serialized_data
-        Yajl::Encoder.encode(:json_wrapper => plaintext_data)
-      end
-    end
-
-    class Version2Encryptor < Version1Encryptor
-
-      # Returns a wrapped and encrypted version of +plaintext_data+ suitable for
-      # using as the value in an encrypted data bag item.
-      def for_encrypted_item
-        {
-          "encrypted_data" => encrypted_data,
-          "hmac" => hmac,
-          "iv" => Base64.encode64(iv),
-          "version" => 2,
-          "cipher" => ALGORITHM
-        }
-      end
-
-      # Generates an HMAC-SHA2-256 of the encrypted data (encrypt-then-mac)
-      def hmac
-        @hmac ||= begin
-          digest = OpenSSL::Digest::Digest.new("sha256")
-          raw_hmac = OpenSSL::HMAC.digest(digest, key, encrypted_data)
-          Base64.encode64(raw_hmac)
-        end
-      end
-
-    end
-  end
-
-  #=== Decryptor
-  # For backwards compatibility, Chef implements decryption/deserialization for
-  # older encrypted data bag item formats in addition to the current version.
-  # Each decryption/deserialization strategy is implemented as a class in this
-  # namespace. For convenience the factory method +Decryptor.for()+ can be used
-  # to create an instance of the appropriate strategy for the given encrypted
-  # data bag value.
-  module Decryptor
-
-    # Detects the encrypted data bag item format version and instantiates a
-    # decryptor object for that version. Call #for_decrypted_item on the
-    # resulting object to decrypt and deserialize it.
-    def self.for(encrypted_value, key)
-      format_version = format_version_of(encrypted_value)
-      assert_format_version_acceptable!(format_version)
-      case format_version
-      when 2
-        Version2Decryptor.new(encrypted_value, key)
-      when 1
-        Version1Decryptor.new(encrypted_value, key)
-      when 0
-        Version0Decryptor.new(encrypted_value, key)
-      else
-        raise UnsupportedEncryptedDataBagItemFormat,
-          "This version of chef does not support encrypted data bag item format version '#{format_version}'"
-      end
-    end
-
-    def self.format_version_of(encrypted_value)
-      if encrypted_value.respond_to?(:key?)
-        encrypted_value["version"]
-      else
-        0
-      end
-    end
-
-    def self.assert_format_version_acceptable!(format_version)
-      unless format_version.kind_of?(Integer) and format_version >= Chef::Config[:data_bag_decrypt_minimum_version]
-        raise UnacceptableEncryptedDataBagItemFormat,
-          "The encrypted data bag item has format version `#{format_version}', " +
-          "but the config setting 'data_bag_decrypt_minimum_version' requires version `#{Chef::Config[:data_bag_decrypt_minimum_version]}'"
-      end
-    end
-
-    class Version1Decryptor
-
-      attr_reader :encrypted_data
-      attr_reader :key
-
-      def initialize(encrypted_data, key)
-        @encrypted_data = encrypted_data
-        @key = key
-      end
-
-      def for_decrypted_item
-        Yajl::Parser.parse(decrypted_data)["json_wrapper"]
-      rescue Yajl::ParseError
-        # convert to a DecryptionFailure error because the most likely scenario
-        # here is that the decryption step was unsuccessful but returned bad
-        # data rather than raising an error.
-        raise DecryptionFailure, "Error decrypting data bag value. Most likely the provided key is incorrect"
-      end
-
-      def encrypted_bytes
-        Base64.decode64(@encrypted_data["encrypted_data"])
-      end
-
-      def iv
-        Base64.decode64(@encrypted_data["iv"])
-      end
-
-      def decrypted_data
-        @decrypted_data ||= begin
-          plaintext = openssl_decryptor.update(encrypted_bytes)
-          plaintext << openssl_decryptor.final
-        rescue OpenSSL::Cipher::CipherError => e
-          raise DecryptionFailure, "Error decrypting data bag value: '#{e.message}'. Most likely the provided key is incorrect"
-        end
-      end
-
-      def openssl_decryptor
-        @openssl_decryptor ||= begin
-          assert_valid_cipher!
-          d = OpenSSL::Cipher::Cipher.new(ALGORITHM)
-          d.decrypt
-          d.key = Digest::SHA256.digest(key)
-          d.iv = iv
-          d
-        end
-      end
-
-      def assert_valid_cipher!
-        # In the future, chef may support configurable ciphers. For now, only
-        # aes-256-cbc is supported.
-        requested_cipher = @encrypted_data["cipher"]
-        unless requested_cipher == ALGORITHM
-          raise UnsupportedCipher,
-            "Cipher '#{requested_cipher}' is not supported by this version of Chef. Available ciphers: ['#{ALGORITHM}']"
-        end
-      end
-
-    end
-
-    class Version2Decryptor < Version1Decryptor
-
-      def decrypted_data
-        validate_hmac! unless @decrypted_data
-        super
-      end
-
-      def validate_hmac!
-        digest = OpenSSL::Digest::Digest.new("sha256")
-        raw_hmac = OpenSSL::HMAC.digest(digest, key, @encrypted_data["encrypted_data"])
-
-        if candidate_hmac_matches?(raw_hmac)
-          true
-        else
-          raise DecryptionFailure, "Error decrypting data bag value: invalid hmac. Most likely the provided key is incorrect"
-        end
-      end
-
-      private
-
-      def candidate_hmac_matches?(expected_hmac)
-        return false unless @encrypted_data["hmac"]
-        expected_bytes = expected_hmac.bytes.to_a
-        candidate_hmac_bytes = Base64.decode64(@encrypted_data["hmac"]).bytes.to_a
-        valid = expected_bytes.size ^ candidate_hmac_bytes.size
-        expected_bytes.zip(candidate_hmac_bytes) { |x, y| valid |= x ^ y.to_i }
-        valid == 0
-      end
-    end
-
-    class Version0Decryptor
-
-      attr_reader :encrypted_data
-      attr_reader :key
-
-      def initialize(encrypted_data, key)
-        @encrypted_data = encrypted_data
-        @key = key
-      end
-
-      def for_decrypted_item
-        YAML.load(decrypted_data)
-      end
-
-      def decrypted_data
-        @decrypted_data ||= begin
-          plaintext = openssl_decryptor.update(encrypted_bytes)
-          plaintext << openssl_decryptor.final
-        rescue OpenSSL::Cipher::CipherError => e
-          raise DecryptionFailure, "Error decrypting data bag value: '#{e.message}'. Most likely the provided key is incorrect"
-        end
-      end
-
-      def encrypted_bytes
-        Base64.decode64(@encrypted_data)
-      end
-
-      def openssl_decryptor
-        @openssl_decryptor ||= begin
-          d = OpenSSL::Cipher::Cipher.new(ALGORITHM)
-          d.decrypt
-          d.pkcs5_keyivgen(key)
-          d
-        end
-      end
-    end
-  end
-
   def initialize(enc_hash, secret)
     @enc_hash = enc_hash
     @secret = secret
@@ -390,6 +90,9 @@ class Chef::EncryptedDataBagItem
 
   def self.load_secret(path=nil)
     path ||= Chef::Config[:encrypted_data_bag_secret]
+    if !path
+      raise ArgumentError, "No secret specified to load_secret and no secret found at #{Chef::Config.platform_specific_path('/etc/chef/encrypted_data_bag_secret')}"
+    end
     secret = case path
              when /^\w+:\/\//
                # We have a remote key