chef 0.9.8 → 0.9.10.rc.0

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

@@ -113,7 +113,7 @@ class Chef
           if @current_resource.mounted and @new_resource.supports[:remount]
             shell_out!("mount -o remount #{@new_resource.mount_point}")
 
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
             Chef::Log.info("Remounted #{@new_resource.mount_point}")
           elsif @current_resource.mounted
             umount_fs

data/lib/chef/provider/ohai.rb

@@ -0,0 +1,41 @@
+#
+# Author:: Michael Leianrtas (<mleinartas@gmail.com>)
+# Copyright:: Copyright (c) 2010 Michael Leinartas
+# 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 'ohai'
+
+class Chef
+  class Provider
+    class Ohai < Chef::Provider
+
+      def load_current_resource
+        true
+      end
+
+      def action_reload
+        ohai = ::Ohai::System.new
+        if @new_resource.plugin
+          ohai.require_plugin @new_resource.plugin
+        else
+          ohai.all_plugins
+        end
+
+        node.automatic_attrs.merge! ohai.data
+      end
+    end
+  end
+end

data/lib/chef/provider/package.rb

@@ -59,7 +59,7 @@ class Chef
           
         status = install_package(@new_resource.package_name, install_version)
         if status
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
       
@@ -69,7 +69,7 @@ class Chef
           Chef::Log.info("Upgrading #{@new_resource} version from #{orig_version} to #{candidate_version}")
           status = upgrade_package(@new_resource.package_name, candidate_version)
           if status
-            @new_resource.updated = true
+            @new_resource.updated_by_last_action(true)
           end
         end
       end
@@ -78,7 +78,7 @@ class Chef
         if removing_package?
           Chef::Log.info("Removing #{@new_resource}")
           remove_package(@current_resource.package_name, @new_resource.version)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         else
         end
       end
@@ -99,7 +99,7 @@ class Chef
         if removing_package?
           Chef::Log.info("Purging #{@new_resource}")
           purge_package(@current_resource.package_name, @new_resource.version)
-          @new_resource.updated = true
+          @new_resource.updated_by_last_action(true)
         end
       end
       
@@ -128,7 +128,7 @@ class Chef
         Chef::Log.debug("Fetching preseed file to #{resource.path}")
         resource.run_action('create')
         
-        if resource.updated?
+        if resource.updated_by_last_action?
           resource.path
         else
           false

data/lib/chef/provider/package/yum-dump.py

@@ -60,8 +60,11 @@ try:
     # Yum assumes it can update the cache directory. Disable this for non root 
     # users.
     y.conf.cache = os.geteuid() != 0
-    
-     # Spin up to lock_timeout.
+
+    # Override any setting in yum.conf - we only care about the newest
+    y.conf.showdupesfromrepos = False
+
+    # Spin up to lock_timeout.
     countdown = lock_timeout
     while True:
       try:

data/lib/chef/provider/remote_directory.rb

@@ -50,7 +50,9 @@ class Chef
       end
 
       def action_create_if_missing
-        raise Chef::Exceptions::UnsupportedAction, "Remote Directories do not support create_if_missing."
+        # if this action is called, ignore the existing overwrite flag
+        @new_resource.overwrite = false
+        action_create
       end
 
       protected
@@ -95,8 +97,12 @@ class Chef
         ensure_directory_exists(::File.dirname(full_path))
         
         file_to_fetch = cookbook_file_resource(full_path, cookbook_file_relative_path)
-        file_to_fetch.run_action(:create)
-        @new_resource.updated = true if file_to_fetch.updated?
+        if @new_resource.overwrite
+          file_to_fetch.run_action(:create)
+        else
+          file_to_fetch.run_action(:create_if_missing)
+        end
+        @new_resource.updated_by_last_action(true) if file_to_fetch.updated?
       end
       
       def cookbook_file_resource(target_path, relative_source_path)
@@ -115,7 +121,7 @@ class Chef
         unless ::File.directory?(path)
           directory_to_create = resource_for_directory(path)
           directory_to_create.run_action(:create)
-          @new_resource.updated = true if directory_to_create.updated?
+          @new_resource.updated_by_last_action(true) if directory_to_create.updated?
         end
       end
 
@@ -131,4 +137,4 @@ class Chef
 
     end
   end
-end
+end

data/lib/chef/provider/remote_file.rb

@@ -47,13 +47,13 @@ class Chef
               backup_new_resource
               Chef::Log.debug "copying remote file from origin #{raw_file.path} to destination #{@new_resource.path}"
               FileUtils.cp raw_file.path, @new_resource.path
-              @new_resource.updated = true
+              @new_resource.updated_by_last_action(true)
             end
           end
         end
         enforce_ownership_and_permissions
 
-        @new_resource.updated
+        @new_resource.updated_by_last_action(true)
       end
 
       def action_create_if_missing

data/lib/chef/provider/route.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.
@@ -25,150 +25,171 @@ class Chef::Provider::Route < Chef::Provider
     include Chef::Mixin::Command
 
     attr_accessor :is_running
-    
-    MASK = { 
-        '0.0.0.0'          => '0',  
-        '128.0.0.0'        => '1',  
-        '192.0.0.0'        => '2',  
-        '224.0.0.0'        => '3',  
-        '240.0.0.0'        => '4',  
-        '248.0.0.0'        => '5',  
-        '252.0.0.0'        => '6',  
-        '254.0.0.0'        => '7',  
-        '255.0.0.0'        => '8',  
-        '255.128.0.0'      => '9',  
-        '255.192.0.0'      => '10', 
-        '255.224.0.0'      => '11', 
-        '255.240.0.0'      => '12', 
-        '255.248.0.0'      => '13', 
-        '255.252.0.0'      => '14', 
-        '255.254.0.0'      => '15', 
-        '255.255.0.0'      => '16', 
-        '255.255.128.0'    => '17', 
-        '255.255.192.0'    => '18', 
-        '255.255.224.0'    => '19', 
-        '255.255.240.0'    => '20', 
-        '255.255.248.0'    => '21', 
-        '255.255.252.0'    => '22', 
-        '255.255.254.0'    => '23', 
-        '255.255.255.0'    => '24', 
-        '255.255.255.128'  => '25', 
-        '255.255.255.192'  => '26', 
-        '255.255.255.224'  => '27', 
-        '255.255.255.240'  => '28', 
-        '255.255.255.248'  => '29', 
-        '255.255.255.252'  => '30', 
-        '255.255.255.254'  => '31', 
-        '255.255.255.255'  => '32' 
-    } 
+
+    MASK = {'0.0.0.0'          => '0',
+            '128.0.0.0'        => '1',
+            '192.0.0.0'        => '2',
+            '224.0.0.0'        => '3',
+            '240.0.0.0'        => '4',
+            '248.0.0.0'        => '5',
+            '252.0.0.0'        => '6',
+            '254.0.0.0'        => '7',
+            '255.0.0.0'        => '8',
+            '255.128.0.0'      => '9',
+            '255.192.0.0'      => '10',
+            '255.224.0.0'      => '11',
+            '255.240.0.0'      => '12',
+            '255.248.0.0'      => '13',
+            '255.252.0.0'      => '14',
+            '255.254.0.0'      => '15',
+            '255.255.0.0'      => '16',
+            '255.255.128.0'    => '17',
+            '255.255.192.0'    => '18',
+            '255.255.224.0'    => '19',
+            '255.255.240.0'    => '20',
+            '255.255.248.0'    => '21',
+            '255.255.252.0'    => '22',
+            '255.255.254.0'    => '23',
+            '255.255.255.0'    => '24',
+            '255.255.255.128'  => '25',
+            '255.255.255.192'  => '26',
+            '255.255.255.224'  => '27',
+            '255.255.255.240'  => '28',
+            '255.255.255.248'  => '29',
+            '255.255.255.252'  => '30',
+            '255.255.255.254'  => '31',
+            '255.255.255.255'  => '32' }
 
     def load_current_resource
-        is_running = nil
-        
-        Chef::Log.debug("Configuring Route #{@new_resource.name}")
-
-        # cidr or quad dot mask
-        if @new_resource.netmask 
-            new_ip = IPAddr.new("#{@new_resource.target}/#{@new_resource.netmask}") 
-        else
-            new_ip = IPAddr.new(@new_resource.target)
-        end 
-
-        # pull routes from proc
-        if node[:os] == "linux" 
-            route_file = ::File.open("/proc/net/route", "r") 
-            while (line = route_file.gets)
-                # proc layout
-                iface,destination,gateway,flags,refcnt,use,metric,mask,mtu,window,irtt = line.split
-              
-                # need to convert packed adresses int quad dot
-                #  the addrs are reversed hex packed decimal addrs. so this unwraps them. tho you could 
-                #  do this without ipaddr using unpack. ipaddr has no htoa method.
-                #
-                destination = IPAddr.new(destination.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
-                gateway = IPAddr.new(gateway.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
-                mask = IPAddr.new(mask.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s  
-                Chef::Log.debug( "System has route:  dest=#{destination} mask=#{mask} gw=#{gateway}")
-                
-                # check if what were trying to configure is already there
-                # use an ipaddr object with ip/mask this way we can have 
-                # a new resource be in cidr format (i don't feel like 
-                # expanding bitmask by hand.
-                #
-                running_ip = IPAddr.new("#{destination}/#{mask}")
-                Chef::Log.debug( "new ip: #{new_ip.inspect} running ip: #{running_ip.inspect} ")
-                is_running = true if running_ip == new_ip 
-            end
-            route_file.close
+      is_running = nil
+
+      Chef::Log.debug("Configuring Route #{@new_resource.name}")
+
+      # cidr or quad dot mask
+      if @new_resource.netmask
+        new_ip = IPAddr.new("#{@new_resource.target}/#{@new_resource.netmask}")
+      else
+        new_ip = IPAddr.new(@new_resource.target)
+      end
+
+      # pull routes from proc
+      if node[:os] == "linux"
+        route_file = ::File.open("/proc/net/route", "r")
+        while (line = route_file.gets)
+          # proc layout
+          iface,destination,gateway,flags,refcnt,use,metric,mask,mtu,window,irtt = line.split
+
+          # need to convert packed adresses int quad dot
+          #  the addrs are reversed hex packed decimal addrs. so this unwraps them. tho you could
+          #  do this without ipaddr using unpack. ipaddr has no htoa method.
+          #
+          destination = IPAddr.new(destination.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
+          gateway = IPAddr.new(gateway.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
+          mask = IPAddr.new(mask.scan(/../).reverse.to_s.hex, Socket::AF_INET).to_s
+          Chef::Log.debug( "System has route:  dest=#{destination} mask=#{mask} gw=#{gateway}")
+
+          # check if what were trying to configure is already there
+          # use an ipaddr object with ip/mask this way we can have
+          # a new resource be in cidr format (i don't feel like
+          # expanding bitmask by hand.
+          #
+          running_ip = IPAddr.new("#{destination}/#{mask}")
+          Chef::Log.debug( "new ip: #{new_ip.inspect} running ip: #{running_ip.inspect} ")
+          is_running = true if running_ip == new_ip
         end
+      route_file.close
+      end
     end
 
     def action_add
-        # check to see if load_current_resource found the route
-        if  is_running
-            Chef::Log.debug("Route #{@new_resource.name} already active ")
-        else
-            command =  "ip route replace #{@new_resource.target}"
-            command << "/#{MASK[@new_resource.netmask.to_s]}" if @new_resource.netmask 
-            command << " via #{@new_resource.gateway} "
-            command << " dev #{@new_resource.device} " if @new_resource.device
-            
-            Chef::Log.info("Adding route: #{command} ")  
-            run_command( :command => command )
-            @new_resource.updated = true
-        end
-        
-        #for now we always write the file (ugly but its what it is)
-        generate_config
+      # check to see if load_current_resource found the route
+      if  is_running
+        Chef::Log.debug("Route #{@new_resource.name} already active ")
+      else
+        command = generate_command(:add)
+
+        Chef::Log.info("Adding route: #{command} ")
+        run_command( :command => command )
+        @new_resource.updated_by_last_action(true)
+      end
 
+      #for now we always write the file (ugly but its what it is)
+      generate_config
     end
 
     def action_delete
-        if is_running
-            command = "ip route delete #{@new_resource.target}"
-            command << "/#{MASK[@new_resource.netmask.to_s]}" if @new_resource.netmask 
-            command << " via #{@new_resource.gateway} " 
-            
-            Chef::Log.info("Removing route: #{command}")  
-            run_command( :command => command )
-            @new_resource.updated = true
-        else
-            Chef::Log.debug("Route #{@new_resource.name} does not exist")
-        end
+      if is_running
+        command = generate_command(:delete)
+
+        Chef::Log.info("Removing route: #{command}")
+        run_command( :command => command )
+        @new_resource.updated_by_last_action(true)
+      else
+        Chef::Log.debug("Route #{@new_resource.name} does not exist")
+      end
     end
 
     def generate_config
-        conf = Hash.new
-        case node[:platform]
-        when ("centos" || "redhat" || "fedora")
-            # walk the collection 
-            @collection.each do |resource|
-                if resource.is_a? Chef::Resource::Route
-                    # default to eth0 
-                    if resource.device
-                      dev = resource.device
-                    else
-                      dev = "eth0"
-                    end
-                   
-                    conf[dev] = String.new if conf[dev].nil? 
-                    if resource.action == :add
-                        conf[dev] << "#{resource.target}"
-                        conf[dev] << "/#{resource.netmask}" if resource.netmask
-                        conf[dev] << " via #{resource.gateway}\n" 
-                    else 
-                        # need to do this for the case when the last route on an int
-                        # is removed
-                        conf[dev] = ""
-                    end
-                end
+      conf = Hash.new
+      case node[:platform]
+      when ("centos" || "redhat" || "fedora")
+        # walk the collection
+        run_context.resource_collection.each do |resource|
+          if resource.is_a? Chef::Resource::Route
+            # default to eth0
+            if resource.device
+              dev = resource.device
+            else
+              dev = "eth0"
+            end
+
+            conf[dev] = String.new if conf[dev].nil?
+            if resource.action == :add
+              conf[dev] = config_file_contents(:add, :target => resource.target, :netmask => resource.netmask, :gateway => resource.gateway)
+            else
+              # need to do this for the case when the last route on an int
+              # is removed
+              conf[dev] = config_file_contents(:delete)
             end
-            conf.each do |k, v|
-               network_file = ::File.new("/etc/sysconfig/network-scripts/route-#{k}", "w")
-               network_file.puts(conf[k])
-               Chef::Log.debug("writing route.#{k}\n#{conf[k]}")
-               network_file.close
-            end 
+          end
         end
-    end    
+        conf.each do |k, v|
+          network_file = ::File.new("/etc/sysconfig/network-scripts/route-#{k}", "w")
+          network_file.puts(conf[k])
+          Chef::Log.debug("writing route.#{k}\n#{conf[k]}")
+          network_file.close
+        end
+      end
+    end
+
+    def generate_command(action)
+      common_route_items = ''
+      common_route_items << "/#{MASK[@new_resource.netmask.to_s]}" if @new_resource.netmask
+      common_route_items << " via #{@new_resource.gateway} " if @new_resource.gateway
+
+      case action
+      when :add
+        command = "ip route replace #{@new_resource.target}"
+        command << common_route_items
+        command << " dev #{@new_resource.device} " if @new_resource.device
+      when :delete
+        command = "ip route delete #{@new_resource.target}"
+        command << common_route_items
+      end
+
+      return command
+    end
+
+    def config_file_contents(action, options={})
+      content = ''
+      case action
+      when :add
+        content << "#{options[:target]}"
+        content << "/#{options[:netmask]}" if options[:netmask]
+        content << " via #{options[:gateway]}" if options[:gateway]
+        content << "\n"
+      end
+
+      return content
+    end
 end