oneblackbear-obbistrano 1.0.19 → 1.0.20

data/lib/obbistrano_tasks.rb

@@ -203,10 +203,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   
     task :setup_mysql do
+      set :user_to_add, "#{user}"
+      set :passwd_to_add, "#{password}"
       with_user("root", "#{root_pass}") do
         "#{databases}".each do |db|
-          run "mysql -uroot -p#{root_pass} -e 'CREATE DATABASE #{db}'"
-          run "musql -uroot -p#{root_pass} -e 'GRANT ALL PRIVILEGES ON `#{db}` . * TO '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';"
+          begin
+            run "mysql -uroot -p#{root_pass} -e 'CREATE DATABASE #{db}'"
+            run "musql -uroot -p#{root_pass} -e 'GRANT ALL PRIVILEGES ON `#{db}` . * TO '#{user_to_add}'@'localhost' IDENTIFIED BY '#{passwd_to_add}';"
+          rescue
+            logger.info "Database #{db} already exists"
+          end
         end
       end
     

data/obbistrano.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{obbistrano}
-  s.version = "1.0.19"
+  s.version = "1.0.20"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.date = Time.now
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oneblackbear-obbistrano
 version: !ruby/object:Gem::Version 
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors: 
 - Ross Riley