capistrano-container-db 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f236a486192089b4688459ad3439ab874821f17
-  data.tar.gz: 37a43ae5ec9750be66df21d5d49094736c8d033d
+  metadata.gz: 6f9fafce47206c3a7e06f2738642dd8e4f1e474a
+  data.tar.gz: acbbaf8af6245ad654174f293d76df51a76c52ad
 SHA512:
-  metadata.gz: 4f3cca20d9bb697923e2d1d572f8848eb8c05a73ea8baf28712f19737478a1272950f275cceac9954950904a5dac4f211256f07ff091debd731eb9c03a978d38
-  data.tar.gz: d54bdf8c2518359144d3b4c37ccaa4ef3abdbb0fccddb5871de4d0f85c0a3d832bb8a725af252dbabc3ced11bf2d954c85d1d1d351ec43ace652631641bdff66
+  metadata.gz: 8b3c7918fc632dff312afb964d74aaa1a2057ec5a8591284e0c4fc86cb61edf33d9458a2b4826c29563ac5b52eaf89cd386d291180bd7eb91a41862ddb8a9af8
+  data.tar.gz: 3e831a15ffba3167f66759118441e5fcca4dc4d971f82ce3b28e1a38996d169acc732fd2bdc9fb646c1de8001bea5c62ded31c53fff4cd7f471f1b0f7741b481

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 is only support for mysql, feel free to contribute =)
+This project is in an early stage but helps me a lot dealing with my container deployments and keeps my code clean. It is not only meant 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).
 
@@ -90,6 +90,10 @@ set :filter_on_import, lambda{ |sql_dump| return sql_dump } -> !not implemented
   * add db:execute task
 
 ## Changes
+### Version 0.0.6
+  * use clean module namespaces
+  * add `--lock-tables=false` as default dump arg
+
 ### Version 0.0.5
   * add "CREATE DATABASE IF NOT EXISTS" to import statements
   * provide additional mysql auth/dump/restore args

data/capistrano-container-db.gemspec

@@ -4,8 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'capistrano-container-db'
-  spec.version     = '0.0.5'
-  spec.date        = '2016-09-30'
+  spec.version     = '0.0.6'
+  spec.date        = '2018-02-03'
   spec.summary     = 'Helps managing databases on local and remote stages, also on remote docker container'
   spec.description = spec.summary
   spec.authors     = ['Tom Hanoldt']

data/lib/capistrano/container/db.rb

@@ -1,11 +1,4 @@
 require_relative '../tasks/db.rb'
-
-module Capistrano
-  module Container
-    module DB
-      require_relative '../../db/helper.rb'
-      require_relative '../../db/load_helper.rb'
-      require_relative '../../db/dump_helper.rb'
-    end
-  end
-end
+require_relative '../../db/helper.rb'
+require_relative '../../db/load_helper.rb'
+require_relative '../../db/dump_helper.rb'

data/lib/capistrano/tasks/db.rb

@@ -7,7 +7,7 @@ namespace :db do
   task :execute do
     on roles(:db, :container_host) do |host|
       ask(:tmp_cmd, "mysql command")
-      Helper.execute_db_command_autodetect fetch(:tmp_cmd)
+      Capistrano::Container::DB::Helper.execute_db_command_autodetect fetch(:tmp_cmd)
     end
   end
 
@@ -16,14 +16,14 @@ namespace :db do
   task :export do
     on roles(:db, :container_host) do |host|
       if fetch(:db_is_container)
-        DumpHelper::dump_on_container_and_download container_by_name(fetch(:db_container_name))
-      elsif Helper::local_stage?
-        DumpHelper::dump_on_local
+        Capistrano::Container::DB::DumpHelper::dump_on_container_and_download container_by_name(fetch(:db_container_name))
+      elsif Capistrano::Container::DB::Helper::local_stage?
+        Capistrano::Container::DB::DumpHelper::dump_on_local
       else
-        DumpHelper::dump_on_server_and_download
+        Capistrano::Container::DB::DumpHelper::dump_on_server_and_download
       end
 
