percheron 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7864a1fc9b27417829cd3a42124c9b1940e02131
-  data.tar.gz: 628242dd1c60cf4a398d8d57300495a6a38b5a2b
+  metadata.gz: f46c7382608bc1a9d0df8f0cfb476fdd3db6d168
+  data.tar.gz: 80f069209a8756e8e8ffd7ad5e9306439258d75e
 SHA512:
-  metadata.gz: 6d5520219f1f55f8217472d8b5b321dac21823c7174f248a7f2a0eeeb44652731a4ac488d72345ced4a11fc617ce9ceda9611ec5750acc02cdecee5f0ea0a4e5
-  data.tar.gz: 642a061e6c746e8db5eeca4d8a22b0faa921c796f793366fc6f6883363e8da3f8c041acaef7d3c32a9d76838b46051b7f95f7e2f09c9be2701d9fad01ca7c019
+  metadata.gz: 0994145a901b28e2cc993b3659128ff69e12e8253e0598b0f79a604bb64dde23a6ae19fa2ff96c35bf2442b883de6c2c22b6b4e96d90ebd43aa15fccd4c7263f
+  data.tar.gz: 686b119e1190e27e7cbf7cf96e1785eb5c4d0f941cb1816135b4cb49a13d374a5813d6096d757f6f744567351a2f65b8bcc683b2c8f49e2ce52da2f5d77ebc61

data/lib/percheron/cli/abstract_command.rb

@@ -2,17 +2,24 @@ module Percheron
   module CLI
     class AbstractCommand < Clamp::Command
 
-      option [ '-c', '--config_file' ], 'CONFIG', 'Configuration file', default: '.percheron.yml'
+      DEFAULT_CONFIG_FILE = '.percheron.yml'
+
+      option [ '-c', '--config_file' ], 'CONFIG', 'Configuration file', default: DEFAULT_CONFIG_FILE
 
       option '--version', :flag, 'show version' do
         puts Percheron::VERSION
         exit(0)
       end
 
+      def default_config_file
+        ENV.fetch('PERCHERON_CONFIG', DEFAULT_CONFIG_FILE)
+      end
+
       def config
         @config ||= Percheron::Config.new(config_file)
       rescue Errors::ConfigFileInvalid => e
-        $logger.error "An error has occurred while reading your config file - #{e.message}"
+        $logger.error e.message
+        exit(1)
       end
     end
   end

data/lib/percheron/validators/config.rb

@@ -22,6 +22,7 @@ module Percheron
 
         def rules
           [
+            :validate_config_file_defined,
             :validate_config_file_existence,
             :validate_config_file_not_empty,
             :validate_config_file_contents
@@ -32,16 +33,24 @@ module Percheron
           @config_file_contents ||= Hashie::Mash.new(YAML.load_file(config_file))
         end
 
+        def validate_config_file_defined
+          'Config file is not defined' if config_file.nil?
+        end
+
         def validate_config_file_existence
-          'Config file does not exist' unless config_file.exist?
+          "#{base_message} does not exist" unless config_file.exist?
         end
 
         def validate_config_file_not_empty
-          'Config file is empty' if config_file_contents.empty?
+          "#{base_message} is empty" if config_file_contents.empty?
         end
 
         def validate_config_file_contents
-          'Config file is invalid' unless config_file_contents.docker
+          "#{base_message} is invalid" unless config_file_contents.docker
+        end
+
+        def base_message
+          "Config file '#{config_file}'"
         end
     end
   end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp