wordmove 1.0.2 → 1.0.3

data/README.mdown

@@ -67,6 +67,7 @@ remote:
     host: "host"
     port: 2202 # optional
 ```
+
 ### If you have your local SSH public key already installed on the remote machine.. (recommended)
 Just not use the `remote.ssh.password` field on your `Movefile`. Easy peasy.
 
@@ -80,6 +81,13 @@ too much about security though: the script is deleted just after the usage,
 and can only be executed by `wordmove`, as each time it requires a pre-shared
 one-time-password to be run.
 
+### If you want to specify both relative and absolute wordpress path (FTP paths anyone?)
+Just add to the YAML config a `wordpress_absolute_path` field specifying the absolute path,
+while using the usual `wordpress_path` for the relative one.
+
+### If you want to specify a passive FTP connection
+Add to the YAML config a `passive` flag set to `true`.
+
 * The dump script is the [`MYSQL-dump` PHP package](https://github.com/dg/MySQL-dump) by David Grudl;
 * The import script used is the [BigDump](http://www.ozerov.de/bigdump/) library;
 

data/lib/wordmove/sql_mover.rb

@@ -22,16 +22,18 @@ module Wordmove
     end
 
     def replace_vhost!
-      replace_field!(:vhost)
+      source_vhost = source_config[:vhost]
+      dest_vhost = dest_config[:vhost]
+      replace_field!(source_vhost, dest_vhost)
     end
 
     def replace_wordpress_path!
-      replace_field!(:wordpress_path)
+      source_path = source_config[:wordpress_absolute_path] || source_config[:wordpress_path]
+      dest_path = dest_config[:wordpress_absolute_path] || dest_config[:wordpress_path]
+      replace_field!(source_path, dest_path)
     end
 
-    def replace_field!(field_sym)
-      source_field = source_config[field_sym]
-      dest_field = dest_config[field_sym]
+    def replace_field!(source_field, dest_field)
       if source_field && dest_field
         serialized_replace!(source_field, dest_field)
         simple_replace!(source_field, dest_field)

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/sql_mover_spec.rb

@@ -42,31 +42,42 @@ describe Wordmove::SqlMover do
     end
   end
 
-  context ".replace_vhost!" do
-    it "should replace source vhost with dest vhost" do
-      sql_mover.should_receive(:replace_field!).with(:vhost).and_return(true)
-      sql_mover.replace_vhost!
+  describe "replace single fields" do
+    context ".replace_vhost!" do
+      let(:source_config) do { :vhost => "DUMP" } end
+      let(:dest_config)   do { :vhost => "FUNK" } end
+
+      it "should replace source vhost with dest vhost" do
+        sql_mover.should_receive(:replace_field!).with("DUMP", "FUNK").and_return(true)
+        sql_mover.replace_vhost!
+      end
     end
-  end
 
-  context ".replace_wordpress_path!" do
-    it "should replace source path with dest path" do
-      sql_mover.should_receive(:replace_field!).with(:wordpress_path).and_return(true)
-      sql_mover.replace_wordpress_path!
+    context ".replace_wordpress_path!" do
+      let(:source_config) do { :wordpress_path => "DUMP" } end
+      let(:dest_config)   do { :wordpress_path => "FUNK" } end
+
+      it "should replace source vhost with dest wordpress paths" do
+        sql_mover.should_receive(:replace_field!).with("DUMP", "FUNK").and_return(true)
+        sql_mover.replace_wordpress_path!
+      end
+
+      context "given an absolute path" do
+        let(:source_config) do { :wordpress_absolute_path => "ABSOLUTE_DUMP", :wordpress_path => "DUMP" } end
+
+        it "should replace the absolute path instead" do
+          sql_mover.should_receive(:replace_field!).with("ABSOLUTE_DUMP", "FUNK").and_return(true)
+          sql_mover.replace_wordpress_path!
+        end
+      end
     end
   end
 
   context ".replace_field!" do
-    let(:source_config) { stub("config") }
-    let(:dest_config) { stub("config") }
-
     it "should replace source vhost with dest vhost" do
-      source_config.stub(:[]).with(:field).and_return("DUMP")
-      dest_config.stub(:[]).with(:field).and_return("FUNK")
-
       sql_mover.should_receive(:serialized_replace!).ordered.with("DUMP", "FUNK").and_return(true)
       sql_mover.should_receive(:simple_replace!).ordered.with("DUMP", "FUNK").and_return(true)
-      sql_mover.replace_field!(:field)
+      sql_mover.replace_field!("DUMP", "FUNK")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: