wordmove 1.0.0 → 1.0.1

data/README.mdown

@@ -20,8 +20,7 @@ Beware!
 
 From version 1.0 we have decided to change wordmove flags' behaviour: they used to tell
 wordmove which options to **skip**, now they tell instead which options to **include**.
-In the Movefile, we have also changed in the ssh subsection the "username" field to be
-just "user".
+In the Movefile, we have also changed all "username" fields to be just "user".
 
 So please, be very careful when upgrading :heart:
 

data/features/generator.feature

@@ -13,18 +13,18 @@ Feature: Generating Movefile
         vhost: "http://vhost.local"
         wordpress_path: "~/dev/sites/your_site"
         database:
-          username: "username"
+          user: "user"
           password: "password"
           host: "host"
       remote:
         vhost: "http://remote.com"
         wordpress_path: "/var/www/your_site"
         database:
-          username: "username"
+          user: "user"
           password: "password"
           host: "host"
         ssh:
-          username: "username"
+          user: "user"
           password: "password"
           host: "host"
       """

data/lib/wordmove/assets/dump.php.erb

@@ -153,8 +153,8 @@ class MySQLDump
   }
 }
 
-function get_connection($db_host, $db_username, $db_password, $db_name, $error = NULL) {
-  $db_connection = new mysqli($db_host, $db_username, $db_password);
+function get_connection($db_host, $db_user, $db_password, $db_name, $error = NULL) {
+  $db_connection = new mysqli($db_host, $db_user, $db_password);
   if (!$db_connection || !$db_connection->select_db($db_name)) {
     if ($db_connection) {
       $error = mysqli_connect_error();
@@ -167,7 +167,7 @@ function get_connection($db_host, $db_username, $db_password, $db_name, $error =
 }
 
 $db_host = '<%= escape_php db[:host] %>';
-$db_username = '<%= escape_php db[:user] %>';
+$db_user = '<%= escape_php db[:user] %>';
 $db_password = '<%= escape_php db[:password] %>';
 $db_name = '<%= escape_php_literal db[:name] %>';
 $shared_key = '<%= password %>';
@@ -175,7 +175,7 @@ $shared_key = '<%= password %>';
 $mysql_error = '';
 
 if ($_GET['shared_key'] == $shared_key) {
-  $connection = get_connection($db_host, $db_username, $db_password, $db_name, &$mysql_error);
+  $connection = get_connection($db_host, $db_user, $db_password, $db_name, &$mysql_error);
   $dump = new MySQLDump($connection);
   $dump->send('dump.mysql');
 }

data/lib/wordmove/assets/import.php.erb

@@ -10,7 +10,7 @@ if ($_GET['shared_key'] != $shared_key) {
 // Database configuration
 
 $db_server = '<%= escape_php db[:host] %>';
-$db_username = '<%= escape_php db[:username] %>';
+$db_user = '<%= escape_php db[:user] %>';
 $db_password = '<%= escape_php db[:password] %>';
 $db_name = '<%= escape_php db[:name] %>';
 
@@ -324,7 +324,7 @@ if (!$error && isset($_REQUEST["delete"]) && $_REQUEST["delete"]!=basename($_SER
 // Connect to the database, set charset and execute pre-queries
 
 if (!$error && !TESTMODE)
-{ $dbconnection = @mysql_connect($db_server,$db_username,$db_password);
+{ $dbconnection = @mysql_connect($db_server,$db_user,$db_password);
   if ($dbconnection)
     $db = mysql_select_db($db_name);
   if (!$dbconnection || !$db)

data/lib/wordmove/deployer.rb

@@ -61,7 +61,7 @@ module Wordmove
       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.username}", "--password=#{config.local.database.password}", config.local.database.name, :stdout => local_mysql_dump_path
+        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
@@ -73,7 +73,7 @@ module Wordmove
 
       remotely do |host|
         host.download_file local_mysql_dump_path, remote_mysql_dump_path
-        host.run "mysql", "--user=#{config.remote.database.username}", "--password=#{config.remote.database.password}", "--host=#{config.remote.database.host}", "--database=#{config.remote.database.name}", :stdin => 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
 
@@ -88,7 +88,7 @@ module Wordmove
       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.username}", "--password=#{config.remote.database.password}", config.remote.database.name, :stdout => remote_mysql_dump_path
+        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
 
@@ -100,7 +100,7 @@ module Wordmove
             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.username}", "--password=#{config.local.database.password}", "--host=#{config.local.database.host}", "--database=#{config.local.database.name}", :stdin => local_mysql_dump_path
+        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
 

data/lib/wordmove/deployer/base.rb

@@ -109,7 +109,7 @@ module Wordmove
       def mysql_dump_command(options, save_to_path)
         arguments = [ "mysqldump" ]
         arguments << "--host=#{options[:host]}" if options[:host].present?
-        arguments << "--user=#{options[:username]}" if options[:username].present?
+        arguments << "--user=#{options[:user]}" if options[:user].present?
         arguments << "--password=#{options[:password]}" if options[:password].present?
         arguments << "--default-character-set=#{options[:charset]}" if options[:charset].present?
         arguments << options[:name]
@@ -119,7 +119,7 @@ module Wordmove
       def mysql_import_command(dump_path, options)
         arguments = [ "mysql" ]
         arguments << "--host=#{options[:host]}" if options[:host].present?
-        arguments << "--user=#{options[:username]}" if options[:username].present?
+        arguments << "--user=#{options[:user]}" if options[:user].present?
         arguments << "--password=#{options[:password]}" if options[:password].present?
         arguments << "--database=#{options[:name]}"
         Escape.shell_command(arguments) + " < #{dump_path}"

data/lib/wordmove/generators/Movefile

@@ -3,7 +3,7 @@ local:
   wordpress_path: "~/dev/sites/your_site"
   database:
     name: "database_name"
-    username: "user"
+    user: "user"
     password: "password"
     host: "127.0.0.1"
 remote:
@@ -11,7 +11,7 @@ remote:
   wordpress_path: "/var/www/your_site"
   database:
     name: "database_name"
-    username: "user"
+    user: "user"
     password: "password"
     host: "host"
   ssh: # also ftp is allowed

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -186,7 +186,6 @@ files:
 - lib/wordmove/deployer/ssh.rb
 - lib/wordmove/generators/Movefile
 - lib/wordmove/generators/movefile.rb
-- lib/wordmove/hosts/remote_host.rb
 - lib/wordmove/logger.rb
 - lib/wordmove/sql_mover.rb
 - lib/wordmove/version.rb

data/lib/wordmove/hosts/remote_host.rb

@@ -1,137 +0,0 @@
-require 'net/ssh'
-require 'net/scp'
-require 'net/ssh/gateway'
-
-module Wordmove
-  class RemoteHost < LocalHost
-
-    alias :locally_run :run
-
-    attr_reader :session
-
-    def initialize(options = {})
-      super
-    end
-
-    def session
-      if options.ssh.nil?
-        raise Thor::Error, "No SSH credentials provided on Movefile!"
-      end
-
-      ssh_extras = {}
-      [ :port, :password ].each do |p|
-        ssh_extras.merge!( { p => options.ssh[p] } ) if options.ssh[p]
-      end
-
-      if options.ssh.gateway.nil?
-        logger.verbose "Connecting to #{options.ssh.host}..." unless @session.present?
-        @session ||= Net::SSH.start(options.ssh.host, options.ssh.username, ssh_extras)
-      else
-        logger.verbose "Connecting to #{options.ssh.host} through the gateway..." unless @session.present?
-        @session ||= gateway.ssh(options.ssh.host, options.ssh.username, ssh_extras)
-      end
-
-      @session
-    end
-
-    def gateway
-      if options.ssh.gateway.nil?
-        raise Thor::Error, "No SSH credentials provided on Movefile!"
-      end
-
-      ssh_extras = {}
-      [ :port, :password ].each do |p|
-        ssh_extras.merge!( { p => options.ssh.gateway[p] } ) if options.ssh.gateway[p]
-      end
-
-      logger.verbose "Connecting to #{options.ssh.gateway.host}..." unless @gateway.present?
-      @gateway ||= Net::SSH::Gateway.new(options.ssh.gateway.host, options.ssh.gateway.username, ssh_extras )
-
-      @gateway
-    end
-
-    def close
-      session.close
-      if options.ssh.gateway.present?
-        gateway.close(session.transport.port)
-      end
-    end
-
-    def upload_file(source_file, destination_file)
-      logger.verbose "Copying remote #{source_file} to #{destination_file}..."
-      session.scp.download! source_file, destination_file
-    end
-
-    def download_file(source_file, destination_file)
-      logger.verbose "Copying local #{source_file} to #{destination_file}..."
-      session.scp.upload! source_file, destination_file
-    end
-
-    def download_dir(source_dir, destination_dir)
-      destination_dir = ":#{destination_dir}"
-      destination_dir = "#{options.ssh.username}@#{destination_dir}" if options.ssh.username
-      rsync "#{source_dir}/", destination_dir
-    end
-
-    def upload_dir(source_dir, destination_dir)
-      source_dir = ":#{source_dir}/"
-      rsync source_dir, destination_dir
-    end
-
-    def run(*args)
-      command = shell_command(*args)
-      logger.verbose "Executing remotely #{command}"
-      session.exec!(command)
-    end
-
-    private
-
-    def get_host_for_options(options)
-      if options.username
-        "#{options.username}@#{options.host}"
-      else
-        options.host
-      end
-    end
-
-    def rsync(source_dir, destination_dir)
-
-      exclude_file = Tempfile.new('exclude')
-      exclude_file.write(options.exclude.join("\n"))
-      exclude_file.close
-
-      arguments = [ "-azLKO" ]
-
-      if options.ssh
-        remote_shell_arguments = []
-
-        if options.ssh.gateway
-          remote_shell_arguments.push("ssh", get_host_for_options(options.ssh.gateway))
-
-          if options.ssh.gateway.port
-            remote_shell_arguments.push("-p", options.ssh.gateway.port)
-          end
-        end
-
-        remote_shell_arguments.push("ssh")
-
-        if options.ssh.port
-          remote_shell_arguments.push("-p", options.ssh.port)
-        end
-
-        if options.ssh.password
-          remote_shell_arguments.unshift("sshpass", "-p", options.ssh.password)
-        end
-
-        remote_shell_arguments.push(get_host_for_options(options.ssh))
-
-        arguments.push("-e", remote_shell_arguments.join(" "))
-      end
-
-      arguments.push("--exclude-from=#{exclude_file.path}", "--delete", source_dir, destination_dir)
-      locally_run "rsync", *arguments
-
-      exclude_file.unlink
-    end
-  end
-end