lib/daddy.rb in daddy-0.7.4 vs lib/daddy.rb in daddy-0.7.5

@@ -3,17 +3,24 @@
 require 'sql_builder'
 
 module Daddy
 
   def self.config
-    @_config ||= Daddy::Utils::Config.new(File.join('config', 'daddy.yml'))
+    if @_config.nil?
+      daddy_yml = File.join('config', 'daddy.yml')
+      puts daddy_yml
+      if File.exist?(daddy_yml)
+        @_config = Daddy::Utils::Config.new(daddy_yml)
+      else
+        @_config = Daddy::Utils::Config.new
+      end
+    end
+
+    @_config
   end
 
 end
 
 if defined?(Rails)
   require 'daddy/rails/engine'
   require 'daddy/rails/railtie'
-else
-  require 'closer/tasks'
-  require 'daddy/tasks'
 end