capistrano_recipes 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee75d10bd77f57e63cc7f8bbbe764b49d4d7382
-  data.tar.gz: 2435343b3609bc846e1b426402fccc2a52cfae07
+  metadata.gz: 6e78c7154d5a61df05a26fa96ebae0b6f29d6ecb
+  data.tar.gz: 27b8455987d54d5676a5f27f5aff825dd8beea8a
 SHA512:
-  metadata.gz: deb8913d76f06a3cc6c7f7da4b0a4dbe0abf2d66936ad2e517d17a220e39881b7324cb107b2aadc8bdb1a499b14362c6bac712bdffbbd60c1d04daa4b12c526f
-  data.tar.gz: bd2ec2fe3af982ac8d962426567c0f12f1e4c8a33b8e9e703d34b168b16091bc7d528547d0dae09afb8563f643f60331a12730e3a220338a5dd3310bbfa1f551
+  metadata.gz: ef431fd46ed70b81bed968e342a65964bc1eeed6d3558ad09df1880ea478091f4213057e285fe33c7bead08cd52ec91fe65aed5e652305cdfdd4c78ef6a60ed9
+  data.tar.gz: 1e44229c200d5f54872a89b2fc313caaf632b935dbf12a44b474d8d14b0b68222c8a856fba1b9781bc0fa164aec48955b99e95abda29b758d26bd9d246635489

data/capistrano_recipes.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'capistrano_recipes'
-  s.version       = '1.2.0'
+  s.version       = '1.3.0'
   s.authors       = ['Fernando Aleman']
   s.email         = ['fernandoaleman@mac.com']
   s.description   = 'Capistrano recipes to make your deployments fast and easy'

data/lib/capistrano/recipes/git.rb

@@ -5,7 +5,6 @@ module CapistranoRecipes
         set(:repository)        { abort "Please specify repository, set :repository, 'foo'" }
 
         _cset :branch,          'master'
-        _cset :use_sudo,        false
         _cset :check_repo,      true
 
         set :migrate_target,    :current

data/lib/capistrano/recipes/mysql.rb

@@ -2,15 +2,19 @@ module CapistranoRecipes
   module Mysql
     def self.load_into(configuration)
       configuration.load do
+
+        # MySQL command
+        _cset :mysql_command, lambda { 'mysqld' }
+
         # MySQL admin user with access to create databases and grant permissions
         _cset :mysql_admin_user, lambda { ask "Enter #{rails_env} database username with access to create database" }
 
         # Application database adapter
         _cset :mysql_adapter, lambda { 'mysql2' }
-        
+
         # Application database name
         _cset :mysql_database, lambda { "#{application}_#{rails_env}" }
-        
+
         # Application database user
         _cset :mysql_user, lambda { ask "Enter #{rails_env} database username" }
 
@@ -51,17 +55,17 @@ module CapistranoRecipes
           desc 'Create mysql database'
           task :create, :roles => :db, :only => { :primary => true } do
             prepare_from_yaml
-            
+
             db_exists = false
-            
+
             mysql_admin = mysql_admin_user
             pass = password_prompt "Enter database password for '#{mysql_admin}'"
-            
-            run "echo \"SHOW DATABASES\" | mysql -u #{mysql_admin} -p" do |channel, stream, data|
+
+            run "echo \"SHOW DATABASES\" | mysql -h #{mysql_host} -u #{mysql_admin} -p" do |channel, stream, data|
               if data =~ /^Enter password:/
                 channel.send_data "#{pass}\n"
               end
-            
+
               if data =~ /^Database/
                 db_exists = db_exists || data.include?(db_name)
               end
@@ -73,8 +77,8 @@ module CapistranoRecipes
               sql = "CREATE DATABASE #{db_name};"\
                     "GRANT ALL PRIVILEGES ON #{db_name}.* TO #{db_user}@localhost IDENTIFIED BY '#{db_pass}';"\
                     "FLUSH PRIVILEGES;"
-                    
-              run "echo \"#{sql}\" | mysql -u #{mysql_admin} -p" do |channel, stream, data|
+
+              run "echo \"#{sql}\" | mysql -h #{mysql_host} -u #{mysql_admin} -p" do |channel, stream, data|
                 if data =~ /^Enter password:/
                   channel.send_data "#{pass}\n"
                 end
@@ -124,7 +128,7 @@ module CapistranoRecipes
           %w[start stop restart status].each do |command|
             desc "#{command.capitalize} mysql"
             task command, :roles => :db, :only => { :primary => true } do
-              run "#{sudo} service mysqld #{command}"
+              run "#{sudo} service #{mysql_command} #{command}"
             end
           end
         end
@@ -135,11 +139,11 @@ module CapistranoRecipes
           set(:db_host) { db_config[rails_env]["host"] }
           set(:db_name) { db_config[rails_env]["database"] }
         end
-        
+
         def db_config
           @db_config ||= fetch_db_config
         end
-        
+
         def fetch_db_config
           require 'yaml'
           file = capture "cat #{mysql_remote_config_file}"

data/lib/capistrano_recipes.rb

@@ -15,11 +15,13 @@ module CapistranoRecipes
         _cset :pids_path, lambda { File.join shared_path, 'pids' }
         _cset :sockets_path, lambda { File.join shared_path, 'sockets' }
 
-        set :user, 'deployer'
+        set :user, lambda { 'deployer' }
 
         default_run_options[:pty]   = true
         ssh_options[:forward_agent] = true
 
+        set :use_sudo, false
+
         @used_recipes = []
 
         class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Fernando Aleman