capistrano-fiftyfive 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a062ce89eef2c928f8db7af57f9c5023c8978e72
-  data.tar.gz: 151f2d436bbe25871a3d6ae6a931d11b5d571648
+  metadata.gz: c1ad4e92fe008acf75a2a3281becf8f61cecf67a
+  data.tar.gz: bebf97f80cd64e0cf52bca965318d8605f966737
 SHA512:
-  metadata.gz: f0c71a57c1b2296cf4a7d95781c717c471da935419aba27311126f717ad53a9ff2e987b4382d558b0d4c90b46bcd854f46a21dd0efa115bc811292172fb6509c
-  data.tar.gz: 0c709af0de8a65728a44b92be2b9053f7bf428c052cdaa47959b541b7f79d9fae5dc039cbefad84eed85fc857f35ccd2c0a33b9f6924601e858faf4f23ca2bd7
+  metadata.gz: 791fd196392a42c2b7c694a869e774479a5b821058e2f1fa668d6fdfe5ebda1ee5f47b548291d0cce4705c164feef8d052b80e72976ce436d9c5d1d9c529000c
+  data.tar.gz: 8a2bc6793637ae88835cbc2ed0eb8ab9319b2c562144e7eaef945919779fdba4e4b2566d74f81bf7fc3eb2082c57da7cff8e0eb87043e468e4abe2cf4f71f9cb

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # capistrano-fiftyfive Changelog
 
+## `0.11.1`
+
+Fixes errors caused by PostgreSQL password containing shell-unsafe characters. Passwords are now safely hashed with MD5 before being used in the `CREATE USER` command.
+
 ## `0.11.0`
 
 * INFO log messages are now included in abbreviated output (e.g. upload/download progress).

data/lib/capistrano/fiftyfive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiftyfive
-    VERSION = "0.11.0"
+    VERSION = "0.11.1"
   end
 end

data/lib/capistrano/fiftyfive.rb

@@ -1,3 +1,4 @@
+require "digest"
 require "monitor"
 require "capistrano/fiftyfive/version"
 require "capistrano/fiftyfive/compatibility"

data/lib/capistrano/tasks/postgresql.rake

@@ -45,7 +45,9 @@ namespace :fiftyfive do
 
         unless test("sudo -u postgres psql -c '\\du' | grep -q #{user}")
           passwd = fetch(:fiftyfive_postgresql_password)
-          execute %Q[sudo -u postgres psql -c "create user #{user} with password '#{passwd}';"]
+          md5 = Digest::MD5.hexdigest(passwd + user)
+          execute "sudo -u postgres psql -c " +
+                  %Q["CREATE USER #{user} PASSWORD 'md5#{md5}';"]
         end
       end
     end
@@ -64,11 +66,22 @@ namespace :fiftyfive do
 
     desc "Generate database.yml"
     task :database_yml do
+      yaml = {
+        fetch(:rails_env).to_s => {
+          "adapter" => "postgresql",
+          "encoding" => "unicode",
+          "database" => fetch(:fiftyfive_postgresql_database).to_s,
+          "pool" => fetch(:fiftyfive_postgresql_pool_size).to_i,
+          "username" => fetch(:fiftyfive_postgresql_user).to_s,
+          "password" => fetch(:fiftyfive_postgresql_password).to_s,
+          "host" => fetch(:fiftyfive_postgresql_host).to_s
+        }
+      }
       fetch(:fiftyfive_postgresql_password)
       on release_roles(:all) do
-        template "postgresql.yml.erb",
-                 "#{shared_path}/config/database.yml",
-                 :mode => "600"
+        put YAML.dump(yaml),
+            "#{shared_path}/config/database.yml",
+            :mode => "600"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiftyfive
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -110,7 +110,6 @@ files:
 - lib/capistrano/fiftyfive/templates/nginx_unicorn.erb
 - lib/capistrano/fiftyfive/templates/pgpass.erb
 - lib/capistrano/fiftyfive/templates/postgresql-backup-logrotate.erb
-- lib/capistrano/fiftyfive/templates/postgresql.yml.erb
 - lib/capistrano/fiftyfive/templates/rbenv_bashrc
 - lib/capistrano/fiftyfive/templates/sidekiq_init.erb
 - lib/capistrano/fiftyfive/templates/ssl_setup

data/lib/capistrano/fiftyfive/templates/postgresql.yml.erb

@@ -1,8 +0,0 @@
-<%= fetch(:rails_env) %>:
-  adapter: postgresql
-  encoding: unicode
-  database: <%= fetch(:fiftyfive_postgresql_database) %>
-  pool: <%= fetch(:fiftyfive_postgresql_pool_size) %>
-  username: <%= fetch(:fiftyfive_postgresql_user) %>
-  password: <%= fetch(:fiftyfive_postgresql_password) %>
-  host: <%= fetch(:fiftyfive_postgresql_host) %>