middleman-deploy 0.1.2 → 0.1.3

data/.gitignore

@@ -1,2 +1,8 @@
-Gemfile.lock
-coverage
+# Ignore bundler lock file
+/Gemfile.lock
+
+# Ignore pkg folder
+/pkg
+
+# Ignore coverage folder
+/coverage

data/README.md

@@ -80,9 +80,9 @@ Activate the extension by adding the following to `config.rb`:
 activate :deploy do |deploy|
   deploy.method   = :ftp
   deploy.host     = "ftp.example.com"
+  deploy.path     = "/srv/www/site"
   deploy.user     = "tvaughan"
   deploy.password = "secret"
-  deploy.path     = "/srv/www/site"
 end
 ```
 
@@ -94,9 +94,10 @@ Activate the extension by adding the following to `config.rb`:
 activate :deploy do |deploy|
   deploy.method   = :sftp
   deploy.host     = "sftp.example.com"
-  deploy.user     = "tvaughan"
-  deploy.password = "secret"
   deploy.path     = "/srv/www/site"
+  # Optional Settings
+  # deploy.user     = "tvaughan" # no default
+  # deploy.password = "secret" # no default
 end
 ```
 

data/Rakefile

@@ -11,25 +11,4 @@ require 'rake/clean'
 
 task :test => ["cucumber"]
 
-require "middleman-deploy/pkg-info"
-
-PACKAGE = "#{Middleman::Deploy::PACKAGE}"
-VERSION = "#{Middleman::Deploy::VERSION}"
-
-task :package do
-  system "gem build #{PACKAGE}.gemspec"
-end
-
-task :install => :package do
-  Dir.chdir("pkg") do
-    system "gem install #{PACKAGE}-#{VERSION}"
-  end
-end
-
-task :release => :package do
-  Dir.chdir("pkg") do
-    system "gem push #{PACKAGE}-#{VERSION}"
-  end
-end
-
-task :default => :test
+task :default => :test

data/lib/middleman-deploy/commands.rb

@@ -76,9 +76,9 @@ activate :deploy do |deploy|
   deploy.method = :ftp
   # host, user, passwword and path *must* be set
   deploy.host = "ftp.example.com"
+  deploy.path = "/srv/www/site"
   deploy.user = "tvaughan"
   deploy.password = "secret"
-  deploy.path = "/srv/www/site"
 end
 
 # To deploy the build directory to a remote host via sftp:
@@ -86,9 +86,11 @@ activate :deploy do |deploy|
   deploy.method = :sftp
   # host, user, passwword and path *must* be set
   deploy.host = "sftp.example.com"
+  deploy.path = "/srv/www/site"
+  # user is optional (no default)
   deploy.user = "tvaughan"
+  # password is optional (no default)
   deploy.password = "secret"
-  deploy.path = "/srv/www/site"
 end
 EOF
       end
@@ -102,7 +104,7 @@ EOF
 
         begin
           options = inst.options
-        rescue
+        rescue NoMethodError
           print_usage_and_die "You need to activate the deploy extension in config.rb."
         end
 
@@ -111,13 +113,13 @@ EOF
         end
 
         case options.method
-        when :rsync
+        when :rsync, :sftp
           if (!options.host || !options.path)
-            print_usage_and_die "The rsync deploy method requires host and path to be set."
+            print_usage_and_die "The #{options.method} method requires host and path to be set."
           end
-        when :ftp, :sftp
+        when :ftp
           if (!options.host || !options.user || !options.password || !options.path)
-            print_usage_and_die "The #{options.method} method requires host, user, password, and path to be set."
+            print_usage_and_die "The ftp deploy method requires host, path, user, and password to be set."
           end
         end
 
@@ -249,6 +251,7 @@ EOF
 
         puts "## Deploying via sftp to #{user}@#{host}:#{path}"
 
+        # `nil` is a valid value for user and/or pass.
         Net::SFTP.start(host, user, :password => pass) do |sftp|
           sftp.mkdir(path)
           Dir.chdir(self.inst.build_dir) do

data/lib/middleman-deploy/pkg-info.rb

@@ -1,7 +1,7 @@
 module Middleman
   module Deploy
     PACKAGE = "middleman-deploy"
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
     TAGLINE = "Deploy a middleman built site over rsync, ftp, sftp, or git (e.g. gh-pages on github)."
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core