wordmove 1.0.19 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0815e1b130f5d14fcf46ec9587f80ce97fb3e5
-  data.tar.gz: 2ddf287e0114c36f24b3e9e07afa4c3977ceec28
+  metadata.gz: 106a67fd129100bb5aebc13a4192a80a0d44b03f
+  data.tar.gz: e6bb9c88173c3ba982915ceb504483b91067705c
 SHA512:
-  metadata.gz: 8c349036cfeaf78f524176eb8324b9e41942404ae6e3addbe16689e86f7ceeb2d0c74b20405a2e484f9bb1b1df2cfa63bba96e05d2f7190f1633a92a1c6efe48
-  data.tar.gz: 8a2f8fa34728cee8d4fae36c8f4bcd1d5b826ff15462928df344c284964a05d7997a395efdadb93528039272b27323f7e2ed03f8432f78e23ab38972d7972197
+  metadata.gz: d3c763c22230e1893fd2fac63593e4c8c2872df62af6d85c2a230e85173d763d712d76e92450cb2d543577d5fbbf314f0ad3b873445fedf03109a0b2441059ab
+  data.tar.gz: 016a86b636cde8b3b293f50b2b316530bfdbd0b1626e0992e721611bd200f1c873610dcfb9b7bd7f204dc4e3b814480d2ce5bc6c5473f6d3b4c1497d9cf2161c

data/.gitignore

