wordmove 0.0.6 → 0.0.7

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordmove (0.0.5)
+    wordmove (0.0.6)
       activesupport (~> 3.0.0)
       colored
       escape

data/README.mdown

@@ -56,11 +56,23 @@ remote:
     port: 2202 # optional
 ```
 
-## Known problems and limitations
+## Requirements
 * Wordmove requires an SSH connection to the remote host;
 * Wordmove requires `mysqldump` and `mysql` to be present in the remote host and executable by the SSH user;
 * Wordmove requires `rsync` to be present and executable in your machine;
 
+## About SSH authentication
+
+### If you have your local SSH public key already installed on the remote machine.. (recommended)
+Just drop the `remote.ssh.password` file on your `Movefile`.
+
+### Else..
+You need to have `sshpass` on your machine. On Linux, install it with your standard package manager. On Mac, you can have it via [`brew`](https://github.com/mxcl/homebrew):
+
+```
+sudo brew install https://raw.github.com/gist/1513663/3e98bf9e03feb7e31eeddcd08f89ca86163a376d/sshpass.rb
+```
+
 ## License
 
 (The MIT License)

data/lib/wordmove/hosts/remote_host.rb

@@ -36,11 +36,15 @@ module Wordmove
     end
 
     def download_dir(source_dir, destination_dir)
-      rsync "#{source_dir}/", "#{options.ssh.username}@#{options.ssh.host}:#{destination_dir}"
+      destination_dir = "#{options.ssh.host}:#{destination_dir}"
+      destination_dir = "#{options.ssh.username}@#{destination_dir}" if options.ssh.username
+      rsync "#{source_dir}/", destination_dir
     end
 
     def upload_dir(source_dir, destination_dir)
-      rsync "#{options.ssh.username}@#{options.ssh.host}:#{source_dir}/", destination_dir
+      source_dir = "#{options.ssh.host}:#{source_dir}/"
+      source_dir = "#{options.ssh.username}@#{source_dir}" if options.ssh.username
+      rsync source_dir, destination_dir
     end
 
     def run(*args)
@@ -59,26 +63,25 @@ module Wordmove
 
       arguments = [ "-azLK" ]
 
-      password_file = nil
-      if options.ssh
+      if options.ssh && (options.ssh.port || options.ssh.password)
+
+        remote_shell_arguments = [ "ssh" ]
 
         if options.ssh.port
-          arguments << [ '-e', "ssh -p #{options.ssh.port}" ]
+          remote_shell_arguments << [ "-p", options.ssh.port ]
         end
 
         if options.ssh.password
-          password_file = Tempfile.new('rsync_password')
-          password_file.write(options.ssh.password)
-          password_file.close
-          arguments << "--password-file=#{password_file.path}"
+          remote_shell_arguments = [ "sshpass", "-p", options.ssh.password ] + remote_shell_arguments
         end
+
+        arguments << [ "-e", remote_shell_arguments.join(" ") ]
       end
 
       arguments <<  [ "--exclude-from=#{exclude_file.path}", "--delete", source_dir, destination_dir ]
       arguments.flatten!
       locally_run "rsync", *arguments
 
-      password_file.unlink if password_file
       exclude_file.unlink
     end
 

data/lib/wordmove/version.rb

@@ -1,3 +1,3 @@
 module Wordmove
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/fixtures/Movefile

@@ -21,6 +21,7 @@ remote:
     host: "host"
   ssh:
     username: "username"
-    password: "password" # Password is optional, will use public keys if available.
+    password: "password"
     host: "host"
-    # port: 22 # Port is optional
+    port: 30000
+

data/spec/remote_host_spec.rb

@@ -2,36 +2,61 @@ require 'spec_helper'
 
 describe Wordmove::RemoteHost do
 
-  def load_config( config_path )
-    @config = Hashie::Mash.new(YAML::load(File.open(config_path)))
-    @logger = Wordmove::Logger.new
-    @logger.level = Logger::INFO
-    @config.remote[:logger] = @logger
-    @host = Wordmove::RemoteHost.new( @config.remote )
-    @host.stub!(:locally_run).and_return( 1 )
-  end
+  let!(:config) {
+    Hashie::Mash.new(YAML::load(File.open(File.join( File.dirname(__FILE__), "fixtures", "Movefile"))))
+  }
 
-  it "should use ports properly" do
-    load_config( File.join( File.dirname(__FILE__), "fixtures", "Movefile.port" ) )
-    @host.should_receive(:locally_run).with("rsync", "-azLK", "-e",  "ssh -p 30000", anything(), anything(), "--delete", "username@host:foobar/", "barfoo" )
-    @host.upload_dir("foobar", "barfoo" )
-  end
+  let(:host) {
+    logger = Wordmove::Logger.new
+    logger.level = Logger::INFO
+    config.remote[:logger] = @logger
+    host = Wordmove::RemoteHost.new( config.remote )
+    host.stub!(:locally_run).and_return( 1 )
+    host
+  }
 
-  it "should not use ports if missing" do
-    load_config( File.join( File.dirname(__FILE__), "fixtures", "Movefile.no_port" ) )
-    @host.should_receive(:locally_run).with("rsync", "-azLK", anything(), anything(), "--delete", "username@host:foobar/", "barfoo" )
-    @host.upload_dir("foobar", "barfoo" )
-  end
+  context ".upload_dir" do
 
-  it "should skip password files when not using passwords" do
-    load_config( File.join( File.dirname(__FILE__), "fixtures", "Movefile.no_password" ) )
-    @host.should_receive(:locally_run).with("rsync", "-azLK", anything(), "--delete", "username@host:foobar/", "barfoo" )
-    @host.upload_dir("foobar", "barfoo" )
-  end
+    it "should use config ports, username and password properly" do
+      host.should_receive(:locally_run).with("rsync", "-azLK", "-e",  "sshpass -p password ssh -p 30000", anything(), "--delete", "username@host:foobar/", "barfoo" )
+      host.upload_dir( "foobar", "barfoo" )
+    end
+
+    it "should skip port if missing" do
+      config.remote!.ssh!.port = nil
+      host.should_receive(:locally_run).with("rsync", "-azLK", "-e",  "sshpass -p password ssh", anything(), "--delete", "username@host:foobar/", "barfoo" )
+      host.upload_dir( "foobar", "barfoo" )
+    end
+
+    it "should skip username if missing" do
+      config.remote!.ssh!.username = nil
+      host.should_receive(:locally_run).with("rsync", "-azLK", "-e",  "sshpass -p password ssh -p 30000", anything(), "--delete", "host:foobar/", "barfoo" )
+      host.upload_dir( "foobar", "barfoo" )
+    end
+
+    context "when password is missing" do
+
+      before { config.remote!.ssh!.password = nil }
+
+      it "should use config ports and username properly" do
+        host.should_receive(:locally_run).with("rsync", "-azLK", "-e",  "ssh -p 30000", anything(), "--delete", "username@host:foobar/", "barfoo" )
+        host.upload_dir( "foobar", "barfoo" )
+      end
+
+      it "should skip port if missing" do
+        config.remote!.ssh!.port = nil
+        host.should_receive(:locally_run).with("rsync", "-azLK", anything(), "--delete", "username@host:foobar/", "barfoo" )
+        host.upload_dir( "foobar", "barfoo" )
+      end
+
+      it "should skip username if missing" do
+        config.remote!.ssh!.username = nil
+        host.should_receive(:locally_run).with("rsync", "-azLK", "-e",  "ssh -p 30000", anything(), "--delete", "host:foobar/", "barfoo" )
+        host.upload_dir( "foobar", "barfoo" )
+      end
+
+    end
 
-  it "should have a password file when using passwords" do
-    load_config( File.join( File.dirname(__FILE__), "fixtures", "Movefile.with_password" ) )
-    @host.should_receive(:locally_run).with("rsync", "-azLK", /--password-file.*/, anything(), "--delete", "username@host:foobar/", "barfoo" )
-    @host.upload_dir("foobar", "barfoo" )
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70234736353880 !ruby/object:Gem::Requirement
+  requirement: &70270250096520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736353880
+  version_requirements: *70270250096520
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &70234736353340 !ruby/object:Gem::Requirement
+  requirement: &70270250095520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736353340
+  version_requirements: *70270250095520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70234736352780 !ruby/object:Gem::Requirement
+  requirement: &70270250095020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736352780
+  version_requirements: *70270250095020
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70234736352340 !ruby/object:Gem::Requirement
+  requirement: &70270250094540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736352340
+  version_requirements: *70270250094540
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70234736351860 !ruby/object:Gem::Requirement
+  requirement: &70270250093960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736351860
+  version_requirements: *70270250093960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70234736351340 !ruby/object:Gem::Requirement
+  requirement: &70270250093360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736351340
+  version_requirements: *70270250093360
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70234736350760 !ruby/object:Gem::Requirement
+  requirement: &70270250092400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234736350760
+  version_requirements: *70270250092400
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70234736350260 !ruby/object:Gem::Requirement
+  requirement: &70270250091700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736350260
+  version_requirements: *70270250091700
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70234736349600 !ruby/object:Gem::Requirement
+  requirement: &70270250091120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70234736349600
+  version_requirements: *70270250091120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70234736349120 !ruby/object:Gem::Requirement
+  requirement: &70270250090580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234736349120
+  version_requirements: *70270250090580
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70234736348540 !ruby/object:Gem::Requirement
+  requirement: &70270250089940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234736348540
+  version_requirements: *70270250089940
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70234736347900 !ruby/object:Gem::Requirement
+  requirement: &70270250089340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234736347900
+  version_requirements: *70270250089340
 description: Capistrano for Wordpress
 email:
 - stefano.verna@welaika.com
@@ -154,7 +154,6 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
-- README
 - README.mdown
 - Rakefile
 - bin/wordmove
@@ -175,10 +174,6 @@ files:
 - pkg/wordmove-0.0.1.gem
 - pkg/wordmove-0.0.2.gem
 - spec/fixtures/Movefile
-- spec/fixtures/Movefile.no_password
-- spec/fixtures/Movefile.no_port
-- spec/fixtures/Movefile.port
-- spec/fixtures/Movefile.with_password
 - spec/remote_host_spec.rb
 - spec/spec_helper.rb
 - wordmove.gemspec
@@ -213,9 +208,5 @@ test_files:
 - features/step_definitions/aruba_ext_steps.rb
 - features/support/setup.rb
 - spec/fixtures/Movefile
-- spec/fixtures/Movefile.no_password
-- spec/fixtures/Movefile.no_port
-- spec/fixtures/Movefile.port
-- spec/fixtures/Movefile.with_password
 - spec/remote_host_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/Movefile.no_password

@@ -1,24 +0,0 @@
-local:
-  vhost: "http://vhost.local"
-  wordpress_path: "~/dev/sites/your_site"
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-remote:
-  vhost: "http://remote.com"
-  wordpress_path: "/var/www/your_site"
-  exclude:
-    - .git
-    - .DS_Store
-    - .sass-cache
-    - Movefile
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-  ssh:
-    username: "username"
-    host: "host"

data/spec/fixtures/Movefile.no_port

@@ -1,25 +0,0 @@
-local:
-  vhost: "http://vhost.local"
-  wordpress_path: "~/dev/sites/your_site"
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-remote:
-  vhost: "http://remote.com"
-  wordpress_path: "/var/www/your_site"
-  exclude:
-    - .git
-    - .DS_Store
-    - .sass-cache
-    - Movefile
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-  ssh:
-    username: "username"
-    password: "password" # Password is optional, will use public keys if available.
-    host: "host"

data/spec/fixtures/Movefile.port

@@ -1,26 +0,0 @@
-local:
-  vhost: "http://vhost.local"
-  wordpress_path: "~/dev/sites/your_site"
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-remote:
-  vhost: "http://remote.com"
-  wordpress_path: "/var/www/your_site"
-  exclude:
-    - .git
-    - .DS_Store
-    - .sass-cache
-    - Movefile
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-  ssh:
-    username: "username"
-    password: "password" # Password is optional, will use public keys if available.
-    host: "host"
-    port: 30000

data/spec/fixtures/Movefile.with_password

@@ -1,25 +0,0 @@
-local:
-  vhost: "http://vhost.local"
-  wordpress_path: "~/dev/sites/your_site"
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-remote:
-  vhost: "http://remote.com"
-  wordpress_path: "/var/www/your_site"
-  exclude:
-    - .git
-    - .DS_Store
-    - .sass-cache
-    - Movefile
-  database:
-    name: "database_name"
-    username: "username"
-    password: "password"
-    host: "host"
-  ssh:
-    username: "username"
-    password: "hithere"
-    host: "host"