capistrano_recipes 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDc1YjMxNzE5OThkOTI4YmMxMjRlNTYwMmViYTNjZTliYzRkMzI1OA==
+    YTBhNzUwMzc5MWQxZTgyYzE1MGY2NDZlOTgzZWI2N2QyYWY5YzAyZQ==
   data.tar.gz: !binary |-
-    MWVmZGNkYjNlNmQwMjBiMmFkNTYzMWRhZTNiMGMzYzY1ODYyZmQ5NQ==
+    NTI5MDc5MTM1M2U4MzM1OTNkN2VhNGI2OWU2Mjg2MGY0MTlhYzUzYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGZiYmVhZTc2ZTI1MTJlOWNiNTVmMTJiZGI2ZmE5NzRiMjljOTJhNDE1ZDY2
-    ODgxYTYxYTU0MzUzNTczNDc1NWMyYTU2NjA3YzVlNTQxNzdlZThhNjllNDkx
-    NTg2NDJlZjhiNGEzYTE3YWRlYjM5NmI1ZDI0ZmRlMjJkOGI5NWM=
+    YzIyMTAwMTU1ZjA5YmQ4MGZjNmRmMDA0NmYxMzA3NTRjMjNjYTJjODAxNzRj
+    ZmQzNmM4OGJjOTYxMWRmN2RlYTYzOTJjM2Q0NGE5ZGEwOTQ4ODAxMDBhZTE2
+    MTdiYzkwMTZhZGU1NDVlZDRjMzgzNDI5NjY3MmM2MzQ3YTRmYzI=
   data.tar.gz: !binary |-
-    NmEyMTk5NWY3MGJiODJiMjJiZDhhZTY1ZGQyMDU1MjdlYWIxNzg1YTJhZWI5
-    OWFmOTNlNTlkYmEyY2U4N2M1ZGM5OTlhZjcyZjFmYTlkZDk5YWU5MTNjZjI5
-    NWNlNjBiMTk3YTRiNTJmM2I2YjJjZWM4NDZlYzI2OWNmNjU3Nzk=
+    ZTc0ODllNTJkOGMzNmE1ZGU3OTVkYWQ4YTZlZTM1NjhjMTMwNjMxYjlhYTFk
+    OGFlZDYzYmE0Yzg2NTllNGU5ODVmYTY0OGIxMWUwMjdiNWNkYmFhNGRjZmU5
+    NGUyMGY0ZTMxZjg3ZGQzYzgyNmJiMTJlMTQxMjRmYWEyYWIzNjE=

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.0.3'
+  s.version       = '1.0.4'
   s.authors       = ['Fernando Aleman']
   s.email         = ['fernandoaleman@mac.com']
   s.description   = 'Capistrano recipes to make your deployments fast and easy'

data/lib/capistrano/recipes/mysql.rb

@@ -50,18 +50,35 @@ module CapistranoRecipes
 
           desc 'Create mysql database'
           task :create, :roles => :db, :only => { :primary => true } do
-            sql = <<-SQL.gsub(/^ {14}/, '')
-              "CREATE DATABASE #{mysql_database};
-              GRANT ALL PRIVILEGES ON #{mysql_database}.* TO #{mysql_user}@localhost IDENTIFIED BY '#{mysql_password}';"
-            SQL
-
+            prepare_from_yaml
+            
+            db_exists = false
+            
             mysql_admin = mysql_admin_user
-
-            run "mysql --user=#{mysql_user} -p --execute=#{sql}" do |channel, stream, data|
+            pass = password_prompt "Enter database password for '#{mysql_admin}'"
+            
+            run "echo \"SHOW DATABASES\" | mysql -u #{mysql_admin} -p" do |channel, stream, data|
               if data =~ /^Enter password:/
-                pass = password_prompt "Enter database password for '#{mysql_admin}'"
                 channel.send_data "#{pass}\n"
               end
+            
+              if data =~ /^Database/
+                db_exists = db_exists || data.include?(db_name)
+              end
+            end
+
+            if db_exists
+              say "#{db_name} already exists, skipping..."
+            else
+              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|
+                if data =~ /^Enter password:/
+                  channel.send_data "#{pass}\n"
+                end
+              end
             end
           end
 

data/lib/capistrano/recipes/templates/mysql.yml.erb

@@ -1,6 +1,6 @@
 <%= rails_env %>:
   adapter: <%= mysql_adapter %>
-  database: <%= mysql_database %>
+  database: <%= mysql_database.gsub(/-/, '_') %>
   username: <%= mysql_user %>
   password: <%= mysql_password %>
   host: <%= mysql_host %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Fernando Aleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano