wordmove 1.0.4 → 1.0.6

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    wordmove (0.1.0.rc)
+    wordmove (1.0.5)
       activesupport
       colored
       i18n
-      photocopier
+      photocopier (>= 0.0.6)
       rake
       thor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     aruba (0.5.1)
@@ -33,22 +33,22 @@ GEM
     ffi (1.2.0)
     gherkin (2.11.5)
       json (>= 1.4.6)
-    i18n (0.6.1)
+    i18n (0.6.4)
     json (1.7.5)
-    multi_json (1.4.0)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.6.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    photocopier (0.0.4)
+    multi_json (1.7.0)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    photocopier (0.0.6)
       activesupport
       escape
       i18n
       net-scp
       net-ssh
       net-ssh-gateway
-    rake (10.0.2)
+    rake (10.0.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -57,7 +57,7 @@ GEM
     rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.0)
-    thor (0.16.0)
+    thor (0.17.0)
 
 PLATFORMS
   ruby

data/README.mdown

@@ -47,25 +47,31 @@ local:
     name: "database_name"
     user: "user"
     password: "password"
-    host: "host"
-remote:
+    host: "127.0.0.1"
+staging:
   vhost: "http://remote.com"
   wordpress_path: "/var/www/your_site"
-  exclude:
-    - .git
-    - .DS_Store
-    - .sass-cache
-    - Movefile
   database:
     name: "database_name"
     user: "user"
     password: "password"
     host: "host"
-  ssh:
-    user: "user"
-    password: "password" # optional, will use SSH public key if available
-    host: "host"
-    port: 2202 # optional
+  # ssh:
+  #   host: "host"
+  #   user: "user"
+  #   password: "password" # password is optional, will use public keys if available.
+  #   port: 22 # Port is optional
+  #   gateway: # Gateway is optional
+  #     host: "host"
+  #     user: "user"
+  #     password: "password" # password is optional, will use public keys if available.
+  # ftp:
+  #   user: "user"
+  #   password: "password"
+  #   host: "host"
+  #   passive: true
+# production: # multiple environments can be specified
+#   [...]
 ```
 
 ### If you have your local SSH public key already installed on the remote machine.. (recommended)
@@ -81,9 +87,10 @@ 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 both relative and absolute wordpress path (FTP relative paths anyone?)
+Just add in the remote section of the Movefile a `wordpress_absolute_path` field
+specifying the absolute path (you may need to recover this from the `__FILE__` constant),
+while using `wordpress_path` for the relative folder path.
 
 ### If you want to specify a passive FTP connection
 Add to the YAML config a `passive` flag set to `true`.
@@ -95,7 +102,7 @@ Add to the YAML config a `passive` flag set to `true`.
 
 (The MIT License)
 
-Copyright © 2012 weLaika
+Copyright © 2013 weLaika
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/wordmove/cli.rb

@@ -11,13 +11,15 @@ module Wordmove
     end
 
     desc "pull", "Pulls WP data from remote host to the local machine"
-    method_option :db,       :aliases => "-d", :type => :boolean
-    method_option :uploads,  :aliases => "-u", :type => :boolean
-    method_option :themes,   :aliases => "-t", :type => :boolean
-    method_option :plugins,  :aliases => "-p", :type => :boolean
-    method_option :verbose,  :aliases => "-v", :type => :boolean
-    method_option :simulate, :aliases => "-s", :type => :boolean
-    method_option :config,   :aliases => "-c"
+    method_option :db,          :aliases => "-d", :type => :boolean
+    method_option :uploads,     :aliases => "-u", :type => :boolean
+    method_option :themes,      :aliases => "-t", :type => :boolean
+    method_option :plugins,     :aliases => "-p", :type => :boolean
+    method_option :verbose,     :aliases => "-v", :type => :boolean
+    method_option :simulate,    :aliases => "-s", :type => :boolean
+    method_option :no_adapt,    :type => :boolean
+    method_option :environment, :aliases => "-e"
+    method_option :config,      :aliases => "-c"
     def pull
       deployer = Wordmove::Deployer::Base.deployer_for(options)
       %w(db uploads themes plugins).map(&:to_sym).each do |task|
@@ -28,13 +30,15 @@ module Wordmove
     end
 
     desc "push", "Pushes WP data from local machine to remote host"
-    method_option :db,       :aliases => "-d", :type => :boolean
-    method_option :uploads,  :aliases => "-u", :type => :boolean
-    method_option :themes,   :aliases => "-t", :type => :boolean
-    method_option :plugins,  :aliases => "-p", :type => :boolean
-    method_option :verbose,  :aliases => "-v", :type => :boolean
-    method_option :simulate, :aliases => "-s", :type => :boolean
-    method_option :config,   :aliases => "-c"
+    method_option :uploads,     :aliases => "-u", :type => :boolean
+    method_option :db,          :aliases => "-d", :type => :boolean
+    method_option :themes,      :aliases => "-t", :type => :boolean
+    method_option :plugins,     :aliases => "-p", :type => :boolean
+    method_option :verbose,     :aliases => "-v", :type => :boolean
+    method_option :simulate,    :aliases => "-s", :type => :boolean
+    method_option :no_adapt,    :type => :boolean
+    method_option :environment, :aliases => "-e"
+    method_option :config,      :aliases => "-c"
     def push
       deployer = Wordmove::Deployer::Base.deployer_for(options)
       %w(db uploads themes plugins).map(&:to_sym).each do |task|

data/lib/wordmove/deployer/base.rb

@@ -9,16 +9,26 @@ module Wordmove
     class Base
       attr_reader :options
       attr_reader :logger
+      attr_reader :environment
 
-      def self.deployer_for(options)
-        options = fetch_movefile(options[:config]).merge(options)
+      def self.deployer_for(cli_options)
+        options = fetch_movefile(cli_options[:config])
+        available_enviroments = options.keys.map(&:to_sym) - [ :local ]
+        options.merge!(cli_options)
         recursive_symbolize_keys!(options)
-        if options[:remote][:ftp]
+
+        if available_enviroments.size > 1 && options[:environment].nil?
+          raise "You need to specify an environment with --environment parameter"
+        end
+
+        environment = (options[:environment] || available_enviroments.first).to_sym
+
+        if options[environment][:ftp]
           require 'wordmove/deployer/ftp'
-          FTP.new(options)
-        elsif options[:remote][:ssh]
+          FTP.new(environment, options)
+        elsif options[environment][:ssh]
           require 'wordmove/deployer/ssh'
-          SSH.new(options)
+          SSH.new(environment, options)
         else
           raise Thor::Error, "No valid adapter found."
         end
@@ -32,7 +42,8 @@ module Wordmove
         YAML::load(File.open(path))
       end
 
-      def initialize(options = {})
+      def initialize(environment, options = {})
+        @environment = environment.to_sym
         @options = options
         @logger = Logger.new(STDOUT)
         @logger.level = Logger::DEBUG
@@ -64,18 +75,19 @@ module Wordmove
       protected
 
       def paths_to_exclude
-        options[:remote][:exclude] || Array.new
+        remote_options[:exclude] || Array.new
       end
 
       def run(command)
         logger.task_step true, command
         unless simulate?
           system(command)
+          raise "Return code reports an error" unless $?.success?
         end
       end
 
       def download(url, local_path)
-        logger.task_step true, "download #{url}"
+        logger.task_step true, "download #{url} > #{local_path}"
         unless simulate?
           open(local_path, 'w') do |file|
             file << open(url).read
@@ -88,21 +100,23 @@ module Wordmove
       end
 
       def local_wpcontent_path(*args)
-        File.join(options[:local][:wordpress_path], "wp-content", *args)
+        File.join(local_options[:wordpress_path], "wp-content", *args)
       end
 
       def remote_wpcontent_path(*args)
-        File.join(options[:remote][:wordpress_path], "wp-content", *args)
+        File.join(remote_options[:wordpress_path], "wp-content", *args)
       end
 
       def remote_wpcontent_url(*args)
-        options[:remote][:vhost] + File.join("/wp-content", *args)
+        remote_options[:vhost] + File.join("/wp-content", *args)
       end
 
       def adapt_sql(save_to_path, local, remote)
-        logger.task_step true, "adapt dump"
-        unless simulate?
-          SqlMover.new(save_to_path, local, remote).move!
+        unless options[:no_adapt]
+          logger.task_step true, "adapt dump"
+          unless simulate?
+            SqlMover.new(save_to_path, local, remote).move!
+          end
         end
       end
 
@@ -125,6 +139,19 @@ module Wordmove
         Escape.shell_command(arguments) + " < #{dump_path}"
       end
 
+      def save_local_db(local_dump_path)
+        # dump local mysql into file
+        run mysql_dump_command(local_options[:database], local_dump_path)
+      end
+
+      def remote_options
+        options[environment].clone
+      end
+
+      def local_options
+        options[:local].clone
+      end
+
       private
 
       def self.recursive_symbolize_keys! hash

data/lib/wordmove/deployer/ftp.rb

@@ -7,9 +7,9 @@ module Wordmove
   module Deployer
     class FTP < Base
 
-      def initialize(options)
+      def initialize(environment, options)
         super
-        ftp_options = options[:remote][:ftp]
+        ftp_options = remote_options[:ftp]
         @copier = Photocopier::FTP.new(ftp_options)
         @copier.logger = logger
       end
@@ -17,29 +17,20 @@ module Wordmove
       def push_db
         super
 
-        remote_import_script_path = remote_wpcontent_path("import.php")
         local_dump_path = local_wpcontent_path("dump.sql")
         remote_dump_path = remote_wpcontent_path("dump.sql")
+        local_backup_path = local_wpcontent_path("remote-backup-#{Time.now.to_i}.sql")
+
+        download_remote_db(local_backup_path)
+        save_local_db(local_dump_path)
 
-        # dump local mysql into file
-        run mysql_dump_command(options[:local][:database], local_dump_path)
         # gsub sql
-        adapt_sql(local_dump_path, options[:local], options[:remote])
+        adapt_sql(local_dump_path, local_options, remote_options)
         # upload it
         remote_put(local_dump_path, remote_dump_path)
 
-        # generate a secure one-time password
-        one_time_password = SecureRandom.hex(40)
-        # generate import script
-        import_script = generate_import_script(options[:remote][:database], one_time_password)
-        # upload import script
-        remote_put(import_script, remote_import_script_path)
-        # run import script
-        import_url = "#{remote_wpcontent_url("import.php")}?shared_key=#{one_time_password}&start=1&foffset=0&totalqueries=0&fn=dump.sql"
-        download(import_url, local_dump_path + "_")
+        import_remote_dump
 
-        # remove script remotely
-        remote_delete(remote_import_script_path)
         # remove dump remotely
         remote_delete(remote_dump_path)
         # and locally
@@ -48,28 +39,17 @@ module Wordmove
 
       def pull_db
         super
-
-        remote_dump_script = remote_wpcontent_path("dump.php")
         local_dump_path = local_wpcontent_path("dump.sql")
+        local_backup_path = local_wpcontent_path("local-backup-#{Time.now.to_i}.sql")
 
-        # generate a secure one-time password
-        one_time_password = SecureRandom.hex(40)
-
-        # generate dump script
-        dump_script = generate_dump_script(options[:remote][:database], one_time_password)
-        # upload the dump script
-        remote_put(dump_script, remote_dump_script)
-        # download the resulting dump (using the password)
-        dump_url = "#{remote_wpcontent_url("dump.php")}?shared_key=#{one_time_password}"
-        download(dump_url, local_dump_path)
+        save_local_db(local_backup_path)
+        download_remote_db(local_dump_path)
 
         # gsub sql
-        adapt_sql(local_dump_path, options[:remote], options[:local])
+        adapt_sql(local_dump_path, remote_options, local_options)
         # import locally
-        run mysql_import_command(local_dump_path, options[:local][:database])
+        run mysql_import_command(local_dump_path, local_options[:database])
 
-        # remove it remotely
-        remote_delete(remote_dump_script)
         # and locally
         run "rm #{local_dump_path}"
       end
@@ -112,6 +92,38 @@ module Wordmove
         template.result(binding)
       end
 
+      def download_remote_db(local_dump_path)
+        remote_dump_script = remote_wpcontent_path("dump.php")
+        # generate a secure one-time password
+        one_time_password = SecureRandom.hex(40)
+        # generate dump script
+        dump_script = generate_dump_script(remote_options[:database], one_time_password)
+        # upload the dump script
+        remote_put(dump_script, remote_dump_script)
+        # download the resulting dump (using the password)
+        dump_url = "#{remote_wpcontent_url("dump.php")}?shared_key=#{one_time_password}"
+        download(dump_url, local_dump_path)
+        # remove it remotely
+        remote_delete(remote_dump_script)
+      end
+
+      def import_remote_dump
+        temp_path = local_wpcontent_path("temp.txt")
+        remote_import_script_path = remote_wpcontent_path("import.php")
+        # generate a secure one-time password
+        one_time_password = SecureRandom.hex(40)
+        # generate import script
+        import_script = generate_import_script(remote_options[:database], one_time_password)
+        # upload import script
+        remote_put(import_script, remote_import_script_path)
+        # run import script
+        import_url = "#{remote_wpcontent_url("import.php")}?shared_key=#{one_time_password}&start=1&foffset=0&totalqueries=0&fn=dump.sql"
+        download(import_url, temp_path)
+        run "rm #{temp_path}"
+        # remove script remotely
+        remote_delete(remote_import_script_path)
+      end
+
     end
   end
 end

data/lib/wordmove/deployer/ssh.rb

@@ -4,9 +4,9 @@ require 'photocopier/ssh'
 module Wordmove
   module Deployer
     class SSH < Base
-      def initialize(options)
+      def initialize(environment, options)
         super
-        ssh_options = options[:remote][:ssh]
+        ssh_options = remote_options[:ssh]
         @copier = Photocopier::SSH.new(ssh_options)
         @copier.logger = logger
       end
@@ -15,19 +15,12 @@ module Wordmove
         super
 
         local_dump_path = local_wpcontent_path("dump.sql")
-        remote_dump_path = remote_wpcontent_path("dump.sql")
+        local_backup_path = local_wpcontent_path("remote-backup-#{Time.now.to_i}.sql")
+        download_remote_db(local_backup_path)
 
-        # dump local mysql into file
-        run mysql_dump_command(options[:local][:database], local_dump_path)
-        # gsub sql
-        adapt_sql(local_dump_path, options[:local], options[:remote])
-        # upload it
-        remote_put(local_dump_path, remote_dump_path)
-        # import it remotely
-        remote_run mysql_import_command(remote_dump_path, options[:remote][:database])
-        # remove it remotely
-        remote_delete(remote_dump_path)
-        # and locally
+        save_local_db(local_dump_path)
+        adapt_sql(local_dump_path, local_options, remote_options)
+        import_remote_dump(local_dump_path)
         run "rm #{local_dump_path}"
       end
 
@@ -36,18 +29,12 @@ module Wordmove
 
         local_dump_path = local_wpcontent_path("dump.sql")
         remote_dump_path = remote_wpcontent_path("dump.sql")
+        local_backup_path = local_wpcontent_path("local-backup-#{Time.now.to_i}.sql")
+        save_local_db(local_backup_path)
 
-        # dump remote db into file
-        remote_run mysql_dump_command(options[:remote][:database], remote_dump_path)
-        # download remote dump
-        remote_get(remote_dump_path, local_dump_path)
-        # gsub sql
-        adapt_sql(local_dump_path, options[:remote], options[:local])
-        # import locally
-        run mysql_import_command(local_dump_path, options[:local][:database])
-        # remove it remotely
-        remote_delete(remote_dump_path)
-        # and locally
+        download_remote_db(local_dump_path)
+        adapt_sql(local_dump_path, remote_options, local_options)
+        run mysql_import_command(local_dump_path, local_options[:database])
         run "rm #{local_dump_path}"
       end
 
@@ -65,10 +52,27 @@ module Wordmove
       def remote_run(command)
         logger.task_step false, command
         unless simulate?
-          @copier.session.exec! command
+          stdout, stderr, exit_code = @copier.exec! command
+          raise "Error code #{exit_code} returned by command \"#{cmd}\": #{stderr}" unless exit_code.zero?
         end
       end
 
+      def download_remote_db(local_dump_path)
+        remote_dump_path = remote_wpcontent_path("dump.sql")
+        # dump remote db into file
+        remote_run mysql_dump_command(remote_options[:database], remote_dump_path)
+        # download remote dump
+        remote_get(remote_dump_path, local_dump_path)
+        remote_delete(remote_dump_path)
+      end
+
+      def import_remote_dump(local_dump_path)
+        remote_dump_path = remote_wpcontent_path("dump.sql")
+        remote_put(local_dump_path, remote_dump_path)
+        remote_run mysql_import_command(remote_dump_path, remote_options[:database])
+        remote_delete(remote_dump_path)
+      end
+
     end
   end
 end

data/lib/wordmove/generators/Movefile

@@ -6,7 +6,7 @@ local:
     user: "user"
     password: "password"
     host: "127.0.0.1"
-remote:
+staging:
   vhost: "http://remote.com"
   wordpress_path: "/var/www/your_site"
   database:
@@ -14,14 +14,19 @@ remote:
     user: "user"
     password: "password"
     host: "host"
-  ssh: # also ftp is allowed
-    host: "host"
-    user: "user"
-    password: "password" # password is optional, will use public keys if available.
-    # port: 22 # Port is optional
-    #
-    # gateway:
-    #   host: "host"
-    #   user: "user"
-    #   password: "password" # password is optional, will use public keys if available.
-
+  # ssh:
+  #   host: "host"
+  #   user: "user"
+  #   password: "password" # password is optional, will use public keys if available.
+  #   port: 22 # Port is optional
+  #   gateway: # Gateway is optional
+  #     host: "host"
+  #     user: "user"
+  #     password: "password" # password is optional, will use public keys if available.
+  # ftp:
+  #   user: "user"
+  #   password: "password"
+  #   host: "host"
+  #   passive: true
+# production: # multiple environments can be specified
+#   [...]

data/lib/wordmove/sql_mover.rb

@@ -43,10 +43,17 @@ module Wordmove
     def serialized_replace!(source_field, dest_field)
       length_delta = source_field.length - dest_field.length
 
-      sql_content.gsub!(/s:(\d+):([\\'"]+)#{Regexp.escape(source_field)}/) do |match|
-        source_length = $1.to_i
-        dest_length = source_length - length_delta
-        "s:#{dest_length}:#{$2}#{dest_field}"
+      sql_content.gsub!(/s:(\d+):([\\'"]+)(.*?)\2;/) do |match|
+        length = $1.to_i
+        delimiter = $2
+        string = $3
+
+        string.gsub!(/#{Regexp.escape(source_field)}/) do |match|
+          length -= length_delta
+          dest_field
+        end
+
+        %(s:#{length}:#{delimiter}#{string}#{delimiter};)
       end
     end
 

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.0.4"
+  VERSION = "1.0.6"
 end

data/spec/sql_mover_spec.rb

@@ -82,21 +82,30 @@ describe Wordmove::SqlMover do
   end
 
   context ".serialized_replace!" do
-    let(:content) { 's:4:"spam";s:20:"http://dump.com/spam";s:6:"foobar";s:22:"http://dump.com/foobar";s:8:"sausages"' }
+    let(:content) { 'a:3:{i:0;s:20:"http://dump.com/spam";i:1;s:6:"foobar";i:2;s:22:"http://dump.com/foobar";}' }
     let(:sql) { Tempfile.new('sql').tap do |d| d.write(content); d.close end }
     let(:sql_path) { sql.path }
 
     it "should replace source vhost with dest vhost" do
       sql_mover.serialized_replace!('http://dump.com', 'http://shrubbery.com')
-      sql_mover.sql_content.should == 's:4:"spam";s:25:"http://shrubbery.com/spam";s:6:"foobar";s:27:"http://shrubbery.com/foobar";s:8:"sausages"'
+      sql_mover.sql_content.should == 'a:3:{i:0;s:25:"http://shrubbery.com/spam";i:1;s:6:"foobar";i:2;s:27:"http://shrubbery.com/foobar";}'
     end
 
     context "given multiple types of string quoting" do
-      let(:content) { "s:20:\\\"http://dump.com/spam\\\";s:6:'foobar';s:22:'http://dump.com/foobar';s:8:'sausages'" }
+      let(:content) { "a:3:{s:20:\\\"http://dump.com/spam\\\";s:6:'foobar';s:22:'http://dump.com/foobar';s:8:'sausages';}" }
 
-      it "handles replacing just as well" do
+      it "should handle replacing just as well" do
         sql_mover.serialized_replace!('http://dump.com', 'http://shrubbery.com')
-        sql_mover.sql_content.should == "s:25:\\\"http://shrubbery.com/spam\\\";s:6:'foobar';s:27:'http://shrubbery.com/foobar';s:8:'sausages'"
+        sql_mover.sql_content.should == "a:3:{s:25:\\\"http://shrubbery.com/spam\\\";s:6:'foobar';s:27:'http://shrubbery.com/foobar';s:8:'sausages';}"
+      end
+    end
+
+    context "given multiple occurences in the same string" do
+      let(:content) { 'a:1:{i:0;s:52:"ni http://dump.com/spam ni http://dump.com/foobar ni";}' }
+
+      it "should replace all occurences" do
+        sql_mover.serialized_replace!('http://dump.com', 'http://shrubbery.com')
+        sql_mover.sql_content.should == 'a:1:{i:0;s:62:"ni http://shrubbery.com/spam ni http://shrubbery.com/foobar ni";}'
       end
     end
   end

data/wordmove.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "thor"
   gem.add_dependency "activesupport"
   gem.add_dependency "i18n"
-  gem.add_dependency "photocopier"
+  gem.add_dependency "photocopier", ">= 0.0.6"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "cucumber"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,6 @@ files:
 - lib/wordmove/assets/dump.php.erb
 - lib/wordmove/assets/import.php.erb
 - lib/wordmove/cli.rb
-- lib/wordmove/deployer.rb
 - lib/wordmove/deployer/base.rb
 - lib/wordmove/deployer/ftp.rb
 - lib/wordmove/deployer/ssh.rb
@@ -230,3 +229,4 @@ test_files:
 - spec/fixtures/Movefile
 - spec/spec_helper.rb
 - spec/sql_mover_spec.rb
+has_rdoc: 

data/lib/wordmove/deployer.rb

@@ -1,166 +0,0 @@
-require 'active_support/core_ext'
-require 'hashie'
-require 'wordmove/hosts/local_host'
-require 'wordmove/hosts/remote_host'
-require 'wordmove/logger'
-require 'wordmove/sql_mover'
-
-module Wordmove
-
-  class Deployer
-
-    attr_reader :options
-    attr_reader :logger
-
-    def initialize(options = {})
-      @options = Hashie::Mash.new(options)
-      @logger = Logger.new
-      @logger.level = options.verbose ? Logger::VERBOSE : Logger::INFO
-    end
-
-    def push
-      informative_errors do
-        unless options.skip_db
-          logger.info "Pushing the DB..."
-          push_db
-        end
-
-        remotely do |host|
-          %w(uploads themes plugins).each do |step|
-            unless options.send("skip_#{step}")
-              logger.info "Pushing wp-content/#{step}..."
-              host.download_dir local_wpcontent_path(step), remote_wpcontent_path(step)
-            end
-          end
-        end
-      end
-    end
-
-    def pull
-      informative_errors do
-        unless options.skip_db
-          logger.info "Pulling the DB..."
-          pull_db
-        end
-
-        remotely do |host|
-          %w(uploads themes plugins).each do |step|
-            unless options.send("skip_#{step}")
-              logger.info "Pulling wp-content/#{step}..."
-              host.upload_dir remote_wpcontent_path(step), local_wpcontent_path(step)
-            end
-          end
-        end
-      end
-    end
-
-    private
-
-    def push_db
-      local_mysql_dump_path = local_wpcontent_path("database_dump.sql")
-      remote_mysql_dump_path = remote_wpcontent_path("database_dump.sql")
-
-      locally do |host|
-        host.run "mysqldump", "--host=#{config.local.database.host}", "--user=#{config.local.database.user}", "--password=#{config.local.database.password}", config.local.database.name, :stdout => local_mysql_dump_path
-        if options.adapt_sql
-          Wordmove::SqlMover.new(local_mysql_dump_path, config.local, config.remote).move!
-        else
-          File.open(local_mysql_dump_path, 'a') do |file|
-            file.write "UPDATE #{options_table} SET option_value=\"#{config.remote.vhost}\" WHERE option_name=\"siteurl\" OR option_name=\"home\";\n"
-          end
-        end
-      end
-
-      remotely do |host|
-        host.download_file local_mysql_dump_path, remote_mysql_dump_path
-        host.run "mysql", "--user=#{config.remote.database.user}", "--password=#{config.remote.database.password}", "--host=#{config.remote.database.host}", "--database=#{config.remote.database.name}", :stdin => remote_mysql_dump_path
-        host.run "rm", remote_mysql_dump_path
-      end
-
-      locally do |host|
-        host.run "rm", local_mysql_dump_path
-      end
-    end
-
-
-    def pull_db
-      local_mysql_dump_path = local_wpcontent_path("database_dump.sql")
-      remote_mysql_dump_path = remote_wpcontent_path("database_dump.sql")
-
-      remotely do |host|
-        host.run "mysqldump", "--host=#{config.remote.database.host}", "--user=#{config.remote.database.user}", "--password=#{config.remote.database.password}", config.remote.database.name, :stdout => remote_mysql_dump_path
-        host.upload_file remote_mysql_dump_path, local_mysql_dump_path
-      end
-
-      locally do |host|
-        if options.adapt_sql
-          Wordmove::SqlMover.new(local_mysql_dump_path, config.remote, config.local).move!
-        else
-          File.open(local_mysql_dump_path, 'a') do |file|
-            file.write "UPDATE #{options_table} SET option_value=\"#{config.local.vhost}\" WHERE option_name=\"siteurl\" OR option_name=\"home\";\n"
-          end
-        end
-        host.run "mysql", "--user=#{config.local.database.user}", "--password=#{config.local.database.password}", "--host=#{config.local.database.host}", "--database=#{config.local.database.name}", :stdin => local_mysql_dump_path
-        host.run "rm", local_mysql_dump_path
-      end
-
-      remotely do |host|
-        host.run "rm", remote_mysql_dump_path
-      end
-
-    end
-
-    def config
-      if @config.blank?
-        config_path = @options[:config] || "Movefile"
-        unless File.exists? config_path
-          raise Thor::Error, "Could not find a valid Movefile"
-        end
-        @config = Hashie::Mash.new(YAML::load(File.open(config_path)))
-      end
-      @config
-    end
-
-    def table_prefix
-      config.table_prefix || "wp_"
-    end
-
-    def options_table
-      table_prefix + "options"
-    end
-
-    def local_wpcontent_path(*args)
-      File.join(config.local.wordpress_path, "wp-content", *args)
-    end
-
-    def remote_wpcontent_path(*args)
-      File.join(config.remote.wordpress_path, "wp-content", *args)
-    end
-
-    def locally
-      host = LocalHost.new(config.local.merge(:logger => @logger))
-      yield host
-      host.close
-    end
-
-    def remotely
-      host = RemoteHost.new(config.remote.merge(:logger => @logger))
-      yield host
-      host.close
-    end
-
-    def informative_errors
-      yield
-    rescue Timeout::Error
-      logger.error "Connection timed out!"
-      puts "Timed out"
-    rescue Errno::EHOSTUNREACH
-      logger.error "Host unreachable!"
-    rescue Errno::ECONNREFUSED
-      logger.error "Connection refused!"
-    rescue Net::SSH::AuthenticationFailed
-      logger.error "SSH authentification failure, please double check the SSH credentials on your Movefile!"
-    end
-
-  end
-end