@@ -1,3 +1,4 @@
 tmp/*
 pkg/*
 .DS_Store
+.bundle

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordmove (1.0.19)
+    wordmove (1.1.0)
       activesupport
       colored
       i18n

data/lib/wordmove/deployer/base.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext'
 require 'wordmove/core_ext'
 require 'wordmove/logger'
 require 'wordmove/wordpress_directory'
-require 'wordmove/sql_mover'
+require 'wordmove/sql_adapter'
 require 'escape'
 
 module Wordmove
@@ -177,7 +177,7 @@ module Wordmove
         unless options[:no_adapt]
           logger.task_step true, "adapt dump"
           unless simulate?
-            SqlMover.new(save_to_path, local, remote).move!
+            SqlAdapter.new(save_to_path, local, remote).adapt!
           end
         end
       end

data/lib/wordmove/generators/Movefile

@@ -1,12 +1,12 @@
 local:
   vhost: "http://vhost.local"
-  wordpress_path: "/home/john/sites/your_site" # use an absolute path here
+  wordpress_path: "<%= wordpress_path %>" # use an absolute path here
 
   database:
-    name: "database_name"
-    user: "user"
-    password: "password"
-    host: "127.0.0.1"
+    name: "<%= database.name %>"
+    user: "<%= database.user %>"
+    password: "<%= database.password %>"
+    host: "<%= database.host %>"
 
 staging:
   vhost: "http://remote.com"

data/lib/wordmove/generators/movefile.rb

@@ -1,9 +1,11 @@
 require 'thor/group'
+require 'wordmove/generators/movefile_adapter'
 
 module Wordmove
   module Generators
     class Movefile < Thor::Group
       include Thor::Actions
+      include MovefileAdapter
 
       def self.source_root
         File.dirname(__FILE__)
@@ -16,3 +18,4 @@ module Wordmove
     end
   end
 end
+

data/lib/wordmove/generators/movefile_adapter.rb

@@ -0,0 +1,86 @@
+require 'ostruct'
+require 'wordmove/wordpress_directory'
+
+module Wordmove
+  module Generators
+    module MovefileAdapter
+      def wordpress_path
+        File.expand_path(Dir.pwd)
+      end
+
+      def database
+        DBConfigReader.config
+      end
+    end
+
+    class DBConfigReader
+      def self.config
+        new.config
+      end
+
+      def config
+        OpenStruct.new(database_config)
+      end
+
+      def database_config
+        if wp_config_exists?
+          WordpressDBConfig.config
+        else
+          DefaultDBConfig.config
+        end
+      end
+
+      def wp_config_exists?
+        File.exists?(WordpressDirectory.default_path_for(:wp_config))
+      end
+    end
+
+    class DefaultDBConfig
+      def self.config
+        {
+          name: "database_name",
+          user: "user",
+          password: "password",
+          host: "127.0.0.1"
+        }
+      end
+    end
+
+    class WordpressDBConfig
+      def self.config
+        new.config
+      end
+
+      def wp_config
+        @wp_config ||= File.open(WordpressDirectory.default_path_for(:wp_config)).read
+      end
+
+      def wp_definitions
+        {
+          name: 'DB_NAME',
+          user: 'DB_USER',
+          password: 'DB_PASSWORD',
+          host: 'DB_HOST'
+        }
+      end
+
+      def wp_definition_regex(definition)
+        /['"]#{definition}['"],\s*["'](?<value>.*)['"]/
+      end
+
+      def defaults
+        DefaultDBConfig.config.clone
+      end
+
+      def config
+        wp_definitions.each_with_object(defaults) do |(key, definition), result|
+          wp_config.match(wp_definition_regex(definition)) do |match|
+            result[key] = match[:value]
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/wordmove/{sql_mover.rb → sql_adapter.rb}

@@ -1,7 +1,5 @@
 module Wordmove
-
-  class SqlMover
-
+  class SqlAdapter
     attr_accessor :sql_content
     attr_reader :sql_path, :source_config, :dest_config
 
@@ -15,7 +13,7 @@ module Wordmove
       @sql_content ||= File.open(sql_path).read
     end
 
-    def move!
+    def adapt!
       replace_vhost!
       replace_wordpress_path!
       write_sql!

data/lib/wordmove/version.rb

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

data/lib/wordmove/wordpress_directory.rb

@@ -2,6 +2,7 @@ class WordpressDirectory < Struct.new(:type, :options)
 
   module PATH
     WP_CONTENT = :wp_content
+    WP_CONFIG  = :wp_config
     PLUGINS    = :plugins
     THEMES     = :themes
     UPLOADS    = :uploads
@@ -10,12 +11,17 @@ class WordpressDirectory < Struct.new(:type, :options)
 
   DEFAULT_PATHS = {
     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'
   }
 
+  def self.default_path_for(sym)
+    DEFAULT_PATHS[sym]
+  end
+
   def path(*args)
     File.join(options[:wordpress_path], relative_path(*args))
   end

data/spec/features/movefile_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'wordmove/generators/movefile'
+
+describe Wordmove::Generators::Movefile do
+
+  let(:movefile) { 'Movefile' }
+  let(:tmpdir) { "/tmp/wordmove" }
+
+  before do
+    @pwd = Dir.pwd
+    FileUtils.mkdir(tmpdir)
+    Dir.chdir(tmpdir)
+  end
+
+  after do
+    Dir.chdir(@pwd)
+    FileUtils.rm_rf(tmpdir)
+  end
+
+  context "::start" do
+    before do
+      capture(:stdout) { Wordmove::Generators::Movefile.start }
+    end
+
+    it 'creates a Movefile' do
+      expect(File.exists?(movefile)).to be_true
+    end
+
+    it 'fills local wordpress_path using shell path' do
+      yaml = YAML::load(File.open(movefile))
+      expect(yaml['local']['wordpress_path']).to eq(Dir.pwd)
+    end
+
+    it 'fills database configuration defaults' do
+      yaml = YAML::load(File.open(movefile))
+      expect(yaml['local']['database']['name']).to eq('database_name')
+      expect(yaml['local']['database']['user']).to eq('user')
+      expect(yaml['local']['database']['password']).to eq('password')
+      expect(yaml['local']['database']['host']).to eq('127.0.0.1')
+    end
+  end
+
+  context "database configuration" do
+    let(:wp_config) { File.join(File.dirname(__FILE__), "../fixtures/wp-config.php") }
+
+    before do
+      FileUtils.cp(wp_config, ".")
+      capture(:stdout) { Wordmove::Generators::Movefile.start }
+    end
+
+    it 'fills database configuration from wp-config' do
+      yaml = YAML::load(File.open(movefile))
+      expect(yaml['local']['database']['name']).to eq('wordmove_db')
+      expect(yaml['local']['database']['user']).to eq('wordmove_user')
+      expect(yaml['local']['database']['password']).to eq('wordmove_password')
+      expect(yaml['local']['database']['host']).to eq('wordmove_host')
+    end
+  end
+end

data/spec/fixtures/wp-config.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * The base configurations of the WordPress.
+ *
+ * This file has the following configurations: MySQL settings, Table Prefix,
+ * Secret Keys, WordPress Language, and ABSPATH. You can find more information
+ * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
+ * wp-config.php} Codex page. You can get the MySQL settings from your web host.
+ *
+ * This file is used by the wp-config.php creation script during the
+ * installation. You don't have to use the web site, you can just copy this file
+ * to "wp-config.php" and fill in the values.
+ *
+ * @package WordPress
+ */
+
+// ** MySQL settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+define('DB_NAME', 'wordmove_db');
+
+/** MySQL database username */
+define('DB_USER', 'wordmove_user');
+
+/** MySQL database password */
+define('DB_PASSWORD', 'wordmove_password');
+
+/** MySQL hostname */
+define('DB_HOST', 'wordmove_host');
+
+/** Database Charset to use in creating database tables. */
+define('DB_CHARSET', 'utf8');
+
+/** The Database Collate type. Don't change this if in doubt. */
+define('DB_COLLATE', '');
+
+/**#@+
+ * Authentication Unique Keys and Salts.
+ *
+ * Change these to different unique phrases!
+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
+ * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+ *
+ * @since 2.6.0
+ */
+define('AUTH_KEY',         'put your unique phrase here');
+define('SECURE_AUTH_KEY',  'put your unique phrase here');
+define('LOGGED_IN_KEY',    'put your unique phrase here');
+define('NONCE_KEY',        'put your unique phrase here');
+define('AUTH_SALT',        'put your unique phrase here');
+define('SECURE_AUTH_SALT', 'put your unique phrase here');
+define('LOGGED_IN_SALT',   'put your unique phrase here');
+define('NONCE_SALT',       'put your unique phrase here');
+
+/**#@-*/
+
+/**
+ * WordPress Database Table prefix.
+ *
+ * You can have multiple installations in one database if you give each a unique
+ * prefix. Only numbers, letters, and underscores please!
+ */
+$table_prefix  = 'wp_';
+
+/**
+ * WordPress Localized Language, defaults to English.
+ *
+ * Change this to localize WordPress. A corresponding MO file for the chosen
+ * language must be installed to wp-content/languages. For example, install
+ * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
+ * language support.
+ */
+define('WPLANG', '');
+
+/**
+ * For developers: WordPress debugging mode.
+ *
+ * Change this to true to enable the display of notices during development.
+ * It is strongly recommended that plugin and theme developers use WP_DEBUG
+ * in their development environments.
+ */
+define('WP_DEBUG', false);
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+	define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');

data/spec/spec_helper.rb

@@ -7,5 +7,16 @@ require 'active_support/core_ext'
 require 'thor'
 
 RSpec.configure do |config|
-  # some (optional) config here
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
 end

data/spec/{sql_mover_spec.rb → sql_adapter_spec.rb}

@@ -1,13 +1,13 @@
-require 'wordmove/sql_mover'
+require 'wordmove/sql_adapter'
 require 'tempfile'
 
-describe Wordmove::SqlMover do
+describe Wordmove::SqlAdapter do
 
   let(:sql_path) { double }
   let(:source_config) { double }
   let(:dest_config) { double }
-  let(:sql_mover) {
-    Wordmove::SqlMover.new(
+  let(:adapter) {
+    Wordmove::SqlAdapter.new(
       sql_path,
       source_config,
       dest_config
@@ -16,9 +16,9 @@ describe Wordmove::SqlMover do
 
   context ".initialize" do
     it "should assign variables correctly on initialization" do
-      sql_mover.sql_path.should == sql_path
-      sql_mover.source_config.should == source_config
-      sql_mover.dest_config.should == dest_config
+      adapter.sql_path.should == sql_path
+      adapter.source_config.should == source_config
+      adapter.dest_config.should == dest_config
     end
   end
 
@@ -29,16 +29,16 @@ describe Wordmove::SqlMover do
     let(:sql_path) { sql.path }
 
     it "should read the sql file content" do
-      sql_mover.sql_content.should == 'DUMP'
+      adapter.sql_content.should == 'DUMP'
     end
   end
 
-  context ".move!" do
+  context ".adapt!" do
     it "should replace host, path and write to sql" do
-      sql_mover.should_receive(:replace_vhost!).and_return(true)
-      sql_mover.should_receive(:replace_wordpress_path!).and_return(true)
-      sql_mover.should_receive(:write_sql!).and_return(true)
-      sql_mover.move!
+      adapter.should_receive(:replace_vhost!).and_return(true)
+      adapter.should_receive(:replace_wordpress_path!).and_return(true)
+      adapter.should_receive(:write_sql!).and_return(true)
+      adapter.adapt!
     end
   end
 
@@ -48,8 +48,8 @@ describe Wordmove::SqlMover do
       let(:dest_config)   do { :vhost => "FUNK" } end
 
       it "should replace source vhost with dest vhost" do
-        sql_mover.should_receive(:replace_field!).with("DUMP", "FUNK").and_return(true)
-        sql_mover.replace_vhost!
+        adapter.should_receive(:replace_field!).with("DUMP", "FUNK").and_return(true)
+        adapter.replace_vhost!
       end
     end
 
@@ -58,16 +58,16 @@ describe Wordmove::SqlMover do
       let(:dest_config)   do { :wordpress_path => "FUNK" } end
 
       it "should replace source vhost with dest wordpress paths" do
-        sql_mover.should_receive(:replace_field!).with("DUMP", "FUNK").and_return(true)
-        sql_mover.replace_wordpress_path!
+        adapter.should_receive(:replace_field!).with("DUMP", "FUNK").and_return(true)
+        adapter.replace_wordpress_path!
       end
 
       context "given an absolute path" do
         let(:source_config) do { :wordpress_absolute_path => "ABSOLUTE_DUMP", :wordpress_path => "DUMP" } end
 
         it "should replace the absolute path instead" do
-          sql_mover.should_receive(:replace_field!).with("ABSOLUTE_DUMP", "FUNK").and_return(true)
-          sql_mover.replace_wordpress_path!
+          adapter.should_receive(:replace_field!).with("ABSOLUTE_DUMP", "FUNK").and_return(true)
+          adapter.replace_wordpress_path!
         end
       end
     end
@@ -75,9 +75,9 @@ describe Wordmove::SqlMover do
 
   context ".replace_field!" do
     it "should replace source vhost with dest vhost" do
-      sql_mover.should_receive(:serialized_replace!).ordered.with("DUMP", "FUNK").and_return(true)
-      sql_mover.should_receive(:simple_replace!).ordered.with("DUMP", "FUNK").and_return(true)
-      sql_mover.replace_field!("DUMP", "FUNK")
+      adapter.should_receive(:serialized_replace!).ordered.with("DUMP", "FUNK").and_return(true)
+      adapter.should_receive(:simple_replace!).ordered.with("DUMP", "FUNK").and_return(true)
+      adapter.replace_field!("DUMP", "FUNK")
     end
   end
 
@@ -87,24 +87,24 @@ describe Wordmove::SqlMover do
     let(:sql_path) { sql.path }
 
     it "should replace source vhost with dest vhost" do
-      sql_mover.serialized_replace!('http://dump.com', 'http://shrubbery.com')
-      sql_mover.sql_content.should == 'a:3:{i:0;s:25:"http://shrubbery.com/spam";i:1;s:6:"foobar";i:2;s:27:"http://shrubbery.com/foobar";}'
+      adapter.serialized_replace!('http://dump.com', 'http://shrubbery.com')
+      adapter.sql_content.should == 'a:3:{i:0;s:25:"http://shrubbery.com/spam";i:1;s:6:"foobar";i:2;s:27:"http://shrubbery.com/foobar";}'
     end
 
     context "given empty strings" do
       let(:content) { 's:0:"";s:3:"foo";s:0:"";' }
 
       it "should leave them untouched" do
-        sql_mover.serialized_replace!('foo', 'sausage')
-        sql_mover.sql_content.should == 's:0:"";s:7:"sausage";s:0:"";'
+        adapter.serialized_replace!('foo', 'sausage')
+        adapter.sql_content.should == 's:0:"";s:7:"sausage";s:0:"";'
       end
 
       context "considering escaping" do
         let(:content) { 's:0:\"\";s:3:\"foo\";s:0:\"\";' }
 
         it "should leave them untouched" do
-          sql_mover.serialized_replace!('foo', 'sausage')
-          sql_mover.sql_content.should == 's:0:\"\";s:7:\"sausage\";s:0:\"\";'
+          adapter.serialized_replace!('foo', 'sausage')
+          adapter.sql_content.should == 's:0:\"\";s:7:\"sausage\";s:0:\"\";'
         end
       end
     end
@@ -113,8 +113,8 @@ describe Wordmove::SqlMover do
       let(:content) { 's:6:"dump\"\"";' }
 
       it "should calculate the correct final length" do
-        sql_mover.serialized_replace!('dump', 'sausage')
-        sql_mover.sql_content.should == 's:9:"sausage\"\"";'
+        adapter.serialized_replace!('dump', 'sausage')
+        adapter.sql_content.should == 's:9:"sausage\"\"";'
       end
     end
 
@@ -122,8 +122,8 @@ describe Wordmove::SqlMover do
       let(:content) { "a:3:{s:20:\\\"http://dump.com/spam\\\";s:6:'foobar';s:22:'http://dump.com/foobar';s:8:'sausages';}" }
 
       it "should handle replacing just as well" do
-        sql_mover.serialized_replace!('http://dump.com', 'http://shrubbery.com')
-        sql_mover.sql_content.should == "a:3:{s:25:\\\"http://shrubbery.com/spam\\\";s:6:'foobar';s:27:'http://shrubbery.com/foobar';s:8:'sausages';}"
+        adapter.serialized_replace!('http://dump.com', 'http://shrubbery.com')
+        adapter.sql_content.should == "a:3:{s:25:\\\"http://shrubbery.com/spam\\\";s:6:'foobar';s:27:'http://shrubbery.com/foobar';s:8:'sausages';}"
       end
     end
 
@@ -131,8 +131,8 @@ describe Wordmove::SqlMover do
       let(:content) { 'a:1:{i:0;s:52:"ni http://dump.com/spam ni http://dump.com/foobar ni";}' }
 
       it "should replace all occurences" do
-        sql_mover.serialized_replace!('http://dump.com', 'http://shrubbery.com')
-        sql_mover.sql_content.should == 'a:1:{i:0;s:62:"ni http://shrubbery.com/spam ni http://shrubbery.com/foobar ni";}'
+        adapter.serialized_replace!('http://dump.com', 'http://shrubbery.com')
+        adapter.sql_content.should == 'a:1:{i:0;s:62:"ni http://shrubbery.com/spam ni http://shrubbery.com/foobar ni";}'
       end
     end
   end
@@ -143,8 +143,8 @@ describe Wordmove::SqlMover do
     let(:sql_path) { sql.path }
 
     it "should replace source vhost with dest vhost" do
-      sql_mover.simple_replace!("DUMP", "FUNK")
-      sql_mover.sql_content.should == "THE FUNK!"
+      adapter.simple_replace!("DUMP", "FUNK")
+      adapter.sql_content.should == "THE FUNK!"
     end
   end
 
@@ -155,8 +155,8 @@ describe Wordmove::SqlMover do
     let(:the_funk) { "THE FUNK THE FUNK THE FUNK" }
 
     it "should write content to file" do
-      sql_mover.sql_content = the_funk
-      sql_mover.write_sql!
+      adapter.sql_content = the_funk
+      adapter.write_sql!
       File.open(sql_path).read == the_funk
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.1.0
 platform: ruby
 authors:
 - Stefano Verna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -138,16 +138,19 @@ files:
 - lib/wordmove/deployer/ssh.rb
 - lib/wordmove/generators/Movefile
 - lib/wordmove/generators/movefile.rb
+- lib/wordmove/generators/movefile_adapter.rb
 - lib/wordmove/logger.rb
-- lib/wordmove/sql_mover.rb
+- lib/wordmove/sql_adapter.rb
 - lib/wordmove/version.rb
 - 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_mover_spec.rb
+- spec/sql_adapter_spec.rb
 - wordmove.gemspec
 homepage: https://github.com/welaika/wordmove
 licenses:
@@ -183,7 +186,9 @@ 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_mover_spec.rb
+- spec/sql_adapter_spec.rb
 has_rdoc: