chef 0.9.8 → 0.9.10.rc.0

data/lib/chef/node/attribute.rb

@@ -29,14 +29,12 @@ class Chef
                     :default,
                     :override,
                     :automatic,
-                    :state,
                     :current_normal,
                     :current_default,
                     :current_override,
                     :current_automatic,
                     :auto_vivifiy_on_read,
                     :set_unless_value_present,
-                    :has_been_read,
                     :set_type
 
       include Enumerable
@@ -50,7 +48,7 @@ class Chef
         @current_override = override
         @automatic = automatic
         @current_automatic = automatic
-        @state = state
+        @current_nesting_level = state
         @auto_vivifiy_on_read = false
         @set_unless_value_present = false
         @set_type = nil
@@ -78,18 +76,18 @@ class Chef
         end
       end
 
-      # Reset our internal state to the top of every tree
+      # Reset our internal current_nesting_level to the top of every tree
       def reset
         @current_normal = @normal
         @current_default = @default
         @current_override = @override
         @current_automatic = @automatic
         @has_been_read = false
-        @state = []
+        @current_nesting_level = []
       end
 
       def [](key)
-        @state << key
+        @current_nesting_level << key
 
         # We set this to so that we can cope with ||= as a setting.
         # See the comments in []= for more details.
@@ -114,21 +112,18 @@ class Chef
         end
       end
 
-      def attribute?(key)
-        return true if get_value(automatic, key)
-        return true if get_value(override, key)
-        return true if get_value(normal, key)
-        return true if get_value(default, key)
-        false
-      end
-
       def has_key?(key)
-        attribute?(key)
+        return true if component_has_key?(@default,key)
+        return true if component_has_key?(@automatic,key)
+        return true if component_has_key?(@normal,key)
+        return true if component_has_key?(@override,key)
+        false
       end
 
-      alias :include? :has_key?
-      alias :key? :has_key?
-      alias :member? :has_key?
+      alias :attribute? :has_key?
+      alias :include?   :has_key?
+      alias :key?       :has_key?
+      alias :member?    :has_key?
 
       def each(&block)
         get_keys.each do |key|
@@ -263,7 +258,7 @@ class Chef
       def get_value(data_hash, key)
         last = nil
 
-        if state.length == 0
+        if @current_nesting_level.length == 0
           if data_hash.has_key?(key) && ! data_hash[key].nil?
             return data_hash[key]
           else
@@ -271,18 +266,18 @@ class Chef
           end
         end
 
-        0.upto(state.length) do |i|
+        0.upto(@current_nesting_level.length) do |i|
           if i == 0
-            last = auto_vivifiy(data_hash, state[i])
-          elsif i == state.length
-            fk = last[state[i - 1]]
+            last = auto_vivifiy(data_hash, @current_nesting_level[i])
+          elsif i == @current_nesting_level.length
+            fk = last[@current_nesting_level[i - 1]]
             if fk.has_key?(key) && ! fk[key].nil?
               return fk[key]
             else
               return nil
             end
           else
-            last = auto_vivifiy(last[state[i - 1]], state[i])
+            last = auto_vivifiy(last[@current_nesting_level[i - 1]], @current_nesting_level[i])
           end
         end
       end
@@ -327,7 +322,7 @@ class Chef
 
         if set_unless_value_present
           if get_value(set_type_hash, key) != nil
-            Chef::Log.debug("Not setting #{state.join("/")}/#{key} to #{value.inspect} because it has a #{@set_type} value already")
+            Chef::Log.debug("Not setting #{@current_nesting_level.join("/")}/#{key} to #{value.inspect} because it has a #{@set_type} value already")
             return false
           end
         end
@@ -338,7 +333,7 @@ class Chef
         #
         # In practice, these objects are single use - this is just
         # supporting one more single-use style.
-        @state.pop if @has_been_read && @state.last == key
+        @current_nesting_level.pop if @has_been_read && @current_nesting_level.last == key
 
         set_value(set_type_hash, key, value)
         value
@@ -347,23 +342,23 @@ class Chef
       def set_value(data_hash, key, value)
         last = nil
 
-        # If there is no state, just set the value
-        if state.length == 0
+        # If there is no current_nesting_level, just set the value
+        if @current_nesting_level.length == 0
           data_hash[key] = value
           return data_hash
         end
 
         # Walk all the previous places we have been
-        0.upto(state.length) do |i|
+        0.upto(@current_nesting_level.length) do |i|
           # If we are the first, we are top level, and should vivifiy the data_hash
           if i == 0
-            last = auto_vivifiy(data_hash, state[i])
-          # If we are one past the last state, we are adding a key to that hash with a value
-          elsif i == state.length
-            last[state[i - 1]][key] = value
+            last = auto_vivifiy(data_hash, @current_nesting_level[i])
+          # If we are one past the last current_nesting_level, we are adding a key to that hash with a value
+          elsif i == @current_nesting_level.length
+            last[@current_nesting_level[i - 1]][key] = value
           # Otherwise, we're auto-vivifiy-ing an interim mash
           else
-            last = auto_vivifiy(last[state[i - 1]], state[i])
+            last = auto_vivifiy(last[@current_nesting_level[i - 1]], @current_nesting_level[i])
           end
         end
         data_hash
@@ -372,7 +367,7 @@ class Chef
       def auto_vivifiy(data_hash, key)
         if data_hash.has_key?(key)
           unless data_hash[key].respond_to?(:has_key?)
-            raise ArgumentError, "You tried to set a nested key, where the parent is not a hash-like object: #{@state.join("/")}/#{key} " unless auto_vivifiy_on_read
+            raise ArgumentError, "You tried to set a nested key, where the parent is not a hash-like object: #{@current_nesting_level.join("/")}/#{key} " unless auto_vivifiy_on_read
           end
         else
           data_hash[key] = Mash.new
@@ -390,7 +385,7 @@ class Chef
         end
 
         if data_hash[key].respond_to?(:has_key?)
-          cna = Chef::Node::Attribute.new(@normal, @default, @override, @automatic, @state)
+          cna = Chef::Node::Attribute.new(@normal, @default, @override, @automatic, @current_nesting_level)
           cna.current_normal = current_normal.nil? ? Mash.new : current_normal[key]
           cna.current_default   = current_default.nil? ? Mash.new : current_default[key]
           cna.current_override  = current_override.nil? ? Mash.new : current_override[key]
@@ -404,27 +399,30 @@ class Chef
         end
       end
 
+      # Fetches or sets the value, depending on if any arguments are given.
+      # ==== Fetching
+      # If no arguments are given, fetches the value:
+      #   node.network
+      #   => {network data}
+      # Getters will find either a string or symbol key.
+      # ==== Setting
+      # If arguments are given, a value will be set. Both normal setter and DSL
+      # style setters are allowed:
+      #   node.foo = "bar"
+      #   node.foo("bar")
+      # Both set node[:foo] = "bar"
       def method_missing(symbol, *args)
-        by = symbol
-        if self.attribute?(symbol)
-          by = symbol
-        elsif self.attribute?(symbol.to_s)
-          by = symbol.to_s
-        else
-          if args.length != 0
-            by = symbol
+        if args.empty?
+          if key?(symbol)
+            self[symbol]
+          elsif key?(symbol.to_s)
+            self[symbol.to_s]
           else
-            raise ArgumentError, "Attribute #{symbol.to_s} is not defined!" unless auto_vivifiy_on_read
+            raise ArgumentError, "Attribute #{symbol} is not defined!" unless auto_vivifiy_on_read
           end
-        end
-
-        if args.length != 0
-          if by.to_s =~ /^(.+)=$/
-            by = $1
-          end
-          self[by] = args.length == 1 ? args[0] : args
         else
-          self[by]
+          key_to_set = symbol.to_s[/^(.+)=$/, 1] || symbol
+          self[key_to_set] = (args.length == 1 ? args[0] : args)
         end
       end
 
@@ -445,6 +443,16 @@ class Chef
         end
       end
 
