capistrano-typo3 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb5cc54bbc6964dc71232417d6da19a4ec6fc865
-  data.tar.gz: e41a7c8db712812e8f15ddfd2d4c9f3371a77442
+  metadata.gz: 67be3d0d96438f00b0c03bcea91920051b390926
+  data.tar.gz: f2314ba40882ddf06c37a5a2a2c431d57f05bd26
 SHA512:
-  metadata.gz: 2a3df5af753a0fe65fb20e137f5003d8d890621f19436aaa044ec417d8958d0cd17b4b6c8647369ca5f4b3aceda22f3ca93e2dc318eece4d12a30ab8e4067ac1
-  data.tar.gz: 336af96ecc43bb45bfefb26ea4948af3fd06448fdf2ba85c7b3151e126dff0304ba173bfb891d991e33c28b27fb54cd07f043af5228cd635492c71aa5bee52e4
+  metadata.gz: b79802466debf604b69dff6a6fe0ea59b0607fe4885e8b3f173446a915d1fa671dc135d28aa2788991c2e364901f75f5f18c36243e11325f80723e9b2aeb6c85
+  data.tar.gz: e6186356944254e77c67d47342110032481e5f5b398f724028c22167432dc1cc6e301e4d338ae99d48b72dce68fe5850e6b104a0e66bd0567dd421df89d121e5

data/lib/capistrano/tasks/git.cap

@@ -21,4 +21,12 @@ namespace :git do
     end
   end
 
+  task "check_branch" do
+    current_branch = `git branch | grep \\* | cut -d ' ' -f2`.strip
+    if current_branch != fetch(:branch)
+      raise "current branch differs from homestead.rb configuration.\n see config/deploy/homestead.rb\n\n Current branch:   #{current_branch}\n Homestead branch: #{fetch(:branch)} "
+    end
+  end
+
+
 end

data/lib/capistrano/tasks/sync.cap

@@ -0,0 +1,95 @@
+namespace :sync do
+
+    desc 'sync files from production'
+    task :sync_files_from_production do
+      on roles(:allow_syncfiles) do
+        if fetch(:t3_live_sync)['filesync']
+          fetch(:t3_live_sync)['filesync'].each do |key,command|
+            execute "cd #{fetch(:deploy_to)} && #{command}"
+          end
+        end
+      end
+    end
+
+    desc 'sync database from production and run sql updates'
+    task :sync_db_from_production do
+      on roles(:allow_syncdatabase) do
+
+        ignorestring = ""
+
+        if(:t3_db_sync_ignore_tables)
+
+          fetch(:t3_db_sync_ignore_tables).each do | ignore_tbl |
+            ignorestring = "#{ignorestring} --ignore-table=#{fetch(:t3_live_sync)['dbsync']['dbname']}.#{ignore_tbl}"
+          end
+        end
+
+        # DUMP DATABASE TO IMAGE
+        execute <<DBSYNC1
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'mysqldump -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
+          -h#{fetch(:t3_live_sync)['dbsync']['dbhost']} \
+          -p#{fetch(:t3_live_sync)['dbsync']['dbpass']} \
+          #{ignorestring} \
+          #{fetch(:t3_live_sync)['dbsync']['dbname']} > /tmp/.captypo3dump-src-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
+DBSYNC1
+
+        if(:t3_db_sync_ignore_tables)
+          fetch(:t3_db_sync_ignore_tables).each do | ignore_tbl |
+
+            execute <<DBSYNC1
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'mysqldump -u#{fetch(:t3_live_sync)['dbsync']['dbuser']} \
+          -h#{fetch(:t3_live_sync)['dbsync']['dbhost']} \
+          -p#{fetch(:t3_live_sync)['dbsync']['dbpass']} \
+          --no-data \
+            #{fetch(:t3_live_sync)['dbsync']['dbname']} #{ignore_tbl} >> /tmp/.captypo3dump-src-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
+DBSYNC1
+          end
+        end
+
+        # COMPRESS IMAGE
+        execute <<DBSYNC2
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'gzip -f /tmp/.captypo3dump-src-#{fetch(:t3_live_sync)['dbsync']['dbname']}'
+DBSYNC2
+
+        # TRANSFER IMAGE
+        execute <<DBSYNC3
+          scp #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']}:/tmp/.captypo3dump-src-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz \
+          /tmp/.captypo3dump-dest-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz
+DBSYNC3
+
+        # DECOMPRESS IMAGE
+        execute <<DBSYNC4
+          gunzip -f /tmp/.captypo3dump-dest-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz
+DBSYNC4
+
+        # IMPORT AND REMOVE IMAGE
+        execute <<DBSYNC5
+          mysql -u#{fetch(:dbuser)} -h#{fetch(:dbhost)} -p#{fetch(:dbpass)} #{fetch(:dbname)} < /tmp/.captypo3dump-dest-#{fetch(:t3_live_sync)['dbsync']['dbname']} && \
+          rm -f /tmp/.captypo3dump-dest-#{fetch(:t3_live_sync)['dbsync']['dbname']}
+DBSYNC5
+
+        # REMOVE IMAGE
+        execute <<DBSYNC6
+          ssh #{fetch(:t3_live_sync)['dbsync']['ssh_user']}@#{fetch(:t3_live_sync)['dbsync']['ssh_server']} \
+          'rm -f /tmp/.captypo3dump-src-#{fetch(:t3_live_sync)['dbsync']['dbname']}.gz'
+DBSYNC6
+      end
+
+      invoke 'sync:sql_updates'
+    end
+
+    desc 'run necessary sql queries for environment'
+    task :sql_updates do
+      on roles(:allow_syncdatabase) do
+        if fetch(:sql_updates)
+          fetch(:sql_updates).each do |command|
+            execute DT3MySQL::mysql_execute(command)
+          end
+        end
+      end
+    end
+
+end

data/lib/capistrano/tasks/typo3.cap

@@ -19,13 +19,15 @@ namespace :typo3 do
 
   desc "Setup a new production environment. Don't sync content from old production"
   task :setup_new_stage_no_sync do
-    invoke 'typo3:helper:rm_deploy_to' #OKE
-    invoke 'deploy' #OKE
-    invoke 'typo3:helper:setup_shared_typo3_dirs' #OKE
-    invoke 'typo3:helper:update_localconf' #OKE
-    invoke 'typo3:helper:write_tsconstants' #OKE
-    invoke 'typo3:helper:current_relative_symlink' #OKE
-    invoke 'typo3:helper:restart_webserver' #OKE
+    invoke 'typo3:helper:rm_deploy_to'
+    invoke 'deploy'
+
+    invoke 'typo3:helper:setup_shared_typo3_dirs' unless fetch(:t3_skip_setup_shared_typo3_dirs)
+    invoke 'typo3:helper:update_localconf' unless fetch(:t3_skip_update_localconf)
+    invoke 'typo3:helper:write_tsconstants' unless fetch(:t3_skip_write_tsconstants)
+    invoke 'typo3:helper:current_relative_symlink' unless fetch(:t3_skip_current_relative_symlink)
+    invoke 'typo3:helper:restart_webserver' unless fetch(:t3_skip_restart_webserver)
+
     invoke 'typo3:helper:execute_post_deployment_commands'
 
     print "environment has been setup, you do need to sync content from old production"
@@ -34,17 +36,17 @@ namespace :typo3 do
   desc "Setup a new staged typo3 environment when a it's already in model"
   task :setup_new_stage_sync do
 
-    invoke 'typo3:helper:rm_deploy_to' #OKE
-    invoke 'deploy' #OKE
-    invoke 'typo3:helper:setup_shared_typo3_dirs' #OKE
-
-    invoke 'typo3:content:sync_files_from_production' #OKE
-    invoke 'typo3:content:sync_db_from_production' #OKE
-    invoke 'typo3:content:flush_cache_in_db' #OKE
-    invoke 'typo3:helper:update_localconf' #OKE
-    invoke 'typo3:helper:write_tsconstants' #OKE
-    invoke 'typo3:helper:current_relative_symlink' #OKE
-    invoke 'typo3:helper:restart_webserver' #OKE
+    invoke 'typo3:helper:rm_deploy_to'
+    invoke 'deploy'
+    invoke 'typo3:helper:setup_shared_typo3_dirs' unless fetch(:t3_skip_setup_shared_typo3_dirs)
+
+    invoke 'typo3:content:sync_files_from_production'
+    invoke 'typo3:content:sync_db_from_production'
+    invoke 'typo3:content:flush_cache_in_db'
+    invoke 'typo3:helper:update_localconf' unless fetch(:t3_skip_update_localconf)
+    invoke 'typo3:helper:write_tsconstants' unless fetch(:t3_skip_write_tsconstants)
+    invoke 'typo3:helper:current_relative_symlink' unless fetch(:t3_skip_current_relative_symlink)
+    invoke 'typo3:helper:restart_webserver' unless fetch(:t3_skip_restart_webserver)
     invoke 'typo3:helper:execute_post_deployment_commands'
   end
 
@@ -54,20 +56,20 @@ namespace :typo3 do
     invoke 'typo3:content:sync_files_from_production'
     invoke 'typo3:content:sync_db_from_production'
     invoke 'typo3:content:flush_cache_in_db'
-    invoke 'typo3:helper:update_localconf'
-    invoke 'typo3:helper:write_tsconstants' #OKE
-    invoke 'typo3:helper:current_relative_symlink'
-    invoke 'typo3:helper:restart_webserver'
+    invoke 'typo3:helper:update_localconf' unless fetch(:t3_skip_update_localconf)
+    invoke 'typo3:helper:write_tsconstants' unless fetch(:t3_skip_write_tsconstants)
+    invoke 'typo3:helper:current_relative_symlink' unless fetch(:t3_skip_current_relative_symlink)
+    invoke 'typo3:helper:restart_webserver' unless fetch(:t3_skip_restart_webserver)
     invoke 'typo3:helper:execute_post_deployment_commands'
   end
 
   desc "deploy the typo3 way"
   task :deploy do
     invoke 'deploy'
-    invoke 'typo3:helper:update_localconf'
-    invoke 'typo3:helper:write_tsconstants' #OKE
-    invoke 'typo3:helper:current_relative_symlink'
-    invoke 'typo3:helper:restart_webserver'
+    invoke 'typo3:helper:update_localconf' unless fetch(:t3_skip_update_localconf)
+    invoke 'typo3:helper:write_tsconstants' unless fetch(:t3_skip_write_tsconstants)
+    invoke 'typo3:helper:current_relative_symlink' unless fetch(:t3_skip_current_relative_symlink)
+    invoke 'typo3:helper:restart_webserver' unless fetch(:t3_skip_restart_webserver)
     invoke 'typo3:helper:execute_post_deployment_commands'
   end
 

data/lib/capistrano/tasks/typo3helper.cap

@@ -57,30 +57,6 @@ deprecation_*.log
       end
     end
 
-    desc "update LocalConf with correct db credentionals without SSH"
-    task :update_localconf_local do
-
-      system "echo '<?php' > dummy/typo3conf/AdditionalConfiguration.php"
-
-      if fetch(:t3_add_unsafe_trusted_host_pattern)
-        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"SYS\"][\"trustedHostsPattern\"] = \".*\";' >> dummy/typo3conf/AdditionalConfiguration.php"
-      end
-
-      if fetch(:t3_store_db_credentials_in_addionalconf)
-        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"database\"] = \"#{fetch(:dbname)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
-        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"host\"] = \"#{fetch(:dbhost)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
-        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"password\"] = \"#{fetch(:dbpass)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
-        system "echo ' $GLOBALS[\"TYPO3_CONF_VARS\"][\"DB\"][\"username\"] = \"#{fetch(:dbuser)}\";' >> dummy/typo3conf/AdditionalConfiguration.php"
-      else
-        cmd1 =Typo3Helper::make_set_localconf_database_settings_command(fetch(:dbname),fetch(:dbuser),fetch(:dbpass),fetch(:dbhost))
-        system "cd #{fetch(:deploy_to)} && #{cmd1}"
-
-        cmd2 = "mv #{fetch(:typo3_v6_local_conf_path)}.tmp #{fetch(:typo3_v6_local_conf_path)}"
-        system "cd #{fetch(:deploy_to)} && #{cmd2}"
-      end
-    end
-
-
     desc "update LocalConf with correct db credentionals"
     task :update_localconf do
 

