chef 10.16.0 → 10.16.2

data/distro/common/man/man1/knife-cookbook.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\fR \- upload and manage chef cookbooks

data/distro/common/man/man1/knife-data-bag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-DATA\-BAG" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server

data/distro/common/man/man1/knife-environment.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ENVIRONMENT" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure

data/distro/common/man/man1/knife-exec.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-EXEC" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-exec\fR \- Run user scripts using the Chef API DSL

data/distro/common/man/man1/knife-index.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-INDEX" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-index\fR \- Rebuild the search index on a Chef Server

data/distro/common/man/man1/knife-node.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-NODE" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure

data/distro/common/man/man1/knife-role.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ROLE" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-role\fR \- Group common configuration settings

data/distro/common/man/man1/knife-search.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SEARCH" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-search\fR \- Find objects on a Chef Server by query

data/distro/common/man/man1/knife-ssh.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SSH" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts

data/distro/common/man/man1/knife-status.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-STATUS" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-status\fR \- Display status information for the nodes in your infrastructure

data/distro/common/man/man1/knife-tag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-TAG" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server

data/distro/common/man/man1/knife.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "KNIFE" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility

data/distro/common/man/man1/shef.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "SHEF" "1" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "SHEF" "1" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBshef\fR \- Interactive Chef Console

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-CLIENT" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDER" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDERCTL" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expanderctl\fR \- management program for chef\-expander

data/distro/common/man/man8/chef-server-webui.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER\-WEBUI" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\fR \- Start the Chef Server merb application slice\.

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLO" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLR" "8" "October 2012" "Chef 10.16.0" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "October 2012" "Chef 10.16.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb

@@ -44,6 +44,12 @@ class Chef
           end
 
           error_description.section("Compiled Resource:", "#{resource.to_text}")
+
+          # Template errors get wrapped in an exception class that can show the relevant template code,
+          # so add them to the error output.
+          if exception.respond_to?(:source_listing)
+            error_description.section("Template Context:", "#{exception.source_location}\n#{exception.source_listing}")
+          end
         end
 
         def recipe_snippet

data/lib/chef/knife/cookbook_site_install.rb

@@ -107,6 +107,7 @@ class Chef
           end
         end
 
+
         unless config[:no_deps]
           md = Chef::Cookbook::Metadata.new
           md.from_file(File.join(@install_path, @cookbook_name, "metadata.rb"))
@@ -143,13 +144,21 @@ class Chef
 
       def extract_cookbook(upstream_file, version)
         ui.info("Uncompressing #{@cookbook_name} version #{version}.")
-        shell_out!("tar zxvf #{Shellwords.escape upstream_file}", :cwd => @install_path)
+        shell_out!("tar zxvf #{convert_path upstream_file}", :cwd => @install_path)
       end
 
       def clear_existing_files(cookbook_path)
         ui.info("Removing pre-existing version.")
         FileUtils.rmtree(cookbook_path) if File.directory?(cookbook_path)
       end
+      
+      def convert_path(upstream_file)
+      	if ENV['MSYSTEM'] == 'MINGW32'
+      	  return upstream_file.sub(/^([[:alpha:]]):/, '/\1')
+      	else 
+      	  return Shellwords.escape upstream_file
+      	end
+      end
     end
   end
 end

data/lib/chef/provider/cookbook_file.rb

@@ -44,9 +44,6 @@ class Chef
               Chef::Log.debug("#{@new_resource} staging #{file_cache_location} to #{tempfile.path}")
               tempfile.close
               FileUtils.cp(file_cache_location, tempfile.path)
-              # Since the @new_resource.path file will not be updated
-              # at the time of converge, we must use the tempfile
-              update_new_file_state(tempfile.path)
             end
             Chef::Log.info("#{@new_resource} created file #{@new_resource.path}")
           end

data/lib/chef/provider/file.rb

@@ -132,7 +132,9 @@ class Chef
         @current_resource.path(@new_resource.path)
         if !::File.directory?(@new_resource.path)
           if ::File.exist?(@new_resource.path)
-            @current_resource.checksum(checksum(@new_resource.path))
+            if @action != :create_if_missing  
+              @current_resource.checksum(checksum(@new_resource.path))
+            end
           end
         end
         load_current_resource_attrs
@@ -142,6 +144,13 @@ class Chef
       end
 
       def load_current_resource_attrs
+        if Chef::Platform.windows?
+          # TODO: To work around CHEF-3554, add support for Windows
+          # equivalent, or implicit resource reporting won't work for
+          # Windows.
+          return
+        end
+
         if ::File.exist?(@new_resource.path)
           stat = ::File.stat(@new_resource.path)
           @current_resource.owner(stat.uid)
@@ -215,13 +224,21 @@ class Chef
       # override the default with the tempfile, since the 
       # file at @new_resource.path will not be updated on converge
       def update_new_file_state(path=@new_resource.path)
+        if !::File.directory?(path) 
+          @new_resource.checksum(checksum(path))
+        end
+
+        if Chef::Platform.windows?
+          # TODO: To work around CHEF-3554, add support for Windows
+          # equivalent, or implicit resource reporting won't work for
+          # Windows.
+          return
+        end
+
         stat = ::File.stat(path)
         @new_resource.owner(stat.uid)
         @new_resource.mode(stat.mode & 07777)
         @new_resource.group(stat.gid)
-        if !::File.directory?(path) 
-          @new_resource.checksum(checksum(path))
-        end
       end
 
       def action_create

data/lib/chef/provider/remote_directory.rb

@@ -34,23 +34,27 @@ class Chef
 
       def action_create
         super
-
-        files_to_purge = Set.new(
-          Dir.glob(::File.join(@new_resource.path, '**', '*'), ::File::FNM_DOTMATCH).select do |name|
-            name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
-          end
-        )
-        files_to_transfer.each do |cookbook_file_relative_path|
-          create_cookbook_file(cookbook_file_relative_path)
-          # the file is removed from the purge list
-          files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
-          # parent directories are also removed from the purge list
-          directories=::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path)).split(::File::SEPARATOR)
-          for i in 0..directories.length-1
-            files_to_purge.delete(::File.join(directories[0..i]))
+        files_to_purge = Set.new(Dir.glob(::File.join(@new_resource.path, '**', '*'),
+                                          ::File::FNM_DOTMATCH).select do |name|
+                                   name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
+                                 end)
+
+        converge_by("Create managed files in directory") do
+          files_to_transfer.each do |cookbook_file_relative_path|
+            create_cookbook_file(cookbook_file_relative_path)
+            # the file is removed from the purge list
+            files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
+            # parent directories are also removed from the purge list
+            directories=::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path)).split(::File::SEPARATOR)
+            for i in 0..directories.length-1
+              files_to_purge.delete(::File.join(directories[0..i]))
+            end
           end
         end
-        purge_unmanaged_files(files_to_purge)
+
+        converge_by("Purge unmanaged files from directory") do
+          purge_unmanaged_files(files_to_purge)
+        end
       end
 
       def action_create_if_missing
@@ -170,5 +174,10 @@ class Chef
       end
 
     end
+
+    def whyrun_supported?
+      true
+    end
+
   end
 end

data/lib/chef/version.rb

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

data/spec/functional/resource/cookbook_file_spec.rb

@@ -0,0 +1,51 @@
+#
+# Author:: Tim Hinderliter (<tim@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Chef::Resource::CookbookFile do
+  include_context Chef::Resource::File
+
+  let(:file_base) { 'cookbook_file_spec' }
+  let(:source) { 'java.response' }
+  let(:cookbook_name) { 'java' }
+  let(:expected_content) { IO.read(File.join(CHEF_SPEC_DATA, 'cookbooks', 'java', 'files', 'default', 'java.response')) }
+
+  def create_resource
+    # set up cookbook collection for this run to use, based on our
+    # spec data.
+    cookbook_repo = File.expand_path(File.join(CHEF_SPEC_DATA, 'cookbooks'))
+    Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, cookbook_repo) }
+    cookbook_collection = Chef::CookbookCollection.new(Chef::CookbookLoader.new(cookbook_repo))
+
+    node = Chef::Node.new
+    events = Chef::EventDispatch::Dispatcher.new
+    run_context = Chef::RunContext.new(node, cookbook_collection, events)
+    resource = Chef::Resource::CookbookFile.new(path, run_context)
+    resource.cookbook(cookbook_name)
+    resource.source(source)
+
+    resource
+  end
+
+  let!(:resource) do
+    create_resource
+  end
+
+  it_behaves_like "a file resource"
+end

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -34,7 +34,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
 
   before do
     @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
-    @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
+    @stdout = StringIO.new
+    @outputter = Chef::Formatters::Outputter.new(@stdout, STDERR)
     #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
 
     Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache" ])
@@ -77,6 +78,35 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       @description.display(@outputter)
     end
 
+    describe "and the error is a template error" do
+      before do
+        @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
+        @template_class = Class.new { include Chef::Mixin::Template }
+        @template = @template_class.new
+        @context = {:chef => "cool"}
+
+        @resource = template("/tmp/foo.txt") do
+          mode "0644"
+        end
+
+        @error = begin
+                   @template.render_template("foo\nbar\nbaz\n<%= this_is_not_defined %>\nquin\nqunx\ndunno", @context) {|r| r}
+                 rescue  Chef::Mixin::Template::TemplateError => e
+                   e
+                 end
+
+        @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @error)
+        @inspector.add_explanation(@description)
+      end
+
+      it "includes contextual info from the template error in the output" do
+        @description.display(@outputter)
+        @stdout.string.should include(@error.source_listing)
+      end
+
+
+    end
+
     describe "recipe_snippet" do
       before do
         # fake code to run through #recipe_snippet