capistrano-typo3 0.4.7 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9db65bc915f2cc8eda5b8e4db074a31e02be3c
-  data.tar.gz: 8b1d694b1d638659ddf96c60d6d2560c61cc3ab1
+  metadata.gz: 18ad521a406fd4ffd9502784269ce5119e4b1cb6
+  data.tar.gz: 5082d9b53a97bb96265a3364fdf16dd6c1681a16
 SHA512:
-  metadata.gz: 382c4444504ee2ba3c8b40cca985cf6602dfb08ee0689837daf770421eeb1cef5d30e6836d86db10a54d679256e6194d6fb8f4e8c71e9db3f59232a1ef61e61e
-  data.tar.gz: 7aa024ce92327c3c82d22cba5dcd912f10b4adf292cb78979d996a70bf869f258437001e73ec012111c852b2ea245c601c10fdf6b57b54caa9b0af84cd035602
+  metadata.gz: b16242087ee0fd2889cee854a95cbad09d210abc60cbef4351b564ecb466632165a8f8de33be5c5a951c97aa173966f3d35b544e35949fe6ac6cce55a696583a
+  data.tar.gz: 1e40c5181cb08672744851ba5a7cfbe69ba88e2057e2229f3e39ce87cbbf00bf2d6a3aed108a287148dbadb91699555b37a7e0d2f88af0fdf85b0e4855bc1872

data/capistrano-typo3.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency "capistrano", "~> 3"
+  spec.add_runtime_dependency "text-table", "~> 1"
+require 'text-table'
 end

data/lib/capistrano/tasks/db.cap

@@ -0,0 +1,132 @@
+namespace :db do
+
+  desc 'test db connection'
+  task :conntest do
+    on roles(:all) do
+      stdout = capture DT3MySQL::mysql_execute('SHOW TABLES;')
+      if stdout.include? 'denied'
+        print "\nNO CORRECT DB CONNECTION. CHECK DB SETTINGS\n\n"
+      else
+        print "\nCORRECT DB CONNECTION.\n\n"
+      end
+    end
+  end
+
+  #### LIBRARY TASKS
+  task :create_dump_dir do
+    on roles(:all) do
+       execute "cd #{fetch(:deploy_to)}/current && mkdir -p #{TYPO3_DB_DUMP_DIR}"
+    end
+  end
+  #### END LIBRARY TASKS
+
+  desc 'dump a full sql-image'
+  task :dump do
+
+    invoke 'db:create_dump_dir'
+
+    on roles(:all) do
+      execute "cd #{fetch(:deploy_to)}/current && " + DT3MySQL::dump_db_version
+    end
+  end
+
+  desc 'list dumped sql-images'
+  task :imglist do
+    images_arr = DT3MySQL::db_image_list
+    print DT3Div::hashlist_to_table_string(images_arr)
+  end
+
+  desc 'show all tables'
+  task :tables do
+    print("Show tables:\n\n")
+    on roles(:all) do
+    execute DT3MySQL::show_tables
+    end
+    print("\n")
+  end
+
+  desc 'dump an sql-image with only the essential tables'
+  task :dump_essential do
+
+    on roles(:all) do
+      table_exclude_list = %w( be_users be_sessions cache_* cf_* fe_session_data fe_sessions static_countries \
+        static_country_zones static_currencies static_languages static_territories sys_history sys_log tx_devlog \
+        zzz_deleted_* )
+
+      tables = capture DT3MySQL::show_tables
+      table_arr = tables.split("\n")
+
+      substr_arr = []
+      excltable_arr = []
+      realexclude_list = []
+
+      table_exclude_list.each {|excltable|
+        if(excltable.include? '*')
+          substr_arr << excltable[0,excltable.index('*')]
+        else
+          excltable_arr << excltable
+        end
+      }
+
+      table_arr.each {|table|
+        if(excltable_arr.include?(table))
+          realexclude_list << table
+        else
+          substr_arr.each {|substr|
+            if(table[0,substr.length] == substr)
+              realexclude_list << table
+            end
+          }
+        end
+      }
+
+      table_exclude_list = realexclude_list.uniq
+
+      execute "cd #{fetch(:deploy_to)}/current && " + DT3MySQL::dump_db_version(table_exclude_list)
+    end
+  end
+
+  desc 'import one of the sql image into the current database'
+  task :import do
+
+    images_arr = DT3MySQL::db_image_list
+    print DT3Div::hashlist_to_table_string(images_arr)
+
+    print "\nEnter the index of the image you want to import from the list above: "
+
+    imageChoosen = STDIN.gets.chomp
+    if imageChoosen=~ /^[0-9]+$/
+      imageChoosen = imageChoosen.to_i-1
+      if images_arr[(imageChoosen)].nil?
+        print "ERR. You must enter an existing index from above."
+      else
+        print "\nImporting database #{images_arr[imageChoosen]['filename']}\n"
+
+        on roles(:all) do
+          execute "cd #{fetch(:deploy_to)}/current && " + DT3MySQL.mysql_import(images_arr[imageChoosen]['filename'])
+        end
+
+      end
+    else
+      print "ERR. You must enter a number"
+    end
+  end
+
+  desc 'delete all tables'
+  task :flush do
+    print "Flush tables in DB? Enter YES to confirm: "
+    cleanConfirm = STDIN.gets.chomp
+    if(cleanConfirm.downcase=='yes')
+      on roles(:all) do
+        tablelist = capture "#{DT3MySQL.create_mysql_base_command} -e \"show tables\" | grep -v Tables_in | grep -v \"+\""
+        dropsql = ''
+        tablelist.split("\n").each {|table|
+          dropsql +="drop table #{table};"
+        }
+        execute DT3MySQL::mysql_execute(dropsql)
+
+      end
+    end
+  end
+
+end

data/lib/capistrano/typo3.rb

@@ -6,9 +6,14 @@ require "capistrano/typo3/dt3_div"
 require "capistrano/typo3/dt3_mysql"
 require 'yaml' # Built in, no gem required
 
+
+
+TYPO3_DB_DUMP_DIR = 'db_dumps'
+
 load File.expand_path('../tasks/typo3.cap', __FILE__)
 load File.expand_path('../tasks/deploy.cap', __FILE__)
 load File.expand_path('../tasks/git.cap', __FILE__)
+load File.expand_path('../tasks/db.cap', __FILE__)
 
 
 

data/lib/capistrano/typo3/dt3_mysql.rb

@@ -9,13 +9,12 @@ class DT3MySQL
   end
 
   def self.flush_tables
-    tablelist =	 `#{self.create_mysql_base_command} -e "show tables" | grep -v Tables_in | grep -v "+"`
+    tablelist = `#{self.create_mysql_base_command} -e "show tables" | grep -v Tables_in | grep -v "+"`
     dropsql = ''
     tablelist.split("\n").each {|table|
       dropsql +="drop table #{table};"
     }
     self.mysql_execute(dropsql)
-    return true
   end
 
   def self.show_tables
@@ -31,48 +30,6 @@ class DT3MySQL
     return cmd
   end
 
-  def self.test_connection
-    stdout = self.mysql_execute('SHOW TABLES;')
-    if stdout.include? 'denied'
-      return false
-    else
-      return 1
-    end
-  end
-
-  def self.dump_db_version(name=nil, table_exclude_list=nil)
-
-    if not File.directory?(TYPO3_DB_DUMP_DIR)
-      FileUtils.mkdir TYPO3_DB_DUMP_DIR
-    end
-
-    filename =''
-    numbers = []
-    dbsettings = Typo3Helper::get_db_settings
-
-    if name
-      filename = File.join(TYPO3_DB_DUMP_DIR,"#{dbsettings['name']}-#{ENV['name']}.sql")
-      version = name
-    else
-      Dir.foreach(TYPO3_DB_DUMP_DIR) {|sql|
-        tmpname = sql.split('.')
-        if(tmpname.count == 3)
-          numbers << tmpname[1].to_i
-        end
-      }
-      if(numbers.count > 0)
-        version = (numbers.max + 1)
-      else
-        version = 1
-      end
-
-      filename = File.join(TYPO3_DB_DUMP_DIR,"#{dbsettings['name']}.#{version.to_s}.sql")
-    end
-
-    print "new image:#{dbsettings['name']} version:#{version}\n"
-    DT3MySQL::mysqldump_to(filename,table_exclude_list)
-  end
-
   def self.db_image_list
     images_arr = []
     idx = 0
@@ -96,7 +53,7 @@ class DT3MySQL
           image['version'] = '[MASTER]'
           image['name'] = File.basename(sql,'.*')
         end
-        image['time'] = File.mtime(sql).strftime("%Y-%m-%d")
+        image['time'] = File.mtime(sql).strftime("%Y-%m-%d %H:%M")
         image['filename'] = sql
 
         images_arr << image
@@ -105,42 +62,29 @@ class DT3MySQL
     return images_arr
   end
 
-  def self.create_exclude_list
+  def self.dump_db_version(table_exclude_list=nil)
 
-    table_exclude_list = %w( be_users be_sessions cache_* cf_* fe_session_data fe_sessions static_countries \
-    static_country_zones static_currencies static_languages static_territories sys_history sys_log tx_devlog \
-    zzz_deleted_* )
-
-    tables = self.show_tables
-    table_arr = tables.split("\n")
-
-    substr_arr = []
-    excltable_arr = []
-    realexclude_list = []
-
-    table_exclude_list.each {|excltable|
-      if(excltable.include? '*')
-        substr_arr << excltable[0,excltable.index('*')]
-      else
-        excltable_arr << excltable
-      end
-    }
+    filename =''
+    numbers = []
 
-    table_arr.each {|table|
-      if(excltable_arr.include?(table))
-        realexclude_list << table
-      else
-        substr_arr.each {|substr|
-          if(table[0,substr.length] == substr)
-            realexclude_list << table
-          end
-        }
+    Dir.foreach(TYPO3_DB_DUMP_DIR) {|sql|
+      tmpname = sql.split('.')
+      if(tmpname.count == 3)
+        numbers << tmpname[1].to_i
       end
     }
+    if(numbers.count > 0)
+      version = (numbers.max + 1)
+    else
+      version = 1
+    end
 
-    return realexclude_list.uniq
+    filename = File.join(TYPO3_DB_DUMP_DIR,"#{fetch(:dbname)}-#{fetch(:branch)}.#{version.to_s}.sql")
+    print "new image:#{fetch(:dbname)} version:#{version}\n"
+    DT3MySQL::mysqldump_to(filename,table_exclude_list)
   end
 
+
   def self.create_mysql_base_command(exec='mysql')
     return self.create_mysql_base_command_with(fetch(:dbuser),fetch(:dbhost),fetch(:dbpass),fetch(:dbname),exec)
   end
@@ -149,13 +93,13 @@ class DT3MySQL
     "#{self.create_mysql_base_command} -e \"#{sql}\""
   end
 
-  def self.create_exclude_string(excludelist,db)
+  def self.create_exclude_string(excludelist)
     s = ''
     excludelist.each {|extab|
       if(s.length>0)
         s += " "
       end
-      s += "--ignore-table=#{db}.#{extab}"
+      s += "--ignore-table=#{fetch(:dbname)}.#{extab}"
     }
     return s
   end
@@ -163,17 +107,15 @@ class DT3MySQL
   def self.mysqldump_to(outputfile,excludelist=nil,no_schema=nil)
 
     if(not excludelist.nil?)
-      excludestring = self.create_exclude_string(excludelist,db)
+      excludestring = self.create_exclude_string(excludelist)
     else
       excludestring = ''
     end
 
-    cmd="#{create_mysql_base_command('mysqldump')} #{excludestring} > #{outputfile}"
-    system(cmd)
+    "#{create_mysql_base_command('mysqldump')} #{excludestring} > #{outputfile}"
   end
 
-  def self.mysql_import(user,pass,host,db,insqlfile)
-    cmd ="#{create_mysql_base_command} < #{insqlfile}"
-    system(cmd)
+  def self.mysql_import(insqlfile)
+    "#{create_mysql_base_command} < #{insqlfile}"
   end
 end

data/lib/capistrano/typo3/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Typo3
-    VERSION = "0.4.7"
+    VERSION = "0.4.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-typo3
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.9
 platform: ruby
 authors:
 - Pim Snel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: text-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Capistrano 3 deployment and continious delivery tasks for TYPO3 versions
   6.2+, 7.x, 8.x
 email:
@@ -73,6 +87,7 @@ files:
 - homestead_files/Vagrantfile
 - homestead_files/homestead.rb
 - homestead_files/vagrant.yml
+- lib/capistrano/tasks/db.cap
 - lib/capistrano/tasks/deploy.cap
 - lib/capistrano/tasks/git.cap
 - lib/capistrano/tasks/typo3.cap