Changed all uses of Chef::Exception to Chef::Exceptions to avoid masking ::Exception in places like popen4

Author: Christopher Brown

chef-server/lib/chef/search_index.rb

@@ -44,15 +44,15 @@ def create_index_object(new_object)
       elsif new_object.kind_of?(Hash)
         index_hash = new_object
       else
-        raise Chef::Exception::SearchIndex, "Cannot transform argument to a Hash!" 
+        raise Chef::Exceptions::SearchIndex, "Cannot transform argument to a Hash!" 
       end
 
       unless index_hash.has_key?(:index_name) || index_hash.has_key?("index_name")
-        raise Chef::Exception::SearchIndex, "Cannot index without an index_name key: #{index_hash.inspect}"
+        raise Chef::Exceptions::SearchIndex, "Cannot index without an index_name key: #{index_hash.inspect}"
       end
 
       unless index_hash.has_key?(:id) || index_hash.has_key?("id")
-        raise Chef::Exception::SearchIndex, "Cannot index without an id key: #{index_hash.inspect}"
+        raise Chef::Exceptions::SearchIndex, "Cannot index without an id key: #{index_hash.inspect}"
       end
 
       index_hash.each do |k,v|

chef/lib/chef/exceptions.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 class Chef
-  class Exception
+  class Exceptions
     class Cron < RuntimeError; end
     class Exec < RuntimeError; end
     class FileNotFound < RuntimeError; end  

chef/lib/chef/file_cache.rb

@@ -98,7 +98,7 @@ def move_to(file, path)
       # String:: A string with the file contents, or the path to the file.
       #
       # === Raises
-      # Chef::Exception::FileNotFound:: If it cannot find the file in the cache
+      # Chef::Exceptions::FileNotFound:: If it cannot find the file in the cache
       def load(path, read=true)
         validate(
           {
@@ -109,7 +109,7 @@ def load(path, read=true)
           }
         )
         cache_path = create_cache_path(path, false)
-        raise Chef::Exception::FileNotFound, "Cannot find #{cache_path} for #{path}!" unless File.exists?(cache_path)
+        raise Chef::Exceptions::FileNotFound, "Cannot find #{cache_path} for #{path}!" unless File.exists?(cache_path)
         if read
           File.read(cache_path)
         else
@@ -202,4 +202,4 @@ def create_cache_path(path, create_if_missing=true)
 
     end
   end
-end
+end

chef/lib/chef/mixin/command.rb

@@ -144,7 +144,7 @@ def run_command(args={})
 
         args[:cwd] ||= Dir.tmpdir        
         unless File.directory?(args[:cwd])
-          raise Chef::Exception::Exec, "#{args[:cwd]} does not exist or is not a directory"
+          raise Chef::Exceptions::Exec, "#{args[:cwd]} does not exist or is not a directory"
         end
 
         Chef::Log.debug("Executing #{args[:command]}")
@@ -177,7 +177,7 @@ def run_command(args={})
                 output << "#{command_stderr}\n"
                 output << "---- End #{args[:command]} STDERR ----\n"
               end
-              raise Chef::Exception::Exec, "#{args[:command_string]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}"
+              raise Chef::Exceptions::Exec, "#{args[:command_string]} returned #{status.exitstatus}, expected #{args[:returns]}#{output}"
             end
           end
           Chef::Log.debug("Ran #{args[:command_string]} (#{args[:command]}) returned #{status.exitstatus}")
@@ -191,9 +191,9 @@ def run_command(args={})
       # modified to suit the needs of Chef.  Any bugs here are most likely
       # my own, and not Ara's.
       #
-      # The original appears in external/open4.rb in it's unmodified form. 
+      # The original appears in external/open4.rb in its unmodified form. 
       #
-      # Thanks, Ara. 
+      # Thanks Ara!
       def popen4(cmd, args={}, &b)
 
         # Waitlast - this is magic.  

chef/lib/chef/mixin/find_preferred_file.rb

@@ -88,12 +88,12 @@ def find_preferred_file(cookbook_id, file_type, file_name, fqdn, platform, versi
         end
 
         unless to_send
-          raise Chef::Exception::FileNotFound, "Cannot find a preferred file for #{file_name}!"
+          raise Chef::Exceptions::FileNotFound, "Cannot find a preferred file for #{file_name}!"
         end
 
         to_send
       end
 
     end
   end
-end
+end

chef/lib/chef/provider.rb

@@ -28,7 +28,7 @@ def initialize(node, new_resource)
     end
 
     def load_current_resource
-      raise Chef::Exception::Override, "You must override load_current_resource in #{self.to_s}"
+      raise Chef::Exceptions::Override, "You must override load_current_resource in #{self.to_s}"
     end
 
     def action_nothing
@@ -37,4 +37,4 @@ def action_nothing
     end
 
   end
-end
+end

chef/lib/chef/provider/cron.rb

@@ -39,7 +39,7 @@ def load_current_resource
           stdout.each { |line| crontab << line }
         end
         if status.exitstatus > 1
-          raise Chef::Exception::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
+          raise Chef::Exceptions::Cron, "Error determining state of #{@new_resource.name}, exit: #{status.exitstatus}"
         elsif status.exitstatus == 0
           crontab.each do |line|
             case line

chef/lib/chef/provider/group.rb

@@ -102,9 +102,9 @@ def action_modify
             Chef::Log.info("Modified #{@new_resource}")
           end
         else
-          raise Chef::Exception::Group, "Cannot modify #{@new_resource} - group does not exist!"
+          raise Chef::Exceptions::Group, "Cannot modify #{@new_resource} - group does not exist!"
         end
       end
     end
   end
-end
+end

chef/lib/chef/provider/group/groupadd.rb

@@ -28,7 +28,7 @@ def load_current_resource
             "/usr/sbin/groupmod",
             "/usr/sbin/groupdel",
             "/usr/bin/gpasswd" ].each do |required_binary|
-            raise Chef::Exception::Group, "Could not find binary #{required_binary} for #{@new_resource}" unless ::File.exists?(required_binary)
+            raise Chef::Exceptions::Group, "Could not find binary #{required_binary} for #{@new_resource}" unless ::File.exists?(required_binary)
           end
         end
 
@@ -82,4 +82,4 @@ def set_options
       end
     end
   end
-end
+end

chef/lib/chef/provider/mount.rb

@@ -58,7 +58,7 @@ def action_umount
 
       def action_remount
         unless @new_resource.supports[:remount]
-          raise Chef::Exception::UnsupportedAction, "#{self.to_s} does not support :remount"
+          raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remount"
         else
           if @current_resource.mounted
             Chef::Log.debug("#{@new_resource}: attempting to remount")
@@ -98,23 +98,23 @@ def action_disable
       end
 
       def mount_fs
-        raise Chef::Exception::UnsupportedAction, "#{self.to_s} does not support :mount"
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :mount"
       end
 
       def umount_fs
-        raise Chef::Exception::UnsupportedAction, "#{self.to_s} does not support :umount"
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :umount"
       end
 
       def remount_fs
-        raise Chef::Exception::UnsupportedAction, "#{self.to_s} does not support :remount"
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :remount"
       end
 
       def enable_fs
-        raise Chef::Exception::UnsupportedAction, "#{self.to_s} does not support :enable"        
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :enable"        
       end
 
       def disable_fs
-        raise Chef::Exception::UnsupportedAction, "#{self.to_s} does not support :disable"        
+        raise Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :disable"        
       end      
     end
   end