capistrano-postgresql 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac96a8782805305ec27d12b90dee2777b48c081
-  data.tar.gz: 4c575b7874fd8c42cd7de70e177af3e9d495fffc
+  metadata.gz: 64756f3cbd959704ddb49e120d669ce593817398
+  data.tar.gz: 476e3f52826affad3fbcba2beb04db05a0a30593
 SHA512:
-  metadata.gz: 4b9f7b18da40c71f8c4b9a06bf9703bbfeb36722655e91d42d76fb58921f752f1b93b430baa84c74e8a61ee4468b8b2af31ee82f3b1aab5409d872f38348aaf4
-  data.tar.gz: c700d02f33eb191950d2f38046ffe43c8df0dd6dc6643569fad2c2c1deaaf4b6640ac7e95374d74e6eb9df7504a0903ea94efcfe8cb8c14b2c1b01884482ee2d
+  metadata.gz: 43b02bb91ec6bfa9d8ed3cd59408961bf5a81f8556e02718937c5c86796411c07731a00ae509820a1a14b7c75fcfb9448034d907b2b7a58575d8c50da773ec0c
+  data.tar.gz: e6d8cb4b11369573d62faf246a4ec479c8eb78e4b7ac7e395df238b4f74d82a76fdcc20650b785fd54fea1f463c637472126a745c4e076d81954acf56d5d0f81

data/lib/capistrano/postgresql/helper_methods.rb

@@ -0,0 +1,82 @@
+require 'securerandom'
+require 'erb'
+
+module Capistrano
+  module Postgresql
+    module HelperMethods
+
+      def database_yml_template(template_name, target)
+        config_file = "#{fetch(:postgresql_templates_path)}/#{template_name}"
+        # If there's no customized file in your rails app template directory,
+        # proceed with the default.
+        unless File.exists?(config_file)
+          config_file = File.join(File.dirname(__FILE__), "../../generators/capistrano/postgresql/templates/#{template_name}")
+        end
+        upload! StringIO.new(ERB.new(File.read(config_file)).result(binding)), target
+      end
+
+      # This method is invoked only if `:postgresql_password` is not already set in
+      # `config/deploy.rb`. Directly setting `:postgresql_password` has precedence.
+      def ask_for_or_generate_password
+        if fetch(:postgresql_ask_for_password)
+          ask :postgresql_password, "Postgresql database password for the app: "
+        else
+          set :postgresql_password, generate_random_password
+        end
+      end
+
+      def generate_random_password
+        SecureRandom.hex(10)
+      end
+
+      def db_user_exists?(name)
+        psql "-tAc", %Q{"SELECT 1 FROM pg_roles WHERE rolname='#{name}';" | grep -q 1}
+      end
+
+      def create_db_user(name, password)
+        if psql "-c", %Q{"CREATE user #{name} WITH password '#{password}';"}
+          info "postgresq: database user '#{name}' created"
+        else
+          error "postgresql: creating database user failed!"
+          exit 1
+        end
+      end
+
+      def ensure_db_user_created(name, password)
+        unless db_user_exists?(name)
+          create_db_user(name, password)
+        end
+      end
+
+      def database_exists?(db_name)
+        psql "-tAc", %Q{"SELECT 1 FROM pg_database WHERE datname='#{db_name}';" | grep -q 1}
+      end
+
+      def create_database(db_name, user_name)
+        if psql "-c", %Q{"CREATE database #{db_name} owner #{user_name};"}
+          info "postgresql: database '#{db_name}' created"
+        else
+          error "postgresql: creating database '#{db_name}' failed!"
+          exit 1
+        end
+      end
+
+      def ensure_database_created(db_name, user_name)
+        unless database_exists?(db_name)
+          create_database(db_name, user_name)
+        end
+      end
+
+      # returns true or false depending on the remote command exit status
+      def psql(*args)
+        test :sudo, "-u postgres psql", *args
+      end
+
+      def remote_file_exists?(path)
+        test "[ -e #{path} ]"
+      end
+
+    end
+  end
+end
+

data/lib/capistrano/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Postgresql
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/capistrano/tasks/postgresql.rake

@@ -1,76 +1,6 @@
-require 'securerandom'
-require 'erb'
+require 'capistrano/postgresql/helper_methods'
 
-def database_yml_template(template_name, target)
-  config_file = "#{fetch(:postgresql_templates_path)}/#{template_name}"
-  # If there's no customized file in your rails app template directory,
-  # proceed with the default.
-  unless File.exists?(config_file)
-    config_file = File.join(File.dirname(__FILE__), "../../generators/capistrano/postgresql/templates/#{template_name}")
-  end
-  upload! StringIO.new(ERB.new(File.read(config_file)).result(binding)), target
-end
-
-# This method is invoked only if `:postgresql_password` is not already set in
-# `config/deploy.rb`. Directly setting `:postgresql_password` has precedence.
-def ask_for_or_generate_password
-  if fetch(:postgresql_ask_for_password)
-    ask :postgresql_password, "Postgresql database password for the app: "
-  else
-    set :postgresql_password, generate_random_password
-  end
-end
-
-def generate_random_password
-  SecureRandom.hex(10)
-end
-
-def db_user_exists?(name)
-  psql "-tAc", %Q{"SELECT 1 FROM pg_roles WHERE rolname='#{name}';" | grep -q 1}
-end
-
-def create_db_user(name, password)
-  if psql "-c", %Q{"CREATE user #{name} WITH password '#{password}';"}
-    info "postgresq: database user '#{name}' created"
-  else
-    error "postgresql: creating database user failed!"
-    exit 1
-  end
-end
-
-def ensure_db_user_created(name, password)
-  unless db_user_exists?(name)
-    create_db_user(name, password)
-  end
-end
-
-def database_exists?(db_name)
-  psql "-tAc", %Q{"SELECT 1 FROM pg_database WHERE datname='#{db_name}';" | grep -q 1}
-end
-
-def create_database(db_name, user_name)
-  if psql "-c", %Q{"CREATE database #{db_name} owner #{user_name};"}
-    info "postgresql: database '#{db_name}' created"
-  else
-    error "postgresql: creating database '#{db_name}' failed!"
-    exit 1
-  end
-end
-
-def ensure_database_created(db_name, user_name)
-  unless database_exists?(db_name)
-    create_database(db_name, user_name)
-  end
-end
-
-# returns true or false depending on the remote command exit status
-def psql(*args)
-  test :sudo, "-u postgres psql", *args
-end
-
-def remote_file_exists?(path)
-  test "[ -e #{path} ]"
-end
+include Capistrano::Postgresql::HelperMethods
 
 namespace :load do
   task :defaults do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-postgresql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -56,6 +56,7 @@ files:
 - capistrano-postgresql.gemspec
 - lib/capistrano-postgresql.rb
 - lib/capistrano/postgresql.rb
+- lib/capistrano/postgresql/helper_methods.rb
 - lib/capistrano/postgresql/version.rb
 - lib/capistrano/tasks/postgresql.rake
 - lib/generators/capistrano/postgresql/README.md