middleman-deploy 0.1.1 → 0.1.2

data/README.md

@@ -42,10 +42,10 @@ following to `config.rb`:
 ```ruby
 activate :deploy do |deploy|
   deploy.method = :rsync
-  deploy.user   = "tvaughan"
   deploy.host   = "www.example.com"
   deploy.path   = "/srv/www/site"
   # Optional Settings
+  # deploy.user  = "tvaughan" # no default
   # deploy.port  = 5309 # ssh port, default: 22
   # deploy.clean = true # remove orphaned files on remote host, default: false
 end

data/lib/middleman-deploy/commands.rb

@@ -3,9 +3,6 @@ require "middleman-core/cli"
 require "middleman-deploy/extension"
 require "middleman-deploy/pkg-info"
 
-PACKAGE = "#{Middleman::Deploy::PACKAGE}"
-VERSION = "#{Middleman::Deploy::VERSION}"
-
 module Middleman
   module Cli
 
@@ -52,10 +49,13 @@ extension in config.rb.
 # To deploy the build directory to a remote host via rsync:
 activate :deploy do |deploy|
   deploy.method = :rsync
-  # host, user, and path *must* be set
-  deploy.user = "tvaughan"
+  # host and path *must* be set
   deploy.host = "www.example.com"
   deploy.path = "/srv/www/site"
+  # user is optional (no default)
+  deploy.user = "tvaughan"
+  # port is optional (default is 22)
+  deploy.port  = 5309
   # clean is optional (default is false)
   deploy.clean = true
 end
@@ -112,8 +112,8 @@ EOF
 
         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."
+          if (!options.host || !options.path)
+            print_usage_and_die "The rsync deploy method requires host and path to be set."
           end
         when :ftp, :sftp
           if (!options.host || !options.user || !options.password || !options.path)
@@ -127,12 +127,17 @@ EOF
       def deploy_rsync
         host = self.deploy_options.host
         port = self.deploy_options.port
-        user = self.deploy_options.user
         path = self.deploy_options.path
 
-        puts "## Deploying via rsync to #{user}@#{host}:#{path} port=#{port}"
+        # Append "@" to user if provided.
+        user = self.deploy_options.user
+        user = "#{user}@" if user && !user.empty?
+
+        dest_url = "#{user}#{host}:#{path}"
+
+        puts "## Deploying via rsync to #{dest_url} port=#{port}"
 
-        command = "rsync -avze '" + "ssh -p #{port}" + "' #{self.inst.build_dir}/ #{user}@#{host}:#{path}"
+        command = "rsync -avze '" + "ssh -p #{port}" + "' #{self.inst.build_dir}/ #{dest_url}"
 
         if self.deploy_options.clean
           command += " --delete"
@@ -178,7 +183,7 @@ EOF
           end
 
           `git add -A`
-          `git commit --allow-empty -am 'Automated commit at #{Time.now.utc} by #{PACKAGE} #{VERSION}'`
+          `git commit --allow-empty -am 'Automated commit at #{Time.now.utc} by #{Middleman::Deploy::PACKAGE} #{Middleman::Deploy::VERSION}'`
           `git push -f origin #{branch}`
         end
       end

data/lib/middleman-deploy/extension.rb

@@ -17,8 +17,11 @@ module Middleman
         options = Options.new(options_hash)
         yield options if block_given?
 
+        # Default options for the rsync method.
         options.port ||= 22
         options.clean ||= false
+
+        # Default options for the git method.
         options.remote ||= "origin"
         options.branch ||= "gh-pages"
 

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

@@ -1,7 +1,7 @@
 module Middleman
   module Deploy
     PACKAGE = "middleman-deploy"
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
     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.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -92,18 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1810602657871223633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1810602657871223633
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23