wordmove 1.4.0.pre7 → 1.4.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ac474b0d1eef78e90da2a4c16c81d7b6dae3087
-  data.tar.gz: b48c797cdcf367898b2f05f9d958a404cd7bdf8c
+  metadata.gz: 5dd5dc97097603a0676f7e74164930fc30bd5075
+  data.tar.gz: 1368b0ffa30ff530fbbda793de9a158c15f211a9
 SHA512:
-  metadata.gz: 817aafb920b05cf1a2c3e9d4b7ecd651b1cebf87947e596abab072a304cc5c091fe1feef1bf1107daba2fa67e409e9c58bcbf3996d66f59ae9005aaf9e051175
-  data.tar.gz: 2f0b6f56dabb041cd6dd3f1abb9e581cf0f6b7129d03d751806bbf14bad6ca0459a939985bfed60a0536300482b8c79a0882141b5c80bf4adc0ca7cd025174b1
+  metadata.gz: 9bf3456e0f2a4a21eeba58f3a610d513c949772c25fbf57440a57f894dea7237333b550070d654377c3bfdbc242d142be4805c088ade6aece1700f3a9548e886
+  data.tar.gz: d705f83295a45f7a5ae607793894a6043bdc255e39f3aa90d05cf066740d82386db41baafde984838bf290f2e1c3ae9d59bd9483dc1e3dd535d354ad37cfc179

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 2.0.0
   - 2.1.7
   - 2.2.3
+  - 2.3.0

data/README.mdown

@@ -79,6 +79,10 @@ production:
     - "Movefile"
     - "wp-config.php"
     - "wp-content/*.sql"
+
+  ssh:
+    host: "host"
+    user: "user"
 ```
 
 We warmly **recommend** to read the wiki article [Multiple environments explained
@@ -139,11 +143,12 @@ Visit [Wordpress Tools](http://wptools.it).
 
 ## Contribute
 
-In order to promote a simpler contribution workflow we have decided to fork the `master` branch and PR to the master
-`branch`.
+In order to promote a simpler contribution workflow we have decided to fork and PR the `master` branch.
 We will accordingly tag and release or pre-release versions to the rubygems.org repository.
 Do not consider the `dev` branch for your forks and PR.
-We will never more use version-named branches as in the past.
+We will never more use version-named branches as in the past, but we'll tag release on `master` and pre-release on `dev`.
+
+### Please, **read the full [contributor guide](https://github.com/welaika/wordmove/wiki/Contributor-Guide)**.
 
 Feel free to open an issue about contribution if more you need more info
 

data/lib/wordmove/cli.rb

@@ -46,6 +46,10 @@ module Wordmove
         puts "No options given. See wordmove --help"
         exit 1
       end
+
+      def logger
+        Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
+      end
     end
 
     desc "pull", "Pulls WP data from remote host to the local machine"
@@ -54,7 +58,12 @@ module Wordmove
     end
     def pull
       ensure_wordpress_options_presence!(options)
-      deployer = Wordmove::Deployer::Base.deployer_for(options)
+      begin
+        deployer = Wordmove::Deployer::Base.deployer_for(options)
+      rescue MovefileNotFound => e
+        logger.error(e.message)
+        exit 1
+      end
       handle_options(options) do |task|
         deployer.send("pull_#{task}")
       end
@@ -66,7 +75,12 @@ module Wordmove
     end
     def push
       ensure_wordpress_options_presence!(options)
-      deployer = Wordmove::Deployer::Base.deployer_for(options)
+      begin
+        deployer = Wordmove::Deployer::Base.deployer_for(options)
+      rescue MovefileNotFound => e
+        logger.error(e.message)
+        exit 1
+      end
       handle_options(options) do |task|
         deployer.send("push_#{task}")
       end

data/lib/wordmove/deployer/base.rb

@@ -147,12 +147,11 @@ module Wordmove
       end
 
       [
-        WordpressDirectory::PATH::WP_CONTENT,
-        WordpressDirectory::PATH::PLUGINS,
-        WordpressDirectory::PATH::MU_PLUGINS,
-        WordpressDirectory::PATH::THEMES,
-        WordpressDirectory::PATH::UPLOADS,
-        WordpressDirectory::PATH::LANGUAGES
+        WordpressDirectory::Path::WP_CONTENT,
+        WordpressDirectory::Path::PLUGINS,
+        WordpressDirectory::Path::THEMES,
+        WordpressDirectory::Path::UPLOADS,
+        WordpressDirectory::Path::LANGUAGES
       ].each do |type|
         [:remote, :local].each do |location|
           define_method "#{location}_#{type}_dir" do
@@ -180,7 +179,7 @@ module Wordmove
         if options[:charset].present?
           command << "--default-character-set=#{Shellwords.escape(options[:charset])}"
         end
-        command << "--result-file=#{Shellwords.escape(save_to_path)}"
+        command << "--result-file=\"#{save_to_path}\""
         if options[:mysqldump_options].present?
           command << Shellwords.split(options[:mysqldump_options])
         end
@@ -201,7 +200,7 @@ module Wordmove
           command << "--default-character-set=#{Shellwords.escape(options[:charset])}"
         end
         command << "--database=#{Shellwords.escape(options[:name])}"
-        command << "--execute=#{Shellwords.escape("SOURCE #{dump_path}")}"
+        command << "--execute=\"SET autocommit=0;SOURCE #{dump_path};COMMIT\""
         puts command.join(" ")
         command.join(" ")
       end
@@ -209,13 +208,16 @@ module Wordmove
       def compress_command(path)
         command = ["gzip"]
         command << "--best"
+        command << "--force"
         command << Shellwords.escape(path)
         puts command.join(" ")
         command.join(" ")
       end
 
       def uncompress_command(path)
-        command = ["gunzip"]
+        command = ["gzip"]
+        command << "-d"
+        command << "--force"
         command << Shellwords.escape(path)
         puts command.join(" ")
         command.join(" ")

data/lib/wordmove/deployer/ssh.rb

@@ -12,9 +12,10 @@ module Wordmove
 
         local_dump_path = local_wp_content_dir.path("dump.sql")
         local_gzipped_dump_path = local_dump_path + '.gz'
-        local_gizipped_backup_path = local_wp_content_dir.path("#{environment}-backup-#{Time.now.to_i}.sql.gz")
+        local_gzipped_backup_path = local_wp_content_dir
+                                     .path("#{environment}-backup-#{Time.now.to_i}.sql.gz")
 
-        download_remote_db(local_gizipped_backup_path)
+        download_remote_db(local_gzipped_backup_path)
 
         save_local_db(local_dump_path)
         adapt_sql(local_dump_path, local_options, remote_options)

data/lib/wordmove/logger.rb

@@ -18,6 +18,10 @@ module Wordmove
       end
     end
 
+    def error(msg)
+      puts "ERROR: ".red + msg.black
+    end
+
     private
 
     def padding_length(line)

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.4.0.pre7".freeze
+  VERSION = "1.4.0.pre8".freeze
 end

data/lib/wordmove/wordpress_directory.rb

@@ -1,22 +1,20 @@
-WordpressDirectory = Struct.new(:type, :options) do
-  module PATH
-    WP_CONTENT = :wp_content
-    WP_CONFIG  = :wp_config
-    PLUGINS    = :plugins
-    MU_PLUGINS = :mu_plugins
-    THEMES     = :themes
-    UPLOADS    = :uploads
-    LANGUAGES  = :languages
+require 'wordmove/wordpress_directory/path'
+
+class WordpressDirectory
+  attr_accessor :type, :options
+
+  def initialize(type, options)
+    @type = type
+    @options = options
   end
 
   DEFAULT_PATHS = {
-    PATH::WP_CONTENT => 'wp-content',
-    PATH::WP_CONFIG  => 'wp-config.php',
-    PATH::PLUGINS    => 'wp-content/plugins',
-    PATH::MU_PLUGINS => 'wp-content/mu-plugins',
-    PATH::THEMES     => 'wp-content/themes',
-    PATH::UPLOADS    => 'wp-content/uploads',
-    PATH::LANGUAGES  => 'wp-content/languages'
+    Path::WP_CONTENT => 'wp-content',
+    Path::WP_CONFIG  => 'wp-config.php',
+    Path::PLUGINS    => 'wp-content/plugins',
+    Path::THEMES     => 'wp-content/themes',
+    Path::UPLOADS    => 'wp-content/uploads',
+    Path::LANGUAGES  => 'wp-content/languages'
   }.freeze
 
   def self.default_path_for(sym)

data/lib/wordmove/wordpress_directory/path.rb

@@ -0,0 +1,10 @@
+class WordpressDirectory
+  module Path
+    WP_CONTENT = :wp_content
+    WP_CONFIG  = :wp_config
+    PLUGINS    = :plugins
+    THEMES     = :themes
+    UPLOADS    = :uploads
+    LANGUAGES  = :languages
+  end
+end

data/wordmove.gemspec

@@ -27,14 +27,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "colorize", "~> 0.7.5"
-  spec.add_dependency "thor", "~> 0.19.1"
-  spec.add_dependency "activesupport", "~> 4.2.1"
-  spec.add_dependency "photocopier", "~> 1.1.0"
+  spec.add_runtime_dependency "colorize", "~> 0.7.5"
+  spec.add_runtime_dependency "thor", "~> 0.19.1"
+  spec.add_runtime_dependency "activesupport", "~> 4.2", ">= 4.2.1"
+  spec.add_runtime_dependency "photocopier", "~> 1.1", ">= 1.1.0"
 
   spec.required_ruby_version = "~> 2.0"
 
-  spec.add_development_dependency "bundler", ">= 1.6.2"
+  spec.add_development_dependency "bundler", "~> 1.6", ">= 1.6.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "simplecov", "~> 0.9"
@@ -45,8 +45,8 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = <<-RAINBOW
     Starting from 1.4.0 Wordmove will compress SQL dumps both in remote and locale environments.
-    If something will broke, please check if gzip and gunzip executables are present locally and
-    remotely. We are considering obviuos they are installed in any web environment.
+    If something will broke, please check if gzip executable is present locally and
+    remotely. We are considering obvious it's installed in any web environment.
     Open an issue on github at your needs.
   RAINBOW
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre7
+  version: 1.4.0.pre8
 platform: ruby
 authors:
 - Stefano Verna
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -46,6 +46,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
   type: :runtime
@@ -53,6 +56,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
 - !ruby/object:Gem::Dependency
@@ -60,6 +66,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
@@ -67,12 +76,18 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -80,6 +95,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
@@ -223,6 +241,7 @@ files:
 - lib/wordmove/sql_adapter.rb
 - lib/wordmove/version.rb
 - lib/wordmove/wordpress_directory.rb
+- lib/wordmove/wordpress_directory/path.rb
 - pkg/wordmove-0.0.1.gem
 - pkg/wordmove-0.0.2.gem
 - wordmove.gemspec
@@ -232,8 +251,8 @@ licenses:
 metadata: {}
 post_install_message: |2
       Starting from 1.4.0 Wordmove will compress SQL dumps both in remote and locale environments.
-      If something will broke, please check if gzip and gunzip executables are present locally and
-      remotely. We are considering obviuos they are installed in any web environment.
+      If something will broke, please check if gzip executable is present locally and
+      remotely. We are considering obvious it's installed in any web environment.
       Open an issue on github at your needs.
 rdoc_options: []
 require_paths:
@@ -250,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Wordmove, Capistrano for Wordpress