chef 11.12.0.alpha.1-x86-mingw32 → 11.12.0.rc.1-x86-mingw32

data/lib/chef/provider/cron.rb

@@ -25,11 +25,14 @@ class Chef
     class Cron < Chef::Provider
       include Chef::Mixin::Command
 
+      SPECIAL_TIME_VALUES = [:reboot, :yearly, :annually, :monthly, :weekly, :daily, :midnight, :hourly]
+      CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :time, :command, :mailto, :path, :shell, :home, :environment]
+      WEEKDAY_SYMBOLS = [:sunday, :monday, :tuesday, :wednesday, :thursday, :friday, :saturday]
+      
       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(.*)/
+      SPECIAL_PATTERN = /\A(@(#{SPECIAL_TIME_VALUES.join('|')}))\s(.*)/
       ENV_PATTERN = /\A(\S+)=(\S*)/
 
-      CRON_ATTRIBUTES = [:minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home, :environment]
-
       def initialize(new_resource, run_context)
         super(new_resource, run_context)
         @cron_exists = false
@@ -58,6 +61,12 @@ class Chef
             when ENV_PATTERN
               set_environment_var($1, $2) if cron_found
               next
+            when SPECIAL_PATTERN
+              if cron_found
+                @current_resource.time($2.to_sym)
+                @current_resource.command($3)
+                cron_found=false
+              end
             when CRON_PATTERN
               if cron_found
                 @current_resource.minute($1)
@@ -220,9 +229,22 @@ class Chef
         @new_resource.environment.each do |name, value|
           newcron << "#{name}=#{value}\n"
         end
-        newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n"
+        if @new_resource.time
+          newcron << "@#{@new_resource.time} #{@new_resource.command}\n"
+        else
+          newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n"
+        end
         newcron
       end
+
+      def weekday_in_crontab
+        weekday_in_crontab = WEEKDAY_SYMBOLS.index(@new_resource.weekday)
+        if weekday_in_crontab.nil?
+          @new_resource.weekday
+        else
+          weekday_in_crontab.to_s
+        end
+      end
     end
   end
 end

data/lib/chef/provider/mount/mount.rb

@@ -244,7 +244,7 @@ class Chef
             # So given a symlink like this:
             # /dev/mapper/vgroot-tmp.vol -> /dev/dm-9
             # First it will try to match "/dev/mapper/vgroot-tmp.vol". If there is no match it will try matching for "/dev/dm-9".
-            "(?:#{Regexp.escape(device_real)}|#{Regexp.escape(::File.readlink(device_real))})"
+            "(?:#{Regexp.escape(device_real)}|#{Regexp.escape(::File.expand_path(::File.readlink(device_real),::File.dirname(device_real)))})"
           else
             Regexp.escape(device_real)
           end

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

@@ -25,7 +25,8 @@ class Chef
   class Provider
     class Package
       class Dpkg < Chef::Provider::Package::Apt
-        DPKG_INFO = /([a-z\d\-\+\.]+)\t([\w\d.~-]+)/
+        # http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version
+        DPKG_INFO = /([a-z\d\-\+\.]+)\t([\w\d.~:-]+)/
         DPKG_INSTALLED = /^Status: install ok installed/
         DPKG_VERSION = /^Version: (.+)$/
 

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

@@ -0,0 +1,80 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 Chef Software, 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 'chef/resource/windows_package'
+require 'chef/provider/package'
+
+class Chef
+  class Provider
+    class Package
+      class Windows < Chef::Provider::Package
+
+        # Depending on the installer, we may need to examine installer_type or 
+        # source attributes, or search for text strings in the installer file 
+        # binary to determine the installer type for the user. Since the file
+        # must be on disk to do so, we have to make this choice in the provider.
+        require 'chef/provider/package/windows/msi.rb'
+
+        # load_current_resource is run in Chef::Provider#run_action when not in whyrun_mode?
+        def load_current_resource
+          @current_resource = Chef::Resource::WindowsPackage.new(@new_resource.name)
+          @current_resource.version(package_provider.installed_version)
+          @new_resource.version(package_provider.package_version)
+          @current_resource
+        end
+
+        def package_provider
+          @package_provider ||= begin
+            case installer_type
+            when :msi
+              Chef::Provider::Package::Windows::MSI.new(@new_resource)
+            else
+              raise "Unable to find a Chef::Provider::Package::Windows provider for installer_type '#{installer_type}'"
+            end
+          end
+        end
+
+        def installer_type
+          @installer_type ||= begin
+            if @new_resource.installer_type
+              @new_resource.installer_type
+            else
+              file_extension = ::File.basename(@new_resource.source).split(".").last.downcase
+
+              if file_extension == "msi"
+                :msi
+              else
+                raise ArgumentError, "Installer type for Windows Package '#{@new_resource.name}' not specified and cannot be determined from file extension '#{file_extension}'"
+              end
+            end
+          end
+        end
+
+        # Chef::Provider::Package action_install + action_remove call install_package + remove_package
+        # Pass those calls to the correct sub-provider
+        def install_package(name, version)
+          package_provider.install_package(name, version)
+        end
+
+        def remove_package(name, version)
+          package_provider.remove_package(name, version)
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/package/windows/msi.rb

@@ -0,0 +1,69 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2014 Chef Software, 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.
+#
+
+# TODO: Allow @new_resource.source to be a Product Code as a GUID for uninstall / network install
+
+require 'chef/mixin/shell_out'
+require 'chef/win32/api/installer' if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+
+class Chef
+  class Provider
+    class Package
+      class Windows
+        class MSI
+          include Chef::ReservedNames::Win32::API::Installer if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+          include Chef::Mixin::ShellOut
+
+          def initialize(resource)
+            @new_resource = resource
+          end
+
+          # From Chef::Provider::Package
+          def expand_options(options)
+            options ? " #{options}" : ""
+          end
+
+          # Returns a version if the package is installed or nil if it is not.
+          def installed_version
+            Chef::Log.debug("#{@new_resource} getting product code for package at #{@new_resource.source}")
+            product_code = get_product_property(@new_resource.source, "ProductCode")
+            Chef::Log.debug("#{@new_resource} checking package status and verion for #{product_code}")
+            get_installed_version(product_code)
+          end
+
+          def package_version
+            Chef::Log.debug("#{@new_resource} getting product version for package at #{@new_resource.source}")
+            get_product_property(@new_resource.source, "ProductVersion")
+          end
+
+          def install_package(name, version)
+            # We could use MsiConfigureProduct here, but we'll start off with msiexec
+            Chef::Log.debug("#{@new_resource} installing MSI package '#{@new_resource.source}'")
+            shell_out!("msiexec /qn /i \"#{@new_resource.source}\" #{expand_options(@new_resource.options)}", {:timeout => @new_resource.timeout, :returns => @new_resource.returns})
+          end
+  
+          def remove_package(name, version)
+            # We could use MsiConfigureProduct here, but we'll start off with msiexec
+            Chef::Log.debug("#{@new_resource} removing MSI package '#{@new_resource.source}'")
+            shell_out!("msiexec /qn /x \"#{@new_resource.source}\" #{expand_options(@new_resource.options)}", {:timeout => @new_resource.timeout, :returns => @new_resource.returns})
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/provider/powershell_script.rb

@@ -23,9 +23,9 @@ class Chef
     class PowershellScript < Chef::Provider::WindowsScript
 
       protected
-
-      EXIT_STATUS_NORMALIZATION_SCRIPT = "\nif ($? -eq $true) {exit 0} elseif ( $LASTEXITCODE -ne 0) {exit $LASTEXITCODE} else { exit 1 }"
-      EXIT_STATUS_RESET_SCRIPT = "$LASTEXITCODE=0\n"
+      EXIT_STATUS_EXCEPTION_HANDLER = "\ntrap [Exception] {write-error -exception ($_.Exception.Message);exit 1}".freeze
+      EXIT_STATUS_NORMALIZATION_SCRIPT = "\nif ($? -ne $true) { if ( $LASTEXITCODE -ne 0) {exit $LASTEXITCODE} else { exit 1 }}".freeze
+      EXIT_STATUS_RESET_SCRIPT = "\n$LASTEXITCODE=0".freeze
 
       # Process exit codes are strange with PowerShell. Unless you
       # explicitly call exit in Powershell, the powershell.exe
@@ -36,15 +36,28 @@ class Chef
       # last process run in the script if it is the last command
       # executed, otherwise 0 or 1 based on whether $? is set to true
       # (success, where we return 0) or false (where we return 1).
-      def NormalizeScriptExitStatus( code )
-        @code = (! code.nil?) ? ( EXIT_STATUS_RESET_SCRIPT + code + EXIT_STATUS_NORMALIZATION_SCRIPT ) : nil
+      def normalize_script_exit_status( code )
+        target_code = ( EXIT_STATUS_EXCEPTION_HANDLER +
+                        EXIT_STATUS_RESET_SCRIPT +
+                        "\n" +
+                        code.to_s +
+                        EXIT_STATUS_NORMALIZATION_SCRIPT )
+        convert_boolean_return = @new_resource.convert_boolean_return
+        @code = <<EOH
+new-variable -name interpolatedexitcode -visibility private -value $#{convert_boolean_return}
+new-variable -name chefscriptresult -visibility private
+$chefscriptresult = {
+#{target_code}
+}.invokereturnasis()
+if ($interpolatedexitcode -and $chefscriptresult.gettype().name -eq 'boolean') { exit [int32](!$chefscriptresult) } else { exit 0 }
+EOH
       end
 
       public
 
       def initialize (new_resource, run_context)
         super(new_resource, run_context, '.ps1')
-        NormalizeScriptExitStatus(new_resource.code)
+        normalize_script_exit_status(new_resource.code)
       end
 
       def flags

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

@@ -25,11 +25,13 @@ class Chef
     class Service
       class Solaris < Chef::Provider::Service
         include Chef::Mixin::ShellOut
+        attr_reader :maintenance
 
         def initialize(new_resource, run_context=nil)
           super
           @init_command = "/usr/sbin/svcadm"
           @status_command = "/bin/svcs -l"
+          @maintenace     = false
         end
 
 
@@ -44,6 +46,7 @@ class Chef
         end
 
         def enable_service
+          shell_out!("#{default_init_command} clear #{@new_resource.service_name}") if @maintenance
           shell_out!("#{default_init_command} enable -s #{@new_resource.service_name}")
         end
 
@@ -65,13 +68,14 @@ class Chef
         end
 
         def service_status
-          status = popen4("#{@status_command} #{@current_resource.service_name}") do |pid, stdin, stdout, stderr|
-            stdout.each do |line|
-              case line
-              when /state\s+online/
-                @current_resource.enabled(true)
-                @current_resource.running(true)
-              end
+          status = shell_out!("#{@status_command} #{@current_resource.service_name}")
+          status.stdout.each_line do |line|
+            case line
+            when /state\s+online/
+              @current_resource.enabled(true)
+              @current_resource.running(true)
+            when /state\s+maintenance/
+              @maintenance = true
             end
           end
           unless @current_resource.enabled

data/lib/chef/resource.rb

@@ -23,6 +23,7 @@ require 'chef/dsl/data_query'
 require 'chef/dsl/registry_helper'
 require 'chef/dsl/reboot_pending'
 require 'chef/mixin/convert_to_class_name'
+require 'chef//guard_interpreter/resource_guard_interpreter'
 require 'chef/resource/conditional'
 require 'chef/resource/conditional_action_not_nothing'
 require 'chef/resource_collection'
@@ -249,6 +250,7 @@ F
       @not_if = []
       @only_if = []
       @source_line = nil
+      @guard_interpreter = :default
       @elapsed_time = 0
 
       @node = run_context ? deprecated_ivar(run_context.node, :node, :warn) : nil
@@ -401,6 +403,14 @@ F
       ignore_failure(arg)
     end
 
+    def guard_interpreter(arg=nil)
+      set_or_return(
+        :guard_interpreter,
+        arg,
+        :kind_of => Symbol
+      )
+    end
+
     # Sets up a notification from this resource to the resource specified by +resource_spec+.
     def notifies(action, resource_spec, timing=:delayed)
       # when using old-style resources(:template => "/foo.txt") style, you
@@ -552,7 +562,7 @@ F
     # * evaluates to false if the block is false, or if the command returns a non-zero exit code.
     def only_if(command=nil, opts={}, &block)
       if command || block_given?
-        @only_if << Conditional.only_if(command, opts, &block)
+        @only_if << Conditional.only_if(self, command, opts, &block)
       end
       @only_if
     end
@@ -573,7 +583,7 @@ F
     # * evaluates to false if the block is true, or if the command returns a 0 exit status.
     def not_if(command=nil, opts={}, &block)
       if command || block_given?
-        @not_if << Conditional.not_if(command, opts, &block)
+        @not_if << Conditional.not_if(self, command, opts, &block)
       end
       @not_if
     end
@@ -627,7 +637,7 @@ F
         provider_for_action(action).run_action
       rescue Exception => e
         if ignore_failure
-          Chef::Log.error("#{self} (#{defined_at}) had an error: #{e.message}; ignore_failure is set, continuing")
+          Chef::Log.error("#{custom_exception_message(e)}; ignore_failure is set, continuing")
           events.resource_failed(self, action, e)
         elsif retries > 0
           events.resource_failed_retriable(self, action, retries, e)
@@ -662,8 +672,12 @@ F
       end
     end
 
+    def custom_exception_message(e)
+      "#{self} (#{defined_at}) had an error: #{e.class.name}: #{e.message}"
+    end
+
     def customize_exception(e)
-      new_exception = e.exception("#{self} (#{defined_at}) had an error: #{e.class.name}: #{e.message}")
+      new_exception = e.exception(custom_exception_message(e))
       new_exception.set_backtrace(e.backtrace)
       new_exception
     end
@@ -815,6 +829,5 @@ F
         end
       end
     end
-
   end
 end

data/lib/chef/resource/conditional.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/mixin/shell_out'
+require 'chef/guard_interpreter/resource_guard_interpreter'
 
 class Chef
   class Resource
@@ -29,12 +30,12 @@ class Chef
         private :new
       end
 
-      def self.not_if(command=nil, command_opts={}, &block)
-        new(:not_if, command, command_opts, &block)
+      def self.not_if(parent_resource, command=nil, command_opts={}, &block)
+        new(:not_if, parent_resource, command, command_opts, &block)
       end
 
-      def self.only_if(command=nil, command_opts={}, &block)
-        new(:only_if, command, command_opts, &block)
+      def self.only_if(parent_resource, command=nil, command_opts={}, &block)
+        new(:only_if, parent_resource, command, command_opts, &block)
       end
 
       attr_reader :positivity
@@ -42,14 +43,16 @@ class Chef
       attr_reader :command_opts
       attr_reader :block
 
-      def initialize(positivity, command=nil, command_opts={}, &block)
+      def initialize(positivity, parent_resource, command=nil, command_opts={}, &block)
         @positivity = positivity
         case command
         when String
+          @guard_interpreter = new_guard_interpreter(parent_resource, command, command_opts, &block)
           @command, @command_opts = command, command_opts
           @block = nil
         when nil
           raise ArgumentError, "only_if/not_if requires either a command or a block" unless block_given?
+          @guard_interpreter = nil
           @command, @command_opts = nil, nil
           @block = block
         else
@@ -69,11 +72,11 @@ class Chef
       end
 
       def evaluate
-        @command ? evaluate_command : evaluate_block
+        @guard_interpreter ? evaluate_command : evaluate_block
       end
 
       def evaluate_command
-        shell_out(@command, @command_opts).status.success?
+        @guard_interpreter.evaluate
       rescue Chef::Exceptions::CommandTimeout
         Chef::Log.warn "Command '#{@command}' timed out"
         false
@@ -100,6 +103,16 @@ class Chef
         end
       end
 
+      private
+
+      def new_guard_interpreter(parent_resource, command, opts)
+        if parent_resource.guard_interpreter == :default
+          guard_interpreter = Chef::GuardInterpreter::DefaultGuardInterpreter.new(command, opts)
+        else
+          guard_interpreter = Chef::GuardInterpreter::ResourceGuardInterpreter.new(parent_resource, command, opts)
+        end
+      end
+
     end
   end
 end