conker 0.12.1 → 0.12.2

data/conker.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name = 'conker'
   s.authors = ['Sam Stokes', 'Conrad Irwin', 'Lee Mallabone', 'Martin Kleppmann']
   s.email = 'supportive@rapportive.com'
-  s.version = '0.12.1'
+  s.version = '0.12.2'
   s.summary = %q{Conker will conquer your config.}
   s.description = "Configuration library."
   s.homepage = "https://github.com/rapportive/conker"

data/lib/conker.rb

@@ -42,7 +42,7 @@ module Conker
     # Parse a multi-key hash into globals and raise an informative error message on failure.
     def setup_config!(current_env, *args)
       declarations = args.extract_options!
-      values = values_hash(args[0])
+      values = values_hash(current_env, args[0])
 
       setup_constants(current_env, declarations, values)
     end
@@ -58,9 +58,10 @@ module Conker
     def setup_rack_environment!(*args)
       ENV['RACK_ENV'] ||= 'development'
       set_constant(:RACK_ENV, ENV['RACK_ENV'])
+      current_env = get_constant(:RACK_ENV)
 
       declarations = args.extract_options!
-      values = values_hash(args[0])
+      values = values_hash(current_env, args[0])
 
       if declarations.key?('RACK_ENV') || declarations.key?(:RACK_ENV)
         raise Error, "No need to declare RACK_ENV; please remove it to avoid confusion!"
@@ -69,7 +70,7 @@ module Conker
         raise "RACK_ENV differs between environment (#{env}) and config (#{conf})!  Please remove it from your config."
       end
 
-      setup_constants(ENV['RACK_ENV'], declarations, values)
+      setup_constants(current_env, declarations, values)
     end
 
     # Declare an environment variable that is required to be defined in the
@@ -126,10 +127,18 @@ module Conker
     end
 
     private
-    def values_hash(values)
+    def values_hash(current_env, values)
       case values
       when Hash; values
-      when String; require 'yaml'; YAML.parse_file(values).to_ruby
+      when String
+        if File.exist?(values)
+          require 'yaml'
+          YAML.parse_file(values).to_ruby
+        elsif 'production' == current_env.to_s
+          raise Error, "Missing config file #{values}"
+        else
+          {}
+        end
       else; ENV
       end
     end
@@ -153,6 +162,10 @@ module Conker
     def set_constant(varname, value)
       Kernel.const_set(varname, value)
     end
+
+    def get_constant(varname)
+      Kernel.const_get(varname)
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conker
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
   prerelease: 
 platform: ruby
 authors: