capistrano-cul 0.1.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0229d59429d92fb3ad6b6316d2e0cb4b3e35cd5f6541058da2cdce27cff86632'
-  data.tar.gz: 00e342d9bbf5ad0953b34630495b0c1f7d8bec69a53749e628c12c0c040f8c6f
+  metadata.gz: e45a37c83d7409c27a9363783d566178c6c9de89b308ac06fcb75fc062a3d679
+  data.tar.gz: ed9b25f8a4faf0753ff16f5a8bc3c7447e298559165fef4abb176432b5968fb6
 SHA512:
-  metadata.gz: 6c2c1a1ad4803773a7aedf38c858cbb5f6c6f0ee1f841ee385ca6b5f64f7674eca3f26279ba367e5ae116ddb9fac7e1edfd30d740d91cd6500616762d558e02a
-  data.tar.gz: 72be52d3afe3145f88bd8aba8956fd889e7e5880da618ec4ba7af6ff7fd63d604c8369828d78b8f9c42d2f892937587a3aa34decd522c67bdc5e346499ef6106
+  metadata.gz: '0568d92354d3b8fdf8583ba3b579803813ef27158f4fa6fbf32180f6eff1945c10a60e3f5586785d432daf03be96fad388c63d3c16673ddba86a6688a7daf062'
+  data.tar.gz: 1d19fe901a4a1307e08a383f062fafae414a9fbebd17d03bb8fb6485913f947f1ec82c9bccc8a360e2832975b5bccce59bca8e493a3f68036c17162970ab06c9

data/README.md

@@ -109,9 +109,11 @@ set :wp_custom_plugins, {
   'custom-plugin-directory' => 'plugins/custom-plugin-directory'
 }
 
-set :additional_plugins_from_remote_zip, [
-   'https://github.com/cul/cf-byline/archive/v1.0.0.zip'
-]
+# NOTE: It is important that the keys in the hash below match the plugin name
+# keys exactly. The zip file url can be any valid, publicly-accessible url.
+set :additional_plugins_from_remote_zip, {
+   'cf-byline' => 'https://github.com/cul/cf-byline/archive/v1.0.0.zip'
+}
 
 set :wp_custom_themes, {
   'mytheme' => 'themes/mytheme'

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.3.0

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

@@ -44,10 +44,10 @@ namespace :cul do
       task :install_additional_plugins_from_remote_zip do
         on roles(:web) do
           within File.join(fetch(:wp_docroot)) do
-            plugin_zip_urls = fetch(:additional_plugins_from_remote_zip) || []
+            plugin_zip_names_and_urls = fetch(:additional_plugins_from_remote_zip) || {}
             # Make sure that all of the URLs start with http:// or https://
-            raise 'Found non-http/https url in :additional_plugins_from_remote_zip' if plugin_zip_urls.detect { |val| val !~ /^https?:\/\// }
-            plugin_zip_urls.each do |plugin_url|
+            raise 'Found non-http/https url in :additional_plugins_from_remote_zip' if plugin_zip_names_and_urls.values.detect { |val| val !~ /^https?:\/\// }
+            plugin_zip_names_and_urls.each do |plugin_name, plugin_url|
               execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:dest_multisite_domain)}" : ''), 'plugin', 'install', plugin_url, '--force'
             end
           end
@@ -106,23 +106,23 @@ namespace :cul do
 
       desc 'Symlink the wp-content wflogs directory to a corresponding directory in /var'
       task :symlink_wflogs_to_var_directory do
-        opt_wflogs_path = File.join(fetch(:wp_docroot), 'wp-content', 'wflogs')
-        var_wflogs_path = opt_wflogs_path.sub(/^\/opt/, '/var')
+        wp_docroot_wflogs_path = File.join(fetch(:wp_docroot), 'wp-content', 'wflogs')
+        local_disk_wflogs_path = File.join(fetch(:local_disk_wflogs_path), wp_docroot_wflogs_path.sub(/^\/opt/, '/var'))
 
         on roles(:web) do
           # Create target var wflogs dir if it doesn't exist
-          execute :mkdir, '-p', var_wflogs_path
+          execute :mkdir, '-p', local_disk_wflogs_path
 
           # Check if a file or directory already exists at opt wflogs
-          if test "[ -e #{opt_wflogs_path} ]"
-            if test "[ -L #{opt_wflogs_path} ]"
+          if test "[ -e #{wp_docroot_wflogs_path} ]"
+            if test "[ -L #{wp_docroot_wflogs_path} ]"
               # If it's a symlink, delete it and re-create it
-              execute :rm, opt_wflogs_path,
-                '&&', 'ln', '-s', var_wflogs_path, opt_wflogs_path
+              execute :rm, wp_docroot_wflogs_path,
+                '&&', 'ln', '-s', local_disk_wflogs_path, wp_docroot_wflogs_path
             else
               # If it's NOT a symlink, move it and symlink to the var wflogs dir
-              execute :mv, opt_wflogs_path, "#{opt_wflogs_path}-#{Time.now.strftime("%Y-%m-%d-%H%M")}",
-                '&&', 'ln', '-s', var_wflogs_path, opt_wflogs_path
+              execute :mv, wp_docroot_wflogs_path, "#{wp_docroot_wflogs_path}-#{Time.now.strftime("%Y-%m-%d-%H%M")}",
+                '&&', 'ln', '-s', local_disk_wflogs_path, wp_docroot_wflogs_path
             end
           end
         end

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

@@ -104,7 +104,10 @@ namespace :cul do
                 '--exclude="mu-plugins"',
                 '--exclude="themes"',
                 '--exclude="uploads"',
-                '--exclude="blogs.dir"'
+                '--exclude="blogs.dir"',
+                # We don't want to copy wflogs because we will be symlinking the
+                # dir on the other side, and Wordfence will recreate it anyway.
+                '--exclude="wflogs"'
               ] +
               # Apply user-defined exclusion filters, if present
               fetch(:wp_content_rsync_exclude_filters, []).map{ |filter_value| "--exclude=\"#{filter_value}\"" } +
@@ -149,8 +152,8 @@ 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/*' \\) | sort\")",
-              "<(cd #{dest_wp_content_path} && find . -type f \\( -path '*/uploads/*' -o -path '*/blogs.dir/*' \\) | sort)"
+              "<(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)"
             )
 
             # Generate list of files that weren't copied. Display this list to the user.
@@ -258,7 +261,14 @@ namespace :cul do
 
             puts "Downloading new copies of non-repo-managed plugins and themes..."
 
-            data_for_plugins.delete_if{|plugin_info| repo_managed_plugin_names.include?(plugin_info['name']) }.each do |plugin_info|
+            remote_zip_plugin_names = (fetch(:additional_plugins_from_remote_zip) || {}).keys
+
+            # Skip plugins that are repo-managed
+            data_for_plugins.delete_if{|plugin_info| repo_managed_plugin_names.include?(plugin_info['name']) }
+            # Skip plugins that come from a remote zip url
+            data_for_plugins.delete_if{|plugin_info| remote_zip_plugin_names.include?(plugin_info['name']) }
+
+            data_for_plugins.each do |plugin_info|
               name = plugin_info['name']
               version = plugin_info['version']
               status = plugin_info['status']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cul
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Carla Galarza
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Common capistrano tasks shared across projects at CUL