lib/rubber/environment.rb in rubber-1.5.3 vs lib/rubber/environment.rb in rubber-1.5.4

@@ -12,10 +12,13 @@
       attr_reader :config_files
       attr_reader :config_secret
 
       def initialize(config_root)
         @config_root = config_root
-        @config_files = ["#{@config_root}/rubber.yml"] + Dir["#{@config_root}/rubber-*.yml"].sort
+        @config_files = ["#{@config_root}/rubber.yml"]
+        @config_files += Dir["#{@config_root}/rubber-*.yml"].sort
+        @config_files -= Dir["#{@config_root}/rubber-*-env.yml"]
+        @config_files << "#{@config_root}/rubber-#{Rubber.env}-env.yml"
         @items = {}
         @config_files.each { |file| read_config(file) }
         @config_secret = bind().rubber_secret
         read_config(@config_secret) if @config_secret
       end
\ No newline at end of file