wordmove 6.0.0.alpha.1 → 6.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d9941b583c7efed07744b92745a92343597448609a3eaf744bda7c43f7c5c92
-  data.tar.gz: ad6e8b8f4da9431749a763aa0f85a1747ae83ee976aaa2da1506181021a30530
+  metadata.gz: 1ea52bea7c72c65b2b9a55a425d54bfd586b2c8c71e998517d489f4f55fd1616
+  data.tar.gz: 90430c49a99da9c6ded3519a103066b26c13ee6771d89114ed85b46dad39860f
 SHA512:
-  metadata.gz: 428d6fb168d3b9fbd61d7b2ab378651f8e208437ca829fb9b8d8bb57fec59393a519339bfd4fa402f07020482a4ffd3374ca672b6f055f310201aa4176540f84
-  data.tar.gz: 76443da36ac2d51c6af649abbcb6bbbc4f14af67dff363fb87369c6e3a825e35422dc4d28682dd53a4d0f1a7ae1ceaa4e2bc424d2908119028981351caa81f07
+  metadata.gz: 95dd8ab8d22c5f8ec4faa15deb9b95792ecce5e2826d43266cbfdebac551e3f1ee6d646a86b2248ae5a16696849dc6e403ccd1a01d3cbadaa629ae0d62148ea4
+  data.tar.gz: e2413aaf068bd8993a1d4701504eddcdd3259b713f1bd1de92e1b10d7523234862c5e398e367277b8ddc80fb4ab00c717575ad6ac50cb6cb01fdfd6f53e4136f

data/lib/wordmove/actions/adapt_local_db.rb

@@ -38,7 +38,7 @@ module Wordmove
 
         next context if simulate?(cli_options: context.cli_options)
 
-        Wordmove::Actions::RunLocalCommand.execute(
+        result = Wordmove::Actions::RunLocalCommand.execute(
           cli_options: context.cli_options,
           logger: context.logger,
           command: mysql_dump_command(
@@ -46,24 +46,27 @@ module Wordmove
             save_to_path: context.db_paths.local.path
           )
         )
+        context.fail_and_return!(result.message) if result.failure?
 
         if context.cli_options[:no_adapt]
           context.logger.warn 'Skipping DB adapt'
         else
-          Wordmove::Actions::RunLocalCommand.execute(
+          result = Wordmove::Actions::RunLocalCommand.execute(
             cli_options: context.cli_options,
             logger: context.logger,
             command: wpcli_search_replace_command(context, :vhost)
           )
+          context.fail_and_return!(result.message) if result.failure?
 
-          Wordmove::Actions::RunLocalCommand.execute(
+          result = Wordmove::Actions::RunLocalCommand.execute(
             cli_options: context.cli_options,
             logger: context.logger,
             command: wpcli_search_replace_command(context, :wordpress_path)
           )
+          context.fail_and_return!(result.message) if result.failure?
         end
 
-        Wordmove::Actions::RunLocalCommand.execute(
+        result = Wordmove::Actions::RunLocalCommand.execute(
           cli_options: context.cli_options,
 
           logger: context.logger,
@@ -72,16 +75,18 @@ module Wordmove
             save_to_path: context.db_paths.local.adapted_path
           )
         )
+        context.fail_and_return!(result.message) if result.failure?
 
         if context.photocopier.is_a? Photocopier::SSH
-          Wordmove::Actions::RunLocalCommand.execute(
+          result = Wordmove::Actions::RunLocalCommand.execute(
             cli_options: context.cli_options,
             logger: context.logger,
             command: compress_command(file_path: context.db_paths.local.adapted_path)
           )
+          context.fail_and_return!(result.message) if result.failure?
         end
 
-        Wordmove::Actions::RunLocalCommand.execute(
+        result = Wordmove::Actions::RunLocalCommand.execute(
           cli_options: context.cli_options,
           logger: context.logger,
           command: mysql_import_command(
@@ -89,6 +94,7 @@ module Wordmove
             env_db_options: context.local_options[:database]
           )
         )
+        context.fail_and_return!(result.message) if result.failure?
       end
     end
   end

data/lib/wordmove/actions/adapt_remote_db.rb

@@ -52,7 +52,7 @@ module Wordmove
           )
         end
 
-        Wordmove::Actions::RunLocalCommand.execute(
+        result = Wordmove::Actions::RunLocalCommand.execute(
           cli_options: context.cli_options,
           logger: context.logger,
           command: mysql_import_command(
@@ -60,6 +60,7 @@ module Wordmove
             env_db_options: context.local_options[:database]
           )
         )
+        context.fail_and_return!(result.message) if result.failure?
 
         if context.cli_options[:no_adapt]
           context.logger.warn 'Skipping DB adapt'

data/lib/wordmove/actions/backup_local_db.rb

@@ -30,7 +30,7 @@ module Wordmove
           next context
         end
 
-        Wordmove::Actions::RunLocalCommand.execute(
+        result = Wordmove::Actions::RunLocalCommand.execute(
           cli_options: context.cli_options,
           logger: context.logger,
           command: mysql_dump_command(
@@ -38,12 +38,14 @@ module Wordmove
             save_to_path: context.db_paths.backup.local.path
           )
         )
+        context.fail_and_return!(result.message) if result.failure?
 
-        Wordmove::Actions::RunLocalCommand.execute(
+        result = Wordmove::Actions::RunLocalCommand.execute(
           cli_options: context.cli_options,
           logger: context.logger,
           command: compress_command(file_path: context.db_paths.backup.local.path)
         )
+        context.fail_and_return!(result.message) if result.failure?
 
         context.logger.success(
           "Backup saved at #{context.db_paths.backup.local.gzipped_path}"

data/lib/wordmove/actions/ftp/cleanup_after_adapt.rb

@@ -33,7 +33,7 @@ module Wordmove
           )
 
           if result.failure?
-            context.logger.warning 'Failed to delete remote file ' \
+            context.logger.warning 'Failed to delete local file ' \
                                    "#{context.db_paths.local.path} because: " \
                                    "#{result.message}" \
                                    '. Manual intervention required'

data/lib/wordmove/actions/ftp/put_and_import_dump_remotely.rb

@@ -61,11 +61,18 @@ module Wordmove
           if context.cli_options[:debug]
             context.logger.debug "Operation log located at: #{context.db_paths.ftp.local.temp_path}"
           else
-            Wordmove::Actions::DeleteLocalFile.execute(
+            result = Wordmove::Actions::DeleteLocalFile.execute(
               cli_options: context.cli_options,
               logger: context.logger,
               file_path: context.db_paths.ftp.local.temp_path
             )
+
+            if result.failure?
+              context.logger.warning 'Failed to delete local file ' \
+                                     "#{context.db_paths.ftp.local.temp_path} because: " \
+                                     "#{result.message}" \
+                                     '. Manual intervention required'
+            end
           end
         end
       end

data/lib/wordmove/actions/setup_context_for_db.rb

@@ -16,12 +16,6 @@ module Wordmove
       promises :db_paths
 
       executed do |context| # rubocop:disable Metrics/BlockLength
-        if context.database_task == false
-          context.skip_remaining!
-          context.db_paths = false
-          next context
-        end
-
         next context if simulate?(cli_options: context.cli_options)
 
         content_dir = local_wp_content_dir(local_options: context.local_options)

data/lib/wordmove/actions/ssh/cleanup_after_adapt.rb

@@ -16,7 +16,7 @@ module Wordmove
         # @param logger [Wordmove::Logger]
         # @!scope class
         # @return [LightService::Context] Action's context
-        executed do |context|
+        executed do |context| # rubocop:disable Metrics/BlockLength
           context.logger.task 'Cleanup'
 
           if simulate?(cli_options: context.cli_options)
@@ -24,17 +24,29 @@ module Wordmove
             next context
           end
 
-          Wordmove::Actions::DeleteLocalFile.execute(
+          result = Wordmove::Actions::DeleteLocalFile.execute(
             logger: context.logger,
             cli_options: context.cli_options,
             file_path: context.db_paths.local.path
           )
+          if result.failure?
+            context.logger.warning 'Failed to delete local file ' \
+                                   "#{context.db_paths.local.path} because: " \
+                                   "#{result.message}" \
+                                   '. Manual intervention required'
+          end
 
-          Wordmove::Actions::DeleteLocalFile.execute(
+          result = Wordmove::Actions::DeleteLocalFile.execute(
             cli_options: context.cli_options,
             logger: context.logger,
             file_path: context.db_paths.local.gzipped_adapted_path
           )
+          if result.failure?
+            context.logger.warning 'Failed to delete local file ' \
+                                   "#{context.db_paths.local.gzipped_adapted_path} because: " \
+                                   "#{result.message}" \
+                                   '. Manual intervention required'
+          end
         end
       end
     end

data/lib/wordmove/actions/ssh/download_remote_db.rb

@@ -64,7 +64,12 @@ module Wordmove
             cli_options: context.cli_options,
             remote_file: context.db_paths.remote.gzipped_path
           )
-          context.fail_and_return!(result.message) if result.failure?
+          if result.failure?
+            context.logger.warning 'Failed to delete remote file ' \
+                                   "#{context.db_paths.remote.gzipped_path} because: " \
+                                   "#{result.message}" \
+                                   '. Manual intervention required'
+          end
 
           context.logger.success(
             "Remote DB dump downloaded in #{context.db_paths.local.gzipped_path}"

data/lib/wordmove/actions/ssh/put_and_import_dump_remotely.rb

@@ -62,7 +62,12 @@ module Wordmove
             cli_options: context.cli_options,
             remote_file: context.db_paths.remote.path
           )
-          context.fail!(result.message) if result.failure?
+          if result.failure?
+            context.logger.warning 'Failed to delete remote file ' \
+                                   "#{context.db_paths.remote.path} because: " \
+                                   "#{result.message}" \
+                                   '. Manual intervention required'
+          end
         end
       end
     end

data/lib/wordmove/doctor/wpcli.rb

@@ -36,7 +36,7 @@ module Wordmove
       end
 
       def up_to_date?
-        `wp cli check-update --format=json`.empty?
+        `wp cli check-update --format=json --allow-root`.empty?
       end
     end
   end

data/lib/wordmove/organizers/ftp/pull.rb

@@ -35,14 +35,15 @@ module Wordmove
               ->(ctx) { ctx.wordpress_task },
               [Wordmove::Actions::Ftp::PullWordpress]
             ),
-            iterate(:folder_tasks, [Wordmove::Actions::Ftp::GetDirectory])
-          ].concat [
-            Wordmove::Actions::SetupContextForDb,
-            Wordmove::Actions::BackupLocalDb,
-            Wordmove::Actions::Ftp::DownloadRemoteDb,
-            Wordmove::Actions::AdaptRemoteDb,
-            Wordmove::Actions::Ftp::CleanupAfterAdapt
-          ].concat [
+            iterate(:folder_tasks, [Wordmove::Actions::Ftp::GetDirectory]),
+            reduce_if(->(ctx) { ctx.database_task },
+                      [
+                        Wordmove::Actions::SetupContextForDb,
+                        Wordmove::Actions::BackupLocalDb,
+                        Wordmove::Actions::Ftp::DownloadRemoteDb,
+                        Wordmove::Actions::AdaptRemoteDb,
+                        Wordmove::Actions::Ftp::CleanupAfterAdapt
+                      ]),
             Wordmove::Actions::RunAfterPullHook # Will fail and warn the user
           ]
         end

data/lib/wordmove/organizers/ftp/push.rb

@@ -35,15 +35,16 @@ module Wordmove
               ->(ctx) { ctx.wordpress_task },
               [Wordmove::Actions::Ftp::PushWordpress]
             ),
-            iterate(:folder_tasks, [Wordmove::Actions::Ftp::PutDirectory])
-          ].concat [
-            Wordmove::Actions::SetupContextForDb,
-            Wordmove::Actions::Ftp::DownloadRemoteDb,
-            Wordmove::Actions::Ftp::BackupRemoteDb,
-            Wordmove::Actions::AdaptLocalDb,
-            Wordmove::Actions::Ftp::PutAndImportDumpRemotely,
-            Wordmove::Actions::Ftp::CleanupAfterAdapt
-          ].concat [
+            iterate(:folder_tasks, [Wordmove::Actions::Ftp::PutDirectory]),
+            reduce_if(->(ctx) { ctx.database_task },
+                      [
+                        Wordmove::Actions::SetupContextForDb,
+                        Wordmove::Actions::Ftp::DownloadRemoteDb,
+                        Wordmove::Actions::Ftp::BackupRemoteDb,
+                        Wordmove::Actions::AdaptLocalDb,
+                        Wordmove::Actions::Ftp::PutAndImportDumpRemotely,
+                        Wordmove::Actions::Ftp::CleanupAfterAdapt
+                      ]),
             Wordmove::Actions::RunAfterPushHook # Will fail and warn the user
           ]
         end

data/lib/wordmove/organizers/ssh/pull.rb

@@ -35,14 +35,15 @@ module Wordmove
               ->(ctx) { ctx.wordpress_task },
               [Wordmove::Actions::Ssh::PullWordpress]
             ),
-            iterate(:folder_tasks, [Wordmove::Actions::Ssh::GetDirectory])
-          ].concat [
-            Wordmove::Actions::SetupContextForDb,
-            Wordmove::Actions::BackupLocalDb,
-            Wordmove::Actions::Ssh::DownloadRemoteDb,
-            Wordmove::Actions::AdaptRemoteDb,
-            Wordmove::Actions::Ssh::CleanupAfterAdapt
-          ].concat [
+            iterate(:folder_tasks, [Wordmove::Actions::Ssh::GetDirectory]),
+            reduce_if(->(ctx) { ctx.database_task },
+                      [
+                        Wordmove::Actions::SetupContextForDb,
+                        Wordmove::Actions::BackupLocalDb,
+                        Wordmove::Actions::Ssh::DownloadRemoteDb,
+                        Wordmove::Actions::AdaptRemoteDb,
+                        Wordmove::Actions::Ssh::CleanupAfterAdapt
+                      ]),
             Wordmove::Actions::RunAfterPullHook
           ]
         end

data/lib/wordmove/organizers/ssh/push.rb

@@ -35,15 +35,16 @@ module Wordmove
               ->(ctx) { ctx.wordpress_task },
               [Wordmove::Actions::Ssh::PushWordpress]
             ),
-            iterate(:folder_tasks, [Wordmove::Actions::Ssh::PutDirectory])
-          ].concat [
-            Wordmove::Actions::SetupContextForDb,
-            Wordmove::Actions::Ssh::DownloadRemoteDb,
-            Wordmove::Actions::Ssh::BackupRemoteDb,
-            Wordmove::Actions::AdaptLocalDb,
-            Wordmove::Actions::Ssh::PutAndImportDumpRemotely,
-            Wordmove::Actions::Ssh::CleanupAfterAdapt
-          ].concat [
+            iterate(:folder_tasks, [Wordmove::Actions::Ssh::PutDirectory]),
+            reduce_if(->(ctx) { ctx.database_task },
+                      [
+                        Wordmove::Actions::SetupContextForDb,
+                        Wordmove::Actions::Ssh::DownloadRemoteDb,
+                        Wordmove::Actions::Ssh::BackupRemoteDb,
+                        Wordmove::Actions::AdaptLocalDb,
+                        Wordmove::Actions::Ssh::PutAndImportDumpRemotely,
+                        Wordmove::Actions::Ssh::CleanupAfterAdapt
+                      ]),
             Wordmove::Actions::RunAfterPushHook
           ]
         end

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = '6.0.0.alpha.1'.freeze
+  VERSION = '6.0.0.alpha.5'.freeze
 end

data/lib/wordmove/wpcli.rb

@@ -33,8 +33,11 @@ module Wordmove
         [
           'wp search-replace',
           "--path=#{wpcli_config_path(context)}",
-          context.remote_options[config_key],
-          context.local_options[config_key],
+          '"\A' + context.dig(:remote_options, config_key) + '\Z"', # rubocop:disable Style/StringConcatenation
+          '"' + context.dig(:local_options, config_key) + '"', # rubocop:disable Style/StringConcatenation
+          '--regex-delimiter="|"',
+          '--regex',
+          '--precise',
           '--quiet',
           '--skip-columns=guid',
           '--all-tables',
@@ -50,7 +53,7 @@ module Wordmove
       # @return [String]
       # @!scope class
       def wpcli_config_path(context)
-        load_from_yml(context) || load_from_wpcli || context.local_options[:wordpress_path]
+        load_from_yml(context) || load_from_wpcli || context.dig(:local_options, :wordpress_path)
       end
 
       # If wordpress installation brings a `wp-cli.yml` file in its root folder,
@@ -60,7 +63,7 @@ module Wordmove
       # @!scope class
       # @!visibility private
       def load_from_yml(context)
-        yml_path = File.join(context.local_options[:wordpress_path], 'wp-cli.yml')
+        yml_path = File.join(context.dig(:local_options, :wordpress_path), 'wp-cli.yml')
 
         return unless File.exist?(yml_path)
 
@@ -75,7 +78,10 @@ module Wordmove
       # @!scope class
       # @!visibility private
       def load_from_wpcli
-        wpcli_config = JSON.parse(`wp cli param-dump --with-values`, symbolize_names: true)
+        wpcli_config = JSON.parse(
+          `wp cli param-dump --with-values --allow-root`,
+          symbolize_names: true
+        )
         wpcli_config.dig(:path, :current)
       rescue JSON::ParserError => _e
         nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 6.0.0.alpha.1
+  version: 6.0.0.alpha.5
 platform: ruby
 authors:
 - Stefano Verna
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport