Skip to content
Browse files

Merge branch 'master' of https://github.com/wr0ngway/rubber

  • Loading branch information...
2 parents 15fe2e0 + 783d16d commit 2ff0188437ab0b3146a36a69ce0f4fe62cc0b088 @zapnap committed
View
11 CHANGELOG
@@ -1,3 +1,14 @@
+1.10.2
+-----
+
+Regenerate gemspec for version 1.10.2 <4f49701> [Kevin Menard]
+Merge branch 'master' of github.com:wr0ngway/rubber <e32671f> [Kevin Menard]
+Fixed issue #41: rvm installation exits prematurely. <8a4bced> [Kevin Menard]
+Fixed issue #28: postgresql with password fails <97270e3> [Kevin Menard]
+fix file write for db restoration <51b1117> [Matt Conway]
+Bumped passenger version. <2547950> [Kevin Menard]
+Note that a release had been yanked. <d636389> [Kevin Menard]
+
1.10.1
-----
View
2 VERSION
@@ -1 +1 @@
-1.10.1
+1.10.2
View
2 lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
@@ -61,7 +61,7 @@
sleep 1
while true; do
- if ! ps ax | grep -q "[r]vm install"; then exit; fi
+ if ! ps ax | grep -q "[r]vm install"; then break; fi
echo -n .
sleep 5
done
View
2 lib/generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
@@ -43,7 +43,7 @@
common_bootstrap("postgresql_master")
create_user_cmd = "CREATE USER #{env.db_user} WITH NOSUPERUSER CREATEDB NOCREATEROLE"
- create_user_cmd << "PASSWORD '#{env.db_pass}'" if env.db_pass
+ create_user_cmd << " PASSWORD '#{env.db_pass}'" if env.db_pass
rubber.sudo_script "create_master_db", <<-ENDSCRIPT
sudo -u postgres psql -c "#{create_user_cmd}"
sudo -u postgres psql -c "CREATE DATABASE #{env.db_name} WITH OWNER #{env.db_user}"
View
4 rubber.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{rubber}
- s.version = "1.10.1"
+ s.version = "1.10.2"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Matt Conway"]
- s.date = %q{2011-02-17}
+ s.date = %q{2011-02-21}
s.default_executable = %q{vulcanize}
s.description = %q{ The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to
Amazon's Elastic Compute Cloud (EC2). Like capistrano, rubber is role based, so you can define a set

0 comments on commit 2ff0188

Please sign in to comment.
Something went wrong with that request. Please try again.