wordmove 1.0.6 → 1.0.7

data/README.mdown

@@ -51,6 +51,11 @@ local:
 staging:
   vhost: "http://remote.com"
   wordpress_path: "/var/www/your_site"
+  # paths: # you can customize wordpress paths
+  #   wp_content: "wp-content"
+  #   uploads: "wp-content/uploads"
+  #   plugins: "wp-content/plugins"
+  #   languages: "wp-content/languages"
   database:
     name: "database_name"
     user: "user"

data/lib/wordmove/cli.rb

@@ -15,6 +15,7 @@ module Wordmove
     method_option :uploads,     :aliases => "-u", :type => :boolean
     method_option :themes,      :aliases => "-t", :type => :boolean
     method_option :plugins,     :aliases => "-p", :type => :boolean
+    method_option :languages,   :aliases => "-l", :type => :boolean
     method_option :verbose,     :aliases => "-v", :type => :boolean
     method_option :simulate,    :aliases => "-s", :type => :boolean
     method_option :no_adapt,    :type => :boolean
@@ -22,7 +23,7 @@ module Wordmove
     method_option :config,      :aliases => "-c"
     def pull
       deployer = Wordmove::Deployer::Base.deployer_for(options)
-      %w(db uploads themes plugins).map(&:to_sym).each do |task|
+      %w(db uploads themes plugins languages).map(&:to_sym).each do |task|
         if options[task]
           deployer.send("pull_#{task}")
         end
@@ -34,6 +35,7 @@ module Wordmove
     method_option :db,          :aliases => "-d", :type => :boolean
     method_option :themes,      :aliases => "-t", :type => :boolean
     method_option :plugins,     :aliases => "-p", :type => :boolean
+    method_option :languages,   :aliases => "-l", :type => :boolean
     method_option :verbose,     :aliases => "-v", :type => :boolean
     method_option :simulate,    :aliases => "-s", :type => :boolean
     method_option :no_adapt,    :type => :boolean
@@ -41,7 +43,7 @@ module Wordmove
     method_option :config,      :aliases => "-c"
     def push
       deployer = Wordmove::Deployer::Base.deployer_for(options)
-      %w(db uploads themes plugins).map(&:to_sym).each do |task|
+      %w(db uploads themes plugins languages).map(&:to_sym).each do |task|
         if options[task]
           deployer.send("push_#{task}")
         end

data/lib/wordmove/deployer/base.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext'
 require 'wordmove/logger'
+require 'wordmove/wordpress_directory'
 require 'wordmove/sql_mover'
 require 'escape'
 
@@ -60,15 +61,19 @@ module Wordmove
       def remote_get_directory(directory); end
       def remote_put_directory(directory); end
 
-      %w(uploads themes plugins).each do |task|
+      %w(uploads themes plugins languages).each do |task|
         define_method "push_#{task}" do
           logger.task "Pushing #{task.titleize}"
-          remote_put_directory(local_wpcontent_path(task), remote_wpcontent_path(task), paths_to_exclude)
+          local_path = send("local_#{task}_dir").path
+          remote_path = send("remote_#{task}_dir").path
+          remote_put_directory(local_path, remote_path, paths_to_exclude)
         end
 
         define_method "pull_#{task}" do
           logger.task "Pulling #{task.titleize}"
-          remote_get_directory(remote_wpcontent_path(task), local_wpcontent_path(task), paths_to_exclude)
+          local_path = send("local_#{task}_dir").path
+          remote_path = send("remote_#{task}_dir").path
+          remote_get_directory(remote_path, local_path, paths_to_exclude)
         end
       end
 
@@ -99,16 +104,18 @@ module Wordmove
         options[:simulate]
       end
 
-      def local_wpcontent_path(*args)
-        File.join(local_options[:wordpress_path], "wp-content", *args)
-      end
-
-      def remote_wpcontent_path(*args)
-        File.join(remote_options[:wordpress_path], "wp-content", *args)
-      end
-
-      def remote_wpcontent_url(*args)
-        remote_options[:vhost] + File.join("/wp-content", *args)
+      [ 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
+            options = send("#{location}_options")
+            WordpressDirectory.new(type, options)
+          end
+        end
       end
 
       def adapt_sql(save_to_path, local, remote)

data/lib/wordmove/deployer/ftp.rb

@@ -17,9 +17,9 @@ module Wordmove
       def push_db
         super
 
-        local_dump_path = local_wpcontent_path("dump.sql")
-        remote_dump_path = remote_wpcontent_path("dump.sql")
-        local_backup_path = local_wpcontent_path("remote-backup-#{Time.now.to_i}.sql")
+        local_dump_path = local_wp_content_dir.path("dump.sql")
+        remote_dump_path = remote_wp_content_dir.path("dump.sql")
+        local_backup_path = local_wp_content_dir.path("remote-backup-#{Time.now.to_i}.sql")
 
         download_remote_db(local_backup_path)
         save_local_db(local_dump_path)
@@ -39,8 +39,8 @@ module Wordmove
 
       def pull_db
         super
-        local_dump_path = local_wpcontent_path("dump.sql")
-        local_backup_path = local_wpcontent_path("local-backup-#{Time.now.to_i}.sql")
+        local_dump_path = local_wp_content_dir.path("dump.sql")
+        local_backup_path = local_wp_content_dir.path("local-backup-#{Time.now.to_i}.sql")
 
         save_local_db(local_backup_path)
         download_remote_db(local_dump_path)
@@ -93,7 +93,7 @@ module Wordmove
       end
 
       def download_remote_db(local_dump_path)
-        remote_dump_script = remote_wpcontent_path("dump.php")
+        remote_dump_script = remote_wp_content_dir.path("dump.php")
         # generate a secure one-time password
         one_time_password = SecureRandom.hex(40)
         # generate dump script
@@ -101,15 +101,15 @@ module Wordmove
         # upload the dump script
         remote_put(dump_script, remote_dump_script)
         # download the resulting dump (using the password)
-        dump_url = "#{remote_wpcontent_url("dump.php")}?shared_key=#{one_time_password}"
+        dump_url = "#{remote_wp_content_dir.url("dump.php")}?shared_key=#{one_time_password}"
         download(dump_url, local_dump_path)
         # remove it remotely
         remote_delete(remote_dump_script)
       end
 
       def import_remote_dump
-        temp_path = local_wpcontent_path("temp.txt")
-        remote_import_script_path = remote_wpcontent_path("import.php")
+        temp_path = local_wp_content_dir.path("temp.txt")
+        remote_import_script_path = remote_wp_content_dir.path("import.php")
         # generate a secure one-time password
         one_time_password = SecureRandom.hex(40)
         # generate import script
@@ -117,7 +117,7 @@ module Wordmove
         # upload import script
         remote_put(import_script, remote_import_script_path)
         # run import script
-        import_url = "#{remote_wpcontent_url("import.php")}?shared_key=#{one_time_password}&start=1&foffset=0&totalqueries=0&fn=dump.sql"
+        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}"
         # remove script remotely

data/lib/wordmove/deployer/ssh.rb

@@ -14,8 +14,8 @@ module Wordmove
       def push_db
         super
 
-        local_dump_path = local_wpcontent_path("dump.sql")
-        local_backup_path = local_wpcontent_path("remote-backup-#{Time.now.to_i}.sql")
+        local_dump_path = local_wp_content_dir.path("dump.sql")
+        local_backup_path = local_wp_content_dir.path("remote-backup-#{Time.now.to_i}.sql")
         download_remote_db(local_backup_path)
 
         save_local_db(local_dump_path)
@@ -27,9 +27,9 @@ module Wordmove
       def pull_db
         super
 
-        local_dump_path = local_wpcontent_path("dump.sql")
-        remote_dump_path = remote_wpcontent_path("dump.sql")
-        local_backup_path = local_wpcontent_path("local-backup-#{Time.now.to_i}.sql")
+        local_dump_path = local_wp_content_dir.path("dump.sql")
+        remote_dump_path = remote_wp_content_dir.path("dump.sql")
+        local_backup_path = local_wp_content_dir.path("local-backup-#{Time.now.to_i}.sql")
         save_local_db(local_backup_path)
 
         download_remote_db(local_dump_path)
@@ -58,7 +58,7 @@ module Wordmove
       end
 
       def download_remote_db(local_dump_path)
-        remote_dump_path = remote_wpcontent_path("dump.sql")
+        remote_dump_path = remote_wp_content_dir.path("dump.sql")
         # dump remote db into file
         remote_run mysql_dump_command(remote_options[:database], remote_dump_path)
         # download remote dump
@@ -67,7 +67,7 @@ module Wordmove
       end
 
       def import_remote_dump(local_dump_path)
-        remote_dump_path = remote_wpcontent_path("dump.sql")
+        remote_dump_path = remote_wp_content_dir.path("dump.sql")
         remote_put(local_dump_path, remote_dump_path)
         remote_run mysql_import_command(remote_dump_path, remote_options[:database])
         remote_delete(remote_dump_path)

data/lib/wordmove/generators/Movefile

@@ -9,6 +9,16 @@ local:
 staging:
   vhost: "http://remote.com"
   wordpress_path: "/var/www/your_site"
+  # paths: # you can customize wordpress internal paths
+  #   wp_content: "wp-content"
+  #   uploads: "wp-content/uploads"
+  #   plugins: "wp-content/plugins"
+  #   languages: "wp-content/languages"
+  exclude:
+    - ".sass-cache"
+    - ".git"
+    - "tmp/*"
+    - "wp-content/*.sql"
   database:
     name: "database_name"
     user: "user"

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/wordmove/wordpress_directory.rb

@@ -0,0 +1,36 @@
+class WordpressDirectory < Struct.new(:type, :options)
+
+  module PATH
+    WP_CONTENT = :wp_content
+    PLUGINS    = :plugins
+    THEMES     = :themes
+    UPLOADS    = :uploads
+    LANGUAGES  = :languages
+  end
+
+  DEFAULT_PATHS = {
+    PATH::WP_CONTENT => 'wp-content',
+    PATH::PLUGINS    => 'wp-content/plugins',
+    PATH::THEMES     => 'wp-content/themes',
+    PATH::UPLOADS    => 'wp-content/uploads',
+    PATH::LANGUAGES  => 'wp-content/languages'
+  }
+
+  def path(*args)
+    File.join(options[:wordpress_path], relative_path(*args))
+  end
+
+  def url(*args)
+    File.join(options[:vhost], relative_path(*args))
+  end
+
+  def relative_path(*args)
+    path = if options[:paths] && options[:paths][type]
+             options[:paths][type]
+           else
+             DEFAULT_PATHS[type]
+           end
+    File.join(path, *args)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -171,11 +171,6 @@ files:
 - README.mdown
 - Rakefile
 - bin/wordmove
-- features/generator.feature
-- features/pull.feature
-- features/push.feature
-- features/step_definitions/aruba_ext_steps.rb
-- features/support/setup.rb
 - lib/wordmove.rb
 - lib/wordmove/assets/dump.php.erb
 - lib/wordmove/assets/import.php.erb
@@ -188,6 +183,7 @@ files:
 - lib/wordmove/logger.rb
 - lib/wordmove/sql_mover.rb
 - lib/wordmove/version.rb
+- lib/wordmove/wordpress_directory.rb
 - pkg/wordmove-0.0.1.gem
 - pkg/wordmove-0.0.2.gem
 - spec/fixtures/Movefile
@@ -221,11 +217,6 @@ signing_key:
 specification_version: 3
 summary: Capistrano for Wordpress
 test_files:
-- features/generator.feature
-- features/pull.feature
-- features/push.feature
-- features/step_definitions/aruba_ext_steps.rb
-- features/support/setup.rb
 - spec/fixtures/Movefile
 - spec/spec_helper.rb
 - spec/sql_mover_spec.rb

data/features/generator.feature

@@ -1,30 +0,0 @@
-Feature: Generating Movefile
-  In order to configure Wordmove
-  As a WP developer
-  I want Wordmove to generate me a Wordmove skeleton file
-
-  Scenario: Wordmove creation
-    When I run "wordmove init"
-    Then the following files should exist:
-      | Movefile |
-    Then the file "Movefile" should contain:
-      """
-      local:
-        vhost: "http://vhost.local"
-        wordpress_path: "~/dev/sites/your_site"
-        database:
-          user: "user"
-          password: "password"
-          host: "host"
-      remote:
-        vhost: "http://remote.com"
-        wordpress_path: "/var/www/your_site"
-        database:
-          user: "user"
-          password: "password"
-          host: "host"
-        ssh:
-          user: "user"
-          password: "password"
-          host: "host"
-      """

data/features/step_definitions/aruba_ext_steps.rb

@@ -1,3 +0,0 @@
-Then /^the file "([^"]*)" should contain:$/ do |file, content|
-  check_file_content(file, content, true)
-end

data/features/support/setup.rb

@@ -1,2 +0,0 @@
-require 'aruba/cucumber'
-