rubber 1.5.4 → 1.5.5

data/CHANGELOG

@@ -1,3 +1,18 @@
+1.5.4
+-----
+
+add an environment specific rubber.yml file <8f8366e> [Matt Conway]
+set ruby ver to more stable 1.9.2 (rvm currently maps it to preview3, but will map it to actual 1.9.2 when released) <5fa8763> [Matt Conway]
+extra test <0ff8aba> [Matt Conway]
+fix some test failures <9ac276b> [Matt Conway]
+Merge branch 'master' into merge <6599fcb> [Matt Conway]
+add missing stuff from create to refresh to aid in sertting instance details for a partially failed create <a7ac958> [Matt Conway]
+clean string from instance arch to remove newlines <1b1052f> [Matt Conway]
+tell bundler to not install dev/test gems <a3a7d3b> [Matt Conway]
+use correct path for passenger ruby for newer rvm <dcff158> [Matt Conway]
+fix wget params for cassandra <d521eb1> [Matt Conway]
+set rvmrc before installing <df111ef> [Matt Conway]
+
 1.5.3
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/lib/rubber/environment.rb

@@ -16,8 +16,13 @@ module Rubber
         @config_root = config_root
         @config_files = ["#{@config_root}/rubber.yml"]
         @config_files += Dir["#{@config_root}/rubber-*.yml"].sort
+
+        # add a config file for current env only so that you can override
+        #things for specific envs
         @config_files -= Dir["#{@config_root}/rubber-*-env.yml"]
-        @config_files << "#{@config_root}/rubber-#{Rubber.env}-env.yml"
+        env_yml = "#{@config_root}/rubber-#{Rubber.env}-env.yml"
+        @config_files << env_yml if File.exist?(env_yml)
+        
         @items = {}
         @config_files.each { |file| read_config(file) }
         @config_secret = bind().rubber_secret

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 5
+  version: 1.5.5
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -04:00
+date: 2010-06-07 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency