wordmove 3.1.2.pre2 → 3.1.2.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0a8d2ce4e3dd407a40e10716d18d305c578c89
-  data.tar.gz: 066a4e4c3789e5ae60a101701ddf8e384b01999b
+  metadata.gz: 01c26cc26687f56e5dd676977452542b1273dbe9
+  data.tar.gz: 60c4de34715f35926e8a77f5819ed4032c01a59a
 SHA512:
-  metadata.gz: 444a62cee062aa8fabd462e8f2586c93b29604670747be3f9460dc8e7c81fd543ea4a445e6c6ac165a69dd60895604ac09443a4e8f359f65366a3eb94862d4ef
-  data.tar.gz: cac0b9a65b2f0691efc766642067c8e2fdd16fb7313340dfb3668394ca1ebc97d73b0ea8bc7b53de8a810d978c82912cd7e6d70ca246b4562c1e219293caaf79
+  metadata.gz: 99362150137d9a19d0eaeb5c03bf1979e352a64ef5dda1e112353e313dfa4655e307a4d83b03e78a10f5c495736ef9e49a853bcf8c63f776a7a773a3b178ce05
+  data.tar.gz: 52c51c6aef8a0cedcfac263f07caffb804e77071a531a174fdf28eecba3adf5150d9f1f449f7f059b821073f518aabd102b3d89e2bb7e2260302fdb9a0c9df0a

data/lib/wordmove/cli.rb

@@ -89,7 +89,7 @@ module Wordmove
     def push
       ensure_wordpress_options_presence!(options)
       begin
-        deployer = Wordmove::Deployer::Base.deployer_for(options)
+        deployer = Wordmove::Deployer::Base.deployer_for(options.deep_symbolize_keys)
       rescue MovefileNotFound => e
         logger.error(e.message)
         exit 1

data/lib/wordmove/deployer/ssh.rb

@@ -101,7 +101,7 @@ module Wordmove
           remote_path = remote_options[:wordpress_path]
 
           remote_put_directory(local_path, remote_path,
-                               push_exclude_paths, push_inlcude_paths(task))
+                               push_exclude_paths(task), push_inlcude_paths(task))
         end
 
         define_method "pull_#{task}" do
@@ -109,7 +109,7 @@ module Wordmove
           local_path = local_options[:wordpress_path]
           remote_path = remote_options[:wordpress_path]
           remote_get_directory(remote_path, local_path,
-                               pull_exclude_paths, pull_include_paths(task))
+                               pull_exclude_paths(task), pull_include_paths(task))
         end
       end
 
@@ -124,22 +124,45 @@ module Wordmove
                 end
       end
 
-      def push_exclude_paths
-        paths_to_exclude + [
-          "/*",
-          "/#{local_wp_content_dir.relative_path}/*"
-        ]
+      def push_exclude_paths(task)
+        Pathname.new(send(:"local_#{task}_dir").relative_path)
+                .dirname
+                .ascend
+                .each_with_object([]) do |directory, array|
+                  path = directory.to_path
+                  path.prepend('/') unless path.match? %r{^/}
+                  path.concat('/') unless path.match? %r{/$}
+                  path.concat('*')
+                  array << path
+                end
+                .concat(paths_to_exclude)
+                .concat(['/*'])
       end
 
       def pull_include_paths(task)
-        push_inlcude_paths(task)
+        Pathname.new(send(:"remote_#{task}_dir").relative_path)
+                .ascend
+                .each_with_object([]) do |directory, array|
+                  path = directory.to_path
+                  path.prepend('/') unless path.match? %r{^/}
+                  path.concat('/') unless path.match? %r{/$}
+                  array << path
+                end
       end
 
-      def pull_exclude_paths
-        paths_to_exclude + [
-          "/*",
-          "/#{remote_wp_content_dir.relative_path}/*"
-        ]
+      def pull_exclude_paths(task)
+        Pathname.new(send(:"remote_#{task}_dir").relative_path)
+                .dirname
+                .ascend
+                .each_with_object([]) do |directory, array|
+                  path = directory.to_path
+                  path.prepend('/') unless path.match? %r{^/}
+                  path.concat('/') unless path.match? %r{/$}
+                  path.concat('*')
+                  array << path
+                end
+                .concat(paths_to_exclude)
+                .concat(['/*'])
       end
     end
   end

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "3.1.2.pre2".freeze
+  VERSION = "3.1.2.pre3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 3.1.2.pre2
+  version: 3.1.2.pre3
 platform: ruby
 authors:
 - Stefano Verna
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport