chef 10.34.6 → 11.0.0.beta.0

data/lib/chef/provider/ruby_block.rb

@@ -28,12 +28,15 @@ class Chef
         true
       end
 
-      def action_create
-        converge_by("execute the ruby block #{@new_resource.name}") do
+      def action_run
+        converge_by("execute the ruby block #{@new_resource.name}") do 
           @new_resource.block.call
           Chef::Log.info("#{@new_resource} called")
         end
       end
+
+      alias :action_create :action_run
+
     end
   end
 end

data/lib/chef/provider/service.rb

@@ -153,6 +153,21 @@ class Chef
         raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :restart"
       end
 
+      protected
+
+      def default_init_command
+        if @new_resource.init_command
+          @new_resource.init_command
+        elsif self.instance_variable_defined?(:@init_command)
+          @init_command
+        end
+      end
+
+      def custom_command_for_action?(action)
+        method_name = "#{action}_command".to_sym
+        @new_resource.respond_to?(method_name) &&
+          !!@new_resource.send(method_name)
+      end
     end
   end
 end

data/lib/chef/provider/service/init.rb

@@ -37,9 +37,11 @@ class Chef
           # do not call super here, inherit only shared_requirements
           shared_resource_requirements
           requirements.assert(:start, :stop, :restart, :reload) do |a|
-            a.assertion { ::File.exist?(@init_command) }
-            a.failure_message(Chef::Exceptions::Service, "#{@init_command} does not exist!")
-            a.whyrun("Init script '#{@init_command}' doesn't exist, assuming a prior action would have created it.") do
+            a.assertion do
+              custom_command_for_action?(action) || ::File.exist?(default_init_command)
+            end
+            a.failure_message(Chef::Exceptions::Service, "#{default_init_command} does not exist!")
+            a.whyrun("Init script '#{default_init_command}' doesn't exist, assuming a prior action would have created it.") do
               # blindly assume that the service exists but is stopped in why run mode:
               @status_load_success = false
             end
@@ -50,7 +52,7 @@ class Chef
           if @new_resource.start_command
             super
           else
-            shell_out!("#{@init_command} start")
+            shell_out!("#{default_init_command} start")
           end
         end
 
@@ -58,7 +60,7 @@ class Chef
           if @new_resource.stop_command
             super
           else
-            shell_out!("#{@init_command} stop")
+            shell_out!("#{default_init_command} stop")
           end
         end
 
@@ -66,7 +68,7 @@ class Chef
           if @new_resource.restart_command
             super
           elsif @new_resource.supports[:restart]
-            shell_out!("#{@init_command} restart")
+            shell_out!("#{default_init_command} restart")
           else
             stop_service
             sleep 1
@@ -78,7 +80,7 @@ class Chef
           if @new_resource.reload_command
             super
           elsif @new_resource.supports[:reload]
-            shell_out!("#{@init_command} reload")
+            shell_out!("#{default_init_command} reload")
           end
         end
       end

data/lib/chef/provider/service/macosx.rb

@@ -17,7 +17,6 @@
 #
 
 require 'chef/provider/service'
-require 'rexml/document'
 
 class Chef
   class Provider
@@ -36,7 +35,6 @@ class Chef
           @current_resource.service_name(@new_resource.service_name)
           @plist_size = 0
           @plist = find_service_plist
-          @service_label = find_service_label
           set_service_status
 
           @current_resource
@@ -44,6 +42,14 @@ class Chef
 
         def define_resource_requirements
           #super
+          requirements.assert(:enable) do |a| 
+            a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :enable"
+          end
+
+          requirements.assert(:disable) do |a| 
+            a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :disable"
+          end
+
           requirements.assert(:reload) do |a| 
             a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :reload"
           end
@@ -53,21 +59,16 @@ class Chef
             a.failure_message Chef::Exceptions::Service, "Several plist files match service name. Please use full service name."
           end
 
-          requirements.assert(:enable, :disable) do |a|
-            a.assertion { !@service_label.to_s.empty? }
-            a.failure_message Chef::Exceptions::Service,
-              "Could not find service's label in plist file '#{@plist}'!"
-          end
-
           requirements.assert(:all_actions) do |a| 
             a.assertion { @plist_size > 0 } 
-            # No failure here in original code - so we also will not
+            # No failrue here in original code - so we also will not
             # fail. Instead warn that the service is potentially missing
             a.whyrun "Assuming that the service would have been previously installed and is currently disabled." do 
               @current_resource.enabled(false)
               @current_resource.running(false)
             end
           end
+
         end
 
         def start_service
@@ -104,56 +105,19 @@ class Chef
           end
         end
 
-        # On OS/X, enabling a service has the side-effect of starting it,
-        # and disabling a service has the side-effect of stopping it.
-        #
-        # This makes some sense on OS/X since launchctl is an "init"-style
-        # supervisor that will restart daemons that are crashing, etc.
-        def enable_service
-          if @current_resource.enabled
-            Chef::Log.debug("#{@new_resource} already enabled, not enabling")
-          else
-            shell_out!(
-              "launchctl load -w '#{@plist}'",
-              :user => @owner_uid, :group => @owner_gid
-            )
-          end
-        end
-
-        def disable_service
-          unless @current_resource.enabled
-            Chef::Log.debug("#{@new_resource} not enabled, not disabling")
-          else
-            shell_out!(
-              "launchctl unload -w '#{@plist}'",
-              :user => @owner_uid, :group => @owner_gid
-            )
-          end
-        end
 
         def set_service_status
-          return if @plist == nil or @service_label.to_s.empty?
+          return if @plist == nil
 
-          cmd = shell_out(
-            "launchctl list #{@service_label}",
-            :user => @owner_uid, :group => @owner_gid
-          )
-
-          if cmd.exitstatus == 0
-            @current_resource.enabled(true)
-          else
-            @current_resource.enabled(false)
-          end
+          @current_resource.enabled(!@plist.nil?)
 
           if @current_resource.enabled
             @owner_uid = ::File.stat(@plist).uid
             @owner_gid = ::File.stat(@plist).gid
 
-            shell_out!(
-              "launchctl list", :user => @owner_uid, :group => @owner_gid
-            ).stdout.each_line do |line|
+            shell_out!("launchctl list", :user => @owner_uid, :group => @owner_gid).stdout.each_line do |line|
               case line
-              when /(\d+|-)\s+(?:\d+|-)\s+(.*\.?)#{@service_label}/
+              when /(\d+|-)\s+(?:\d+|-)\s+(.*\.?)#{@current_resource.service_name}/
                 pid = $1
                 @current_resource.running(!pid.to_i.zero?)
               end
@@ -165,31 +129,9 @@ class Chef
 
       private
 
-        def find_service_label
-          # CHEF-5223 "you can't glob for a file that hasn't been converged
-          # onto the node yet."
-          return nil if @plist.nil?
-
-          # Most services have the same internal label as the name of the
-          # plist file. However, there is no rule saying that *has* to be
-          # the case, and some core services (notably, ssh) do not follow
-          # this rule.
-
-          # plist files can come in XML or Binary formats. this command
-          # will make sure we get XML every time.
-          plist_xml = shell_out!("plutil -convert xml1 -o - #{@plist}").stdout
-
-          plist_doc = REXML::Document.new(plist_xml)
-          plist_doc.elements[
-            "/plist/dict/key[text()='Label']/following::string[1]/text()"]
-        end
-
         def find_service_plist
           plists = PLIST_DIRS.inject([]) do |results, dir|
-            edir = ::File.expand_path(dir)
-            entries = Dir.glob(
-              "#{edir}/*#{@current_resource.service_name}*.plist"
-            )
+            entries = Dir.glob("#{::File.expand_path(dir)}/*#{@current_resource.service_name}*.plist")
             entries.any? ? results << entries : results
           end
           plists.flatten!

data/lib/chef/provider/service/simple.rb

@@ -128,7 +128,7 @@ class Chef
           elsif @new_resource.supports[:status]
             Chef::Log.debug("#{@new_resource} supports status, running")
             begin
-              if shell_out("#{@init_command} status").exitstatus == 0
+              if shell_out("#{default_init_command} status").exitstatus == 0
                 @current_resource.running true
                 Chef::Log.debug("#{@new_resource} is running")
               end

data/lib/chef/provider/service/solaris.rb

@@ -42,12 +42,12 @@ class Chef
         end
 
         def enable_service
-          run_command(:command => "#{@init_command} enable #{@new_resource.service_name}")
+          run_command(:command => "#{default_init_command} enable #{@new_resource.service_name}")
           return service_status.enabled
         end
 
         def disable_service
-          run_command(:command => "#{@init_command} disable #{@new_resource.service_name}")
+          run_command(:command => "#{default_init_command} disable #{@new_resource.service_name}")
           return service_status.enabled
         end
 
@@ -55,7 +55,7 @@ class Chef
         alias_method :start_service, :enable_service
 
         def reload_service
-          run_command(:command => "#{@init_command} refresh #{@new_resource.service_name}")
+          run_command(:command => "#{default_init_command} refresh #{@new_resource.service_name}")
         end
 
         def restart_service

data/lib/chef/provider/template.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+require 'chef/provider/template_finder'
 require 'chef/provider/file'
 require 'chef/mixin/template'
 require 'chef/mixin/checksum'
@@ -27,6 +28,7 @@ class Chef
 
     class Template < Chef::Provider::File
 
+      include Chef::Mixin::EnforceOwnershipAndPermissions
       include Chef::Mixin::Checksum
       include Chef::Mixin::Template
 
@@ -38,8 +40,8 @@ class Chef
       def define_resource_requirements
         super
 
-        requirements.assert(:create, :create_if_missing) do |a|
-          a.assertion { ::File::exist?(template_location) }
+        requirements.assert(:create, :create_if_missing) do |a| 
+          a.assertion { ::File::exist?(template_location) } 
           a.failure_message "Template source #{template_location} could not be found."
           a.whyrun "Template source #{template_location} does not exist. Assuming it would have been created."
           a.block_action!
@@ -49,14 +51,17 @@ class Chef
       def action_create
         render_with_context(template_location) do |rendered_template|
           rendered(rendered_template)
-          update = ::File.exist?(@new_resource.path)
-          if update && content_matches?
+          if file_already_exists? && content_matches?
             Chef::Log.debug("#{@new_resource} content has not changed.")
             set_all_access_controls
+            update_new_file_state(@new_resource.path)
           else
             description = []
-            action_message = update ? "update #{@current_resource} from #{short_cksum(@current_resource.checksum)} to #{short_cksum(@new_resource.checksum)}" :
+            action_message = if file_already_exists?
+              "update #{@current_resource} from #{short_cksum(@current_resource.checksum)} to #{short_cksum(@new_resource.checksum)}"
+            else
               "create #{@new_resource}"
+            end
             description << action_message
             description << diff_current(rendered_template.path)
             converge_by(description) do
@@ -64,28 +69,21 @@ class Chef
               FileUtils.cp(rendered_template.path, @new_resource.path)
               Chef::Log.info("#{@new_resource} updated content")
               access_controls.set_all!
-              stat = ::File.stat(@new_resource.path)
-
-              # template depends on the checksum not changing, and updates it
-              # itself later in the code, so we cannot set it here, as we do with
-              # all other < File child provider classes
-              @new_resource.owner(stat.uid)
-              @new_resource.mode(stat.mode & 07777)
-              @new_resource.group(stat.gid)
+              update_new_file_state(@new_resource.path)
             end
           end
         end
       end
 
+      def template_finder
+        @template_finder ||= begin
+          TemplateFinder.new(run_context, cookbook_name, node)
+        end
+      end
 
       def template_location
         @template_file_cache_location ||= begin
-          if @new_resource.local
-            @new_resource.source
-          else
-            cookbook = run_context.cookbook_collection[resource_cookbook]
-            cookbook.preferred_filename_on_disk_location(node, :templates, @new_resource.source)
-          end
+          template_finder.find(@new_resource.source, :local => @new_resource.local, :cookbook => @new_resource.cookbook)
         end
       end
 
@@ -105,19 +103,18 @@ class Chef
 
       private
 
+      def file_already_exists?
+        ::File.exist?(@new_resource.path)
+      end
+
       def render_with_context(template_location, &block)
         context = {}
         context.merge!(@new_resource.variables)
         context[:node] = node
+        context[:template_finder] = template_finder
         render_template(IO.read(template_location), context, &block)
       end
 
-      def managing_content?
-        return true if @new_resource.checksum
-        return true if !@new_resource.source.nil? && @action != :create_if_missing
-        false
-      end
-
     end
   end
 end

data/lib/chef/provider/template_finder.rb

@@ -0,0 +1,61 @@
+#--
+# Author:: Andrea Campi (<andrea.campi@zephirworks.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.
+#
+
+class Chef
+  class Provider
+
+    class TemplateFinder
+
+      def initialize(run_context, cookbook_name, node)
+        @run_context = run_context
+        @cookbook_name = cookbook_name
+        @node = node
+      end
+
+      def find(template_name, options = {})
+        template_name = template_source_name(template_name, options)
+
+        if options[:local]
+          return template_name
+        end
+
+        cookbook_name = find_cookbook_name(options)
+        cookbook = @run_context.cookbook_collection[cookbook_name]
+
+        cookbook.preferred_filename_on_disk_location(@node, :templates, template_name)
+      end
+
+    protected
+      def template_source_name(name, options)
+        if options[:source]
+          options[:source]
+        else
+          name
+        end
+      end
+
+      def find_cookbook_name(options)
+        if options[:cookbook]
+          options[:cookbook]
+        else
+          @cookbook_name
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/user.rb

@@ -18,7 +18,6 @@
 
 require 'chef/provider'
 require 'chef/mixin/command'
-require 'chef/resource/user'
 require 'etc'
 
 class Chef