capistrano-cul 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf61bf425466ac1f834abf8e1b58c343d6ba6d9
-  data.tar.gz: e4f56d47ce5e62884e0c4e3f9d695fdd09fa040f
+  metadata.gz: 3ba8aa2d215d9e7bd5a08cf20c9d2cc4b68612ca
+  data.tar.gz: b3991585daed81c5bab294d5ba67bb277730a5db
 SHA512:
-  metadata.gz: e44a48f6094f3a73191ee75b321d2ab069b089404a56f00d484606614d3c5acd3d535c1721c41f50819710f2e385cc3306ce63b7331bb2b054bd0b55ace71189
-  data.tar.gz: 8d256b5e8d83985d222b0dcd1522a3bac57cfbc146c7ef418c9232700152c9a76f7c6563e986474a7462bd7a1ba2f1249c9b97a738bd50405b80b4558541c6da
+  metadata.gz: 6b37fd6d3e4b6d71304f91629dfc1cd55bb34d5ee20b9e4df95331c645fe9d07335537d117850c395cf89840b49572a4897ef6347a8fe0b214bdea5f839cd3f2
+  data.tar.gz: d1406e40206bb9701a53cd9df10134b291a626abdc8acd6ed6c079c1942ccf2ebdb7c087c817d29e5af55db3321bdebf695ddc421d658ce0766a9d388c281439

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

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

@@ -50,14 +50,6 @@ namespace :cul do
               failure = true
             end
           end
-          within fetch(:wp_docroot) do
-            # Ensure that destination WordPress is running the latest version
-            result = capture :wp, (fetch(:multisite, false) ? "--url=#{fetch(:destination_site_multisite_url)}" : ''), 'core', 'check-update'
-            unless result.index('Success')
-              puts "Could not copy TO destination [#{fetch(:stage)}] WordPress because it is not running the latest version of WordPress. Please update [#{fetch(:stage)}] before running a copy operation."
-              failure = true
-            end
-          end
         end
         next if failure # End if the previous checks failed
 
@@ -96,7 +88,7 @@ namespace :cul do
             execute :find, find_upload_dirs, ' >> ', path_to_list_of_files_to_copy
 
             # Print out which files won't be copied
-            files_not_copied = capture(:comm, '-23', "<(find . -type f -path './uploads/*' -o -path './blogs.dir/*' | sort)", "<(find #{find_upload_dirs} | sort)")
+            files_not_copied = capture(:comm, '-23', "<(find . -type f \\( -path './uploads/*' -o -path './blogs.dir/*' \\) | sort)", "<(find #{find_upload_dirs} | sort)")
 
             puts (
               "The following files will not be copied:\n" +
@@ -179,8 +171,6 @@ namespace :cul do
             else
               puts '- Skipping search and replace because neither "y" nor "yes" were entered.'
             end
-
-            puts "\nCopy operation complete!"
           end
 
           # Next, install all plugins and themes from src wordpress, matching all versions and active vs. inactive plugin and theme states
@@ -196,40 +186,39 @@ namespace :cul do
 
           # Within dest wp instance, install specifically versioned plugins and themes
           within File.join(fetch(:wp_docroot)) do
-            # Get list of already-installed plugins and themes (from dest instance) so that we don't attempt to reinstall them
-            already_installed_plugin_names = JSON.parse(capture(:wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'plugin', 'list', '--fields=name,version,status', '--format=json')).map{|plugin_info| plugin_info['name']}
-            already_installed_theme_names = JSON.parse(capture(:wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'theme', 'list', '--fields=name,version,status', '--format=json')).map{|theme_info| theme_info['name']}
+            # Get list of repo-managed plugins and themes so that we don't attempt to overwrite these directories
+            repo_managed_plugin_names = fetch(:wp_custom_plugins, {}).keys
+            repo_managed_theme_names = fetch(:wp_custom_themes, {}).keys
 
-            puts 'Already installed plugins: ' + already_installed_plugin_names.inspect
-            puts 'Already installed themes: ' + already_installed_theme_names.inspect
+            puts "Downloading new copies of non-repo-managed plugins and themes..."
 
-            data_for_plugins.delete_if{|plugin_info| already_installed_plugin_names.include?(plugin_info['name']) }.each do |plugin_info|
+            data_for_plugins.delete_if{|plugin_info| repo_managed_plugin_names.include?(plugin_info['name']) }.each do |plugin_info|
               name = plugin_info['name']
               version = plugin_info['version']
               status = plugin_info['status']
 
               case status
               when 'active'
-                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'plugin', 'install', name, "--version=#{version}", '--activate'
+                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:destination_site_multisite_url)}" : ''), 'plugin', 'install', name, "--version=#{version}", '--activate'
               when 'active-network'
-                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'plugin', 'install', name, "--version=#{version}", '--activate-network'
+                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:destination_site_multisite_url)}" : ''), 'plugin', 'install', name, "--version=#{version}", '--activate-network'
               when 'inactive'
-                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'plugin', 'install', name, "--version=#{version}"
+                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:destination_site_multisite_url)}" : ''), 'plugin', 'install', name, "--version=#{version}"
               when 'must-use'
                 puts "--- WARNING: must-use plugin #{name} was not migrated over.  It should be put in your blog's repository and deployed through a regular deployment."
               end
             end
 
-            data_for_themes.delete_if{|theme_info| already_installed_theme_names.include?(theme_info['name']) }.each do |theme_info|
+            data_for_themes.delete_if{|theme_info| repo_managed_theme_names.include?(theme_info['name']) }.each do |theme_info|
               name = theme_info['name']
               version = theme_info['version']
               status = theme_info['status']
 
               case status
               when 'active'
-                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'theme', 'install', name, "--version=#{version}", '--activate'
-              when 'inactive'
-                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:source_site_multisite_url)}" : ''), 'theme', 'install', name, "--version=#{version}"
+                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:destination_site_multisite_url)}" : ''), 'theme', 'install', name, "--version=#{version}", '--activate'
+              when 'inactive', 'parent'
+                execute :wp, (fetch(:multisite, false) ? "--url=#{fetch(:destination_site_multisite_url)}" : ''), 'theme', 'install', name, "--version=#{version}"
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cul
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Carla Galarza
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano