capistrano-container-db 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6329984c7c290ed95ac3328fb8c6235a7a5d950b
-  data.tar.gz: 25c9226e10aa0aba6ff49350f80bffc232543bb0
+  metadata.gz: 4f236a486192089b4688459ad3439ab874821f17
+  data.tar.gz: 37a43ae5ec9750be66df21d5d49094736c8d033d
 SHA512:
-  metadata.gz: dfc3672495ff77d1744288fb276dd269b6471bc6c947d7e440326240e9e960ba4760756350cb20ed3b2f8612566c8259ffeedea2092d2ebf7bfb54aeeb20339b
-  data.tar.gz: a565b87674d837c868d0953250421e08b1128397012e84d661db5f3ba2b672fdcd489d21aa53edbabe5fa224823bcdec322e197d34bf09563b8a41391199772a
+  metadata.gz: 4f3cca20d9bb697923e2d1d572f8848eb8c05a73ea8baf28712f19737478a1272950f275cceac9954950904a5dac4f211256f07ff091debd731eb9c03a978d38
+  data.tar.gz: d54bdf8c2518359144d3b4c37ccaa4ef3abdbb0fccddb5871de4d0f85c0a3d832bb8a725af252dbabc3ced11bf2d954c85d1d1d351ec43ace652631641bdff66

data/README.md

@@ -2,7 +2,7 @@
 
 Helps managing databases on local and remote stages, also on remote [docker](https://www.docker.com/) container for Capistrano 3.x.
 
-This project is in an early stage but helps me alot dealing with my container deployments and keeps my code clean. It is not only ment for mysql, but at the moment there only supports mysql, feel free to contribute =)
+This project is in an early stage but helps me alot dealing with my container deployments and keeps my code clean. It is not only ment for mysql, but at the moment there is only support for mysql, feel free to contribute =)
 
 This gem depends on [capistrano-container](https://github.com/creative-workflow/capistrano-container).
 
@@ -62,13 +62,19 @@ Dont forget to add a server (even for local stage) with the role `db`. `server '
 ```ruby
 cap db:export               # export a local, remote or remote container mysql db
 cap db:import               # import a local, remote or remote container mysql db
+cap db:execute              # execute a mysql command local, remote or container host
 ```
 
 ### default configuration
 ```ruby
 set :db_user, 'root'
 set :db_pass, ''
+set :db_additional_auth_args, []
 set :db_name, ''
+set :db_additional_restore_args, []
+# dont use --database statement, so no use '...' will be generated and we
+# can have different db names local and remote
+set :db_additional_dump_args, ['--no-create-db']
 set :db_remote_dump, '/tmp/dump.sql'
 set :db_local_dump, 'config/db/dump.sql'
 set :db_is_container, false
@@ -80,11 +86,17 @@ set :filter_on_import, lambda{ |sql_dump| return sql_dump } -> !not implemented
 ## TODO
   * adapter pattern for other db engines.
   * integration tests.
+  * :filter_on_import
+  * add db:execute task
 
 ## Changes
+### Version 0.0.5
+  * add "CREATE DATABASE IF NOT EXISTS" to import statements
+  * provide additional mysql auth/dump/restore args
+
 ### Version 0.0.4
   * readme
-  
+
 ### Version 0.0.3
   * remove debug expression
 

data/capistrano-container-db.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'capistrano-container-db'
-  spec.version     = '0.0.4'
+  spec.version     = '0.0.5'
   spec.date        = '2016-09-30'
   spec.summary     = 'Helps managing databases on local and remote stages, also on remote docker container'
   spec.description = spec.summary

data/lib/capistrano/tasks/db.rb

@@ -3,6 +3,15 @@ require_relative('../../db/dump_helper.rb')
 require_relative('../../db/load_helper.rb')
 
 namespace :db do
+  desc "execute a mysql command local, remote or container host"
+  task :execute do
+    on roles(:db, :container_host) do |host|
+      ask(:tmp_cmd, "mysql command")
+      Helper.execute_db_command_autodetect fetch(:tmp_cmd)
+    end
+  end
+
+
   desc "export a local, remote or remote container mysql db"
   task :export do
     on roles(:db, :container_host) do |host|
@@ -36,7 +45,12 @@ namespace :load do
   task :defaults do
     set :db_user, 'root'
     set :db_pass, ''
+    set :db_additional_auth_args, []
     set :db_name, ''
+    set :db_additional_restore_args, []
+    # dont use --database statement, so no use '...' will be generated and we
+    # can have different db names local and remote
+    set :db_additional_dump_args, ['--no-create-db']
     set :db_remote_dump, '/tmp/dump.sql'
     set :db_local_dump, 'config/db/dump.sql'
     set :db_is_container, false

data/lib/db/dump_helper.rb

@@ -2,7 +2,7 @@ require_relative "helper.rb"
 
 module DumpHelper
   def self.dump_on_local()
-    args = Helper::mysql_args(['--no-create-db'])
+    args = Helper::mysql_dump_args
 
     run_locally do
       execute "mysqldump #{args} > #{fetch(:db_local_dump)}"
@@ -10,7 +10,7 @@ module DumpHelper
   end
 
   def self.dump_on_server_and_download()
-    args = Helper::mysql_args(['--no-create-db'])
+    args = Helper::mysql_dump_args
 
     execute "mysqldump #{args} > #{fetch(:db_remote_dump)}"
 
@@ -18,7 +18,7 @@ module DumpHelper
   end
 
   def self.dump_on_container_and_download(container)
-    args = Helper::mysql_args(['--no-create-db'])
+    args = Helper::mysql_dump_args
 
     container.execute("mysqldump #{args} > #{fetch(:db_remote_dump)}")
 

data/lib/db/helper.rb

@@ -1,14 +1,25 @@
 module Helper
-  def self.mysql_args(additional_args=[])
-    command = " -u #{fetch(:db_user)}"
-    command+= " -p#{fetch(:db_pass)}" unless fetch(:db_pass).empty?
-    command+= " #{additional_args.join(' ')} "
+  def self.mysql_dump_args
+    command = mysql_auth_args
+    command+= " #{fetch(:db_additional_dump_args).join(' ')} "
+    command+= " #{fetch(:db_name)}" unless fetch(:db_name).empty?
+    command
+  end
 
-    # dont use --database statement, so no use '...' will be generated
+  def self.mysql_restore_args
+    command = mysql_auth_args
+    command+= " #{fetch(:db_additional_restore_args).join(' ')} "
     command+= " #{fetch(:db_name)}" unless fetch(:db_name).empty?
     command
   end
 
+  def self.mysql_auth_args
+    command = " -u #{fetch(:db_user)}"
+    command+= " -p#{fetch(:db_pass)}" unless fetch(:db_pass).empty?
+    command+= " #{fetch(:db_additional_auth_args).join(' ')} "
+    command
+  end
+
   def self.append_stage_to_filename(file_name, stage = 'local')
     splitted  = file_name.split('.')
     extension = splitted.pop
@@ -26,13 +37,16 @@ module Helper
     fetch(:local_stage_name).to_sym == fetch(:stage).to_sym
   end
 
-  def execute_local_or_remote(cmd)
-    if local_stage?
-      run_locally do
-        execute cmd
+  def self.execute_db_command_autodetect(cmd)
+    cmd = "mysql #{Helper::mysql_auth_args} -e \"#{cmd}\""
+
+    if fetch(:db_is_container)
+      db_container = container_by_name fetch(:db_container_name)
+      on_container db_container do |container|
+        container.execute cmd
       end
     else
-      execute cmd
+      execute_local_or_remote cmd
     end
   end
 end

data/lib/db/load_helper.rb

@@ -1,21 +1,32 @@
 require_relative "helper.rb"
+require 'capistrano/container'
 
 module LoadHelper
   def self.import_on_local()
+    LoadHelper.create_db_if_not_exists fetch(:db_name)
+
     run_locally do
-      execute "mysql #{Helper::mysql_args} < #{fetch(:db_local_dump)}"
+      execute "mysql #{Helper::mysql_restore_args} < #{fetch(:db_local_dump)}"
     end
   end
 
   def self.import_on_container(container)
     container.upload!(fetch(:db_local_dump), fetch(:db_remote_dump))
 
-    container.execute("mysql #{Helper::mysql_args} < #{fetch(:db_remote_dump)}")
+    LoadHelper.create_db_if_not_exists fetch(:db_name)
+
+    container.execute "mysql #{Helper::mysql_restore_args} < #{fetch(:db_remote_dump)}"
   end
 
   def self.import_on_server()
     upload!(fetch(:db_local_dump), fetch(:db_remote_dump))
 
-    execute("mysql #{Helper::mysql_args} < #{fetch(:db_remote_dump)}")
+    LoadHelper.create_db_if_not_exists fetch(:db_name)
+
+    execute("mysql #{Helper::mysql_restore_args} < #{fetch(:db_remote_dump)}")
+  end
+
+  def self.create_db_if_not_exists(db)
+    Helper.execute_db_command_autodetect "CREATE DATABASE IF NOT EXISTS #{db};"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-container-db
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tom Hanoldt