+      def component_has_key?(component_attrs,key)
+        # get the Hash-like object at the current nesting level:
+        nested_attrs = @current_nesting_level.inject(component_attrs) do |subtree, intermediate_key|
+          # if the intermediate value isn't a hash or doesn't have the intermediate key,
+          # it can't have the bottom-level key we're looking for.
+          (subtree.respond_to?(:key?) && subtree[intermediate_key]) or (return false)
+        end
+        nested_attrs.respond_to?(:key?) && nested_attrs.key?(key)
+      end
+
     end
   end
 end

data/lib/chef/platform.rb

@@ -80,6 +80,22 @@ class Chef
               :mdadm => Chef::Provider::Mdadm
             }
           },
+          :amazon   => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
+          :scientific => {
+            :default => {
+              :service => Chef::Provider::Service::Redhat,
+              :cron => Chef::Provider::Cron,
+              :package => Chef::Provider::Package::Yum,
+              :mdadm => Chef::Provider::Mdadm
+            }
+          },
           :fedora   => {
             :default => {
               :service => Chef::Provider::Service::Redhat,
@@ -150,8 +166,9 @@ class Chef
           :solaris2 => {
             :default => {
               :service => Chef::Provider::Service::Solaris,
-        			:package => Chef::Provider::Package::Solaris,
-        			:cron => Chef::Provider::Cron
+              :package => Chef::Provider::Package::Solaris,
+              :cron => Chef::Provider::Cron::Solaris,
+              :group => Chef::Provider::Group::Usermod
             }
           },
           :default  => {

data/lib/chef/provider/breakpoint.rb

@@ -26,7 +26,7 @@ class Chef
       def action_break
         if defined?(Shef) && Shef.running?
           run_context.resource_collection.iterator.pause
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
           run_context.resource_collection.iterator
         end
       end

data/lib/chef/provider/cookbook_file.rb

@@ -42,11 +42,11 @@ class Chef
              stage_file_to_tmpdir(staging_file.path)
              FileUtils.mv(staging_file.path, @new_resource.path)
            end
-           @new_resource.updated = true
+           @new_resource.updated_by_last_action(true)
          else
            set_all_access_controls(@new_resource.path)
          end
-         @new_resource.updated
+         @new_resource.updated_by_last_action(true)
        end
 
       def action_create_if_missing
@@ -81,7 +81,7 @@ class Chef
       def set_all_access_controls(file)
         access_controls = Chef::FileAccessControl.new(@new_resource, file)
         access_controls.set_all
-        @new_resource.updated = access_controls.modified?
+        @new_resource.updated_by_last_action(access_controls.modified?)
       end
 
       def backup_new_resource

data/lib/chef/provider/cron.rb

@@ -133,7 +133,7 @@ class Chef
             crontab.each_line { |line| stdin.puts "#{line}" }
           end
           Chef::Log.info("Updated cron '#{@new_resource.name}'")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
           unless @cron_empty
             status = popen4("crontab -l -u #{@new_resource.user}") do |pid, stdin, stdout, stderr|
@@ -147,7 +147,7 @@ class Chef
             crontab.each_line { |line| stdin.puts "#{line}" }
           end
           Chef::Log.info("Added cron '#{@new_resource.name}'")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 
@@ -177,7 +177,7 @@ class Chef
             crontab.each_line { |line| stdin.puts "#{line}" }
           end
           Chef::Log.debug("Deleted cron '#{@new_resource.name}'")
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
 

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

@@ -0,0 +1,195 @@
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# Author:: Toomas Pelberg (toomasp@gmx.net)
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# Copyright:: Copyright (c) 2010 Toomas Pelberg
+# 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/log'
+require 'chef/mixin/command'
+require 'chef/provider'
+
+class Chef
+  class Provider
+    class Cron
+      class Solaris < Chef::Provider::Cron
+      include Chef::Mixin::Command
+
+      CRON_PATTERN = /([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s([-0-9*,\/]+)\s(.*)/
+
+      def initialize(new_resource, run_context)
+        super(new_resource, run_context)
+        @cron_exists = false
+        @cron_empty = false
+      end
+      attr_accessor :cron_exists, :cron_empty
+
+      def load_current_resource
+        crontab_lines = []
+        @current_resource = Chef::Resource::Cron.new(@new_resource.name)
+        @current_resource.user(@new_resource.user)
+        status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
+          stdout.each_line { |line| crontab_lines << line }
+        end
+        if status.exitstatus > 1
+          raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
+        elsif status.exitstatus == 0
+          cron_found = false
+          crontab_lines.each do |line|
+            case line.chomp
+            when "# Chef Name: #{@new_resource.name}"
+              Chef::Log.debug("Found cron '#{@new_resource.name}'")
+              cron_found = true
+              @cron_exists = true
+              next
+            when /^MAILTO=(\S*)/
+              @current_resource.mailto($1) if cron_found
+              next
+            when /^PATH=(\S*)/
+              @current_resource.path($1) if cron_found
+              next
+            when /^SHELL=(\S*)/
+              @current_resource.shell($1) if cron_found
+              next
+            when /^HOME=(\S*)/
+              @current_resource.home($1) if cron_found
+              next
+            when CRON_PATTERN
+              if cron_found
+                @current_resource.minute($1)
+                @current_resource.hour($2)
+                @current_resource.day($3)
+                @current_resource.month($4)
+                @current_resource.weekday($5)
+                @current_resource.command($6)
+                cron_found=false
+              end
+              next
+            else
+              next
+            end
+          end
+          Chef::Log.debug("Cron '#{@new_resource.name}' not found") unless @cron_exists
+        elsif status.exitstatus == 1
+          Chef::Log.debug("Cron empty for '#{@new_resource.user}'")
+          @cron_empty = true
+        end
+
+        @current_resource
+      end
+
+      def compare_cron
+        [ :minute, :hour, :day, :month, :weekday, :command, :mailto, :path, :shell, :home ].any? do |cron_var|
+          !@new_resource.send(cron_var).nil? && @new_resource.send(cron_var) != @current_resource.send(cron_var)
+        end
+      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)
+        if(status == 0)
+          @new_resource.updated_by_last_action(true)
+        else
+          @new_resource.updated_by_last_action(false)
+        end
+        tempcron.close!
+        return status
+      end
+
+      def action_create
+        crontab = String.new
+        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
+        newcron << "#{@new_resource.minute} #{@new_resource.hour} #{@new_resource.day} #{@new_resource.month} #{@new_resource.weekday} #{@new_resource.command}\n"
+
+        if @cron_exists
+          unless compare_cron
+            Chef::Log.debug("Skipping existing cron entry '#{@new_resource.name}'")
+            return
+          end
+          status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
+            stdout.each_line do |line|
+              case line.chomp
+              when "# Chef Name: #{@new_resource.name}"
+                cron_found = true
+                next
+              when CRON_PATTERN
+                if cron_found
+                  cron_found = false
+                  crontab << newcron
+                  next
+                end
+              else
+                next if cron_found
+              end
+              crontab << line
+            end
+          end
+
+          status = write_crontab(crontab)
+          Chef::Log.info("Updated cron '#{@new_resource.name}'")
+        else
+          unless @cron_empty
+            status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
+              stdout.each { |line| crontab << line }
+            end
+          end
+
+          crontab << newcron
+          status = write_crontab(crontab)
+          Chef::Log.info("Added cron '#{@new_resource.name}'")
+        end
+      end
+
+      def action_delete
+        if @cron_exists
+          crontab = String.new
+          cron_found = false
+          status = popen4("crontab -l #{@new_resource.user}") do |pid, stdin, stdout, stderr|
+            stdout.each_line do |line|
+              case line.chomp
+              when "# Chef Name: #{@new_resource.name}"
+                cron_found = true
+                next
+              when CRON_PATTERN
+                if cron_found
+                  cron_found = false
+                  next
+                end
+              else
+                next if cron_found
+              end
+              crontab << line
+            end
+          end
+
+          status = write_crontab(crontab)
+          Chef::Log.info("Deleted cron '#{@new_resource.name}'")
+        end
+      end
+
+    end
+  end
+end
+end