middleman-deploy 0.0.4 → 0.0.5

data/README.md

@@ -1,4 +1,4 @@
-Middleman Delpoy -- Deploy a [middleman](http://middlemanapp.com/) built site over rsync.
+Middleman Delpoy -- Deploy a [middleman](http://middlemanapp.com/) built site over rsync or to github pages.
 
 [![Build Status](https://secure.travis-ci.org/tvaughan/middleman-deploy.png)](http://travis-ci.org/tvaughan/middleman-deploy)
 
@@ -21,7 +21,7 @@ If deploying through `rsync`, be sure it is installed.
 
 Edit `Gemfile`, and add:
 
-    gem "middleman-deploy"
+    gem "middleman-deploy", "~>0.0.1"
 
 Then run:
 
@@ -35,9 +35,9 @@ Edit `config.rb`, and add:
 
     activate :deploy do |deploy|
       deploy.method = :rsync
-      deploy.user   = "tvaughan"
-      deploy.host   = "www.example.com"
-      deploy.path   = "/srv/www/site"
+      deploy.user = "tvaughan"
+      deploy.host = "www.example.com"
+      deploy.path = "/srv/www/site"
     end
 
 Adjust these values accordingly.
@@ -56,7 +56,7 @@ To remove orphaned files or directories on the remote host, add:
 
 Default is `false`.
 
-### Step 4b - Github Pages setup
+### Step 4b - GitHub Pages setup
 
 Edit `config.rb`, and add:
 
@@ -69,7 +69,7 @@ github set up as `origin` and a working `gh-pages` branch already in place.
 
 ### Step 5
 
-    middleman build
+    middleman build [--clean]
     middleman deploy
 
 ### NOTES

data/lib/middleman-deploy/commands.rb

@@ -26,32 +26,69 @@ module Middleman
       :aliases => "-c",
       :desc => "Remove orphaned files or directories on the remote host"
       def deploy
-        send("deploy_#{self.middleman_options.method}")
+        send("deploy_#{self.deploy_options.method}")
       end
 
       protected
 
-      def middleman_options
-        ::Middleman::Application.server.inst.options
+      def print_usage_and_die(message)
+        raise Error, "ERROR: " + message + "\n" + <<EOF
+
+You should follow one of the two examples below to setup the deploy
+extension in config.rb.
+
+# To copy the build directory to a remote host:
+activate :deploy do |deploy|
+  deploy.method = :rsync
+  # host, user, and path *must* be set
+  deploy.user = "tvaughan"
+  deploy.host = "www.example.com"
+  deploy.path = "/srv/www/site"
+  # clean is optional (default is false).
+  deploy.clean = true
+end
+
+# To push to a remote gh-pages branch on GitHub:
+activate :deploy do |deploy|
+  deploy.method = :git
+end
+EOF
       end
 
-      def deploy_rsync
-        host = self.middleman_options.host
-        port = self.middleman_options.port
-        user = self.middleman_options.user
-        path = self.middleman_options.path
-
-        # These only exists when the config.rb sets them!
-        if (!host || !user || !path)
-          raise Thor::Error.new "You need to activate the deploy extension in config.rb"
+      def deploy_options
+        options = nil
+
+        begin
+          options = ::Middleman::Application.server.inst.options
+        rescue
+          print_usage_and_die "You need to activate the deploy extension in config.rb"
+        end
+
+        if (!options.method)
+          print_usage_and_die "The deploy extension requires you to set a method"
         end
 
+        if (options.method == :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
+
+        options
+      end
+
+      def deploy_rsync
+        host = self.deploy_options.host
+        port = self.deploy_options.port
+        user = self.deploy_options.user
+        path = self.deploy_options.path
+
         command = "rsync -avze '" + "ssh -p #{port}" + "' build/ #{user}@#{host}:#{path}"
 
         if options.has_key? "clean"
           clean = options.clean
         else
-          clean = shared_inst.options.clean
+          clean = self.deploy_options.clean
         end
 
         if clean
@@ -62,7 +99,7 @@ module Middleman
       end
 
       def deploy_git
-        puts "## Deploying to Github Pages"
+        puts "## Deploying to GitHub Pages"
         Dir.mktmpdir do |tmp|
           # clone ./ with branch gh-pages to tmp
           repo = Git.clone(ENV['MM_ROOT'], tmp)

data/lib/middleman-deploy/extension.rb

@@ -5,7 +5,7 @@ require "middleman-core"
 module Middleman
   module Deploy
 
-    class Options < Struct.new(:method, :host, :port, :user, :path, :clean); end
+    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :path, :clean); end
 
     class << self
 
@@ -17,33 +17,12 @@ module Middleman
         options = Options.new(options_hash)
         yield options if block_given?
 
-        options.method ||= :rsync
         options.port ||= 22
         options.clean ||= false
 
         @@options = options
 
         app.send :include, Helpers
-
-        app.after_configuration do
-          if (options.method == :rsync)
-            if (!options.host || !options.user || !options.path)
-              raise <<EOF
-
-
-ERROR: middleman-deploy is not setup correctly. host, user, and path
-*must* be set in config.rb. For example:
-
-activate :deploy do |deploy|
-  deploy.user = "tvaughan"
-  deploy.host = "www.example.com"
-  deploy.path = "/srv/www/site"
-end
-
-EOF
-            end
-          end
-        end
       end
 
       alias :included :registered

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

@@ -1,6 +1,6 @@
 module Middleman
   module Deploy
     PACKAGE = "middleman-deploy"
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
-  requirement: &19921080 !ruby/object:Gem::Requirement
+  requirement: &9045080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19921080
+  version_requirements: *9045080
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &19919900 !ruby/object:Gem::Requirement
+  requirement: &9057240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *19919900
+  version_requirements: *9057240
 description: Deploy a middleman built site over rsync or to github pages.
 email:
 - thomas.david.vaughan@gmail.com