wordmove 1.3.0.pre2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d562d9eedcf4142b15279b786de308bef1aa1e
-  data.tar.gz: a56e964fa64606740a27415a8eb76d31550f710a
+  metadata.gz: ef259f42e99168010fa346b266b25ae9e116f633
+  data.tar.gz: 11fe30b4ff34778cb26a26d74c23e04da4a9e3bf
 SHA512:
-  metadata.gz: ca1dc544d5228b2cbe473bd1308eb9acf5eaa66424c0d3d8776879d024a0ecaffae70bbf020d89a21c0e7781c965b6e327cba0a1c96dab31b535223200febef4
-  data.tar.gz: 346965aa474662a79bad2d430ed50c5723975b05bfa843c3201113e5098b50796e3eb6f476bf683a85904f74a307e5200b7895f35c06dfbee00ad3d4883efa80
+  metadata.gz: 37f218ec6741be9fb5fe47737f7b740b011ce709b5d40047e43986944219161443ddcc67c6534f38ab20c1be83f35ad6d7368fb658ea5711247996022b72436b
+  data.tar.gz: 6e685dad79f7679c1d7b926e698c85dc8cf70c1d267065ff5f8fa96d58daf8cb252e9f5ff65b071bdc9b6623353939868dda3d8ca1ba8d66c7dceb0f6a233926

data/.gitignore

@@ -12,6 +12,8 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/coverage
+spec/examples.txt
 test/tmp
 test/version_tmp
 tmp

data/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.5
+  - 2.1.6
   - 2.2.2

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 1.3.0.pre
+
+- required ruby version ~> 2.0
+- replace `escape` gem with `Shellwords`

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in wordmove.gemspec
 gemspec

data/README.mdown

@@ -1,5 +1,7 @@
 # Wordmove
 
+![logo](https://raw.githubusercontent.com/welaika/wordmove/master/assets/images/wordmove.png)
+
 Wordmove is a nice little gem that lets you automatically mirror local Wordpress
 installations and DB data back and forth from your local development machine to
 the remote staging server. SSH and FTP connections are both supported.
@@ -148,6 +150,9 @@ 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.
 
+## Need more tools?
+Visit [Wordpress Tools](http://wptools.it).
+
 ## Credits
 
 * The dump script is the [`MYSQL-dump` PHP package](https://github.com/dg/MySQL-dump) by David Grudl;

data/Rakefile

@@ -1,7 +1,5 @@
-#!/usr/bin/env rake
-
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+task default: :spec

data/bin/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "wordmove"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+require "pry"
+Pry.start

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/exe/wordmove

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+
+require 'wordmove'
+Wordmove::CLI.start

data/lib/wordmove.rb

@@ -1,4 +1,29 @@
+require 'thor'
+require 'thor/group'
+require 'colorize'
+require 'logger'
+require 'yaml'
+require 'ostruct'
+require 'erb'
+require 'open-uri'
+require 'active_support'
+require 'active_support/core_ext'
+
+require 'photocopier'
+
+require 'wordmove/exceptions'
+require 'wordmove/cli'
+require 'wordmove/logger'
+require 'wordmove/sql_adapter'
 require "wordmove/version"
+require 'wordmove/wordpress_directory'
+
+require 'wordmove/generators/movefile_adapter'
+require 'wordmove/generators/movefile'
+
+require 'wordmove/deployer/base'
+require 'wordmove/deployer/ftp'
+require 'wordmove/deployer/ssh'
 
 module Wordmove
 end

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

@@ -1,186 +1,223 @@
 <?php
 
+$shared_key = '<%= password %>';
+if ($_GET['shared_key'] != $shared_key) {
+  die();
+}
+
 /**
  * MySQL database dump.
  *
- * @author     David Grudl
+ * @author     David Grudl (http://davidgrudl.com)
  * @copyright  Copyright (c) 2008 David Grudl
  * @license    New BSD License
- * @link       http://phpfashion.com/
- * @version    0.9
+ * @version    1.0
  */
-
 class MySQLDump
 {
-  const MAX_SQL_SIZE = 1e6;
-
-  /** @var mysqli */
-  private $connection;
-
-  /**
-   * Connects to database.
-   * @param  mysqli connection
-  */
-  public function __construct(mysqli $connection)
-  {
-    $this->connection = $connection;
-
-    if ($this->connection->connect_errno) {
-      throw new Exception($this->connection->connect_error);
-    }
-  }
-
-  /**
-   * Sends dump to browser.
-   * @param  string filename
-   * @return void
-  */
-  public function send($file)
-  {
-    $this->write(fopen('php://output', 'wb'));
-  }
-
-  /**
-   * Writes dump to logical file.
-   * @param  resource
-   * @return void
-  */
-  public function write($handle)
-  {
-    if (!is_resource($handle) || get_resource_type($handle) !== 'stream') {
-      throw new Exception('Argument must be stream resource.');
-    }
-
-    if (!$this->connection->set_charset('utf8')) { // was added in MySQL 5.0.7 and PHP 5.0.5, fixed in PHP 5.1.5)
-      throw new Exception($this->connection->error);
-    }
-
-    $views = $tables = array();
-
-    $res = $this->connection->query('SHOW TABLES');
-    while ($row = $res->fetch_row()) {
-      $tables[] = $row[0];
-    }
-    $res->close();
-
-    $db = $this->connection->query('SELECT DATABASE()')->fetch_row();
-    fwrite($handle, "-- David Grudl MySQL Dump Utility\n"
-      . "-- Created at " . date('j.n.Y G:i') . "\n"
-      . (isset($_SERVER['HTTP_HOST']) ? "-- Host: $_SERVER[HTTP_HOST]\n" : '')
-      . "-- Server: " . $this->connection->server_info . "\n"
-      . "-- Codepage: " . $this->connection->character_set_name() . "\n"
-      . "-- Database: " . $db[0] . "\n"
-      . "-- Tables: " . implode(', ', $tables) . "\n"
-      . "\n"
-      . "SET NAMES utf8;\n"
-      . "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';\n"
-      . "SET FOREIGN_KEY_CHECKS=0;\n");
-
-    foreach ($tables as $table)
-    {
-      $res = $this->connection->query("SHOW CREATE TABLE `$table`");
-      $row = $res->fetch_assoc();
-      $res->close();
-
-      if (isset($row['Create View'])) {
-        $views[$table] = $row['Create View'];
-        continue;
-      }
-
-      fwrite($handle, "-- --------------------------------------------------------\n\n");
-      fwrite($handle, "DROP TABLE IF EXISTS `$table`;\n\n");
-      fwrite($handle, $row['Create Table'] . ";\n\n");
-
-      $numeric = array();
-      $res = $this->connection->query("SHOW COLUMNS FROM `$table`");
-      $cols = array();
-      while ($row = $res->fetch_assoc()) {
-        $col = $row['Field'];
-        $cols[] = '`' . str_replace('`', '``', $col) . '`';
-        preg_match('/^([a-z]+)/', $row['Type'], $matches);
-        $type = strtolower($matches[1]);
-        $numeric[$col] = in_array($type, array('byte','counter','serial','int','long','currency','real','money','float','double','decimal','numeric','number'));
-      }
-      $cols = '(' . implode(', ', $cols) . ')';
-      $res->close();
-
-
-      $size = 0;
-      $res = $this->connection->query("SELECT * FROM `$table`", MYSQLI_USE_RESULT);
-      while ($row = $res->fetch_assoc()) {
-        $s = '(';
-        foreach ($row as $key => $value) {
-          if ($value === NULL) {
-            $s .= "NULL,\t";
-          } elseif ($numeric[$key]) {
-            $s .= $value . ",\t";
-          } else {
-            $s .= "'" . $this->connection->real_escape_string($value) . "',\t";
-          }
-        }
-
-        if ($size == 0) {
-          $s = "INSERT INTO `$table` $cols VALUES\n$s";
-        } else {
-          $s = ",\n$s";
-        }
-
-        $len = strlen($s) - 1;
-        $s[$len - 1] = ')';
-        fwrite($handle, $s, $len);
-
-        $size += $len;
-        if ($size > self::MAX_SQL_SIZE) {
-          fwrite($handle, ";\n");
-          $size = 0;
-        }
-      }
-
-      if ($size) fwrite($handle, ";\n");
-      $res->close();
-
-      fwrite($handle, "\n\n");
-    }
-
-    foreach ($views as $view => $sql)
-    {
-      fwrite($handle, "-- --------------------------------------------------------\n\n");
-      fwrite($handle, "DROP VIEW IF EXISTS `$view`;\n\n$sql;\n\n");
-    }
-
-    fwrite($handle, "-- THE END\n");
-    fclose($handle);
-  }
-}
+	const MAX_SQL_SIZE = 1e6;
+
+	const NONE = 0;
+	const DROP = 1;
+	const CREATE = 2;
+	const DATA = 4;
+	const TRIGGERS = 8;
+	const ALL = 15; // DROP | CREATE | DATA | TRIGGERS
+
+	/** @var array */
+	public $tables = array(
+		'*' => self::ALL,
+	);
+
+	/** @var mysqli */
+	private $connection;
+
+
+	/**
+	 * Connects to database.
+	 * @param  mysqli connection
+	 */
+	public function __construct(mysqli $connection, $charset = 'utf8'
+	{
+		$this->connection = $connection;
+
+		if ($connection->connect_errno) {
+			throw new Exception($connection->connect_error);
+
+		} elseif (!$connection->set_charset($charset)) { // was added in MySQL 5.0.7 and PHP 5.0.5, fixed in PHP 5.1.5)
+			throw new Exception($connection->error);
+		}
+	}
+
+
+	/**
+	 * Saves dump to the file.
+	 * @param  string filename
+	 * @return void
+	 */
+	public function save($file)
+	{
+		$handle = strcasecmp(substr($file, -3), '.gz') ? fopen($file, 'wb') : gzopen($file, 'wb');
+		if (!$handle) {
+			throw new Exception("ERROR: Cannot write file '$file'.");
+		}
+		$this->write($handle);
+	}
+
+
+	/**
+	 * Writes dump to logical file.
+	 * @param  resource
+	 * @return void
+	 */
+	public function write($handle = NULL)
+	{
+		if ($handle === NULL) {
+			$handle = fopen('php://output', 'wb');
+		} elseif (!is_resource($handle) || get_resource_type($handle) !== 'stream') {
+			throw new Exception('Argument must be stream resource.');
+		}
+
+		$tables = array();
+
+		$res = $this->connection->query('SHOW TABLES');
+		while ($row = $res->fetch_row()) {
+			$tables[] = $row[0];
+		}
+		$res->close();
+
+		$this->connection->query('LOCK TABLES `' . implode('` READ, `', $tables) . '` READ');
+
+		$db = $this->connection->query('SELECT DATABASE()')->fetch_row();
+		fwrite($handle, "-- Created at " . date('j.n.Y G:i') . " using David Grudl MySQL Dump Utility\n"
+			. (isset($_SERVER['HTTP_HOST']) ? "-- Host: $_SERVER[HTTP_HOST]\n" : '')
+			. "-- MySQL Server: " . $this->connection->server_info . "\n"
+			. "-- Database: " . $db[0] . "\n"
+			. "\n"
+			. "SET NAMES utf8;\n"
+			. "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO';\n"
+			. "SET FOREIGN_KEY_CHECKS=0;\n"
+		);
+
+		foreach ($tables as $table) {
+			$this->dumpTable($handle, $table);
+		}
+
+		fwrite($handle, "-- THE END\n");
+
+		$this->connection->query('UNLOCK TABLES');
+	}
+
+
+	/**
+	 * Dumps table to logical file.
+	 * @param  resource
+	 * @return void
+	 */
+	public function dumpTable($handle, $table)
+	{
+		$delTable = $this->delimite($table);
+		$res = $this->connection->query("SHOW CREATE TABLE $delTable");
+		$row = $res->fetch_assoc();
+		$res->close();
+
+		fwrite($handle, "-- --------------------------------------------------------\n\n");
+
+		$mode = isset($this->tables[$table]) ? $this->tables[$table] : $this->tables['*'];
+		$view = isset($row['Create View']);
+
+		if ($mode & self::DROP) {
+			fwrite($handle, 'DROP ' . ($view ? 'VIEW' : 'TABLE') . " IF EXISTS $delTable;\n\n");
+		}
+
+		if ($mode & self::CREATE) {
+			fwrite($handle, $row[$view ? 'Create View' : 'Create Table'] . ";\n\n");
+		}
+
+		if (!$view && ($mode & self::DATA)) {
+			$numeric = array();
+			$res = $this->connection->query("SHOW COLUMNS FROM $delTable");
+			$cols = array();
+			while ($row = $res->fetch_assoc()) {
+				$col = $row['Field'];
+				$cols[] = $this->delimite($col);
+				$numeric[$col] = (bool) preg_match('#^[^(]*(BYTE|COUNTER|SERIAL|INT|LONG$|CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER)#i', $row['Type']);
+			}
+			$cols = '(' . implode(', ', $cols) . ')';
+			$res->close();
+
+
+			$size = 0;
+			$res = $this->connection->query("SELECT * FROM $delTable", MYSQLI_USE_RESULT);
+			while ($row = $res->fetch_assoc()) {
+				$s = '(';
+				foreach ($row as $key => $value) {
+					if ($value === NULL) {
+						$s .= "NULL,\t";
+					} elseif ($numeric[$key]) {
+						$s .= $value . ",\t";
+					} else {
+						$s .= "'" . $this->connection->real_escape_string($value) . "',\t";
+					}
+				}
+
+				if ($size == 0) {
+					$s = "INSERT INTO $delTable $cols VALUES\n$s";
+				} else {
+					$s = ",\n$s";
+				}
+
+				$len = strlen($s) - 1;
+				$s[$len - 1] = ')';
+				fwrite($handle, $s, $len);
+
+				$size += $len;
+				if ($size > self::MAX_SQL_SIZE) {
+					fwrite($handle, ";\n");
+					$size = 0;
+				}
+			}
+
+			$res->close();
+			if ($size) {
+				fwrite($handle, ";\n");
+			}
+			fwrite($handle, "\n");
+		}
+
+		if ($mode & self::TRIGGERS) {
+			$res = $this->connection->query("SHOW TRIGGERS LIKE '" . $this->connection->real_escape_string($table) . "'");
+			if ($res->num_rows) {
+				fwrite($handle, "DELIMITER ;;\n\n");
+				while ($row = $res->fetch_assoc()) {
+					fwrite($handle, "CREATE TRIGGER {$this->delimite($row['Trigger'])} $row[Timing] $row[Event] ON $delTable FOR EACH ROW\n$row[Statement];;\n\n");
+				}
+				fwrite($handle, "DELIMITER ;\n\n");
+			}
+			$res->close();
+		}
+
+		fwrite($handle, "\n");
+	}
+
+
+	private function delimite($s)
+	{
+		return '`' . str_replace('`', '``', $s) . '`';
+	}
 
-function get_connection($db_host, $db_user, $db_password, $db_name, $db_port, &$error = NULL) {
-  $db_connection = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
-  if (!$db_connection || !$db_connection->select_db($db_name)) {
-    if ($db_connection) {
-      $error = mysqli_connect_error();
-    } else {
-      $error = "Unable to connect to mysql database";
-    }
-    return NULL;
-  }
-  return $db_connection;
 }
 
 $db_host = '<%= escape_php db[:host] %>';
-$db_port = '<%= escape_php db[:port] %>';
+$db_port = '<%= db[:port] %>';
 if (!$db_port) {
   $db_port = ini_get("mysqli.default_port");
 }
 $db_user = '<%= escape_php db[:user] %>';
 $db_password = '<%= escape_php db[:password] %>';
 $db_name = '<%= escape_php db[:name] %>';
-$shared_key = '<%= password %>';
-
-$mysql_error = '';
-
-if ($_GET['shared_key'] == $shared_key) {
-  $connection = get_connection($db_host, $db_user, $db_password, $db_name, $db_port, $mysql_error);
-  $dump = new MySQLDump($connection);
-  $dump->send('dump.mysql');
-}
+$db_charset = '<%= escape_php db[:charset] %>';
 
+$connection = new mysqli($db_host, $db_user, $db_password, $db_name, $db_port);
+$dump = new MySQLDump($connection, $db_charset);
+$dump->save('dump.mysql');