wordmove 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 106a67fd129100bb5aebc13a4192a80a0d44b03f
-  data.tar.gz: e6bb9c88173c3ba982915ceb504483b91067705c
+  metadata.gz: 60ff5cc828eb2578676cbb8b3d9d32806eabbd16
+  data.tar.gz: 3c183cd2e044f6e3658c1715761117e72bd005bf
 SHA512:
-  metadata.gz: d3c763c22230e1893fd2fac63593e4c8c2872df62af6d85c2a230e85173d763d712d76e92450cb2d543577d5fbbf314f0ad3b873445fedf03109a0b2441059ab
-  data.tar.gz: 016a86b636cde8b3b293f50b2b316530bfdbd0b1626e0992e721611bd200f1c873610dcfb9b7bd7f204dc4e3b814480d2ce5bc6c5473f6d3b4c1497d9cf2161c
+  metadata.gz: 95c2773c42c25bfbf78a75e3f187b0290a20a2c9869d2b319a21015552243ba3dc6e565296e7aa21bd9422badffc8ada4a5be6fedae6b4a96fc92d192c517885
+  data.tar.gz: 3dff2fd6bc8b94a3f46c0f26f0fe728edfacd635a4ab4da2780b40a1de13a6eaa87b1a9dcd646322172e8480cc13e46ad485f85cdfba885a72734404eb82f549

data/.gitignore

@@ -1,4 +1,17 @@
-tmp/*
-pkg/*
-.DS_Store
+*.gem
+*.rbc
 .bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.ruby-gemset

@@ -0,0 +1 @@
+wordmove

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.1.1

data/README.mdown

@@ -67,6 +67,7 @@ staging:
     user: "user"
     password: "password"
     host: "host"
+    # port: "3308" # Use just in case you have exotic server config
 
   exclude:
     - ".git/"
@@ -130,6 +131,15 @@ machine. Then in the remote host section in your Movefile:
 ### If you want to specify a passive FTP connection
 Add to the YAML config a `passive` flag set to `true`.
 
+### Problems with server's certificate
+If server's certificate is not signed by a known Certificate Authority, you can disable `lftp` check by adding
+`set ssl:verify-certificate no` to your `~/.lftprc` or `~/.lftp/rc`
+
+If host name used to connect to the server does not corresponds to the host name in its certificate, you can disable
+`lftp` check by adding `set ssl:check-hostname no` to your `~/.lftprc` or `~/.lftp/rc`
+
+More `lftp` [configuration flags here.](https://gist.github.com/gaubert/822090)
+
 ### How the heck you are able to sync the DB via FTP?
 We're glad you asked! We basically upload via FTP a PHP script that performs the various
 import/export operations. This script then gets executed via HTTP. Don't worry

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

@@ -153,8 +153,8 @@ class MySQLDump
   }
 }
 
-function get_connection($db_host, $db_user, $db_password, $db_name, &$error = NULL) {
-  $db_connection = new mysqli($db_host, $db_user, $db_password);
+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();
@@ -167,6 +167,10 @@ function get_connection($db_host, $db_user, $db_password, $db_name, &$error = NU
 }
 
 $db_host = '<%= escape_php db[:host] %>';
+$db_port = '<%= escape_php 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] %>';
@@ -175,7 +179,7 @@ $shared_key = '<%= password %>';
 $mysql_error = '';
 
 if ($_GET['shared_key'] == $shared_key) {
-  $connection = get_connection($db_host, $db_user, $db_password, $db_name, $mysql_error);
+  $connection = get_connection($db_host, $db_user, $db_password, $db_name, $db_port, $mysql_error);
   $dump = new MySQLDump($connection);
   $dump->send('dump.mysql');
 }

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

@@ -9,7 +9,11 @@ if ($_GET['shared_key'] != $shared_key) {
 
 // Database configuration
 
-$db_server = '<%= escape_php db[:host] %>';
+$db_port = '<%= escape_php db[:port] %>';
+if (!$db_port) {
+  $db_port = ini_get("mysqli.default_port");
+}
+$db_server = '<%= escape_php db[:host] %>:' . $db_port;
 $db_user = '<%= escape_php db[:user] %>';
 $db_password = '<%= escape_php db[:password] %>';
 $db_name = '<%= escape_php db[:name] %>';
@@ -324,7 +328,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_user,$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/base.rb

@@ -1,9 +1,11 @@
+require 'active_support'
 require 'active_support/core_ext'
 require 'wordmove/core_ext'
 require 'wordmove/logger'
 require 'wordmove/wordpress_directory'
 require 'wordmove/sql_adapter'
 require 'escape'
+require 'yaml'
 
 module Wordmove
   module Deployer
@@ -185,6 +187,7 @@ module Wordmove
       def mysql_dump_command(options, save_to_path)
         arguments = [ "mysqldump" ]
         arguments << "--host=#{options[:host]}" if options[:host].present?
+        arguments << "--port=#{options[:port]}" if options[:port].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?
@@ -195,6 +198,7 @@ module Wordmove
       def mysql_import_command(dump_path, options)
         arguments = [ "mysql" ]
         arguments << "--host=#{options[:host]}" if options[:host].present?
+        arguments << "--port=#{options[:port]}" if options[:port].present?
         arguments << "--user=#{options[:user]}" if options[:user].present?
         arguments << "--password=#{options[:password]}" if options[:password].present?
         arguments << "--database=#{options[:name]}"

data/lib/wordmove/deployer/ftp.rb

@@ -76,6 +76,8 @@ module Wordmove
       end
 
       def escape_php(string)
+        return '' unless string
+
         # replaces \ with \\
         # replaces ' with \'
         string.gsub('\\','\\\\\\').gsub(/[']/, '\\\\\'')

data/lib/wordmove/generators/Movefile

@@ -17,6 +17,7 @@ staging:
     user: "user"
     password: "password"
     host: "host"
+    # port: "3308" # Use just in case you have exotic server config
 
   exclude:
     - ".git/"

data/lib/wordmove/version.rb

@@ -1,4 +1,4 @@
 module Wordmove
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end
 

data/wordmove.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activesupport"
   gem.add_dependency "i18n"
   gem.add_dependency "photocopier", "~> 0.0.10"
+  gem.add_dependency "escape"
 
   gem.add_development_dependency "rspec"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Stefano Verna
@@ -9,104 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: photocopier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.10
+- !ruby/object:Gem::Dependency
+  name: escape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Wordmove deploys your WordPress websites at the speed of light.
@@ -118,13 +132,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.mdown
 - Rakefile
 - bin/wordmove
@@ -170,25 +183,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Wordmove, Capistrano for Wordpress
-test_files:
-- spec/deployer/base_spec.rb
-- spec/features/movefile_spec.rb
-- spec/fixtures/Movefile
-- spec/fixtures/wp-config.php
-- spec/spec_helper.rb
-- spec/sql_adapter_spec.rb
+test_files: []
 has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.2@wordmove

data/Gemfile.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    wordmove (1.1.0)
-      activesupport
-      colored
-      i18n
-      photocopier (~> 0.0.10)
-      rake
-      thor
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.13)
-    colored (1.2)
-    diff-lcs (1.2.4)
-    escape (0.0.4)
-    i18n (0.6.5)
-    minitest (4.7.5)
-    multi_json (1.8.0)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    photocopier (0.0.10)
-      activesupport
-      escape
-      i18n
-      net-scp
-      net-ssh
-      net-ssh-gateway
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec
-  wordmove!