wordpress-deploy 1.0.0.alpha1 → 1.0.0.alpha2

data/.gitignore

@@ -1,2 +1,27 @@
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+
+# Mac files
 .DS_Store
-pkg/*
+
+# Spec data made during tests
+spec/data/wp-config.php
+*.log
+config/
+site/

data/.rspec

@@ -0,0 +1 @@
+--color

data/.rvmrc

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 1.9.3" > .rvmrc
+environment_id="ruby-1.9.3-p194@wordpress-deploy"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.14.10 (stable)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,7 +1,4 @@
-# encoding: utf-8
+source 'https://rubygems.org'
 
-# RubyGems Source
-source 'http://rubygems.org'
-
-# Include gem dependencies from the gemspec for development purposes
+# Specify your gem's dependencies in daavtest.gemspec
 gemspec

data/Gemfile.lock

@@ -1,71 +1,83 @@
 PATH
   remote: .
   specs:
-    wordpress-deploy (1.0.0)
+    wordpress-deploy (1.0.0.alpha2)
       actionpack (~> 3.2.6)
       colorize (~> 0.5.8)
-      open4 (~> 1.3.0)
-      thor (~> 0.14.6)
+      os (~> 0.9.4)
+      thor (~> 0.15.4)
+      titleize (~> 1.2.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    actionpack (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activesupport (3.2.6)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.0)
     colorize (0.5.8)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    ffi (1.1.4)
+    guard (1.3.0)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (1.2.1)
+      guard (>= 1.1)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
-    metaclass (0.0.1)
-    mocha (0.11.4)
-      metaclass (~> 0.0.1)
+    listen (0.4.7)
+      rb-fchange (~> 0.0.5)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
     multi_json (1.3.6)
-    open4 (1.3.0)
+    os (0.9.6)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.11.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.15.4)
     tilt (1.3.3)
-    timecop (0.3.5)
+    titleize (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha
-  rake
-  rspec
-  timecop
+  guard-rspec (~> 1.2.1)
+  rake (~> 0.9.2.2)
+  rspec (~> 2.11.0)
   wordpress-deploy!

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/wordpress_deploy/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  #watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  #watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  #watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  #watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  #watch('config/routes.rb')                           { "spec/routing" }
+  #watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara request specs
+  #watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  #watch(%r{^spec/acceptance/(.+)\.feature$})
+  #watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/README.md

@@ -1,22 +1,37 @@
-Wordpress Deploy
-======
+Wordpress Deploy [![Build Status](https://secure.travis-ci.org/RLovelett/wordpress-deploy.png?branch=master)](http://travis-ci.org/RLovelett/wordpress-deploy)
+================
 
 Wordpress Deploy is a RubyGem, written for Linux and Mac OSX, that allows you to easily perform Wordpress deployment operations. It provides you with an elegant DSL in Ruby for modeling your deployments.
 
-### Author
+[Relocate Method](http://codex.wordpress.org/Changing_The_Site_URL#Relocate_method)
 
-**[Ryan Lovelett](http://ryan.lovelett.me/) ( [@rlovelett](http://twitter.com/#!/rlovelett) )**
+Author
+------
+
+[Ryan Lovelett](http://ryan.lovelett.me/) ( [@rlovelett](http://twitter.com/#!/rlovelett) )
 
 Drop me a message for any questions, suggestions, requests, bugs or submit them to the [issue log](https://github.com/rlovelett/wordpress-deploy/issues).
 
+Requirements
+------------
+
+* thor ~>0.15.4
+* colorize ~>0.5.8
+* os ~>0.9.4
+* titleize ~>1.2.1
+* rspec ~>2.11.0
 
-### Installation
+Installation
+------------
 
 To get the latest stable version
 
     gem install wordpress-deploy
 
-You can view the list of released versions over at [RubyGems.org (Backup)](https://rubygems.org/gems/wordpress-deploy/versions)
+You can view the list of released versions over at [RubyGems.org
+(Wordpress Deploy)](https://rubygems.org/gems/wordpress-deploy/versions)
 
+Usage
+-----
 
-### Getting Started
+    wp-deploy help

data/bin/wp-deploy

@@ -4,8 +4,5 @@
 # Load the WordpressDeploy core library
 require File.expand_path("../../lib/wordpress_deploy", __FILE__)
 
-# Load the WordpressDeploy command line interface utility
-require File.expand_path("../../lib/wordpress_deploy/cli/utility", __FILE__)
-
 # Initialize the WordpressDeploy command line utility
-WordpressDeploy::CLI::Utility.start
+WordpressDeploy::Cli::Utility.start

data/lib/wordpress_deploy.rb

@@ -1,61 +1,35 @@
-# encoding: utf-8
+require "thor"
+require "open3"
+require "fileutils"
 
-# Load Ruby Core Libraries
-require 'rubygems'
-require 'fileutils'
-require 'tempfile'
-require 'yaml'
-require 'etc'
-
-require 'open4'
-require 'thor'
-
-##
-# The Wordpress Deploy Ruby Gem
 module WordpressDeploy
-
   ##
-  # Wordpress Deploy's internal paths
-  ROOT_PATH          = File.dirname(__FILE__)
-  LIBRARY_PATH       = File.join(ROOT_PATH, 'wordpress_deploy')
-  CLI_PATH           = File.join(LIBRARY_PATH, 'cli')
-  DATABASE_PATH      = File.join(LIBRARY_PATH, 'database')
-  STORAGE_PATH       = File.join(LIBRARY_PATH, 'storage')
-
-  ##
-  # Autoload Wordpress Deploy CLI files
-  module CLI
+  # WordpressDeploy's internal paths
+  #
+  LIBRARY_PATH            = File.join(File.dirname(__FILE__), 'wordpress_deploy')
+  CLI_PATH                = File.join(LIBRARY_PATH, 'cli')
+  WORDPRESS_PATH          = File.join(LIBRARY_PATH, 'wordpress')
+  TRANSFER_PROTOCOLS_PATH = File.join(LIBRARY_PATH, 'transfer_protocols')
+  DATABASE_PATH           = File.join(LIBRARY_PATH, 'database')
+
+  module Cli
     autoload :Helpers, File.join(CLI_PATH, 'helpers')
     autoload :Utility, File.join(CLI_PATH, 'utility')
   end
 
-  ##
-  # Autoload Wordpress Deploy storage files
-  module Storage
-    autoload :Base,       File.join(STORAGE_PATH, 'base')
-    autoload :FTP,        File.join(STORAGE_PATH, 'ftp')
-    autoload :SFTP,       File.join(STORAGE_PATH, 'sftp')
-    autoload :SCP,        File.join(STORAGE_PATH, 'scp')
-    autoload :Local,      File.join(STORAGE_PATH, 'local')
+  module Wordpress
+    autoload :Configuration, File.join(WORDPRESS_PATH, 'configuration')
   end
 
-  ##
-  # Autoload Wordpress Deploy database files
-  module Database
-    autoload :Base,       File.join(DATABASE_PATH, 'base')
-    autoload :MySQL,      File.join(DATABASE_PATH, 'mysql')
-    autoload :PostgreSQL, File.join(DATABASE_PATH, 'postgresql')
-    autoload :MongoDB,    File.join(DATABASE_PATH, 'mongodb')
-    autoload :Redis,      File.join(DATABASE_PATH, 'redis')
-    autoload :Riak,       File.join(DATABASE_PATH, 'riak')
+  module TransferProtocols
+    autoload :Ftp, File.join(TRANSFER_PROTOCOLS_PATH, 'ftp')
   end
 
-  %w{
-    config
-    errors
-    logger
-    pipeline
-    version
-  }.each {|lib| require File.join(LIBRARY_PATH, lib) }
+  module Database
+    autoload :MySql, File.join(DATABASE_PATH, 'mysql')
+  end
 
+  %w{version logger errors environment}.each do |klass|
+    require File.join(LIBRARY_PATH, klass)
+  end
 end

data/lib/wordpress_deploy/cli/helpers.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module WordpressDeploy
-  module CLI
+  module Cli
     module Helpers
       UTILITY = {}
 
@@ -17,24 +17,26 @@ module WordpressDeploy
       # Returns nil
       def run(command)
         name = command_name(command)
-        Logger.message "Running system utility '#{ name }'..."
+        Logger.debug "Running system utility '#{ name }'..."
 
         begin
-          out, err = '', ''
-          ps = Open4.popen4(command) do |pid, stdin, stdout, stderr|
+          out, err, ps = '', '', nil
+          Open3.popen3 command do |stdin, stdout, stderr, wait_thr|
             stdin.close
-            out, err = stdout.read.strip, stderr.read.strip
+            out = stdout.read.strip
+            err = stderr.read.strip
+            ps = wait_thr.value #Process::Status object returned
           end
         rescue Exception => e
-          raise Errors::CLI::SystemCallError.wrap(e, <<-EOS)
+          raise Errors::Cli::SystemCallError.wrap(e, <<-EOS)
             Failed to execute system command on #{ RUBY_PLATFORM }
             Command was: #{ command }
           EOS
         end
 
-        if ps.success?
+        if !ps.nil? && ps.success?
           unless out.empty?
-            Logger.message(
+            Logger.debug(
               out.lines.map {|line| "#{ name }:STDOUT: #{ line }" }.join
             )
           end
@@ -47,7 +49,7 @@ module WordpressDeploy
 
           return nil
         else
-          raise Errors::CLI::SystemCallError, <<-EOS
+          raise Errors::Cli::SystemCallError, <<-EOS
             '#{ name }' Failed on #{ RUBY_PLATFORM }
             The following information should help to determine the problem:
             Command was: #{ command }
@@ -64,18 +66,29 @@ module WordpressDeploy
       # Raises an error if utility can not be found in the system's $PATH
       def utility(name)
         name = name.to_s.strip
-        raise Errors::CLI::UtilityNotFoundError,
+        raise Errors::Cli::UtilityNotFoundError,
             'Utility Name Empty' if name.empty?
 
-        path = UTILITY[name] || %x[which #{ name } 2>/dev/null].chomp
-        if path.empty?
-          raise Errors::CLI::UtilityNotFoundError, <<-EOS
+        path = UTILITY[name]
+        err, ps = '', nil
+        Open3.popen3 "which #{name}" do |stdin, stdout, stderr, wait_thr|
+          stdin.close
+          path = stdout.read.strip.chomp
+          err  = stderr.read.strip.chomp
+
+          # Process::Status object returned
+          ps = wait_thr.value
+        end if path.nil?
+
+        if !ps.nil? && ps.success?
+          UTILITY[name] = path
+        else
+          raise Errors::Cli::UtilityNotFoundError, <<-EOS
             Could not locate '#{ name }'.
             Make sure the specified utility is installed
             and available in your system's $PATH.
           EOS
         end
-        UTILITY[name] = path
       end
 
       ##