data/lib/capistrano/tasks/typo3homestead.cap

@@ -6,25 +6,34 @@ namespace :typo3 do
 
     desc "init site dirs from scratch (new installs)"
     task "init_site_dirs" do
-      invoke 'typo3:vagrant:check_branch'
+      invoke 'git:check_branch'
 
       on roles(:all) do
         ## PURGE IF NEEDED
         execute "sudo rm -Rf #{fetch(:deploy_to)}/shared/fileadmin #{fetch(:deploy_to)}/shared/typo3temp #{fetch(:deploy_to)}/shared/uploads"
-        execute "sudo mysql -e 'DROP DATABASE IF EXISTS #{fetch(:dbname)}'"
 
         ## CREATE
         execute "sudo mkdir -p #{fetch(:deploy_to)}/shared/fileadmin #{fetch(:deploy_to)}/shared/typo3temp #{fetch(:deploy_to)}/shared/uploads"
-        execute "sudo chown -Rf vagrant.vagrant #{fetch(:deploy_to)}/shared/fileadmin #{fetch(:deploy_to)}/shared/typo3temp #{fetch(:deploy_to)}/shared/uploads"
+
+        ['fileadmin','typo3temp','uploads'].each do|dir|
+          begin
+            execute "sudo chown -Rfv vagrant.vagrant #{fetch(:deploy_to)}/shared/#{dir}"
+          rescue
+            print 'could not CHOWN #{dir}. Propably already owned by vagrant.vagrant'
+          end
+        end
+
+
       end
     end
 
 
-    desc "init site database from scratch (new installs)"
+    desc "init site database from scratch (new installs) (danger: drops old)"
     task "init_site_database" do
-      invoke 'typo3:vagrant:check_branch'
+      invoke 'git:check_branch'
 
       on roles(:all) do
+        execute "sudo mysql -e 'DROP DATABASE IF EXISTS #{fetch(:dbname)}'"
         execute "sudo mysql -e 'CREATE DATABASE #{fetch(:dbname)} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
       end
     end

data/lib/capistrano/tasks/typo3util.cap

@@ -0,0 +1,14 @@
+# vim: ft=ruby:sts=2:expandtab
+
+namespace :typo3 do
+  namespace :util do
+
+    desc "flush typo3temp dir"
+    task :typo3temp_rm do
+      on roles(:all) do
+        execute "rm -Rfv #{fetch(:deploy_to)}/shared/typo3temp/*"
+      end
+    end
+
+  end
+end

data/lib/capistrano/tasks/typo3vagrant.cap

@@ -14,7 +14,7 @@ namespace :typo3 do
 
     desc "when homestead is not yet configured"
     task "init_homestead_conf" do
-      invoke 'typo3:vagrant:check_branch'
+      invoke 'git:check_branch'
       sh "mkdir -p config"
       sh "cd config && curl -O https://raw.githubusercontent.com/t3labcom/capistrano-typo3/master/homestead_files/vagrant.yml"
       sh "cd config/deploy && curl -O https://raw.githubusercontent.com/t3labcom/capistrano-typo3/master/homestead_files/homestead.rb"
@@ -23,7 +23,7 @@ namespace :typo3 do
 
     desc "setup new homestead vagrant machine for TYPO3 development"
     task "setup_machine" do
-      invoke 'typo3:vagrant:check_branch'
+      invoke 'git:check_branch'
 
       if `vagrant status | grep running`.strip != ""
         sh "vagrant destroy"
@@ -53,7 +53,7 @@ namespace :typo3 do
 
     desc "init site from scratch (new installs)"
     task "init_site" do
-      invoke 'typo3:vagrant:check_branch'
+      invoke 'git:check_branch'
 
       on roles(:all) do
         ## PURGE IF NEEDED
@@ -96,7 +96,7 @@ MSG
 
     desc "setup site (remote exists)"
     task "setup_site" do
-      invoke 'typo3:vagrant:check_branch'
+      invoke 'git:check_branch'
 
       on roles(:all) do
         ## PURGE IF NEEDED
@@ -154,12 +154,6 @@ MSG
       print "OBSOLETE: you can run 'setup_site' over and over again\n"
     end
 
-    task "check_branch" do
-      current_branch = `git branch | grep \\* | cut -d ' ' -f2`.strip
-      if current_branch != fetch(:branch)
-        raise "current branch differs from homestead.rb configuration.\n see config/deploy/homestead.rb\n\n Current branch:   #{current_branch}\n Homestead branch: #{fetch(:branch)} "
-      end
-    end
 
     task "set_no_site" do
       on roles(:all) do

data/lib/capistrano/tasks/wp_homestead.cap

@@ -0,0 +1,46 @@
+# vim: ft=ruby:sts=2:expandtab
+
+namespace :wp do
+
+  namespace :homestead do
+
+    desc "init site dirs from scratch (new installs)"
+    task "init_site_dirs" do
+      invoke 'git:check_branch'
+
+      on roles(:all) do
+        execute "sudo rm -Rf #{fetch(:deploy_to)}/shared/uploads"
+        execute "sudo mysql -e 'DROP DATABASE IF EXISTS #{fetch(:dbname)}'"
+
+        execute "sudo mkdir -p #{fetch(:deploy_to)}/shared/uploads"
+        execute "sudo chown vagrant.vagrant -Rf #{fetch(:deploy_to)}/shared/uploads"
+      end
+    end
+
+    desc "init site database from scratch (new installs)"
+    task "init_site_database" do
+      invoke 'git:check_branch'
+
+      on roles(:all) do
+        execute "sudo mysql -e 'CREATE DATABASE #{fetch(:dbname)} CHARACTER SET utf8 COLLATE utf8_general_ci;'"
+      end
+    end
+
+    desc "setup site (existing installs)"
+    task "setup_site" do
+      invoke 'wp:homestead:init_site_dirs'
+      invoke 'wp:homestead:init_site_database'
+
+      invoke 'deploy:fixknownhosts'
+      invoke 'sync:sync_db_from_production'
+
+      #WP update config
+
+      invoke 'sync:sync_files_from_production'
+      invoke 'typo3:helper:restart_webserver'
+    end
+
+  end
+end
+
+

data/lib/capistrano/typo3.rb

@@ -6,19 +6,22 @@ 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/typo3content.cap', __FILE__)
 load File.expand_path('../tasks/typo3helper.cap', __FILE__)
+load File.expand_path('../tasks/typo3util.cap', __FILE__)
 load File.expand_path('../tasks/typo3homestead.cap', __FILE__)
 load File.expand_path('../tasks/typo3test.cap', __FILE__)
 load File.expand_path('../tasks/typo3vagrant.cap', __FILE__)
+
+load File.expand_path('../tasks/wp_homestead.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__)
+load File.expand_path('../tasks/sync.cap', __FILE__)
 
 
 

data/lib/capistrano/typo3/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Typo3
-    VERSION = "0.5.1"
+    VERSION = "0.5.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-typo3
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Pim Snel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,12 +88,15 @@ files:
 - lib/capistrano/tasks/db.cap
 - lib/capistrano/tasks/deploy.cap
 - lib/capistrano/tasks/git.cap
+- lib/capistrano/tasks/sync.cap
 - lib/capistrano/tasks/typo3.cap
 - lib/capistrano/tasks/typo3content.cap
 - lib/capistrano/tasks/typo3helper.cap
 - lib/capistrano/tasks/typo3homestead.cap
 - lib/capistrano/tasks/typo3test.cap
+- lib/capistrano/tasks/typo3util.cap
 - lib/capistrano/tasks/typo3vagrant.cap
+- lib/capistrano/tasks/wp_homestead.cap
 - lib/capistrano/typo3.rb
 - lib/capistrano/typo3/dt3_div.rb
 - lib/capistrano/typo3/dt3_mysql.rb