chef 11.10.0.rc.0-x86-mingw32 → 11.10.0.rc.1-x86-mingw32

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

@@ -1,4 +1,4 @@
-.TH "CHEF-SOLO" "8" "Chef 11.8.0" "" "chef-solo"
+.TH "CHEF-SOLO" "8" "Chef 11.10.0" "" "chef-solo"
 .SH NAME
 chef-solo \- The man page for the chef-solo command line tool.
 .
@@ -74,7 +74,13 @@ 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: \fBdoc\fP (default) or \fBmin\fP. Other formatting options are available by using 3rd party formatters.
+The output format: \fBdoc\fP (default) or \fBmin\fP.
+.sp
+Use \fBdoc\fP to print the progress of the chef\-client run using full strings that display a summary of updates as they occur.
+.sp
+Use \fBmin\fP to print the progress of the chef\-client run using single characters. A summary of updates is printed at the end of the chef\-client run. A dot (\fB.\fP) is printed for events that do not have meaningful status information, such as loading a file or synchronizing a cookbook. For resources, a dot (\fB.\fP) is printed when the resource is up to date, an \fBS\fP is printed when the resource is skipped by \fBnot_if\fP or \fBonly_if\fP, and a \fBU\fP is printed when the resource is updated.
+.sp
+Other formatting options are available when those formatters are configured in the client.rb file using the \fBadd_formatter\fP option.
 .TP
 .B \fB\-\-force\-formatter\fP
 Indicates that formatter output will be used instead of logger output.
@@ -92,16 +98,16 @@ Shows help for the command.
 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.
+The path to a file that contains JSON data. Use this option to override \fBnormal\fP attributes set elsewhere.
 .TP
 .B \fB\-l LEVEL\fP, \fB\-\-log_level LEVEL\fP
-The level of logging that will be stored in a log file: \fBdebug\fP, \fBinfo\fP, \fBwarn\fP, \fBerror\fP, or \fBfatal\fP.
+The level of logging that will be stored in a log file.
 .TP
 .B \fB\-L LOGLOCATION\fP, \fB\-\-logfile c\fP
 The location in which log file output files will be saved. If this location is set to something other than \fBSTDOUT\fP, standard output logging will still be performed (otherwise there would be no output other than to a file). This is recommended when starting any executable as a daemon.
 .TP
 .B \fB\-\-[no\-]color\fP
-Indicates that color will not be used in the output. Default setting: \fB\-\-color\fP.
+Indicates whether colored output will be used. Default setting: \fB\-\-color\fP.
 .TP
 .B \fB\-N NODE_NAME\fP, \fB\-\-node\-name NODE_NAME\fP
 The name of the node.
@@ -156,6 +162,6 @@ $ chef\-solo \-c ~/solo.rb \-j http://www.example.com/node.json \-r http://www.e
 .sp
 where \fB\-r\fP corresponds to \fBrecipe_url\fP and \fB\-j\fP corresponds to \fBjson_attribs\fP, both of which are configuration options in solo.rb.
 .SH AUTHOR
-Opscode
+Chef
 .\" Generated by docutils manpage writer.
 .

data/lib/chef/client.rb

@@ -255,18 +255,22 @@ class Chef
       run_context
     end
 
+    def sync_cookbooks
+      policy_builder.sync_cookbooks
+    end
+
     def policy_builder
       @policy_builder ||= Chef::PolicyBuilder.strategy.new(node_name, ohai.data, json_attribs, @override_runlist, events)
     end
 
 
     def save_updated_node
-      unless Chef::Config[:solo]
+      if Chef::Config[:solo]
+        # nothing to do
+      elsif policy_builder.temporary_policy?
+        Chef::Log.warn("Skipping final node save because override_runlist was given")
+      else
         Chef::Log.debug("Saving the current state of node #{node_name}")
-        if(@original_runlist)
-          @node.run_list(*@original_runlist)
-          @node.automatic_attrs[:runlist_override_history] = {Time.now.to_i => @override_runlist.inspect}
-        end
         @node.save
       end
     end

data/lib/chef/cookbook_uploader.rb

@@ -20,7 +20,7 @@ class Chef
     def self.setup_worker_threads(concurrency=10)
       @worker_threads ||= begin
         work_queue
-        (1...concurrency).map do
+        (1..concurrency).map do
           Thread.new do
             loop do
               work_queue.pop.call

data/lib/chef/dsl/recipe.rb

@@ -31,50 +31,131 @@ class Chef
 
       include Chef::Mixin::ConvertToClassName
 
+      # Default +cookbook_name+ implementation, always returns "none". This
+      # should be overriden in including classes whenever a meaningful value
+      # can be provided.
+      def cookbook_name
+        "none"
+      end
+
+      # Default +recipe_name+ implementation, always returns "none". This
+      # should be overridden in including classes whenever a meaningful value
+      # can be provided.
+      def recipe_name
+        "none"
+      end
+
       def method_missing(method_symbol, *args, &block)
         # If we have a definition that matches, we want to use that instead.  This should
         # let you do some really crazy over-riding of "native" types, if you really want
         # to.
-        if run_context.definitions.has_key?(method_symbol)
-          # This dupes the high level object, but we still need to dup the params
-          new_def = run_context.definitions[method_symbol].dup
-          new_def.params = new_def.params.dup
-          new_def.node = run_context.node
-          # This sets up the parameter overrides
-          new_def.instance_eval(&block) if block
-          new_recipe = Chef::Recipe.new(cookbook_name, @recipe_name, run_context)
-          new_recipe.params = new_def.params
-          new_recipe.params[:name] = args[0]
-          new_recipe.instance_eval(&new_def.recipe)
-        else
+        if has_resource_definition?(method_symbol)
+          evaluate_resource_definition(method_symbol, *args, &block)
+        elsif have_resource_class_for?(method_symbol)
           # Otherwise, we're rocking the regular resource call route.
+          declare_resource(method_symbol, args[0], caller[0], &block)
+        else
+          super
+        end
+      rescue NoMethodError
+        raise NoMethodError, "No resource or method named `#{method_symbol}' for #{describe_self_for_error}"
+      rescue NameError
+        raise NameError, "No resource, method, or local variable named `#{method_symbol}' for #{describe_self_for_error}"
+      end
+
+      def has_resource_definition?(name)
+        yes_or_no = run_context.definitions.has_key?(name)
+
+        yes_or_no
+      end
+
+      # Processes the arguments and block as a resource definition.
+      def evaluate_resource_definition(definition_name, *args, &block)
+
+        # This dupes the high level object, but we still need to dup the params
+        new_def = run_context.definitions[definition_name].dup
+
+        new_def.params = new_def.params.dup
+        new_def.node = run_context.node
+        # This sets up the parameter overrides
+        new_def.instance_eval(&block) if block
+
+
+        new_recipe = Chef::Recipe.new(cookbook_name, recipe_name, run_context)
+        new_recipe.params = new_def.params
+        new_recipe.params[:name] = args[0]
+        new_recipe.instance_eval(&new_def.recipe)
+        new_recipe
+      end
+
+      # Instantiates a resource (via #build_resource), then adds it to the
+      # resource collection. Note that resource classes are looked up directly,
+      # so this will create the resource you intended even if the method name
+      # corresponding to that resource has been overridden.
+      def declare_resource(type, name, created_at=nil, &resource_attrs_block)
+        created_at ||= caller[0]
 
-          # Checks the new platform => short_name => resource mapping initially
-          # then fall back to the older approach (Chef::Resource.const_get) for
-          # backward compatibility
-          resource_class = Chef::Resource.resource_for_node(method_symbol, run_context.node)
-
-          super unless resource_class
-          raise ArgumentError, "You must supply a name when declaring a #{method_symbol} resource" unless args.size > 0
-
-          # If we have a resource like this one, we want to steal its state
-          args << run_context
-          resource = resource_class.new(*args)
-          resource.source_line = caller[0]
-          resource.load_prior_resource
-          resource.cookbook_name = cookbook_name
-          resource.recipe_name = @recipe_name
-          resource.params = @params
-          # Determine whether this resource is being created in the context of an enclosing Provider
-          resource.enclosing_provider = self.is_a?(Chef::Provider) ? self : nil
-          # Evaluate resource attribute DSL
-          resource.instance_eval(&block) if block
-
-          # Run optional resource hook
-          resource.after_created
-
-          run_context.resource_collection.insert(resource)
-          resource
+        resource = build_resource(type, name, created_at, &resource_attrs_block)
+
+        run_context.resource_collection.insert(resource)
+        resource
+      end
+
+      # Instantiate a resource of the given +type+ with the given +name+ and
+      # attributes as given in the +resource_attrs_block+.
+      #
+      # The resource is NOT added to the resource collection.
+      def build_resource(type, name, created_at=nil, &resource_attrs_block)
+        created_at ||= caller[0]
+
+        # Checks the new platform => short_name => resource mapping initially
+        # then fall back to the older approach (Chef::Resource.const_get) for
+        # backward compatibility
+        resource_class = resource_class_for(type)
+
+        raise ArgumentError, "You must supply a name when declaring a #{type} resource" if name.nil?
+
+        resource = resource_class.new(name, run_context)
+        resource.source_line = created_at
+        resource.cookbook_name = cookbook_name
+        resource.recipe_name = recipe_name
+        # If we have a resource like this one, we want to steal its state
+        # This behavior is very counter-intuitive and should be removed.
+        # See CHEF-3694, https://tickets.opscode.com/browse/CHEF-3694
+        resource.load_prior_resource
+        # Determine whether this resource is being created in the context of an enclosing Provider
+        resource.enclosing_provider = self.is_a?(Chef::Provider) ? self : nil
+
+        # XXX: This is very crufty, but it's required for resource definitions
+        # to work properly :(
+        resource.params = @params
+
+        # Evaluate resource attribute DSL
+        resource.instance_eval(&resource_attrs_block) if block_given?
+
+        # Run optional resource hook
+        resource.after_created
+
+        resource
+      end
+
+      def resource_class_for(snake_case_name)
+        Chef::Resource.resource_for_node(snake_case_name, run_context.node)
+      end
+
+      def have_resource_class_for?(snake_case_name)
+        not resource_class_for(snake_case_name).nil?
+      rescue NameError
+        false
+      end
+
+      def describe_self_for_error
+        if respond_to?(:name)
+          %Q[`#{self.class.name} "#{name}"']
+        elsif respond_to?(:recipe_name)
+          %Q[`#{self.class.name} "#{recipe_name}"']
+        else
+          to_s
         end
       end
 

data/lib/chef/exceptions.rb

@@ -80,6 +80,10 @@ class Chef
     class ConflictingMembersInGroup < ArgumentError; end
     class InvalidResourceReference < RuntimeError; end
     class ResourceNotFound < RuntimeError; end
+
+    # Can't find a Resource of this type that is valid on this platform.
+    class NoSuchResourceType < NameError; end
+
     class InvalidResourceSpecification < ArgumentError; end
     class SolrConnectionError < RuntimeError; end
     class IllegalChecksumRevert < RuntimeError; end

data/lib/chef/policy_builder/expand_node_object.rb

@@ -155,10 +155,6 @@ class Chef
         raise
       end
 
-      ########################################
-      # Internal public API
-      ########################################
-
       # Sync_cookbooks eagerly loads all files except files and
       # templates.  It returns the cookbook_hash -- the return result
       # from /environments/#{node.chef_environment}/cookbook_versions,
@@ -190,6 +186,17 @@ class Chef
         cookbook_hash
       end
 
+      # Indicates whether the policy is temporary, which means an
+      # override_runlist was provided. Chef::Client uses this to decide whether
+      # to do the final node save at the end of the run or not.
+      def temporary_policy?
+        !!@original_runlist
+      end
+
+      ########################################
+      # Internal public API
+      ########################################
+
       def setup_run_list_override
         runlist_override_sanity_check!
         unless(override_runlist.empty?)

data/lib/chef/policy_builder/policyfile.rb

@@ -174,7 +174,6 @@ class Chef
         run_list_expansion_ish
       end
 
-      ## Internal Public API ##
 
       def sync_cookbooks
         Chef::Log.debug("Synchronizing cookbooks")
@@ -187,6 +186,13 @@ class Chef
         cookbooks_to_sync
       end
 
+      # Whether or not this is a temporary policy. Since PolicyBuilder doesn't
+      # support override_runlist, this is always false.
+      def temporary_policy?
+        false
+      end
+
+      ## Internal Public API ##
 
       def run_list_with_versions_for_display
         run_list.map do |recipe_spec|

data/lib/chef/provider/file.rb

@@ -374,6 +374,7 @@ class Chef
         end
 
         # unlink necessary to clean up in why-run mode
+        tempfile.close
         tempfile.unlink
       end
 

data/lib/chef/resource_platform_map.rb

@@ -123,7 +123,7 @@ class Chef
         resource_klass = platform_resource(short_name, platform, version) ||
                          resource_matching_short_name(short_name)
 
-        raise NameError, "Cannot find a resource for #{short_name} on #{platform} version #{version}" if resource_klass.nil?
+        raise Exceptions::NoSuchResourceType, "Cannot find a resource for #{short_name} on #{platform} version #{version}" if resource_klass.nil?
 
         resource_klass
       end

data/lib/chef/resource_reporter.rb

@@ -50,8 +50,8 @@ class Chef
       def for_json
         as_hash = {}
         as_hash["type"]   = new_resource.class.dsl_name
-        as_hash["name"]   = new_resource.name
-        as_hash["id"]     = new_resource.identity
+        as_hash["name"]   = new_resource.name.to_s
+        as_hash["id"]     = new_resource.identity.to_s
         as_hash["after"]  = state(new_resource)
         as_hash["before"] = current_resource ? state(current_resource) : {}
         as_hash["duration"] = (elapsed_time * 1000).to_i.to_s

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.10.0.rc.0'
+  VERSION = '11.10.0.rc.1'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/functional/knife/cookbook_delete_spec.rb

@@ -51,7 +51,7 @@ describe Chef::Knife::CookbookDelete do
     end
 
     it "logs an error and exits" do
-      @knife.ui.stub!(:stderr).and_return(@log_output)
+      @knife.ui.stub(:stderr).and_return(@log_output)
       lambda {@knife.run}.should raise_error(SystemExit)
       @log_output.string.should match(/Cannot find a cookbook named no-such-cookbook to delete/)
     end
@@ -67,8 +67,8 @@ describe Chef::Knife::CookbookDelete do
 
     it "asks for confirmation, then deletes the cookbook" do
       stdin, stdout = StringIO.new("y\n"), StringIO.new
-      @knife.ui.stub!(:stdin).and_return(stdin)
-      @knife.ui.stub!(:stdout).and_return(stdout)
+      @knife.ui.stub(:stdin).and_return(stdin)
+      @knife.ui.stub(:stdout).and_return(stdout)
 
       cb100_deleted = false
       @api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
@@ -83,8 +83,8 @@ describe Chef::Knife::CookbookDelete do
       @knife.config[:purge] = true
 
       stdin, stdout = StringIO.new("y\ny\n"), StringIO.new
-      @knife.ui.stub!(:stdin).and_return(stdin)
-      @knife.ui.stub!(:stdout).and_return(stdout)
+      @knife.ui.stub(:stdin).and_return(stdin)
+      @knife.ui.stub(:stdout).and_return(stdout)
 
       cb100_deleted = false
       @api.delete("/cookbooks/obsolete-cookbook/1.0.0?purge=true", 200) { cb100_deleted = true; "[\"true\"]" }
@@ -126,8 +126,8 @@ describe Chef::Knife::CookbookDelete do
       cb100_deleted = cb110_deleted = cb120_deleted = nil
       @api.delete("/cookbooks/obsolete-cookbook/1.0.0", 200) { cb100_deleted = true; "[\"true\"]" }
       stdin, stdout = StringIO.new, StringIO.new
-      @knife.ui.stub!(:stdin).and_return(stdin)
-      @knife.ui.stub!(:stdout).and_return(stdout)
+      @knife.ui.stub(:stdin).and_return(stdin)
+      @knife.ui.stub(:stdout).and_return(stdout)
       stdin << "1\n"
       stdin.rewind
       @knife.run
@@ -142,8 +142,8 @@ describe Chef::Knife::CookbookDelete do
       @api.delete("/cookbooks/obsolete-cookbook/1.2.0", 200) { cb120_deleted = true; "[\"true\"]" }
 
       stdin, stdout = StringIO.new("4\n"), StringIO.new
-      @knife.ui.stub!(:stdin).and_return(stdin)
-      @knife.ui.stub!(:stdout).and_return(stdout)
+      @knife.ui.stub(:stdin).and_return(stdin)
+      @knife.ui.stub(:stdout).and_return(stdout)
 
       @knife.run
 

data/spec/functional/knife/ssh_spec.rb

@@ -252,7 +252,7 @@ describe Chef::Knife::Ssh do
     # if available, but #merge_configs (which is called by #configure_chef) is
     # necessary to have default options merged in.
     @knife.merge_configs
-    @knife.stub!(:ssh_command).and_return { 0 }
+    @knife.stub(:ssh_command).and_return { 0 }
     @api = TinyServer::API.instance
     @api.clear
 

data/spec/functional/resource/link_spec.rb

@@ -132,7 +132,7 @@ describe Chef::Resource::Link do
       describe 'the :delete action' do
         before(:each) do
           @info = []
-          Chef::Log.stub!(:info) { |msg| @info << msg }
+          Chef::Log.stub(:info) { |msg| @info << msg }
           resource.run_action(:delete)
         end
 
@@ -153,7 +153,7 @@ describe Chef::Resource::Link do
       describe 'the :delete action' do
         before(:each) do
           @info = []
-          Chef::Log.stub!(:info) { |msg| @info << msg }
+          Chef::Log.stub(:info) { |msg| @info << msg }
           resource.run_action(:delete)
         end
 
@@ -174,7 +174,7 @@ describe Chef::Resource::Link do
       describe 'the :create action' do
         before(:each) do
           @info = []
-          Chef::Log.stub!(:info) { |msg| @info << msg }
+          Chef::Log.stub(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
 
@@ -195,7 +195,7 @@ describe Chef::Resource::Link do
       describe 'the :create action' do
         before(:each) do
           @info = []
-          Chef::Log.stub!(:info) { |msg| @info << msg }
+          Chef::Log.stub(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
 
@@ -216,7 +216,7 @@ describe Chef::Resource::Link do
       describe 'the :create action' do
         before(:each) do
           @info = []
-          Chef::Log.stub!(:info) { |msg| @info << msg }
+          Chef::Log.stub(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
         it 'preserves the hard link' do
@@ -241,7 +241,7 @@ describe Chef::Resource::Link do
       describe 'the :create action' do
         before(:each) do
           @info = []
-          Chef::Log.stub!(:info) { |msg| @info << msg }
+          Chef::Log.stub(:info) { |msg| @info << msg }
           resource.run_action(:create)
         end
         it 'links to the target file' do