wordmove 1.3.0.pre2 → 1.3.0

data/lib/wordmove/cli.rb

@@ -1,11 +1,11 @@
-require 'thor'
-require 'shellwords'
-require "photocopier"
-require 'wordmove/generators/movefile'
-require 'wordmove/deployer/base'
-
 module Wordmove
   class CLI < Thor
+    map %w[--version -v] => :__print_version
+
+    desc "--version, -v", "Print the version"
+    def __print_version
+      puts Wordmove::VERSION
+    end
 
     desc "init", "Generates a brand new Movefile"
     def init
@@ -13,20 +13,20 @@ module Wordmove
     end
 
     shared_options = {
-      :wordpress   => { :aliases => "-w", :type => :boolean },
-      :uploads     => { :aliases => "-u", :type => :boolean },
-      :themes      => { :aliases => "-t", :type => :boolean },
-      :plugins     => { :aliases => "-p", :type => :boolean },
-      :languages   => { :aliases => "-l", :type => :boolean },
-      :db          => { :aliases => "-d", :type => :boolean },
+      wordpress:   { aliases: "-w", type: :boolean },
+      uploads:     { aliases: "-u", type: :boolean },
+      themes:      { aliases: "-t", type: :boolean },
+      plugins:     { aliases: "-p", type: :boolean },
+      languages:   { aliases: "-l", type: :boolean },
+      db:          { aliases: "-d", type: :boolean },
 
-      :verbose     => { :aliases => "-v", :type => :boolean },
-      :simulate    => { :aliases => "-s", :type => :boolean },
-      :environment => { :aliases => "-e"                    },
-      :config      => { :aliases => "-c"                    },
+      verbose:     { aliases: "-v", type: :boolean },
+      simulate:    { aliases: "-s", type: :boolean },
+      environment: { aliases: "-e" },
+      config:      { aliases: "-c" },
 
-      :no_adapt    => { :type => :boolean                   },
-      :all         => { :type => :boolean                   }
+      no_adapt:    { type: :boolean },
+      all:         { type: :boolean }
     }
 
     no_tasks do

data/lib/wordmove/deployer/base.rb

@@ -1,12 +1,3 @@
-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
 
@@ -19,21 +10,19 @@ module Wordmove
         def deployer_for(cli_options)
           options = fetch_movefile(cli_options[:config])
           available_enviroments = extract_available_envs(options)
-          options.merge!(cli_options).recursive_symbolize_keys!
+          options.merge!(cli_options).deep_symbolize_keys!
 
           if available_enviroments.size > 1 && options[:environment].nil?
-            raise "You need to specify an environment with --environment parameter"
+            raise UndefinedEnvironment, "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(environment, options)
           elsif options[environment][:ssh]
-            require 'wordmove/deployer/ssh'
             SSH.new(environment, options)
           else
-            raise StandardError, "No valid adapter found."
+            raise NoAdapterFound, "No valid adapter found."
           end
         end
 
@@ -47,7 +36,7 @@ module Wordmove
 
           if entries.empty?
             if last_dir?(start_dir)
-              raise StandardError, "Could not find a valid Movefile"
+              raise MovefileNotFound, "Could not find a valid Movefile"
             else
               return fetch_movefile(name, upper_dir(start_dir))
             end
@@ -81,7 +70,7 @@ module Wordmove
         @logger = self.class.logger
       end
 
-      def push_db;
+      def push_db
         logger.task "Pushing Database"
       end
 
@@ -144,7 +133,7 @@ module Wordmove
         logger.task_step true, command
         unless simulate?
           system(command)
-          raise "Return code reports an error" unless $?.success?
+          raise ShellCommandError, "Return code reports an error" unless $?.success?
         end
       end
 
@@ -185,24 +174,33 @@ module Wordmove
       end
 
       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?
-        arguments << options[:name]
-        Escape.shell_command(arguments) + " > \"#{save_to_path}\""
+        command = [ "mysqldump" ]
+        command << "--host=#{Shellwords.escape(options[:host])}" if options[:host].present?
+        command << "--port=#{Shellwords.escape(options[:port])}" if options[:port].present?
+        command << "--user=#{Shellwords.escape(options[:user])}" if options[:user].present?
+        command << "--password=#{Shellwords.escape(options[:password])}" if options[:password].present?
+        command << "--default-character-set=#{Shellwords.escape(options[:charset])}" if options[:charset].present?
+        command << Shellwords.escape(options[:name])
+        command << "--result-file=#{Shellwords.escape(save_to_path)}"
+        puts command.join(" ")
+        command.join(" ")
       end
 
       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]}"
-        Escape.shell_command(arguments) + " < \"#{dump_path}\""
+        command = [ "mysql" ]
+        command << "--host=#{Shellwords.escape(options[:host])}" if options[:host].present?
+        command << "--port=#{Shellwords.escape(options[:port])}" if options[:port].present?
+        command << "--user=#{Shellwords.escape(options[:user])}" if options[:user].present?
+        command << "--password=#{Shellwords.escape(options[:password])}" if options[:password].present?
+        command << "--default-character-set=#{Shellwords.escape(options[:charset])}" if options[:charset].present?
+        command << "--database=#{Shellwords.escape(options[:name])}"
+        command << "--execute=#{Shellwords.escape("SOURCE #{dump_path}")}"
+        puts command.join(" ")
+        command.join(" ")
+      end
+
+      def rm_command(path)
+        "rm #{Shellwords.escape(path)}"
       end
 
       def save_local_db(local_dump_path)

data/lib/wordmove/deployer/ftp.rb

@@ -1,7 +1,3 @@
-require 'wordmove/deployer/base'
-require 'erb'
-require 'open-uri'
-
 module Wordmove
   module Deployer
     class FTP < Base
@@ -32,7 +28,7 @@ module Wordmove
         # remove dump remotely
         remote_delete(remote_dump_path)
         # and locally
-        run "rm \"#{local_dump_path}\""
+        run rm_command(local_dump_path)
       end
 
       def pull_db
@@ -49,7 +45,7 @@ module Wordmove
         run mysql_import_command(local_dump_path, local_options[:database])
 
         # and locally
-        run "rm \"#{local_dump_path}\""
+        run rm_command(local_dump_path)
       end
 
       private
@@ -119,7 +115,7 @@ module Wordmove
         # run import script
         import_url = "#{remote_wp_content_dir.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}\""
+        run rm_command(temp_path)
         # remove script remotely
         remote_delete(remote_import_script_path)
       end

data/lib/wordmove/deployer/ssh.rb

@@ -1,5 +1,3 @@
-require 'wordmove/deployer/base'
-
 module Wordmove
   module Deployer
     class SSH < Base
@@ -19,7 +17,7 @@ module Wordmove
         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}\""
+        run rm_command(local_dump_path)
       end
 
       def pull_db
@@ -32,7 +30,7 @@ module Wordmove
         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}\""
+        run rm_command(local_dump_path)
       end
 
       private
@@ -50,7 +48,7 @@ module Wordmove
         logger.task_step false, command
         unless simulate?
           stdout, stderr, exit_code = @copier.exec! command
-          raise "Error code #{exit_code} returned by command \"#{command}\": #{stderr}" unless exit_code.zero?
+          raise ShellCommandError, "Error code #{exit_code} returned by command \"#{command}\": #{stderr}" unless exit_code.zero?
         end
       end
 

data/lib/wordmove/exceptions.rb

@@ -0,0 +1,6 @@
+module Wordmove
+  class UndefinedEnvironment < StandardError; end
+  class NoAdapterFound < StandardError; end
+  class MovefileNotFound < StandardError; end
+  class ShellCommandError < StandardError; end
+end

data/lib/wordmove/generators/movefile.rb

@@ -1,6 +1,3 @@
-require 'thor/group'
-require 'wordmove/generators/movefile_adapter'
-
 module Wordmove
   module Generators
     class Movefile < Thor::Group

data/lib/wordmove/generators/movefile_adapter.rb

@@ -1,6 +1,3 @@
-require 'ostruct'
-require 'wordmove/wordpress_directory'
-
 module Wordmove
   module Generators
     module MovefileAdapter
@@ -52,7 +49,9 @@ module Wordmove
       end
 
       def wp_config
-        @wp_config ||= File.open(WordpressDirectory.default_path_for(:wp_config)).read
+        @wp_config ||= File.read(
+          WordpressDirectory.default_path_for(:wp_config)
+        ).encode('utf-8', invalid: :replace)
       end
 
       def wp_definitions

data/lib/wordmove/logger.rb

@@ -1,8 +1,3 @@
-# encoding: utf-8
-
-require 'colored'
-require 'logger'
-
 module Wordmove
   class Logger < ::Logger
     MAX_LINE = 70

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.3.0.pre2"
+  VERSION = "1.3.0"
 end

data/wordmove.gemspec

@@ -1,39 +1,35 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/wordmove/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Stefano Verna", "Ju Liu", "weLaika"]
-  gem.email         = ["stefano.verna@welaika.com", "ju.liu@welaika.com", "info@welaika.com"]
-  gem.description   = %q{Wordmove deploys your WordPress websites at the speed of light.}
-  gem.summary       = %q{Wordmove, Capistrano for Wordpress}
-  gem.homepage      = "https://github.com/welaika/wordmove"
-  gem.license       = "MIT"
-
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "wordmove"
-  gem.require_paths = ["lib"]
-  gem.version       = Wordmove::VERSION
-
-  gem.add_dependency "colored"
-  gem.add_dependency "rake"
-  gem.add_dependency "thor"
-  gem.add_dependency "activesupport"
-  gem.add_dependency "i18n"
-  gem.add_dependency "photocopier", ">= 1.0.0.pre3"
-  gem.add_dependency "escape"
-
-  gem.add_development_dependency "rspec", '< 3'
-
-  gem.post_install_message = <<-EOF
-
-============================================================================
-Beware! From version 1.0, we have changed the wordmove flags' behaviour:
-they used to tell wordmove what to _skip_, now they tell what to _include_.
-
-Read `wordmove help` for more info.
-============================================================================
-
-  EOF
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'wordmove/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "wordmove"
+  spec.version       = Wordmove::VERSION
+  spec.authors       = ["Stefano Verna", "Ju Liu", "Fabrizio Monti", "Alessandro Fazzi"]
+  spec.email         = ["stefano.verna@welaika.com", "ju.liu@welaika.com", "fabrizio.monti@welaika.com", "alessandro.fazzi@welaika.com"]
+
+  spec.summary       = %q{Wordmove, Capistrano for Wordpress}
+  spec.description   = %q{Wordmove deploys your WordPress websites at the speed of light.}
+  spec.homepage      = "https://github.com/welaika/wordmove"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  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.0.0"
+
+  spec.required_ruby_version = "~> 2.0"
+
+  spec.add_development_dependency "bundler", ">= 1.6.2"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "simplecov", "~> 0.9"
+  spec.add_development_dependency "pry-byebug", "~> 3.1"
+  spec.add_development_dependency "priscilla", "~> 1.0"
 end

metadata

@@ -1,134 +1,164 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre2
+  version: 1.3.0
 platform: ruby
 authors:
 - Stefano Verna
 - Ju Liu
-- weLaika
+- Fabrizio Monti
+- Alessandro Fazzi
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: photocopier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.6.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: photocopier
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre3
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre3
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: escape
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: priscilla
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Wordmove deploys your WordPress websites at the speed of light.
 email:
 - stefano.verna@welaika.com
 - ju.liu@welaika.com
-- info@welaika.com
+- fabrizio.monti@welaika.com
+- alessandro.fazzi@welaika.com
 executables:
 - wordmove
 extensions: []
@@ -139,18 +169,24 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.mdown
 - Rakefile
-- bin/wordmove
+- assets/images/wordmove.png
+- bin/console
+- bin/rake
+- bin/rspec
+- bin/setup
+- exe/wordmove
 - lib/wordmove.rb
 - lib/wordmove/assets/dump.php.erb
 - lib/wordmove/assets/import.php.erb
 - lib/wordmove/cli.rb
-- lib/wordmove/core_ext.rb
 - lib/wordmove/deployer/base.rb
 - lib/wordmove/deployer/ftp.rb
 - lib/wordmove/deployer/ssh.rb
+- lib/wordmove/exceptions.rb
 - lib/wordmove/generators/Movefile
 - lib/wordmove/generators/movefile.rb
 - lib/wordmove/generators/movefile_adapter.rb
@@ -160,49 +196,29 @@ files:
 - lib/wordmove/wordpress_directory.rb
 - pkg/wordmove-0.0.1.gem
 - pkg/wordmove-0.0.2.gem
-- 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
 - wordmove.gemspec
 homepage: https://github.com/welaika/wordmove
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-  ============================================================================
-  Beware! From version 1.0, we have changed the wordmove flags' behaviour:
-  they used to tell wordmove what to _skip_, now they tell what to _include_.
-
-  Read `wordmove help` for more info.
-  ============================================================================
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 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: []