constantinople 0.0.5 → 0.1.0

data/lib/constantinople.rb

@@ -11,21 +11,20 @@ module Constantinople
     caller_config_directories do |dir|
       result.deeper_merge!(load_from_directory(dir))
     end
-    env = environment
-    result.each do |key, value|
-      value.deeper_merge!(value[env]) if value.include?(env)
-    end
     result # I'm the map, I'm the map, I'm the map, I'm the map...
   end
 
   private
 
   def self.load_from_directory(dir)
+    env = environment
     result = Map.new
     ['.yml.default', '.yml', '.yml.override'].each do |ext|
       Dir.glob(File.join(dir,"*#{ext}")) do |path|
         filename = File.basename(path,ext)
         result.deeper_merge!(filename => YAML.load_file(path))
+        sub = result[filename]
+        sub.deeper_merge!(sub[env]) if sub.include?(env)
       end
     end
     result

data/lib/constantinople/version.rb

@@ -1,3 +1,3 @@
 module Constantinople
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: constantinople
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Chris Johnson