capistrano-cluster 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b097ac06df4a9ae20dca5f6696e14e5cb95ce9
-  data.tar.gz: 6d53c42bd9b93e9b334b52af37e586b987bf2806
+  metadata.gz: 5148e1233325254875139ad683e8a3b7aab6ba04
+  data.tar.gz: 82df6a50f92dd477ab21d97e44e9bb42cfa33942
 SHA512:
-  metadata.gz: c5a0f3fdb8b55bb0726e4d8bd9f37e6564c3048cd074d2ab637002fe25b7b7445f8ade750bf750b9318b2cfed731c9b2d1493088f56e586ba641fe3af72e9739
-  data.tar.gz: e524891820745a5c924bbd3a440f77dcfeecb19bc44f84f3e022287843b6df98200e8ab9b776f57fdeba623699a69f521d2df8cec661ae2d5e220e437290ea6e
+  metadata.gz: d3d8d2fd5e96377ad2e725eacd9371f491c8736211318921d97c2d416597322636d9c0177667bddbca337bb981087fd21ebad59a98cc67fca126c4797cfd912d
+  data.tar.gz: 2bad09f1c9653e39cf6d166d9279726e605f5c293c2e809582fee76cc800dcadd1f806272a922ac7dae2791010c2db4e8690826cedaddafa8188159d79cac50a

data/lib/capistrano/cluster/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Cluster
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
   end
 end

data/tasks/roles/db.rake

@@ -29,35 +29,37 @@ namespace :deploy do
 
     task :db do
 
-      db_user = fetch(:database)[:username]
-      db_pass = fetch(:database)[:password]
-      db_name = fetch(:database).fetch(:name, fetch(:application))
-      enconding = fetch(:database)[:enconding] || "utf-8"
+      unless fetch(:database,{}).empty?
+        db_user = fetch(:database)[:username]
+        db_pass = fetch(:database)[:password]
+        db_name = fetch(:database).fetch(:name, fetch(:application))
+        enconding = fetch(:database)[:enconding] || "utf-8"
 
-      on roles(:db) do
+        on roles(:db) do
 
-        if capture(:psql, "-U", "postgres", "template1", "-t", "-c", "SELECT 1 FROM pg_catalog.pg_user WHERE usename = '#{db_user}'".shellescape).empty?
-          execute :psql, "-U", "postgres", "-c", "CREATE ROLE #{db_user} LOGIN PASSWORD '#{db_pass}';".shellescape
-        end
+          if capture(:psql, "-U", "postgres", "template1", "-t", "-c", "SELECT 1 FROM pg_catalog.pg_user WHERE usename = '#{db_user}'".shellescape).empty?
+            execute :psql, "-U", "postgres", "-c", "CREATE ROLE #{db_user} LOGIN PASSWORD '#{db_pass}';".shellescape
+          end
 
-        if capture(:psql, "-U", "postgres", "template1", "-t", "-c", "SELECT 1 FROM pg_catalog.pg_database WHERE datname = '#{db_name}'".shellescape).empty?
-          execute :psql, "-U", "postgres", "-c", "CREATE DATABASE #{db_name} ENCODING '#{enconding}' OWNER #{db_user};".shellescape
-          execute :psql, "-U", "postgres", "#{db_name}", "-c", "CREATE EXTENSION postgis;".shellescape
-        end
+          if capture(:psql, "-U", "postgres", "template1", "-t", "-c", "SELECT 1 FROM pg_catalog.pg_database WHERE datname = '#{db_name}'".shellescape).empty?
+            execute :psql, "-U", "postgres", "-c", "CREATE DATABASE #{db_name} ENCODING '#{enconding}' OWNER #{db_user};".shellescape
+            execute :psql, "-U", "postgres", "#{db_name}", "-c", "CREATE EXTENSION postgis;".shellescape
+          end
 
-      end
+        end
 
-      on roles(:app) do
-        defaults = {
-          environment: fetch(:framework_env),
-          hostname: primary(:db),
-          name: db_name,
-          adapter: 'postgresql',
-          encoding: 'utf-8',
-          options:{}
-        }
-        settings = defaults.merge(fetch(:database))
-        upload! file("database.yml", settings), "#{shared_path}/config/database.yml"
+        on roles(:app) do
+          defaults = {
+            environment: fetch(:framework_env),
+            hostname: primary(:db),
+            name: db_name,
+            adapter: 'postgresql',
+            encoding: 'utf-8',
+            options:{}
+          }
+          settings = defaults.merge(fetch(:database))
+          upload! file("database.yml", settings), "#{shared_path}/config/database.yml"
+        end
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Vlad Verestiuc