-      Helper::duplicate_local_dump_to_staged_dump
+      Capistrano::Container::DB::Helper::duplicate_local_dump_to_staged_dump
     end
   end
 
@@ -31,11 +31,11 @@ namespace :db do
   task :import do
     on roles(:db, :container_host) do
       if fetch(:db_is_container)
-        LoadHelper::import_on_container container_by_name(fetch(:db_container_name))
-      elsif Helper::local_stage?
-        LoadHelper::import_on_local
+        Capistrano::Container::DB::LoadHelper::import_on_container container_by_name(fetch(:db_container_name))
+      elsif Capistrano::Container::DB::Helper::local_stage?
+        Capistrano::Container::DB::LoadHelper::import_on_local
       else
-        LoadHelper::import_on_server
+        Capistrano::Container::DB::LoadHelper::import_on_server
       end
     end
   end
@@ -50,7 +50,7 @@ namespace :load do
     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_additional_dump_args, ['--no-create-db --lock-tables=false']
     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

@@ -1,27 +1,34 @@
 require_relative "helper.rb"
 
-module DumpHelper
-  def self.dump_on_local()
-    args = Helper::mysql_dump_args
+module Capistrano
+  module Container
+    module DB
+      module DumpHelper
+        def self.dump_on_local()
+          args = Helper::mysql_dump_args
 
-    run_locally do
-      execute "mysqldump #{args} > #{fetch(:db_local_dump)}"
-    end
-  end
+          run_locally do
+            execute "mysqldump #{args} > #{fetch(:db_local_dump)}"
+          end
+        end
 
-  def self.dump_on_server_and_download()
-    args = Helper::mysql_dump_args
+        def self.dump_on_server_and_download()
+          args = Helper::mysql_dump_args
 
-    execute "mysqldump #{args} > #{fetch(:db_remote_dump)}"
+          execute "mysqldump #{args} > #{fetch(:db_remote_dump)}"
 
-    download!(fetch(:db_remote_dump), fetch(:db_local_dump))
-  end
+          download!(fetch(:db_remote_dump), fetch(:db_local_dump))
+        end
 
-  def self.dump_on_container_and_download(container)
-    args = Helper::mysql_dump_args
+        def self.dump_on_container_and_download(container)
+          args = Helper::mysql_dump_args
 
-    container.execute("mysqldump #{args} > #{fetch(:db_remote_dump)}")
+          container.execute("mysqldump #{args} > #{fetch(:db_remote_dump)}")
 
-    container.download!(fetch(:db_remote_dump), fetch(:db_local_dump))
+          container.download!(fetch(:db_remote_dump), fetch(:db_local_dump))
+        end
+      end
+
+    end
   end
 end

data/lib/db/helper.rb

@@ -1,52 +1,59 @@
-module Helper
-  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
-
-  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
-    splitted.push stage, extension
-    splitted.join('.')
-  end
-
-  def self.duplicate_local_dump_to_staged_dump()
-    staged_file = append_stage_to_filename(fetch(:db_local_dump), fetch(:stage))
-
-    FileUtils.cp(fetch(:db_local_dump), staged_file)
-  end
-
-  def self.local_stage?
-    fetch(:local_stage_name).to_sym == fetch(:stage).to_sym
-  end
-
-  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
+module Capistrano
+  module Container
+    module DB
+      module Helper
+        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
+
+        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
+          splitted.push stage, extension
+          splitted.join('.')
+        end
+
+        def self.duplicate_local_dump_to_staged_dump()
+          staged_file = append_stage_to_filename(fetch(:db_local_dump), fetch(:stage))
+
+          FileUtils.cp(fetch(:db_local_dump), staged_file)
+        end
+
+        def self.local_stage?
+          fetch(:local_stage_name).to_sym == fetch(:stage).to_sym
+        end
+
+        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_local_or_remote cmd
+          end
+        end
       end
-    else
-      execute_local_or_remote cmd
+
     end
   end
 end

data/lib/db/load_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-container-db
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Hanoldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Helps managing databases on local and remote stages, also on remote docker