From 9c925ff0e5b7b00bcee203900ce471433e173b6c Mon Sep 17 00:00:00 2001
From: Tom Vaughan <tom@software6.net>
Date: Tue, 16 Jul 2013 22:25:06 -0400
Subject: [PATCH] some ftp/sftp related clean-ups

---
 README.md                        |  2 +-
 lib/middleman-deploy/commands.rb | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 8868d18..a868333 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ Edit `config.rb`, and add:
 
     activate :deploy do |deploy|
       deploy.method = :sftp
-      deploy.host = "ftp.example.com"
+      deploy.host = "sftp.example.com"
       deploy.user = "tvaughan"
       deploy.password = "secret"
       deploy.path = "/srv/www/site"
diff --git a/lib/middleman-deploy/commands.rb b/lib/middleman-deploy/commands.rb
index f65616e..9b17a83 100644
--- a/lib/middleman-deploy/commands.rb
+++ b/lib/middleman-deploy/commands.rb
@@ -47,7 +47,7 @@ module Middleman
       def print_usage_and_die(message)
         raise Error, "ERROR: " + message + "\n" + <<EOF
 
-You should follow one of the three examples below to setup the deploy
+You should follow one of the four examples below to setup the deploy
 extension in config.rb.
 
 # To deploy the build directory to a remote host via rsync:
@@ -72,15 +72,25 @@ activate :deploy do |deploy|
   deploy.branch = "some-other-branch-name"
 end
 
-# To deploy the build directory to a remote host via ftp or sftp:
+# To deploy the build directory to a remote host via ftp:
 activate :deploy do |deploy|
-  deploy.method = :ftp or :sftp
+  deploy.method = :ftp
   # host, user, passwword and path *must* be set
   deploy.host = "ftp.example.com"
   deploy.user = "tvaughan"
   deploy.password = "secret"
   deploy.path = "/srv/www/site"
 end
+
+# To deploy the build directory to a remote host via sftp:
+activate :deploy do |deploy|
+  deploy.method = :sftp
+  # host, user, passwword and path *must* be set
+  deploy.host = "sftp.example.com"
+  deploy.user = "tvaughan"
+  deploy.password = "secret"
+  deploy.path = "/srv/www/site"
+end
 EOF
       end
 
@@ -101,15 +111,14 @@ EOF
           print_usage_and_die "The deploy extension requires you to set a method."
         end
 
-        if (options.method == :rsync)
+        case options.method
+        when :rsync
           if (!options.host || !options.user || !options.path)
             print_usage_and_die "The rsync deploy method requires host, user, and path to be set."
           end
-        end
-
-        if (options.method == :ftp || options.method == :sftp)
+        when :ftp, :sftp
           if (!options.host || !options.user || !options.password || !options.path)
-            print_usage_and_die "The ftp and sftp deploy methods requires host, user, password, and path to be set."
+            print_usage_and_die "The #{options.method} method requires host, user, password, and path to be set."
           end
         end