middleman-deploy 0.0.6 → 0.0.7

data/README.md

@@ -95,11 +95,37 @@ To use a particular branch, add:
 Default is `gh-pages`. Run `git branch -a` to see a list of possible
 branches.
 
+### Step 4c - FTP setup
+
+#### These settings are required.
+
+Edit `config.rb`, and add:
+
+    activate :deploy do |deploy|
+      deploy.method = :ftp
+      deploy.host = "ftp.example.com"
+      deploy.user = "tvaughan"
+      deploy.password = "secret"
+      deploy.path = "/srv/www/site"
+    end
+
+Adjust these values accordingly.
+
 ### Step 5
 
     middleman build [--clean]
     middleman deploy [--clean]
 
+To automatically run middleman-deploy after `middleman build`, add:
+
+      deploy.after_build = true
+
+Default is `false`.
+
+Please note that if the `--clean` or `--no-clean` option is passed to
+`middleman build` it will not be passed to `middleman deploy`. For now
+only the value of `deploy.clean` in `config.rb` will be used.
+
 ### NOTES
 
 Inspired by the rsync task in [Octopress](https://github.com/imathis/octopress).

data/THANKS

@@ -0,0 +1,4 @@
+Ben Cates - Git deploy method.
+Gilbert Townshend - Bug reports and feature requests.
+Konstantin Gribov -- Git deploy method improvements.
+Benjamin Knofe -- FTP deploy method.

data/lib/middleman-deploy/commands.rb

@@ -38,7 +38,7 @@ module Middleman
       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
+You should follow one of the three examples below to setup the deploy
 extension in config.rb.
 
 # To deploy the build directory to a remote host via rsync:
@@ -62,6 +62,16 @@ activate :deploy do |deploy|
   # run `git branch -a` to see a list of possible branches
   deploy.branch = "some-other-branch-name"
 end
+
+# To deploy the build directory to a remote host via ftp:
+activate :deploy do |deploy|
+  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
 EOF
       end
 
@@ -140,6 +150,54 @@ EOF
         orig.remote(remote).fetch
       end
 
+      def deploy_ftp
+        require 'net/ftp'
+        require 'ptools'
+
+        host = self.deploy_options.host
+        user = self.deploy_options.user
+        pass = self.deploy_options.password
+        path = self.deploy_options.path
+
+        puts "## Deploying via ftp to #{user}@#{host}:#{path}"
+
+        ftp = Net::FTP.new(host)
+        ftp.login(user, pass)
+        ftp.chdir(path)
+        ftp.passive = true
+
+        Dir.chdir('build/') do
+          Dir['**/*'].each do |f|
+            if File.directory?(f)
+              begin
+                ftp.mkdir(f)
+              rescue
+                puts "Folder '#{f}' exists. skipping..."
+              end
+            else
+              begin
+                if File.binary?(f)
+                  ftp.putbinaryfile(f, f)
+                else
+                  ftp.puttextfile(f, f)
+                end
+              rescue Exception => e
+                reply = e.message
+                err_code = reply[0,3].to_i
+                if err_code == 550
+                  if File.binary?(f)
+                    ftp.putbinaryfile(f, f)
+                  else
+                    ftp.puttextfile(f, f)
+                  end
+                end
+              end
+            end
+          end
+        end
+        ftp.close
+      end
+
     end
 
     # Alias "d" to "deploy"

data/lib/middleman-deploy/extension.rb

@@ -5,7 +5,7 @@ require "middleman-core"
 module Middleman
   module Deploy
 
-    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :path, :clean, :remote, :branch); end
+    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :password, :path, :clean, :remote, :branch, :after_build); end
 
     class << self
 
@@ -22,6 +22,12 @@ module Middleman
         options.remote ||= "origin"
         options.branch ||= "gh-pages"
 
+        options.after_build ||= false
+
+        app.after_build do |builder|
+          ::Middleman::Cli::Deploy.new.deploy if options.after_build
+        end
+
         @@options = options
 
         app.send :include, Helpers

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

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

data/middleman-deploy.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = Middleman::Deploy::PACKAGE
   s.version     = Middleman::Deploy::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Tom Vaughan","Ben Cates"]
+  s.authors     = ["Tom Vaughan"]
   s.email       = ["thomas.david.vaughan@gmail.com"]
   s.homepage    = "http://tvaughan.github.com/middleman-deploy/"
   s.summary     = %q{Deploy a middleman built site over rsync or via git (e.g. gh-pages on github).}
@@ -16,10 +16,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   # The version of middleman-core your extension depends on
   s.add_runtime_dependency("middleman-core", [">= 3.0.0"])
-  
+
   # Additional dependencies
   s.add_runtime_dependency("git", "~> 1.2.0")
+  s.add_runtime_dependency("ptools")
 end

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: middleman-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
 - Tom Vaughan
-- Ben Cates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
-  requirement: &21821760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *21821760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &21821260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +37,28 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21821260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Deploy a middleman built site over rsync or via git (e.g. gh-pages on
   github).
 email:
@@ -47,6 +72,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- THANKS
 - features/support/env.rb
 - lib/middleman-deploy.rb
 - lib/middleman-deploy/commands.rb
@@ -74,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Deploy a middleman built site over rsync or via git (e.g. gh-pages on github).