wordmove 0.0.4 → 0.0.6

data/.gitignore

@@ -1 +1,2 @@
 tmp/*
+pkg/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordmove (0.0.1)
+    wordmove (0.0.5)
       activesupport (~> 3.0.0)
       colored
       escape
@@ -16,29 +16,29 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.11)
-    aruba (0.4.7)
-      childprocess (>= 0.2.2)
+    aruba (0.4.9)
+      childprocess (>= 0.2.3)
       cucumber (>= 1.1.1)
-      ffi (= 1.0.9)
+      ffi (= 1.0.11)
       rspec (>= 2.7.0)
     builder (3.0.0)
     childprocess (0.2.3)
       ffi (~> 1.0.6)
     colored (1.2)
-    cucumber (1.1.3)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     escape (0.0.4)
-    ffi (1.0.9)
-    gherkin (2.6.8)
+    ffi (1.0.11)
+    gherkin (2.7.1)
       json (>= 1.4.6)
     hashie (1.2.0)
     i18n (0.6.0)
-    json (1.6.2)
+    json (1.6.3)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.2.1)

data/README.mdown

@@ -51,8 +51,9 @@ remote:
     host: "host"
   ssh:
     username: "username"
-    password: "password"
+    password: "password" # optional, will use SSH public key if available
     host: "host"
+    port: 2202 # optional
 ```
 
 ## Known problems and limitations

data/lib/wordmove/generators/Movefile

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

data/lib/wordmove/hosts/local_host.rb

@@ -5,10 +5,15 @@ module Wordmove
 
     attr_reader :options
     attr_reader :logger
+    attr_reader :ssh_extras
 
     def initialize(options = {})
       @options = Hashie::Mash.new(options)
       @logger = @options[:logger]
+      @ssh_extras = {}
+      [ :port, :password ].each do |p|
+        @ssh_extras.merge!( { p => @options.ssh[p] } ) if @options.ssh and @options.ssh[p]
+      end
     end
 
     def run(*args)

data/lib/wordmove/hosts/remote_host.rb

@@ -14,7 +14,7 @@ module Wordmove
 
     def session
       logger.verbose "Connecting to #{options.ssh.host}..." unless @session.present?
-      @session ||= Net::SSH.start(options.ssh.host, options.ssh.username, :password => options.ssh.password)
+      @session ||= Net::SSH.start(options.ssh.host, options.ssh.username, @ssh_extras )
     end
 
     def close
@@ -23,12 +23,16 @@ module Wordmove
 
     def upload_file(source_file, destination_file)
       logger.verbose "Copying remote #{source_file} to #{destination_file}..."
-      Net::SCP.download!(options.ssh.host, options.ssh.username, source_file, destination_file, :password => options.ssh.password)
+      Net::SSH.start options.ssh.host, options.ssh.username, @ssh_extras do |ssh|
+        ssh.scp.download! source_file, destination_file
+      end
     end
 
     def download_file(source_file, destination_file)
       logger.verbose "Copying local #{source_file} to #{destination_file}..."
-      Net::SCP.upload!(options.ssh.host, options.ssh.username, source_file, destination_file, :password => options.ssh.password)
+      Net::SSH.start options.ssh.host, options.ssh.username, @ssh_extras do |ssh|
+        ssh.scp.upload! source_file, destination_file
+      end
     end
 
     def download_dir(source_dir, destination_dir)
@@ -48,17 +52,33 @@ module Wordmove
     private
 
     def rsync(source_dir, destination_dir)
-      password_file = Tempfile.new('rsync_password')
-      password_file.write(options.ssh.password)
-      password_file.close
 
       exclude_file = Tempfile.new('exclude')
       exclude_file.write(options.exclude.join("\n"))
       exclude_file.close
 
-      locally_run "rsync", "-azLK", "--password-file=#{password_file.path}", "--exclude-from=#{exclude_file.path}", "--delete", source_dir, destination_dir
+      arguments = [ "-azLK" ]
 
-      password_file.unlink
+      password_file = nil
+      if options.ssh
+
+        if options.ssh.port
+          arguments << [ '-e', "ssh -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}"
+        end
+      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.4"
+  VERSION = "0.0.6"
 end

data/spec/fixtures/Movefile

@@ -0,0 +1,26 @@
+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: 22 # Port is optional

data/spec/fixtures/Movefile.no_password

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,25 @@
+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"

data/spec/remote_host_spec.rb

@@ -0,0 +1,37 @@
+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
+
+  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
+
+  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
+
+  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 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

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'wordmove' # and any other gems you need
+require 'hashie'
+require 'wordmove/hosts/local_host'
+require 'wordmove/hosts/remote_host'
+require 'wordmove/logger'
+require 'tempfile'
+require 'active_support/core_ext'
+require 'thor'
+
+RSpec.configure do |config|
+  # some (optional) config here
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordmove
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70351507049960 !ruby/object:Gem::Requirement
+  requirement: &70234736353880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507049960
+  version_requirements: *70234736353880
 - !ruby/object:Gem::Dependency
   name: escape
-  requirement: &70351507049540 !ruby/object:Gem::Requirement
+  requirement: &70234736353340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507049540
+  version_requirements: *70234736353340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70351507049120 !ruby/object:Gem::Requirement
+  requirement: &70234736352780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507049120
+  version_requirements: *70234736352780
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70351507048700 !ruby/object:Gem::Requirement
+  requirement: &70234736352340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507048700
+  version_requirements: *70234736352340
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70351507048280 !ruby/object:Gem::Requirement
+  requirement: &70234736351860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507048280
+  version_requirements: *70234736351860
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70351507047860 !ruby/object:Gem::Requirement
+  requirement: &70234736351340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507047860
+  version_requirements: *70234736351340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70351507047360 !ruby/object:Gem::Requirement
+  requirement: &70234736350760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351507047360
+  version_requirements: *70234736350760
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70351507046940 !ruby/object:Gem::Requirement
+  requirement: &70234736350260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507046940
+  version_requirements: *70234736350260
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70351507046480 !ruby/object:Gem::Requirement
+  requirement: &70234736349600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351507046480
+  version_requirements: *70234736349600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70351507046060 !ruby/object:Gem::Requirement
+  requirement: &70234736349120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351507046060
+  version_requirements: *70234736349120
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70351507045640 !ruby/object:Gem::Requirement
+  requirement: &70234736348540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351507045640
+  version_requirements: *70234736348540
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70351507045220 !ruby/object:Gem::Requirement
+  requirement: &70234736347900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351507045220
+  version_requirements: *70234736347900
 description: Capistrano for Wordpress
 email:
 - stefano.verna@welaika.com
@@ -174,7 +174,13 @@ files:
 - lib/wordmove/version.rb
 - pkg/wordmove-0.0.1.gem
 - pkg/wordmove-0.0.2.gem
-- spec/foodie_spec.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
 - wordmove.gemspec
 homepage: ''
 licenses: []
@@ -196,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Capistrano for Wordpress
@@ -206,4 +212,10 @@ test_files:
 - features/push.feature
 - features/step_definitions/aruba_ext_steps.rb
 - features/support/setup.rb
-- spec/foodie_spec.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/foodie_spec.rb

@@ -1,9 +0,0 @@
-describe Foodie::Food do
-  it "broccoli is gross" do
-    Foodie::Food.portray("Broccoli").should eql("Gross!")
-  end
-
-  it "anything else is delicious" do
-    Foodie::Food.portray("Not Broccoli").should eql("Delicious!")
-  end
-end