lib/octopolo/config.rb in octopolo-1.2.0 vs lib/octopolo/config.rb in octopolo-1.2.1

@@ -86,15 +86,17 @@
     end
 
     # end defaults
 
     def self.parse
-      new(attributes_from_file)
+      new(attributes_from_file || {})
     end
 
     def self.attributes_from_file
-      YAML.load_file(octopolo_config_path)
+      if path = octopolo_config_path
+        YAML.load_file(path)
+      end
     end
 
     def self.octopolo_config_path
       if filepath = FILE_NAMES.detect {|filename| File.exists?(filename)}
         File.join(Dir.pwd, filepath)
@@ -102,11 +104,10 @@
         old_dir = Dir.pwd
         Dir.chdir('..')
         if old_dir != Dir.pwd
           octopolo_config_path
         else
-          Octopolo::CLI.say "Could not find #{FILE_NAMES.join(' or ')}"
-          exit
+          Octopolo::CLI.say "*** WARNING: Could not find #{FILE_NAMES.join(' or ')} ***"
         end
       end
     end
 
     def load_plugins