chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/lib/chef/mixin/windows_architecture_helper.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -17,7 +17,7 @@
 #
 
 
-require 'chef/exceptions' 
+require 'chef/exceptions'
 require 'win32/api' if Chef::Platform.windows?
 
 class Chef
@@ -32,7 +32,7 @@ class Chef
         is_i386_windows_process? &&
           node_windows_architecture(node) == :x86_64 &&
           desired_architecture == :x86_64
-      end          
+      end
 
       def node_supports_windows_architecture?(node, desired_architecture)
         assert_valid_windows_architecture!(desired_architecture)
@@ -85,7 +85,7 @@ class Chef
           end
         end
       end
-      
+
     end
   end
 end

data/lib/chef/mixin/xml_escape.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -18,26 +18,26 @@
 
 #--
 # Portions of this code are adapted from Sam Ruby's xchar.rb
-# http://intertwingly.net/stories/2005/09/28/xchar.rb 
+# http://intertwingly.net/stories/2005/09/28/xchar.rb
 #
 # Such code appears here under Sam's original MIT license, while portions of
 # this file are covered by the above Apache License.  For a completely MIT
 # licensed version, please see Sam's original.
 #
 # Thanks, Sam!
-# 
-# Copyright (c) 2005, Sam Ruby 
-# 
+#
+# Copyright (c) 2005, Sam Ruby
+#
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -99,7 +99,7 @@ class Chef
         }
 
         # http://www.w3.org/TR/REC-xml/#charsets
-        VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF), 
+        VALID = [[0x9, 0xA, 0xD], (0x20..0xD7FF),
           (0xE000..0xFFFD), (0x10000..0x10FFFF)]
 
         def xml_escape(unescaped_str)
@@ -118,7 +118,7 @@ class Chef
           char = PREDEFINED[char] || (char<128 ? char.chr : "&##{char};")
         end
       end
-      
+
       module FastXS
         extend self
 

data/lib/chef/monkey_patches/numeric.rb

@@ -8,7 +8,7 @@ end
 
 # String elements referenced with [] <= 1.8.6 return a Fixnum. Cheat to allow
 # for the simpler "test"[2].ord construct
-class Numeric 
+class Numeric
   def ord
     return self
   end

data/lib/chef/monkey_patches/regexp.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2009 Marc-Andre Lafortune
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -31,4 +31,4 @@ class Regexp
       end
     end
   end
-end
+end

data/lib/chef/monkey_patches/string.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -39,7 +39,7 @@ class String
   end
 end
 
-# <= 1.8.6 needs some ord! 
+# <= 1.8.6 needs some ord!
 class String
   unless method_defined?(:ord)
     def ord

data/lib/chef/monkey_patches/tempfile.rb

@@ -6,9 +6,9 @@
 # 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.

data/lib/chef/node.rb

@@ -290,6 +290,14 @@ class Chef
       normal[:tags]
     end
 
+    def tag(*tags)
+      tags.each do |tag|
+        self.normal[:tags].push(tag.to_s) unless self[:tags].include? tag.to_s
+      end
+
+      self[:tags]
+    end
+
     # Extracts the run list from +attrs+ and applies it. Returns the remaining attributes
     def consume_run_list(attrs)
       attrs = attrs ? attrs.dup : {}

data/lib/chef/node/attribute.rb

@@ -243,7 +243,7 @@ class Chef
        end
 
        # Clears merged_attributes, which will cause it to be recomputed on the
-       # next access. 
+       # next access.
        def reset_cache
          @merged_attributes = nil
          @combined_default  = nil

data/lib/chef/platform/provider_mapping.rb

@@ -173,6 +173,17 @@ class Chef
               :ifconfig => Chef::Provider::Ifconfig::Redhat
             }
           },
+          :opensuse     => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Zypper,
+              :group => Chef::Provider::Group::Suse
+            },
+            ">= 12.3" => {
+              :group => Chef::Provider::Group::Usermod
+            }
+          },
           :suse     => {
             :default => {
               :service => Chef::Provider::Service::Redhat,
@@ -180,6 +191,16 @@ class Chef
               :package => Chef::Provider::Package::Zypper,
               :group => Chef::Provider::Group::Suse
             },
+            ###############################################
+            # TODO: Remove this after ohai update is released.
+            # Only OpenSuSE 12.3+ should use the Usermod group provider:
+            # Ohai before OHAI-339 is applied reports both OpenSuSE and SuSE
+            # Enterprise as "suse", Ohai after OHAI-339 will report OpenSuSE as
+            # "opensuse".
+            #
+            # In order to support OpenSuSE both before and after the Ohai
+            # change, I'm leaving this here. It needs to get removed before
+            # SuSE enterprise 12.3 ships.
             ">= 12.3" => {
               :group => Chef::Provider::Group::Usermod
             }
@@ -320,7 +341,11 @@ class Chef
           },
           :aix => {
             :default => {
-              :group => Chef::Provider::Group::Aix
+              :group => Chef::Provider::Group::Aix,
+              :mount => Chef::Provider::Mount::Aix,
+              :ifconfig => Chef::Provider::Ifconfig::Aix,
+              :cron => Chef::Provider::Cron::Aix,
+              :package => Chef::Provider::Package::Aix
             }
           },
           :default  => {

data/lib/chef/provider/batch.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -29,7 +29,7 @@ class Chef
       def flags
         @new_resource.flags.nil? ? '/c' : new_resource.flags + ' /c'
       end
-        
+
     end
   end
 end

data/lib/chef/provider/cron.rb

@@ -40,11 +40,12 @@ class Chef
       def whyrun_supported?
         true
       end
-      
+
       def load_current_resource
         crontab_lines = []
         @current_resource = Chef::Resource::Cron.new(@new_resource.name)
         @current_resource.user(@new_resource.user)
+        @cron_exists = false
         if crontab = read_crontab
           cron_found = false
           crontab.each_line do |line|
@@ -81,7 +82,7 @@ class Chef
 
         @current_resource
       end
-      
+
       def cron_different?
         CRON_ATTRIBUTES.any? do |cron_var|
           !@new_resource.send(cron_var).nil? && @new_resource.send(cron_var) != @current_resource.send(cron_var)
@@ -93,14 +94,7 @@ class Chef
         newcron = String.new
         cron_found = false
 
-        newcron << "# Chef Name: #{new_resource.name}\n"
-        [ :mailto, :path, :shell, :home ].each do |v|
-          newcron << "#{v.to_s.upcase}=#{@new_resource.send(v)}\n" if @new_resource.send(v)
-        end
-        @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"
+        newcron = get_crontab_entry
 
         if @cron_exists
           unless cron_different?
@@ -171,7 +165,7 @@ class Chef
             end
             crontab << line
           end
-          description = cron_found ? "remove #{@new_resource.name} from crontab" : 
+          description = cron_found ? "remove #{@new_resource.name} from crontab" :
             "save unmodified crontab"
           converge_by(description) do
             write_crontab crontab
@@ -202,13 +196,33 @@ class Chef
       end
 
       def write_crontab(crontab)
+        write_exception = false
         status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-          stdin.write crontab
+          begin
+            stdin.write crontab
+          rescue Errno::EPIPE => e
+            # popen4 could yield while child has already died.
+            write_exception = true
+            Chef::Log.debug("#{e.message}")
+          end
         end
-        if status.exitstatus > 0
+        if status.exitstatus > 0 || write_exception
           raise Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: #{status.exitstatus}"
         end
       end
+
+      def get_crontab_entry
+        newcron = ""
+        newcron << "# Chef Name: #{new_resource.name}\n"
+        [ :mailto, :path, :shell, :home ].each do |v|
+          newcron << "#{v.to_s.upcase}=#{@new_resource.send(v)}\n" if @new_resource.send(v)
+        end
+        @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"
+        newcron
+      end
     end
   end
 end

data/lib/chef/provider/cron/aix.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
+# Copyright:: Copyright (c) 2013 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 "chef/provider/cron/unix"
+
+class Chef
+  class Provider
+    class Cron
+      class Aix < Chef::Provider::Cron::Unix
+
+        private
+
+        # For AIX we ignore env vars/[ :mailto, :path, :shell, :home ]
+        def get_crontab_entry
+          if env_vars_are_set?
+            raise Chef::Exceptions::Cron, "Aix cron entry does not support environment variables. Please set them in script and use script in cron."
+          end
+
+          newcron = ""
+          newcron << "# Chef Name: #{new_resource.name}\n"
+          newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday}"
+
+          newcron << " #{@new_resource.command}\n"
+          newcron
+        end
+
+        def env_vars_are_set?
+          @new_resource.environment.length > 0 || !@new_resource.mailto.nil? || !@new_resource.path.nil? || !@new_resource.shell.nil? || !@new_resource.home.nil?
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,13 @@
 #
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Author:: Toomas Pelberg (toomasp@gmx.net)
-# Copyright:: Copyright (c) 2009 Bryan McLellan
-# Copyright:: Copyright (c) 2010 Toomas Pelberg
+# Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
+# Copyright:: Copyright (c) 2013 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
+# 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,
@@ -18,39 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/log'
-require 'chef/provider'
+require "chef/provider/cron/unix"
 
-class Chef
-  class Provider
-    class Cron
-      class Solaris < Chef::Provider::Cron
-
-        private
-
-        def read_crontab
-          crontab = nil
-          status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
-            crontab = stdout.read
-          end
-          if status.exitstatus > 1
-            raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
-          end
-          crontab
-        end
-
-        def write_crontab(crontab)
-          tempcron = Tempfile.new("chef-cron")
-          tempcron << crontab
-          tempcron.flush
-          tempcron.chmod(0644)
-          status = run_command(:command => "/usr/bin/crontab #{tempcron.path}",:user => @new_resource.user)
-          tempcron.close!
-          if status.exitstatus > 0
-            raise Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: #{status.exitstatus}"
-          end
-        end
-      end
-    end
-  end
-end
+# Just to create an alias so 'Chef::Provider::Cron::Solaris' is exposed and accessible to existing consumers of class.
+Chef::Provider::Cron::Solaris = Chef::Provider::Cron::Unix