wordmove 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8295afc0c284c3fb0f3e28938875c43b5c2bbf2d4c2a5a3eaca80d69c64ab1a
-  data.tar.gz: 876abf510acbbae9b9c97c50839081e4685758a32995357d2974cdfba99ed0d6
+  metadata.gz: 827af36f1540f218650df064024c9fcd661d3bd87df075e2ba71f15bc8598fcd
+  data.tar.gz: f744dd778926c98cb5071902b8b410c84f2a8b102f0db4e9890e3cb9b6dc8337
 SHA512:
-  metadata.gz: bcd8e3b1769ae854dfb37213c47f46b6cc2f556e0c2893a930e1161df313d6d271389fda3819dc791393e39a1bedb0a4b1984c13b7b221a157f99afe29487912
-  data.tar.gz: 4e82ad3971ee2766bc8478122cc0f33ee84d44de0a1b75c52ae927857144071d6eaeaa1a19541af9a177c6be47543aed5945d12137448d53f55f154533702806
+  metadata.gz: a37976a8841050d1e25b158c4fb47c30bbc87f6b7d15bba88d0eecbf40a2b193dd4a4b93b868e44f72689dd1ef074f804429b3f714b7d9b9e9cd753cef467dff
+  data.tar.gz: 244d0333c938b18cb7c8bcb479c7876c9d9d4626d4eb1d0e6c9d2efe69a09e3274232fdd7819de2ce3e9018ac13fbe1d488fd48acbad8a4428a14eeebb414bac

data/lib/wordmove/hook.rb

@@ -4,6 +4,7 @@ module Wordmove
       Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
     end
 
+    # rubocop:disable Metrics/MethodLength
     def self.run(action, step, cli_options)
       movefile = Wordmove::Movefile.new(cli_options[:config])
       options = movefile.fetch(false)
@@ -15,37 +16,48 @@ module Wordmove
         step
       )
 
-      unless hooks.local_hooks.empty?
-        Wordmove::Hook::Local.run(hooks.local_hooks, options[:local], cli_options[:simulate])
-      end
+      return if hooks.empty?
 
-      return if hooks.remote_hooks.empty?
+      logger.task "Running #{action}/#{step} hooks"
 
-      if options[environment][:ftp]
-        logger.debug "You have configured remote hooks to run over "\
-                     "an FTP connection, but this is not possible. Skipping."
+      hooks.all_commands.each do |command|
+        case command[:where]
+        when 'local'
+          Wordmove::Hook::Local.run(command, options[:local], cli_options[:simulate])
+        when 'remote'
+          if options[environment][:ftp]
+            logger.debug "You have configured remote hooks to run over "\
+                         "an FTP connection, but this is not possible. Skipping."
+            next
+          end
 
-        return
+          Wordmove::Hook::Remote.run(command, options[environment], cli_options[:simulate])
+        else
+          next
+        end
       end
-
-      Wordmove::Hook::Remote.run(
-        hooks.remote_hooks, options[environment], cli_options[:simulate]
-      )
     end
+    # rubocop:enable Metrics/MethodLength
 
     Config = Struct.new(:options, :action, :step) do
       def empty?
-        (local_hooks + remote_hooks).empty?
+        all_commands.empty?
+      end
+
+      def all_commands
+        return [] if empty_step?
+
+        options[action][step] || []
       end
 
-      def local_hooks
+      def local_commands
         return [] if empty_step?
 
         options[action][step]
           .select { |hook| hook[:where] == 'local' } || []
       end
 
-      def remote_hooks
+      def remote_commands
         return [] if empty_step?
 
         options[action][step]
@@ -69,24 +81,20 @@ module Wordmove
         parent.logger
       end
 
-      def self.run(hooks, options, simulate = false)
-        logger.task "Running local hooks"
-
+      def self.run(command_hash, options, simulate = false)
         wordpress_path = options[:wordpress_path]
 
-        hooks.each do |hook|
-          logger.task_step true, "Exec command: #{hook[:command]}"
-          return true if simulate
+        logger.task_step true, "Exec command: #{command_hash[:command]}"
+        return true if simulate
 
-          stdout_return = `cd #{wordpress_path} && #{hook[:command]} 2>&1`
-          logger.task_step true, "Output: #{stdout_return}"
+        stdout_return = `cd #{wordpress_path} && #{command_hash[:command]} 2>&1`
+        logger.task_step true, "Output: #{stdout_return}"
 
-          if $CHILD_STATUS.exitstatus.zero?
-            logger.success ""
-          else
-            logger.error "Error code: #{$CHILD_STATUS.exitstatus}"
-            raise Wordmove::LocalHookException unless hook[:raise].eql? false
-          end
+        if $CHILD_STATUS.exitstatus.zero?
+          logger.success ""
+        else
+          logger.error "Error code: #{$CHILD_STATUS.exitstatus}"
+          raise Wordmove::LocalHookException unless command_hash[:raise].eql? false
         end
       end
     end
@@ -96,28 +104,25 @@ module Wordmove
         parent.logger
       end
 
-      def self.run(hooks, options, simulate = false)
-        logger.task "Running remote hooks"
-
+      def self.run(command_hash, options, simulate = false)
         ssh_options = options[:ssh]
         wordpress_path = options[:wordpress_path]
 
         copier = Photocopier::SSH.new(ssh_options).tap { |c| c.logger = logger }
-        hooks.each do |hook|
-          logger.task_step false, "Exec command: #{hook[:command]}"
-          return true if simulate
-
-          stdout, stderr, exit_code =
-            copier.exec!("cd #{wordpress_path} && #{hook[:command]}")
-
-          if exit_code.zero?
-            logger.task_step false, "Output: #{stdout}"
-            logger.success ""
-          else
-            logger.task_step false, "Output: #{stderr}"
-            logger.error "Error code #{exit_code}"
-            raise Wordmove::RemoteHookException unless hook[:raise].eql? false
-          end
+
+        logger.task_step false, "Exec command: #{command_hash[:command]}"
+        return true if simulate
+
+        stdout, stderr, exit_code =
+          copier.exec!("cd #{wordpress_path} && #{command_hash[:command]}")
+
+        if exit_code.zero?
+          logger.task_step false, "Output: #{stdout}"
+          logger.success ""
+        else
+          logger.task_step false, "Output: #{stderr}"
+          logger.error "Error code #{exit_code}"
+          raise Wordmove::RemoteHookException unless command_hash[:raise].eql? false
         end
       end
     end

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "5.0.1".freeze
+  VERSION = "5.0.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Stefano Verna
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport