fix and test database.yml generation

Author: Michael Gruenewald

deploy/specs/rails_spec.rb

@@ -1,4 +1,5 @@
 require 'minitest/spec'
+require 'yaml'
 
 describe_recipe 'deploy::rails' do
   include MiniTest::Chef::Resources
@@ -20,4 +21,19 @@
       end
     end
   end
+
+  it 'should write a valid database configuration' do
+    node[:deploy].each do |app, deploy|
+      cfg = YAML.load_file("#{deploy[:deploy_to]}/shared/config/database.yml")
+      ["development", "production", deploy[:rails_env]].uniq.each do |env|
+        cfg[env]['adapter'].must_equal deploy[:database][:adapter].to_s
+        cfg[env]['database'].must_equal deploy[:database][:database].to_s
+        cfg[env]['host'].must_equal((deploy[:database][:host] || 'localhost').to_s)
+        cfg[env]['username'].must_equal deploy[:database][:username].to_s
+        cfg[env]['password'].must_equal((deploy[:database][:password] || '').to_s)
+        cfg[env]['reconnect'].must_equal deploy[:database][:reconnect] ? true : false
+        cfg[env]['port'].must_equal deploy[:database][:port].to_i if deploy[:database][:port]
+      end
+    end
+  end
 end

rails/templates/default/database.yml.erb

@@ -3,12 +3,12 @@
   adapter: <%= @database[:adapter].to_s.inspect %>
   database: <%= @database[:database].to_s.inspect %>
   encoding: utf8
-  host: <%= @database[:host].to_s.inspect || 'localhost' %>
+  host: <%= (@database[:host] || 'localhost').to_s.inspect %>
   username: <%= @database[:username].to_s.inspect %>
   password: <%= @database[:password].to_s.inspect %>
   reconnect: <%= @database[:reconnect] ? 'true' : 'false' %>
 <% if @database[:port] -%>
-  port: <%= @database[:port].to_s.inspect %>
+  port: <%= @database[:port].to_i.inspect %>
 <% end -%>
 
 <% end %>