capistrano-wpcli 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    capistrano-wpcli (0.0.2)
+    capistrano-wpcli (0.0.3)
       capistrano (>= 3.0)
-      dotenv
 
 GEM
   remote: https://rubygems.org/
@@ -13,9 +12,6 @@ GEM
       rake (>= 10.0.0)
       sshkit (~> 1.3)
     colorize (0.7.3)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
     i18n (0.6.9)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)

data/README.md

@@ -37,28 +37,16 @@ Pulls the remote server WP database to local and replaces the urls.
 
 ### Configuration
 
-This plugin needs some configuration to work properly. It will try to load these configurations from the env vars. To do so all you need to do is put the following in `.env` file:
-
-	WP_APP_NAME=example
-	WP_HOME=http://example.dev
-	WP_REMOTE_URL=http://example.com
-
-Alternatively, you can put all your configs in capistrano stage files i.e. `config/deploy/production.rb`.
+This plugin needs some configuration to work properly. You can put all your configs in capistrano stage files i.e. `config/deploy/production.rb`.
 
 Here's the list of options and the defaults for each option:
 
-* `set :application`<br/>
-Name of the application.
-
-* `set :remote_url`<br/>
+* `set :wpcli_remote_url`<br/>
 Url of the Wordpress root installation on the remote server (used by search-replace command).
 
-* `set :local_url`<br/>
+* `set :wpcli_local_url`<br/>
 Url of the Wordpress root installation on the local server (used by search-replace command).
 
-* `set :remote_tmp_dir`<br/>
-A temp dir on the remote server which is read and writeable by the capistrano deploy user. Defaults to `/tmp`.
-
 * `set :local_tmp_dir`<br/>
 A local temp dir which is read and writeable. Defaults to `/tmp`.
 

data/capistrano-wpcli.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'capistrano', '>= 3.0'
-  spec.add_dependency 'dotenv'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/capistrano/tasks/wpdb.rake

@@ -1,24 +1,19 @@
 namespace :load do
   task :defaults do
-    set :application,  ENV["WP_APP_NAME"]
-    # A temp dir which is read and writeable by the capistrano
-    # deploy user
-    set :remote_tmp_dir, ENV["WP_REMOTE_TMP"] || "/tmp"
-
-    # A local temp dir which is read and writeable
-    set :local_tmp_dir, ENV["WP_LOCAL_TMP"] || "/tmp"
-
     # The url under which the wordpress installation is
     # available on the remote server
-    set :remote_url, ENV["WP_REMOTE_URL"]
+    set :wpcli_remote_url, "http://example.com"
 
     # The url under which the wordpress installation is
     # available on the local server
-    set :local_url, ENV["WP_HOME"]
+    set :wpcli_local_url, "http://example.dev"
+
+    # A local temp dir which is read and writeable
+    set :local_tmp_dir, "/tmp"
     
-    # Shortcuts
-    set :remote_db_file, "#{fetch(:remote_tmp_dir)}/#{fetch(:application)}_database.sql"
-    set :local_db_file, "#{fetch(:local_tmp_dir)}/#{fetch(:application)}_database.sql"
+    # Temporal db dumps path
+    set :wpcli_remote_db_file, "#{fetch(:tmp_dir)}/wpcli_database.sql"
+    set :wpcli_local_db_file, "#{fetch(:local_tmp_dir)}/wpcli_database.sql"
   end
 end
 
@@ -28,17 +23,15 @@ namespace :wpcli do
     task :pull do
       on roles(:web) do
         within release_path do
-          with path: "#{fetch(:path)}:$PATH" do
-            execute :wp, "db export",  fetch(:remote_db_file)
-            download! fetch(:remote_db_file), fetch(:local_db_file)
-            execute :rm, fetch(:remote_db_file)
-          end
+          execute :wp, "db export",  fetch(:wpcli_remote_db_file)
+          download! fetch(:wpcli_remote_db_file), fetch(:wpcli_local_db_file)
+          execute :rm, fetch(:wpcli_remote_db_file)
         end
 
         run_locally do
-          execute :wp, "db import", fetch(:local_db_file)
-          execute :rm, "#{fetch(:local_db_file)}"
-          execute :wp, "search-replace", "'#{fetch(:remote_url)}' '#{fetch(:local_url)}' --skip-columns=guid"
+          execute :wp, "db import", fetch(:wpcli_local_db_file)
+          execute :rm, "#{fetch(:wpcli_local_db_file)}"
+          execute :wp, "search-replace", fetch(:wpcli_remote_url), fetch(:wpcli_local_url), "--skip-columns=guid"
         end
       end
     end
@@ -47,21 +40,19 @@ namespace :wpcli do
     task :push do
       on roles(:web) do
         run_locally do
-          execute :wp, "db export", fetch(:local_db_file)
+          execute :wp, "db export", fetch(:wpcli_local_db_file)
         end
 
-        upload! fetch(:local_db_file), fetch(:remote_db_file)
+        upload! fetch(:wpcli_local_db_file), fetch(:wpcli_remote_db_file)
 
         run_locally do
-          execute :rm, fetch(:local_db_file)
+          execute :rm, fetch(:wpcli_local_db_file)
         end
 
         within release_path do
-          with path: "#{fetch(:path)}:$PATH" do
-            execute :wp, "db import", fetch(:remote_db_file)
-            execute :rm, fetch(:remote_db_file)
-            execute :wp, "search-replace", "'#{fetch(:local_url)}' '#{fetch(:remote_url)}' --skip-columns=guid"
-          end
+          execute :wp, "db import", fetch(:wpcli_remote_db_file)
+          execute :rm, fetch(:wpcli_remote_db_file)
+          execute :wp, "search-replace", fetch(:wpcli_local_url), fetch(:wpcli_remote_url), "--skip-columns=guid"
         end
       end
     end

data/lib/capistrano/wpcli.rb

@@ -1,6 +1,2 @@
-# Load configuration from .env
-require "dotenv"
-Dotenv.load
-
 load File.expand_path("../tasks/wpcli.rake", __FILE__)
 load File.expand_path("../tasks/wpdb.rake", __FILE__)

data/lib/capistrano/wpcli/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Wpcli
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-wpcli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3608175918401034373
+      hash: 3163576760790071014
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3608175918401034373
+      hash: 3163576760790071014
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23