From ee2e80d513674de2b1eff54cf10aeb87d5141f02 Mon Sep 17 00:00:00 2001
From: ChrisBAshton <chrisashtonweb@gmail.com>
Date: Sun, 28 Feb 2016 14:55:21 +0000
Subject: [PATCH 1/2] better config file locating

---
 lib/wraith/cli.rb    |  3 ++-
 lib/wraith/wraith.rb | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/wraith/cli.rb b/lib/wraith/cli.rb
index 5f445ad6..167bb56e 100644
--- a/lib/wraith/cli.rb
+++ b/lib/wraith/cli.rb
@@ -45,7 +45,8 @@ def copy_old_shots(config_name)
   desc "validate", "checks your configuration and validates that all required properties exist"
   def validate(config_name)
     within_acceptable_limits do
-      Wraith::Validate.new(config_name).validate
+      print Wraith::Validate.new(config_name).validate
+      print "\n"
     end
   end
 
diff --git a/lib/wraith/wraith.rb b/lib/wraith/wraith.rb
index 078af869..746cf98f 100644
--- a/lib/wraith/wraith.rb
+++ b/lib/wraith/wraith.rb
@@ -9,17 +9,25 @@ class Wraith::Wraith
   def initialize(config, yaml_passed = false)
     @config = yaml_passed ? config : open_config_file(config)
     logger.level = verbose ? Logger::DEBUG : Logger::INFO
-  rescue
-    logger.error "unable to find config at #{config}"
   end
 
   def open_config_file(config_name)
-    if File.exist?(config_name) && File.extname(config_name) == ".yaml"
-      config = File.open config_name
-    else
-      config = File.open "configs/#{config_name}.yaml"
+    possible_filenames = [
+      config_name,
+      "#{config_name}.yml",
+      "#{config_name}.yaml",
+      "configs/#{config_name}.yml",
+      "configs/#{config_name}.yaml"
+    ]
+
+    possible_filenames.each do |filepath|
+      if File.exist?(filepath)
+        config = File.open config_name
+        return YAML.load config
+      end
     end
-    YAML.load config
+  rescue
+    logger.error "unable to find config \"#{config}\""
   end
 
   def directory

From 0856cec84651b09452dc5d0a36fff6c9515fc9e9 Mon Sep 17 00:00:00 2001
From: ChrisBAshton <chrisashtonweb@gmail.com>
Date: Sun, 28 Feb 2016 15:16:34 +0000
Subject: [PATCH 2/2] used proper logger class

---
 lib/wraith/cli.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/wraith/cli.rb b/lib/wraith/cli.rb
index 167bb56e..44bc66db 100644
--- a/lib/wraith/cli.rb
+++ b/lib/wraith/cli.rb
@@ -45,8 +45,7 @@ def copy_old_shots(config_name)
   desc "validate", "checks your configuration and validates that all required properties exist"
   def validate(config_name)
     within_acceptable_limits do
-      print Wraith::Validate.new(config_name).validate
-      print "\n"
+      logger.info Wraith::Validate.new(config_name).validate
     end
   end