chef 10.14.0.beta.2 → 10.14.0.beta.3

data/lib/chef/knife/core/node_presenter.rb

@@ -102,6 +102,7 @@ class Chef
 #{key('Roles:')}       #{Array(node[:roles]).join(', ')}
 #{key('Recipes:')}     #{Array(node[:recipes]).join(', ')}
 #{key('Platform:')}    #{node[:platform]} #{node[:platform_version]}
+#{key('Tags:')}        #{Array(node[:tags]).join(', ')}
 SUMMARY
             if config[:medium_output] || config[:long_output]
               summarized +=<<-MORE

data/lib/chef/knife/tag_delete.rb

@@ -51,7 +51,7 @@ class Chef
         message = if deleted_tags.empty?
                     "Nothing has changed. The tags requested to be deleted do not exist."
                   else
-                    "Deleted the following tags: #{deleted_tags.join(", ")}."
+                    "Deleted tags #{deleted_tags.join(", ")} for node #{name}."
                   end
         ui.info(message)
       end

data/lib/chef/mixin/file_class.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Mark Mzyk <mmzyk@opscode.com>
+# Author:: Seth Chisamore <schisamo@opscode.com>
+# Author:: Bryan McLellan <btm@opscode.com>
+# Copyright:: Copyright (c) 2011-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.
+#
+
+class Chef
+  module Mixin
+    module FileClass
+
+      def file_class
+        @host_os_file ||= if Chef::Platform.windows?
+          require 'chef/win32/file'
+          begin
+            Chef::ReservedNames::Win32::File.verify_links_supported!
+          rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e
+            message = "Link resource is not supported on this version of Windows"
+            message << ": #{node[:kernel][:name]}" if node
+            message << " (#{node[:platform_version]})" if node
+            Chef::Log.fatal(message)
+            raise e
+          end
+          Chef::ReservedNames::Win32::File
+        else
+          ::File
+        end
+      end
+    end
+  end
+end
+
+

data/lib/chef/provider/cron.rb

@@ -25,7 +25,7 @@ class Chef
     class Cron < Chef::Provider
       include Chef::Mixin::Command
 
-      CRON_PATTERN = /\A([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s(.*)/
+      CRON_PATTERN = /\A([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+|[a-zA-Z]{3})\s([-0-9*,\/]+|[a-zA-Z]{3})\s(.*)/
       ENV_PATTERN = /\A(\S+)=(\S*)/
 
       CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home, :environment]

data/lib/chef/provider/deploy.rb

@@ -148,9 +148,9 @@ class Chef
       end
 
       def deploy
-        enforce_ownership
         verify_directories_exist
         update_cached_repo # no converge-by - scm provider will dothis
+        enforce_ownership
         copy_cached_repo
         install_gems
         enforce_ownership

data/lib/chef/provider/link.rb

@@ -19,6 +19,7 @@
 require 'chef/config'
 require 'chef/log'
 require 'chef/mixin/shell_out'
+require 'chef/mixin/file_class'
 require 'chef/resource/link'
 require 'chef/provider'
 require 'chef/scan_access_control'
@@ -27,24 +28,7 @@ class Chef
   class Provider
     class Link < Chef::Provider
       include Chef::Mixin::ShellOut
-
-      def file_class
-        @host_os_file ||= if Chef::Platform.windows?
-          require 'chef/win32/file'
-          begin
-            Chef::ReservedNames::Win32::File.verify_links_supported!
-          rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e
-            message = "Link resource is not supported on this version of Windows"
-            message << ": #{node[:kernel][:name]}" if node
-            message << " (#{node[:platform_version]})" if node
-            Chef::Log.fatal(message)
-            raise e
-          end
-          Chef::ReservedNames::Win32::File
-        else
-          ::File
-        end
-      end
+      include Chef::Mixin::FileClass
 
       def negative_complement(big)
         if big > 1073741823 # Fixnum max

data/lib/chef/provider/package/apt.rb

@@ -37,13 +37,16 @@ class Chef
           @current_resource
         end
 
+        def default_release_options
+          # Use apt::Default-Release option only if provider was explicitly defined
+          "-o APT::Default-Release=#{@new_resource.default_release}" if @new_resource.provider && @new_resource.default_release
+        end
+
         def check_package_state(package)
           Chef::Log.debug("#{@new_resource} checking package status for #{package}")
           installed = false
-          # Use apt cache release option only if provider was explicitly defined
-          aptcache_options = "-o APT::Default-Release=#{@new_resource.default_release}" if @new_resource.provider && @new_resource.default_release
 
-          shell_out!("apt-cache#{expand_options(aptcache_options)} policy #{package}").stdout.each_line do |line|
+          shell_out!("apt-cache#{expand_options(default_release_options)} policy #{package}").stdout.each_line do |line|
             case line
             when /^\s{2}Installed: (.+)$/
               installed_version = $1
@@ -88,7 +91,7 @@ class Chef
           package_name = "#{name}=#{version}"
           package_name = name if @is_virtual_package
           run_command_with_systems_locale(
-            :command => "apt-get -q -y#{expand_options(@new_resource.options)} install #{package_name}",
+            :command => "apt-get -q -y#{expand_options(default_release_options)}#{expand_options(@new_resource.options)} install #{package_name}",
             :environment => {
               "DEBIAN_FRONTEND" => "noninteractive"
             }

data/lib/chef/provider/remote_directory.rb

@@ -20,6 +20,7 @@ require 'chef/provider/file'
 require 'chef/provider/directory'
 require 'chef/resource/directory'
 require 'chef/resource/remote_file'
+require 'chef/mixin/file_class'
 require 'chef/platform'
 require 'uri'
 require 'tempfile'
@@ -29,6 +30,7 @@ require 'set'
 class Chef
   class Provider
     class RemoteDirectory < Chef::Provider::Directory
+      include Chef::Mixin::FileClass
 
       def action_create
         super
@@ -62,11 +64,14 @@ class Chef
       def purge_unmanaged_files(unmanaged_files)
         if @new_resource.purge
           unmanaged_files.sort.reverse.each do |f|
-            if ::File.directory?(f) && !::File.symlink?(f)
-              converge_by("delete unmanaged directory #{f}") do
-                Dir::rmdir(f)
-                Chef::Log.debug("#{@new_resource} removed directory #{f}")
-              end
+            # file_class comes from Chef::Mixin::FileClass
+            if ::File.directory?(f) && !Chef::Platform.windows? && !file_class.symlink?(f.dup) 
+              # Linux treats directory symlinks as files
+              # Remove a directory as a directory when not on windows if it is not a symlink
+              purge_directory(f)
+            elsif ::File.directory?(f) && Chef::Platform.windows?
+              # Windows treats directory symlinks as directories so we delete them here
+              purge_directory(f)
             else
               converge_by("delete unmanaged file #{f}") do
                 ::File.delete(f)
@@ -77,6 +82,13 @@ class Chef
         end
       end
 
+      def purge_directory(dir)
+        converge_by("delete unmanaged directory #{dir}") do
+          Dir::rmdir(dir)
+          Chef::Log.debug("#{@new_resource} removed directory #{dir}")
+        end
+      end
+
       def files_to_transfer
         cookbook = run_context.cookbook_collection[resource_cookbook]
         files = cookbook.relative_filenames_in_preferred_directory(node, :files, @new_resource.source)

data/lib/chef/provider/user/useradd.rb

@@ -35,6 +35,7 @@ class Chef
         
         def manage_user
           command = compile_command("usermod") { |u| u << universal_options }
+          command << " -m" if managing_home_dir?
           run_command(:command => command)
         end
         

data/lib/chef/resource_reporter.rb

@@ -137,7 +137,7 @@ class Chef
         @pending_update ||= ResourceReport.new_for_exception(new_resource, action)
         @pending_update.exception = exception
       end
-      description = Formatters::ErrorMapper.resource_failed_helper(new_resource, action, exception)
+      description = Formatters::ErrorMapper.resource_failed(new_resource, action, exception)
       @error_descriptions = description.for_json
     end
 
@@ -187,17 +187,17 @@ class Chef
     end
 
     def run_list_expand_failed(node, exception)
-      description = Formatters::ErrorMapper.run_list_expand_failed_helper(node, exception)
+      description = Formatters::ErrorMapper.run_list_expand_failed(node, exception)
       @error_descriptions = description.for_json
     end
 
     def cookbook_resolution_failed(expanded_run_list, exception)
-      description = Formatters::ErrorMapper.cookbook_resolution_failed_helper(expanded_run_list, exception)
+      description = Formatters::ErrorMapper.cookbook_resolution_failed(expanded_run_list, exception)
       @error_descriptions = description.for_json
     end
 
     def cookbook_sync_failed(cookbooks, exception)
-      description = Formatters::ErrorMapper.cookbook_sync_failed_helper(cookbooks, exception)
+      description = Formatters::ErrorMapper.cookbook_sync_failed(cookbooks, exception)
       @error_descriptions = description.for_json
     end
 

data/lib/chef/rest.rb

@@ -246,6 +246,14 @@ class Chef
         begin
           response = rest_request.call {|r| r.read_body}
 
+          Chef::Log.debug("---- HTTP Status and Header Data: ----")
+          Chef::Log.debug("HTTP #{response.http_version} #{response.code} #{response.msg}")
+
+          response.each do |header, value|
+            Chef::Log.debug("#{header}: #{value}")
+          end
+          Chef::Log.debug("---- End HTTP Status/Header Data ----")
+
           response_body = decompress_body(response)
 
           if response.kind_of?(Net::HTTPSuccess)

data/lib/chef/run_context.rb

@@ -77,6 +77,9 @@ class Chef
           # TODO: timh/cw, 5-14-2010: It's distasteful to be including
           # the DSL in a class outside the context of the DSL
           include_recipe(recipe)
+        rescue Chef::Exceptions::RecipeNotFound => e
+          @events.recipe_not_found(e)
+          raise
         rescue Exception => e
           path = resolve_recipe(recipe)
           @events.recipe_file_load_failed(path, e)
@@ -138,7 +141,7 @@ class Chef
           @events.library_file_loaded(filename)
         rescue Exception => e
           # TODO wrap/munge exception to highlight syntax/name/no method errors.
-          @events.library_load_failed(filename, e)
+          @events.library_file_load_failed(filename, e)
           raise
         end
       end

data/lib/chef/solr_query/lucene.treetop

@@ -129,11 +129,11 @@ grammar Lucene
   end
 
   rule valid_letter
-    start_letter+ ([a-zA-Z0-9*?_.-] / '\\' special_char)*
+    start_letter+ ([a-zA-Z0-9@*?_.-] / '\\' special_char)*
   end
 
   rule start_letter
-    [a-zA-Z0-9._*] / '\\' special_char
+    [a-zA-Z0-9@._*] / '\\' special_char
   end
 
   rule end_letter

data/lib/chef/version.rb

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

data/spec/support/shared/functional/file_resource.rb

@@ -18,6 +18,7 @@
 
 shared_examples_for "a file with the wrong content" do
   it "overwrites the file with the updated content when the :create action is run" do
+    Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
     sleep 1
     resource.run_action(:create)
     File.stat(path).mtime.should > @expected_mtime
@@ -59,7 +60,7 @@ shared_examples_for "a file with the correct content" do
   it "does not update the mtime/atime of the file when the :create action is run" do
     sleep 1
     File.stat(path).mtime.should == @expected_mtime
-    File.stat(path).atime.should be_within(1).of(@expected_atime)
+    File.stat(path).atime.should be_within(2).of(@expected_atime)
   end
 
   it "doesn't overwrite the file when the :create_if_missing action is run" do

data/spec/support/shared/functional/securable_resource.rb

@@ -24,24 +24,40 @@
 require 'etc'
 
 shared_context "setup correct permissions" do
-  before :each, { :requires_root => true, :unix_only => true } do
-    File.chown(Etc.getpwnam('nobody').uid, 1337, path)
-    File.chmod(0776, path)
-  end
-  before :each, { :requires_unprivileged_user => true, :unix_only => true } do
-    File.chmod(0776, path)
+  context "on unix", :unix_only do
+    context "with root", :requires_root do
+      before :each do
+        File.chown(Etc.getpwnam('nobody').uid, 1337, path)
+        File.chmod(0776, path)
+      end
+    end
+
+    context "without root", :requires_unprivileged_user do
+      before :each do
+        File.chmod(0776, path)
+      end
+    end
   end
+
   # FIXME: windows
 end
 
 shared_context "setup broken permissions" do
-  before :each, { :requires_root => true, :unix_only => true } do
-    File.chown(0, 0, path)
-    File.chmod(0644, path)
-  end
-  before :each, { :requires_unprivileged_user => true, :unix_only => true } do
-    File.chmod(0644, path)
+  context "on unix", :unix_only do
+    context "with root", :requires_root do
+      before :each do
+        File.chown(0, 0, path)
+        File.chmod(0644, path)
+      end
+    end
+  
+    context "without root", :requires_unprivileged_user do
+      before :each do
+        File.chmod(0644, path)
+      end
+    end
   end
+
   # FIXME: windows
 end
 

data/spec/unit/client_spec.rb

@@ -24,7 +24,7 @@ require 'chef/run_context'
 require 'chef/rest'
 require 'rbconfig'
 
-describe Chef::Client do
+shared_examples_for Chef::Client do
   before do
     Chef::Log.logger = Logger.new(StringIO.new)
 
@@ -52,24 +52,26 @@ describe Chef::Client do
   end
 
   describe "run" do
+
     it "should identify the node and run ohai, then register the client" do
       mock_chef_rest_for_node = mock("Chef::REST (node)")
       mock_chef_rest_for_client = mock("Chef::REST (client)")
       mock_chef_rest_for_node_save = mock("Chef::REST (node save)")
       mock_chef_runner = mock("Chef::Runner")
 
-      # --Client#register
+      # --Client.register
       #   Make sure Client#register thinks the client key doesn't
       #   exist, so it tries to register and create one.
       File.should_receive(:exists?).with(Chef::Config[:client_key]).exactly(1).times.and_return(false)
 
-      #   Client#register will register with the validation client name.
-      Chef::REST.should_receive(:new).with(Chef::Config[:client_url], Chef::Config[:validation_client_name], Chef::Config[:validation_key]).and_return(mock_chef_rest_for_client)
-      mock_chef_rest_for_client.should_receive(:register).with(@fqdn, Chef::Config[:client_key]).and_return(true)
-      #   Client#register will then turn around create another
+      #   Client.register will register with the validation client name.
+      Chef::REST.should_receive(:new).with(Chef::Config[:client_url], Chef::Config[:validation_client_name], Chef::Config[:validation_key]).exactly(1).and_return(mock_chef_rest_for_client)
+      mock_chef_rest_for_client.should_receive(:register).with(@fqdn, Chef::Config[:client_key]).exactly(1).and_return(true)
+      #   Client.register will then turn around create another
+      
       #   Chef::REST object, this time with the client key it got from the
       #   previous step.
-      Chef::REST.should_receive(:new).with(Chef::Config[:chef_server_url], @fqdn, Chef::Config[:client_key]).and_return(mock_chef_rest_for_node)
+      Chef::REST.should_receive(:new).with(Chef::Config[:chef_server_url], @fqdn, Chef::Config[:client_key]).exactly(1).and_return(mock_chef_rest_for_node)
 
       # --Client#build_node
       #   looks up the node, which we will return, then later saves it.
@@ -98,19 +100,42 @@ describe Chef::Client do
       Chef::REST.should_receive(:new).with(Chef::Config[:chef_server_url]).and_return(mock_chef_rest_for_node_save)
       mock_chef_rest_for_node_save.should_receive(:put_rest).with("nodes/#{@fqdn}", @node).and_return(true)
 
+      # Post conditions: check that node has been filled in correctly
       @client.should_receive(:run_started)
       @client.should_receive(:run_completed_successfully)
 
-
+      if(Chef::Config[:client_fork])
+        require 'stringio'
+        if(Chef::Config[:pipe_node])
+          pipe_sim = StringIO.new
+          pipe_sim.should_receive(:close).exactly(4).and_return(nil)
+          res = ''
+          pipe_sim.should_receive(:puts) do |string|
+            res.replace(string)
+          end
+          pipe_sim.should_receive(:gets).and_return(res)
+          Chef::CouchDB.should_receive(:new).and_return(nil)
+          IO.should_receive(:pipe).and_return([pipe_sim, pipe_sim])
+          IO.should_receive(:select).and_return(true)
+        end
+        proc_ret = Class.new.new
+        proc_ret.should_receive(:success?).and_return(true)
+        Process.should_receive(:waitpid2).and_return([1, proc_ret])
+        @client.should_receive(:exit).and_return(nil)
+        @client.should_receive(:fork) do |&block|
+          block.call
+        end
+      end
+      
       # This is what we're testing.
       @client.run
 
-
-      # Post conditions: check that node has been filled in correctly
-      @node.automatic_attrs[:platform].should == "example-platform"
-      @node.automatic_attrs[:platform_version].should == "example-platform-1.0"
+      if(!Chef::Config[:client_fork] || Chef::Config[:pipe_node])
+        @node.automatic_attrs[:platform].should == "example-platform"
+        @node.automatic_attrs[:platform_version].should == "example-platform-1.0"
+      end
     end
-
+    
     describe "when notifying other objects of the status of the chef run" do
       before do
         Chef::Client.clear_notifications
@@ -224,3 +249,14 @@ describe Chef::Client do
   end
 
 end
+
+describe Chef::Client do
+  it_behaves_like Chef::Client
+end
+
+describe "Chef::Client Forked" do
+  it_behaves_like Chef::Client
+  before do
+    Chef::Config[:client_fork] = true
+  end
+end