capistrano-cul 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d8c0153adc0398b98d587bde126f299cdedc8700339c42331d87163b9842e3
-  data.tar.gz: 6eb49f3abfc755194f3833d65563210d4bc879f7ff93a71d7493bbcca3b72601
+  metadata.gz: 77f9d175ae1d9c1d8328e1c709c9c0a1c0d56fde512c0b93a924d5b70c840791
+  data.tar.gz: fb00f2da7b0c269d5aa68ede5397e1bb5de1f5fb330511b383095b9f5df54802
 SHA512:
-  metadata.gz: 7f758050b607bc1e66b27d8dc8ee52f6824fc4f2650f2f5e4a0197786dde6697afb8c33806b9833c4bb43aa9f44bf212c80ace9e028c604b09fbd5e4dc649acf
-  data.tar.gz: '09c962e938ddb7339e397a24d09e370694310c4bb4abc7e0916b13ac9078eb11baa285565469e3d77306e0faf85ef7d4fecdcaf52bbd7287e228bf78c2a7e6b7'
+  metadata.gz: 6cb3f7c325d7d064ab6c55ccdba0c94ca5dfb03647eca12b665658dcd2a8e09cad5206136eb3fea29a94e152ddc2e34ede0f2c0dd3b15b8d6e73ef0672a76f40
+  data.tar.gz: 527e8c89c2cbf83d5589c749b6993057bf58240cedeccac84160903f8ce7d29891e417794f2a1cd04cc84e7337a468fc4acf0cf0d26982ad77a65436643f8f65

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/capistrano/tasks/wp/migrate.cap

@@ -143,6 +143,21 @@ namespace :cul do
               ]
             )
 
+            # Then copy all .htaccess files in the docroot
+            execute :rsync, (
+              rsync_base_params +
+              [
+                # Include .htaccess files
+                '--include=".htaccess"',
+                # Exclude everything else not included by --include filters
+                '--exclude="*"',
+                # src directory
+                fetch(:remote_user) + '@' + fetch(:src_wp_server) + ':' + File.join(fetch(:src_wp_docroot), '/.'), # trailing '/.' so that .htaccess files are included in the sync scope
+                # dest directory
+                fetch(:wp_docroot)
+              ]
+            )
+
           end
         end
 
@@ -151,10 +166,24 @@ namespace :cul do
 
         on roles(:web) do
           within dest_wp_content_path do
-            files_not_copied = capture(:comm, '-23',
-              "<(ssh #{fetch(:remote_user)}@#{fetch(:src_wp_server)} \"cd #{src_wp_content_path} && find . -type f \\( -path '*/uploads/*' -o -path '*/blogs.dir/*' \\) | LC_ALL=C sort\")",
-              "<(cd #{dest_wp_content_path} && find . -type f \\( -path '*/uploads/*' -o -path '*/blogs.dir/*' \\) | LC_ALL=C sort)"
-            )
+            copy_source_file_list = File.join(fetch(:deploy_to), 'copy-source-file-list.txt')
+            copy_dest_file_list = File.join(fetch(:deploy_to), 'copy-dest-local-file-list.txt')
+
+            # NOTE: We write the output of file scan operations to a file because there are sometime newline
+            # character issues with the `find` operation output is streamed through the capistrano `execute` method.
+            source_file_list_command = "ssh #{fetch(:remote_user)}@#{fetch(:src_wp_server)} \"cd #{src_wp_content_path} && find . -type f \\( -path '*/uploads/*' -o -path '*/blogs.dir/*' \\)\" > #{copy_source_file_list}"
+            destination_file_list_command = "cd #{dest_wp_content_path} && find . -type f \\( -path '*/uploads/*' -o -path '*/blogs.dir/*' \\) > #{copy_dest_file_list}"
+
+            execute(source_file_list_command)
+            execute(destination_file_list_command)
+
+            source_file_list_raw_output = capture("cat #{copy_source_file_list} && rm #{copy_source_file_list}")
+            destination_file_list_raw_output = capture("cat #{copy_dest_file_list} && rm #{copy_dest_file_list}")
+
+            source_file_set = Set.new(source_file_list_raw_output.split("\n"))
+            destination_file_set = Set.new(destination_file_list_raw_output.split("\n"))
+
+            files_not_copied = (source_file_set - destination_file_set).to_a.sort
 
             # Generate list of files that weren't copied. Display this list to the user.
             puts (
@@ -163,18 +192,23 @@ namespace :cul do
               "./plugins\n" +
               "./mu-plugins\n" +
               "./themes\n" +
-              (files_not_copied.length > 0 ? files_not_copied + "\n" : '') +
+              (files_not_copied.length > 0 ? files_not_copied.join("\n") + "\n" : '') +
               "-------------------------"
             )
           end
         end
-
+        unless enter_y_to_continue("Does that list look okay? Normally it should only include plugins, mu-plugins, and themes.")
+          puts 'Exiting because the list did not look okay.'
+          exit
+          puts 'nope'
+        end
       end
 
       desc "Copies certain wp-content (everything other than plugins, themes, and mu-plugins) from one environment to another (e.g. prod to dev). This task is part of the :copy_from task and isn't meant to be called directly."
       task :copy_database do
-        remote_server_db_export_tempfile_path = Tempfile.create(['db_export_tempfile', '.sql'], '/tmp/').path
-        local_server_db_export_file_path = File.join(fetch(:wp_docroot), File.basename(remote_server_db_export_tempfile_path))
+        export_filename = "db_export_tempfile-#{SecureRandom.uuid}.sql"
+        remote_server_db_export_tempfile_path = File.join(fetch(:src_wp_docroot), '..', export_filename)
+        local_server_db_export_file_path = File.join(fetch(:wp_docroot), '..', export_filename)
 
         # Export database from source WordPress instance
         on fetch(:remote_user) + '@' + fetch(:src_wp_server) do

data/lib/capistrano/tasks/wp/setup.cap

@@ -19,6 +19,9 @@ namespace :cul do
           # Download and unpack latest version of WP to wp_docroot
           execute :wp, 'core', ['download', "--version=latest", "--path=#{fetch(:wp_docroot)}"]
 
+          # Delete the unnecessary hello.php plugin that's included with a default installation
+          execute :rm, File.join(fetch(:wp_docroot), 'wp-content/plugins/hello.php')
+
           # Create a limited-content wp-config.php file that requires our shared
           # wp-config-include.php file. We do this so that wordpress still has a
           # wp-config.php file at the expected location, and that file correctly

data/lib/capistrano/tasks/wp.cap

@@ -1,4 +1,4 @@
-set :cul_allowed_upload_types_version, 'v0.5.0' # can be overridden by an app's deploy.rb file
+set :cul_allowed_upload_types_version, 'v0.6.0' # can be overridden by an app's deploy.rb file
 set :cul_allowed_upload_types_plugin_name, 'cul-allowed-upload-types'
 set :cul_allowed_upload_types_downloaded_plugin_path, ->{current_path.join(fetch(:cul_allowed_upload_types_plugin_name))} # can be overridden by an app's deploy.rb file
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cul
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Carla Galarza
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-31 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano