octopress-deploy 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 170e6e1991b426a98b1638fb45687b7016a9fc53
-  data.tar.gz: 9b9a154ac981bc45b2e01c7c46d171176f7f61de
+  metadata.gz: 5e4a09550ef9b0543cffbf51047b99ef82efa4c9
+  data.tar.gz: 8bebda9735365b81fc5bd5feb7171bd91ffec4fe
 SHA512:
-  metadata.gz: e6a9439fa388b44668239362ad0ccb3fab3cfb878a17f355f90bed8c5c92258fabd25321f81dcd06dc47bf0f89daf484b8b133ed7ed4f6b4c784c46878574641
-  data.tar.gz: 17df7f348642dbb83c89b563390fa1b2e8cd8ab778e5d0a9e36682e9ba5669d6fa21e1281928971339268e7d527f1b8da5dfaa787d6dfc5511e7c5e9d0cff0d9
+  metadata.gz: 868c3859731c91f5cfefeb0507564d2c9bfda7d6c51209901aa8f6cffa7cd4099aa9a5c79074090deb395b3aad587f98a3cb92f03c62469e0184af393f5453ff
+  data.tar.gz: a887ef627c3c0f4d8e90d8594670b4bb32686a4406192b5ca19a423aede8840539912a1845c487ec6a3713592d5f84fc0e5383674be3042624737872a49294d3

data/.gitignore

@@ -16,3 +16,13 @@ test/tmp
 test/version_tmp
 tmp
 test/.deploy
+deploy_target
+_s3_deploy.yml
+_rsync_deploy.yml
+_git_deploy.yml
+pull-git
+pull-rsync
+pull-s3
+_site
+local-git
+local-rsync

data/History.markdown

@@ -0,0 +1,13 @@
+## HEAD
+
+### Major Enhancements
+
+### Minor Enhancements
+
+  * Ask user if they would like to ignore the `_deploy.yml` file & automate (#7)
+
+### Bug Fixes
+
+  * Symbolize all incoming keys to `Octopress::Deploy.init_config` (#4)
+
+### Development Fixes

data/README.md

@@ -2,7 +2,7 @@
 
 Deployment tools for Octopress and Jekyll blogs (or really any static site).
 
-Currently this supports deploying through Git and Rsync. Requests for other
+Currently this supports deploying through S3, Git and Rsync. Requests for other
 deployment methods are welcome.
 
 ## Installation
@@ -23,46 +23,83 @@ Or install it yourself as:
 
 To deploy your site run:
 
-```ruby
-Octopress::Deploy.push()
+```bash
+$ octopress deploy
 ```
 
 This will read from your configuration file `_deploy.yml` and deploy your site. If your site has no configuration file, you will be asked if you want to generate one and what deployment method you want to use.
 
-You can also generate a configuration by running:
+You can also generate a `./_deploy.yml` configuration file by running:
 
-```ruby
-Octopress::Deploy.init_cofig('git') # or 'rsync'
+```bash
+$ octopress deploy --init git # or 'rsync' or 's3'
 ```
 
-This will generate a '_deploy.yml' file in your current directory.
+Once you've deployed your site, you can also pull it back down into a local directory. This is mostly useful for checking the results of a deploy. This will create the directory if it doesn't already exist.
+
+```ruby
+Octopress::Deploy.pull('some_directory')
+```
 
 ### Configuration options
 
 Configurations should be added to a `_deploy.yml` file in your project's root directory. You can pass options as a hash directy to the `push` method as well. Passed options will override options set in the config file.
 
-| option        | Description                                      | Default
+| Config        | Description                                      | Default
 |:--------------|:-------------------------------------------------|:---------------|
 | `config_file` | Path to the config file.                         | _config.yml    |
 | `site_dir`    | Path to comipled site files.                     | _site          |
 
 
-### Git options
+#### Amazon S3
+
+Important: when using S3, you must add your _deploy.yml to your .gitignore to prevent accidentally sharing
+account access information. Octopress Deploy will offer to do it for you. If you don't, you won't be able to deploy.`
+
+| Config              | Description                              | Default
+|:--------------------|:-----------------------------------------|:-------------|
+| `bucket_name`       | S3 bucket name                           |              |
+| `access_key_id`     | AWS access key                           |              |
+| `secret_access_key` | AWS secret key                           |              |
+| `remote_path`       | Directory files should be synced to.     | /            |
+| `delete`            | Delete files to create a 1:1 file sync.  | false        |
+| `verbose`           | Display all file actions during deploy.  | true         |
+| `region`            | Region for your AWS bucket               | us-east-1    |
+
+If you choose a bucket which doesn't yet exist, Octopress Deploy will offer to create it for you, and offer to configure it as a static website.
+
+##### ENV config
+
+For the following configurations you can set environment vars instead of adding items to your config file.
+
+| Config              | ENV var                        |
+|:--------------------|:-------------------------------|
+| `access_key_id`     | AWS_ACCESS_KEY_ID              |
+| `secret_access_key` | AWS_SECRET_ACCESS_KEY          |
+| `region`            | AWS_DEFAULT_REGIONS            |
+
+
+##### Deleting files from S3
+
+If the `delete` option is true, files in the `remote_path` on the bucket will be removed if they do not match local site files.
+If `remote_path` is a subdirectory, only files in that subdirectory will be evaluated for deletion.
+
+#### Git
 
-Only git_url is required. Other options will default as shown below.
+Only `git_url` is required. Other options will default as shown below.
 
-| option        | Description                                      | Default
+| Config        | Description                                      | Default
 |:--------------|:-------------------------------------------------|:---------------|
 | `git_url`     | Url for remote git repository.                   |                |
 | `git_branch`  | Deployment branch for git repository.            | master         |
 | `deploy_dir`  | Directory where deployment files are staged.     | .deploy        |
 | `remote`      | Name of git remote.                              | deploy         |
 
-### Rsync options
+#### Rsync
 
 Only `remote_path` is required. If `user` is not present, Rsync will sync between two locally available directories. Do this if your site root is mounted locally.
 
-| option         | Description                                       | Default
+| Config         | Description                                       | Default
 |:---------------|:--------------------------------------------------|:---------------|
 | `user`         | ssh user, e.g user@host.com                       |                |
 | `port`         | ssh port                                          | 22             |

data/lib/octopress-deploy.rb

@@ -1,18 +1,26 @@
-require "octopress-deploy/version"
-require "octopress-deploy/core_ext"
-require "YAML"
+$LOAD_PATH.unshift File.expand_path("../", __FILE__)
+
+require 'octopress-deploy/version'
+require 'octopress-deploy/core_ext'
 require 'colorator'
-require 'open3'
+require 'yaml'
+require 'pathname'
+
+if defined? Octopress::Command
+  require 'octopress-deploy/commands'
+end
 
 
 module Octopress
   module Deploy
     autoload :Git,    'octopress-deploy/git'
     autoload :Rsync,  'octopress-deploy/rsync'
+    autoload :S3,     'octopress-deploy/s3'
 
     METHODS = {
       'git'=> Git,
-      'rsync'=> Rsync
+      'rsync'=> Rsync,
+      's3'=> S3
     }
 
     def self.push(options={})
@@ -25,6 +33,19 @@ module Octopress
       end
     end
 
+    def self.pull(dir='site-pull', options={})
+      init_options(options)
+      if !File.exists? @options[:config_file]
+        init_config if ask_bool("Deployment config file not found. Create #{@options[:config_file]}?")
+      else
+        parse_options
+        if !File.exists? @options[:pull_dir] = dir
+          FileUtils.mkdir_p @options[:pull_dir]
+        end
+        deploy_method.new(@options).pull()
+      end
+    end
+
     def self.parse_options
       config  = YAML.load(File.open(@options[:config_file])).to_symbol_keys
       @options = @options.to_symbol_keys
@@ -32,7 +53,7 @@ module Octopress
     end
 
     def self.init_options(options={})
-      @options ||= options
+      @options = options.to_symbol_keys
       @options[:config_file] ||= '_deploy.yml'
       @options[:site_dir] ||= site_dir
     end
@@ -51,53 +72,100 @@ module Octopress
 
     # Create a config file
     #
-    def self.init_config(method=nil, options={})
-      init_options unless @options
-      @options ||= options
-      @options[:method] ||= method
+    def self.init_config(method=nil, options=nil)
+      if options
+        options[:method] = method
+        init_options(options)
+      end
+
       unless @options[:method]
         @options[:method] = ask("How would you like to deploy your site?", METHODS.keys)
       end
-      config = <<-FILE
-method: #{@options[:method]}
-site_dir: #{@options[:site_dir]}
-FILE
-      config += deploy_method.default_config(options)
 
-      if File.exist? @options[:config_file]
-        unless ask_bool("A config file already exists at #{@options[:config_file]}. Overwrite?")
-          abort "No config file written."
+      write_config
+      check_gitignore
+    end
+
+    def self.write_config
+      if !@options[:force_write_config]
+        if File.exist?(@options[:config_file]) &&
+         !ask_bool("A config file already exists at #{@options[:config_file]}. Overwrite?")
+         return puts "No config file written."
         end
       end
+
+      config = get_config.strip
       File.open(@options[:config_file], 'w') { |f| f.write(config) }
       puts "File #{@options[:config_file]} created.".green
       puts "------------------"
-      puts "#{config.yellow}------------------"
+      puts "#{config.yellow}"
+      puts "------------------"
       puts "Please add your configurations to this file."
     end
 
+    def self.get_config
+      <<-FILE
+method: #{@options[:method]}
+site_dir: #{@options[:site_dir]}
+#{deploy_method.default_config(@options)}
+FILE
+    end
+
+    def self.check_gitignore
+      gitignore = File.join(`git rev-parse --show-toplevel`.strip, ".gitignore")
+      if !File.exist?(gitignore) ||
+        Pathname.new(gitignore).read.match(/^#{@options[:config_file]}/i).nil?
+        if ask_bool("Do you want to add #{@options[:config_file]} to your .gitignore?")
+          git_ignore_config_file gitignore
+          return true
+        end
+      else
+        return true
+      end
+    end
+
+    def self.git_ignore_config_file(gitignore)
+      File.open(gitignore, 'a') { |f| f.write(@options[:config_file]) }
+    end
+
     def self.ask_bool(message)
-      ask(message, ['y','n']) == 'y'
+      ask_or_default(true, message) do
+        ask(message, ['y','n']) == 'y'
+      end
     end
 
     def self.ask(message, valid_options)
-      if valid_options
-        options = valid_options.join '/'
-        answer = get_stdin("#{message} [#{options}]: ").downcase.strip
-        if valid_options.map{|o| o.downcase}.include?(answer)
-          return answer
+      ask_or_default(false, message) do
+        if valid_options
+          options = valid_options.join '/'
+          answer = get_stdin("#{message} [#{options}]: ").downcase.strip
+          if valid_options.map{|o| o.downcase}.include?(answer)
+            return answer
+          else
+            return false
+          end
         else
-          return false
+          answer = get_stdin("#{message}: ")
         end
-      else
-        answer = get_stdin("#{message}: ")
+        answer
       end
-      answer
     end
           
     def self.get_stdin(message)
       print message
       STDIN.gets.chomp
     end
+
+    def self.should_ask?
+      !ENV['NO_ASK']
+    end
+
+    def self.ask_or_default(default, message)
+      if should_ask?
+        yield
+      else
+        puts "Assuming '#{default}' for '#{message}'."
+      end
+    end
   end
 end

data/lib/octopress-deploy/commands.rb

@@ -0,0 +1,26 @@
+module Octopress
+  module Deploy
+    class Commands < Octopress::Command
+      def self.init_with_program(p)
+        p.command(:deploy) do |c|
+          c.syntax "octopress deploy [options]"
+          c.description "Deploy your Octopress site."
+          c.option "using", "--using METHOD", "Define the push method to use, overriding your configuration file's setting"
+          c.option "config_file", "--config FILE", "The path to your config file (default: _deploy.yml)"
+          c.option "init", "--init METHOD", "Initialize a config file with the options for the given method."
+          c.option "pull", "--pull DIRECTORY", "Pull down the published copy of your site into a directory (default: ./site-pull)"
+
+          c.action do |_, options|
+            if options["init"] and options["init"].is_a?(String)
+              Octopress::Deploy.init_config(options["init"], options)
+            elsif options["pull"] and options["pull"].is_a?(String)
+              Octopress::Deploy.pull(options["pull"], options)
+            else
+              Octopress::Deploy.push(options)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/octopress-deploy/git.rb

@@ -3,89 +3,106 @@ module Octopress
     class Git
 
       def initialize(options={})
-        @options    = options
-        @repo       = @options[:git_url]
-        @branch     = @options[:git_branch]
-        @site_dir   = @options[:site_dir]
-        @remote     = @options[:remote]     || 'deploy'
-        @deploy_dir = @options[:deploy_dir] || '.deploy'
-        abort "Deploy Failed: You must provide a repository URL before deploying. Check your #{@options[:config_file]}.".red if @repo.nil?
+        @options     = options
+        @repo        = @options[:git_url]
+        @branch      = @options[:git_branch]
+        @remote      = @options[:remote]       || 'deploy'
+        @remote_path = @options[:remote_path]  || ''
+        @remote_path = @remote_path.sub(/^\//,'') #remove leading slash
+        @site_dir    = File.expand_path(@options[:site_dir])
+        @deploy_dir  = File.expand_path(@options[:deploy_dir] || '.deploy')
+        @pull_dir    = @options[:pull_dir]
+        abort "Deploy Failed: Configure a git_url in #{@options[:config_file]} before deploying.".red if @repo.nil?
       end
 
       # Initialize, pull, copy and deploy.
-      # This is the method you're looking for.
       #
       def push
-        init_repo unless check_repo
-        git_pull
-        copy_site
-        git_push
+        init_repo
+        puts "Syncing #{@site_dir.sub(`pwd`.strip+'/', '')} files to #{@repo}."
+        FileUtils.cd @deploy_dir do
+          git_pull
+          clean_deploy
+          copy_site
+          git_push
+        end
       end
 
-      # Check to see if local deployment dir configured to deploy
+      def pull
+        `git clone -b #{@branch} #{@repo} #{@pull_dir}`
+      end
+
+      # Check to see if local deployment dir is configured to deploy.
       #
       def check_repo
-        return unless Dir.exist? @deploy_dir
-        FileUtils.cd @deploy_dir do
-          return `git remote -v`.include? @repo
+        if Dir.exist? @deploy_dir
+          FileUtils.cd @deploy_dir do
+            return `git remote -v`.include? @repo
+          end
         end
       end
 
       def self.default_config(options={})
-        config = <<-CONFIG
+        <<-CONFIG
 git_url: #{options[:git_url]}
 git_branch: #{options[:git_branch] || 'master'}
 CONFIG
       end
 
-      # If necessary create deploy directory and initialize it with deployment remote
+      # If necessary create deploy directory and initialize it with deployment remote.
       #
       def init_repo
+        return if check_repo
         FileUtils.mkdir_p @deploy_dir
         FileUtils.cd @deploy_dir do
           if Dir[@deploy_dir+'/*'].empty?
 
-            # Attempt to clone from the remote
+            # initialize the repository and add the remote.
+            #
+            `git init; git remote add #{@remote} #{@repo}`
+
+            # Attempt to pull from the remote.
             #
-            cmd = "git clone #{@repo} --origin #{@remote} --branch #{@branch} ."
-            puts cmd
-            Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
-              exit_status = wait_thr.value
+            if git_pull
+              `git branch -m #{@branch}`
 
-              # If cloning fails, initialize the directory manually
-              # This will occur if a remote has no commits
-              #
-              unless exit_status.success?
-                `git init; git remote add #{@remote} #{@repo}`
-                `echo "initialize deploy repo" > _`
-                `git add .; git commit -m 'initial commit'`
-                `git branch -m #{@branch}`
-                `git rm _; git add -u; git commit -m 'cleanup'`
-              end
+            # If no branch exists on remote, create one locally.
+            else
+              `echo "initialize deploy repo" > _`
+              `git add .; git commit -m 'initial commit'`
+              `git branch -m #{@branch}`
+              `git rm _; git add -u; git commit -m 'cleanup'`
             end
           end
         end
       end
 
       def git_push
-        FileUtils.cd @deploy_dir do
-          `git push #{@remote} #{@branch}`
-        end
+        `git push #{@remote} #{@branch}`
       end
 
+      # Attempt to pull from the remote branch
+      #
       def git_pull
-        FileUtils.cd @deploy_dir do
-          output, error = Open3.capture3"git pull #{@remote} #{@branch}"
-          FileUtils.rm_rf(Dir.glob('*'), secure: true) if error.empty?
+        if `git branch -a` =~ /remotes\/#{@remote}\/#{@branch}/ ||
+           `git ls-remote #{@remote}` =~ /refs\/heads\/#{@branch}/
+             `git pull #{@remote} #{@branch}`
         end
       end
 
+      # Remove files in deploy dir, ensuring a 1:1 site files deployment.
+      #
+      def clean_deploy
+        FileUtils.rm_rf(Dir.glob('*'), secure: true)
+      end
+
+      # Copy site files into deploy dir.
+      #
       def copy_site
-        FileUtils.cp_r @site_dir + '/.', @deploy_dir
-        FileUtils.cd @deploy_dir do
-          message = "Site updated at: #{Time.now.utc}"
-          `git add --all :/; git commit -m '#{message}'`
-        end
+        target_dir = File.join(@deploy_dir, @remote_path).sub(/\/$/,'')
+        FileUtils.cp_r @site_dir + '/.', target_dir
+        message = "Site updated at: #{Time.now.utc}"
+        `git add --all :/; git commit -m '#{message}'`
       end
     end
   end

data/lib/octopress-deploy/rsync.rb

@@ -3,48 +3,57 @@ module Octopress
     class Rsync
 
       def initialize(options)
-        @user = options[:user]
-        @port = options[:port] || "22"
-        @local = options[:site_dir]
-        @remote = options[:remote_path]
-        @exclude = options[:exclude]
-        @exclude_file = options[:exclude_file]
-        @include = options[:include]
-        @delete  = options[:delete]
+        @options      = options
+        @user         = @options[:user]
+        @port         = @options[:port]
+        @local        = @options[:site_dir]
+        @remote_path  = @options[:remote_path]
+        @exclude      = @options[:exclude]
+        @exclude_file = @options[:exclude_file]
+        @exclude_file = File.expand_path(@exclude_file) if @exclude_file
+        @include      = @options[:include]
+        @delete       = @options[:delete]
+        @remote_path  = @remote_path.sub(/^\//,'') #remove leading slash
+        @pull_dir     = @options[:pull_dir]
       end
 
       def push
-        cmd = "rsync -avz"
-        if @exclude || @exclude_file
-          cmd << "e"
-          if @exclude_file
-            cmd << " --exclude-from #{@exclude_file}"
-          else
-            cmd << " --exclude #{@exclude}"
-          end
-        end
-        if @include
-          cmd << " --include #{@include}"
-        end
-        if @user
-          cmd << " ssh -p #{@port}"
-        end
-        if @delete
-          cmd << " --delete"
-        end
-        cmd += " #{File.join(@local, '')} "
-        if @user
-          cmd << "#{@user}:"
-        end
-        cmd << "#{@remote}"
+        puts "Syncing #{@local} files to #{@remote_path} with rsync."
+        system cmd
+      end
 
+      def pull
+        puts "Syncing #{@remote_path} files to #{@pull_dir} with rsync."
         system cmd
       end
 
+      def cmd
+        local = ''
+        remote = ''
+
+        cmd    =  "rsync -avz "
+        cmd    << " -e "                               if @exclude_file || @exclude
+        cmd    << " --exclude-from #{@exclude_file} "  if @exclude_file
+        cmd    << " --exclude #{@exclude} "            if @exclude
+        cmd    << " --include #{@include} "            if @include
+        cmd    << " --rsh='ssh -p#{@port}' "           if @user && @port
+        cmd    << " --delete "                         if @delete
+
+        local  << " #{File.join(@local, '')} "
+        remote << " #{@user}:"                         if @user
+        remote << "#{@remote_path}"
+
+        if @pull_dir
+          cmd << remote+'/ ' << @pull_dir
+        else
+          cmd << local << remote
+        end
+      end
+
       def self.default_config(options={})
-        config = <<-CONFIG
+        <<-CONFIG
 user: #{options[:user]}
-port: #{options[:port] || '22'}
+port: #{options[:port]}
 remote_path: #{options[:remote_path]}
 delete: #{options[:delete]}
 CONFIG

data/lib/octopress-deploy/s3.rb

@@ -0,0 +1,177 @@
+require 'find'
+require 'fileutils'
+require 'aws-sdk'
+
+module Octopress
+  module Deploy
+    class S3
+
+      def initialize(options)
+        @local       = options[:site_dir]
+        @bucket_name = options[:bucket_name]
+        @access_key  = options[:access_key_id]     || ENV['AWS_ACCESS_KEY_ID']
+        @secret_key  = options[:secret_access_key] || ENV['AWS_SECRET_ACCESS_KEY']
+        @region      = options[:region]            || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
+        @remote_path = (options[:remote_path]      || '/').sub(/^\//,'')
+        @verbose     = options[:verbose]           || true
+        @delete      = options[:delete]
+        @remote_path = @remote_path.sub(/^\//,'')  # remove leading slash
+        @pull_dir    = options[:pull_dir]
+        connect
+      end
+
+      def push
+        abort "Seriously, you should. Quitting..." unless Deploy.check_gitignore
+        puts "Syncing #{@local} files to #{@bucket_name} on S3."
+        write_files
+        delete_files if delete_files?
+        status_message
+      end
+
+      def pull
+        puts "Syncing #{@bucket_name} files to #{@pull_dir} on S3."
+        @bucket.objects.each do |object|
+          path = File.join(@pull_dir, object.key)
+          dir = File.dirname(path)
+          FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+          File.open(path, 'w') { |f| f.write(object.read) }
+        end
+      end
+
+      # Connect to S3 using the AWS SDK
+      # Retuns an aws bucket
+      def connect
+        AWS.config(access_key_id: @access_key, secret_access_key: @secret_key, region: @region)
+        s3 = AWS.s3
+        @bucket = s3.buckets[@bucket_name]
+        unless @bucket.exists? || create_bucket(s3.buckets)
+          abort "No bucket created. Change your config to point to an existing bucket."
+        end
+      end
+
+      # Write site files to the selected bucket
+      def write_files
+        puts "Writing #{pluralize('file', site_files.size)}:" if @verbose
+        site_files.each do |file| 
+          o = @bucket.objects[remote_path(file)]
+          o.write(file: file)
+          if @verbose
+            puts "+ #{remote_path(file)}"
+          else
+            progress('+')
+          end
+        end
+      end
+
+      # Delete files from the bucket, to ensure a 1:1 match with site files
+      def delete_files
+        if deletable_files.size > 0
+          puts "Deleting #{pluralize('file', deletable_files.size)}:" if @verbose
+          deletable_files.each do |file|
+            @bucket.objects.delete(file)
+            if @verbose
+              puts "- #{file}"
+            else
+              progress('-')
+            end
+          end
+        end
+      end
+
+      def create_bucket(buckets)
+
+        if Deploy.ask_bool("S3 bucket '#{@bucket_name}' not found. Create one in region #{@region}?")
+          @bucket = buckets.create(@bucket_name)
+          puts "Created new bucket #{@bucket_name} in region #{@region}."
+
+          configure_bucket
+          true
+        end
+      end
+
+      def configure_bucket
+        error_page = remote_path('404.html')
+        index_page = remote_path('index.html')
+
+        if Deploy.ask_bool("Bucket is not currently configured as a static websites. Configure it with index_page: #{index_page} and error_page: #{error_page}?")
+          config = @bucket.configure_website do |cfg|
+            cfg.index_document_suffix = index_page
+            cfg.error_document_key = error_page
+          end
+          puts "Bucket configured with index_document: #{index_page} and error_document: #{error_page}."
+        else
+          puts "You'll want to configure your new bucket using the AWS management console."
+        end
+      end
+
+      def delete_files?
+        !!@delete
+      end
+
+      # local site files
+      def site_files
+        @site_files ||= Find.find(@local).to_a.reject do |f|
+          File.directory?(f)
+        end
+      end
+
+      # Destination paths for local site files.
+      def site_files_dest
+        @site_files_dest ||= site_files.map{|f| remote_path(f) }
+      end
+
+      # Replace local path with remote path
+      def remote_path(file)
+        File.join(@remote_path, file.sub(@local, '')).sub(/^\//, '')
+      end
+
+      # Files from the bucket which are deletable
+      # Only deletes files beneath the remote_path if specified
+      def deletable_files
+        return [] unless delete_files?
+        unless @deletable
+          @deletable = @bucket.objects.map(&:key) - site_files_dest
+          @deletable.reject!{|f| (f =~ /^#{@remote_path}/).nil? }
+        end
+        @deletable
+      end
+
+      # List written and deleted file counts
+      def status_message
+        uploaded = site_files.size
+        deleted = deletable_files.size
+
+        message =  "\nSuccess:".green + " #{uploaded} #{pluralize('file', uploaded)} uploaded"
+        message << ", #{deleted} #{pluralize('file', deleted)} deleted."
+        puts message
+        configure_bucket unless @bucket.website?
+      end
+
+      # Print consecutive characters
+      def progress(str)
+        print str
+        $stdout.flush
+      end
+
+      def pluralize(str, num)
+        str << 's' if num != 1
+        str
+      end
+
+      # Return default configuration options for this deployment type
+      def self.default_config(options={})
+        <<-CONFIG
+bucket_name: #{options[:bucket_name]}
+access_key_id: #{options[:access_key_id]}
+secret_access_key: #{options[:secret_access_key]}
+region: #{options[:region] || 'us-east-1'}
+remote_path: #{options[:remote_path] || '/'}
+delete: #{options[:delete] || 'false'}
+verbose: #{options[:verbose] || 'true'}
+CONFIG
+      end
+
+    end
+  end
+end
+

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.0.0.alpha.2"
+    VERSION = "1.0.0.alpha.3"
   end
 end

data/octopress-deploy.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "colorator"
+  spec.add_runtime_dependency "aws-sdk"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/.gitignore

@@ -0,0 +1 @@
+_s3_deploy.yml

data/test/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-group :jekyll_plugins do
-  gem "octopress-deploy", path: "../"
-end
-
+gem "octopress", '~> 3.0.0.alpha.5'
+gem "octopress-deploy", path: "../"
 gem "pry-debugger"
+gem "aws-sdk"

data/test/_deploy_rsync.yml

@@ -0,0 +1,6 @@
+method: rsync
+site_dir: _site
+user: imathis@imathis.com
+port: 
+remote_path: ~/octopress-deploy/rsync/
+delete:

data/test/_deploy_rsync_local.yml

@@ -0,0 +1,6 @@
+method: rsync
+site_dir: _site
+user: 
+port: 
+remote_path: local-rsync
+delete:

data/test/source/.hidden

@@ -0,0 +1 @@
+shh.. I'm hiding. Also ignore that garbage.

data/test/source/dir/file

@@ -0,0 +1 @@
+Amazingness. And yes, the garbage.

data/test/source/test_file

@@ -0,0 +1 @@
+Ignore the follwing garbage:

data/test/test.rb

@@ -1,22 +1,161 @@
-require 'octopress-deploy'
+require File.expand_path("../../lib/octopress-deploy.rb", __FILE__)
+require 'fileutils'
+require 'find'
 
-def test_git
-  FileUtils.mkdir 'deploy_target'
-  FileUtils.cd 'deploy_target' do
-    system 'git init --bare'
+@has_failed = false
+@failures = {}
+
+def setup_tests
+  `rm -rf _site` # clean up from previous tests
+  generate_site
+end
+
+def generate_site
+  system "cp -r source/ _site"
+  Find.find('_site').to_a.each do |f| 
+    system("echo '#{garbage}' >> #{f}") unless File.directory?(f)
+  end
+end
+
+def pout(str)
+  print str
+  $stdout.flush
+end
+
+def garbage
+  o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
+  (0...50).map { o[rand(o.length)] }.join
+end
+
+def diff_dir(dir1, dir2)
+  dir_files(dir1).each do |f1|
+    if diff = diff_file(f1, f1.sub(dir1, dir2))
+      @failures["#{@testing}: #{f1}"] = diff
+      pout "F".red
+      @has_failed = true
+    else
+      pout ".".green
+    end
   end
-  Octopress::Deploy.init_config('git', git_url: File.expand_path("deploy_target"))
-  Octopress::Deploy.push()
-  FileUtils.rm_r 'deploy_target'
 end
 
-def test_rsync
-  FileUtils.mkdir_p "deploy-rsync"
-  Octopress::Deploy.init_config('rsync', remote_path: '.deploy')
-  Octopress::Deploy.push()
-  FileUtils.rm_r 'deploy-rsync'
+def diff_file(file1, file2)
+  if File.exist?(file2)
+    diff = `diff #{file1} #{file2}`
+    if diff.size > 0
+      diff
+    else
+      false
+    end
+  else
+    "File: #{file2}: No such file or directory."
+  end
 end
 
-test_git
-test_rsync
+def dir_files(dir)
+  Find.find(dir).to_a.reject!{|f| File.directory?(f) }
+end
+
+def test_remote_git
+  @testing = 'remote git'
+  repo = "git@github.com:octopress/deploy"
+  config = "_git_deploy.yml"
+  
+  # Clean up from previous tests
+  #
+  `rm -rf .deploy pull-git`
+  
+  # Test remote git deployment
+  #
+  Octopress::Deploy.init_config('git', config_file: config, force_write_config: true, git_branch: 'test_git_deploy', git_url: repo)
+  Octopress::Deploy.push(config_file: config)
+  Octopress::Deploy.pull('pull-git', config_file: config)
+  diff_dir('_site', 'pull-git')
+end
+
+def test_local_git
+  @testing = 'local git'
+  config = "_git_deploy.yml"
+
+  # Clean up from previous tests
+  #
+  `rm -rf .deploy local-git pull-git`
+  `git init --bare local-git`
+  repo = "local-git"
+
+  # Test local git deployment
+  #
+  Octopress::Deploy.push(config_file: config, git_url: File.expand_path(repo), remote_path: 'site')
+  Octopress::Deploy.pull('pull-git', config_file: config, git_url: File.expand_path(repo), remote_path: 'site')
+  diff_dir('_site', 'pull-git/site')
+end
+
+def test_remote_rsync
+  @testing = 'remote rsync'
+  config = '_rsync_deploy.yml'
+
+  # Clean up from previous tests
+  `rm -rf local-rsync pull-rsync`
+  
+  # Test remote git deployment
+  #
+  Octopress::Deploy.init_config('rsync', config_file: config, force_write_config: true, user: 'imathis@imathis.com', remote_path: '~/octopress-deploy/rsync/')
+  Octopress::Deploy.push(config_file: config)
+  Octopress::Deploy.pull('pull-rsync', config_file: config)
+  diff_dir('_site', 'pull-rsync')
+
+end
+
+def test_local_rsync
+  @testing = 'local rsync'
+  config = '_rsync_deploy.yml'
+  
+  # Clean up from previous tests
+  `rm -rf local-rsync pull-rsync`
+
+  # Test local git deployment
+  #
+  Octopress::Deploy.init_config('rsync', config_file: config, force_write_config: true, remote_path: 'local-rsync')
+  Octopress::Deploy.push(config_file: config)
+  Octopress::Deploy.pull('pull-rsync', config_file: config, user: false, remote_path: 'local-rsync')
+  diff_dir('_site', 'pull-rsync')
+end
+
+def test_s3
+  @testing = 's3'
+  config = "_s3_deploy.yml"
+  `rm -rf pull-s3`
+  Octopress::Deploy.push(config_file: config)
+  Octopress::Deploy.pull('pull-s3', config_file: config)
+  diff_dir('_site', 'pull-s3')
+end
+
+def print_test_results
+  puts "\n"
+  if @has_failed
+    @failures.each do |name, diff|
+      puts "Failure in #{name}:".red
+      puts "---------"
+      puts diff
+      puts "---------"
+    end
+    abort
+  else
+    puts "All passed!".green
+  end
+end
+
+
+setup_tests
+
+# local tests
+test_local_rsync
+test_local_git
+
+# remote tests
+test_remote_git
+test_remote_rsync
+test_s3
+
+print_test_results
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.alpha.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,19 +75,25 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- History.markdown
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/octopress-deploy.rb
+- lib/octopress-deploy/commands.rb
 - lib/octopress-deploy/core_ext.rb
 - lib/octopress-deploy/git.rb
 - lib/octopress-deploy/rsync.rb
+- lib/octopress-deploy/s3.rb
 - lib/octopress-deploy/version.rb
 - octopress-deploy.gemspec
+- test/.gitignore
 - test/Gemfile
-- test/_deploy.yml
-- test/_site/foo
-- test/_site/test
+- test/_deploy_rsync.yml
+- test/_deploy_rsync_local.yml
+- test/source/.hidden
+- test/source/dir/file
+- test/source/test_file
 - test/test.rb
 homepage: https://github.com/octopress/deploy
 licenses:
@@ -100,8 +120,11 @@ signing_key:
 specification_version: 4
 summary: Deploy Octopress and Jekyll sites easily
 test_files:
+- test/.gitignore
 - test/Gemfile
-- test/_deploy.yml
-- test/_site/foo
-- test/_site/test
+- test/_deploy_rsync.yml
+- test/_deploy_rsync_local.yml
+- test/source/.hidden
+- test/source/dir/file
+- test/source/test_file
 - test/test.rb

data/test/_deploy.yml

@@ -1,4 +0,0 @@
-method: git
-site_dir: _site
-git_url: /Users/imathis/workspace/octodev/deploy/test/deploy_target
-git_branch: master

data/test/_site/foo

@@ -1 +0,0 @@
-asdfasdf

data/test/_site/test

@@ -1 +0,0 @@
-fioobr