lib/pushyd/conf.rb in pushyd-0.3.0 vs lib/pushyd/conf.rb in pushyd-0.3.1

@@ -15,23 +15,23 @@
       attr_reader :env
     end
 
     def self.prepare args = {}
       # Context parameters
-      raise PushyDaemon::ConfigMissingParameter, "missing root" unless (@root = args[:root])
-      raise PushyDaemon::ConfigMissingParameter, "missing env"  unless (@env = args[:env])
+      fail PushyDaemon::ConfigMissingParameter, "missing root" unless (@root = args[:root])
+      fail PushyDaemon::ConfigMissingParameter, "missing env"  unless (@env = args[:env])
 
       # Gemspec parameter
       gemspec_path = "#{args[:root]}/#{args[:gemspec]}.gemspec"
-      raise PushyDaemon::ConfigMissingParameter, "missing gemspec" unless args[:gemspec]
-      raise PushyDaemon::ConfigMissingParameter, "gemspec file not found: #{gemspec_path}" unless File.exist?(gemspec_path)
+      fail PushyDaemon::ConfigMissingParameter, "missing gemspec" unless args[:gemspec]
+      fail PushyDaemon::ConfigMissingParameter, "gemspec file not found: #{gemspec_path}" unless File.exist?(gemspec_path)
 
       # Load Gemspec
       @spec     = Gem::Specification::load gemspec_path
       @name     = @spec.name
       @version  = @spec.version
-      raise PushyDaemon::ConfigMissingParameter, "missing name" unless @name
+      fail PushyDaemon::ConfigMissingParameter, "missing name" unless @name
 
       # Init Chamber (defaults, etc, cmdline)
       @files = ["#{args[:root]}/defaults.yml"]
       @files << File.expand_path("/etc/#{@name}.yml")
       @files << args[:config].to_s if args[:config]
@@ -44,13 +44,13 @@
 
       # Override some values
       self[:log] = args[:log].to_s if args[:log]
 
     rescue Psych::SyntaxError => e
-      raise PushyDaemon::ConfigParseError, e.message
+      fail PushyDaemon::ConfigParseError, e.message
 
     rescue Exception => e
-      raise PushyDaemon::ConfigParseError, e.message
+      fail PushyDaemon::ConfigParseError, e.message
 
     end
 
     def self.dump
       self.to_hash.to_yaml