octopress-deploy 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75396b3d9c08fa3d3ca51c034f9eeba5eb51342
-  data.tar.gz: d8b79775a8f2371f956cbea7d0599a29c89824b5
+  metadata.gz: 5b40f670b3da0ca63247f292839e1f3ac4078c12
+  data.tar.gz: 2dad3bffc5e0d5a73ebe993d8918c2d63d04fb2f
 SHA512:
-  metadata.gz: 17cf33beeb6801c573fd3c2416ca26f6eca4ee18dddbf358c69b99ab2097f2a4b1e0ffaecad4adb1ac9552d23a084d5de2cfadb15c64a5716af21514fd404aa0
-  data.tar.gz: 8e3f62f866bd690c4f17aea8b849386ad42dab791faf7683746017bcb19d15e09c0072459fce5ff5e514ede4d52039661bc3d1f21b71ba889dd7d4f9e7b14af3
+  metadata.gz: ea4356aae147e4a0f3de99ca98235b729fd48fc19e53fccecd2896b38e2f86b1c8e91c3652861ebadd52f03b5eee4886540a281352388b8274192bbb5a4cf3f1
+  data.tar.gz: 2c91be9d8efeea20adff8b408fb578394abbcd439315fcaa805d04a95180d77620ceece1ab6d290766908428be0e3ac21c11baa1737b90cf7889fdcc8109efe4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.0.5 - 2015-02-04
+
+- Fixed issue where an S3 pull wouldn't create some directories.
+- On S3 deploying, verbose now defaults to false.
+
 ### 1.0.4 - 2015-01-17
 
 - Improved help messaging on `deploy init git`.

data/README.md

@@ -86,7 +86,7 @@ account access information.
 | `access_key_id`     | AWS access key                                        |              |
 | `secret_access_key` | AWS secret key                                        |              |
 | `remote_path`       | Directory files should be synced to.                  | /            |
-| `verbose`           | [optional] Display all file actions during deploy.    | true         |
+| `verbose`           | [optional] Display all file actions during deploy.    | false        |
 | `region`            | [optional] Region for your AWS bucket                 | us-east-1    |
 | `delete`            | Delete files in `remote_path` not found in `site_dir` | false        |
 | `headers`           | Set headers for matched files                         | []           |

data/lib/octopress-deploy/commands.rb

@@ -74,7 +74,7 @@ module Octopress
               c.option 'secret_access_key', '-s', '--secret KEY', 'Secret access key'
               c.option 'region', '-r', '--region REGION', 'AWS region (default: us-east-1)'
               c.option 'remote_path', '-d', '--dir DIR', 'Deploy site into a subdirectory.'
-              c.option 'verbose', '-v', '--verbose', 'Log verbose output when deploying (default: true)'
+              c.option 'verbose', '-v', '--verbose', 'Log verbose output when deploying'
               c.option 'delete', '--delete', 'Sync file deletion'
               add_common_init_options(c)
 

data/lib/octopress-deploy/s3.rb

@@ -9,7 +9,7 @@ module Octopress
         begin
           require 'aws-sdk'
         rescue LoadError
-          abort "Deploying to S3 requires aws-sdk. Install with `gem install aws-sdk`."
+          abort "Deploying to S3 requires the aws-sdk gem. Install with `gem install aws-sdk`."
         end
         @options     = options
         @local       = options[:site_dir]          || '_site'
@@ -18,7 +18,7 @@ module Octopress
         @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
+        @verbose     = options[:verbose]
         @delete      = options[:delete]
         @headers     = options[:headers]           || []
         @remote_path = @remote_path.sub(/^\//,'')  # remove leading slash
@@ -44,12 +44,18 @@ module Octopress
         if !@bucket.exists?
           abort "Bucket not found: '#{@bucket_name}'. Check your configuration or create a bucket using: `octopress deploy add-bucket`"
         else
-          puts "Syncing #{@bucket_name} files to #{@pull_dir} on S3."
+          puts "Syncing from S3 bucket: '#{@bucket_name}' to #{@pull_dir}."
           @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) }
+
+            # Path is a directory, not a file
+            if path =~ /\/$/ 
+              FileUtils.mkdir_p(path) unless File.directory?(path)
+            else
+              dir = File.dirname(path)
+              FileUtils.mkdir_p(dir) unless File.directory?(dir)
+              File.open(path, 'w') { |f| f.write(object.read) }
+            end
           end
         end
       end
@@ -81,7 +87,10 @@ module Octopress
       end
 
       def get_file_with_metadata(file, s3_filename)
-        file_with_options = {:file => file }
+        file_with_options = {
+          :file => file,
+          :acl => :public_read
+        }
 
         @headers.each do |conf|
           if conf.has_key? 'filename' and s3_filename.match(conf['filename'])
@@ -220,9 +229,10 @@ module Octopress
 #{"secret_access_key: #{options[:secret_access_key]}".ljust(40)}  # Keep it safe; keep it secret. Keep this file in your .gitignore.
 #{"remote_path: #{options[:remote_path] || '/'}".ljust(40)}  # relative path on bucket where files should be copied.
 #{"region: #{options[:remote_path] || 'us-east-1'}".ljust(40)}  # Region where your bucket is located.
+#{"verbose: true".ljust(40)}  # Print out all file operations.
 
 #{"# delete: #{options[:delete] || 'true'}".ljust(40)}  # Remove files from destination which do not match source files.
-#{"# verbose: #{options[:verbose] || 'true'}".ljust(40)}  # Print out all file operations.
+#{"# verbose: #{options[:verbose] || 'false'}".ljust(40)}  # Print out all file operations.
 CONFIG
       end
 

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

data/lib/octopress-deploy.rb

@@ -117,7 +117,7 @@ module Octopress
     def self.get_config
       <<-FILE
 #{"method: #{@options[:method]}".ljust(40)}  # How do you want to deploy? git, rsync or s3.
-#{"site_dir: #{@options[:site_dir]}".ljust(40)}  # Location of your your static site files.
+#{"site_dir: #{@options[:site_dir]}".ljust(40)}  # Location of your static site files.
 
 #{get_deployment_method(@options).default_config(@options)}
 FILE

data/{.clash.yml → test/_clash.yml}

@@ -5,7 +5,7 @@
     reset: 
       - cleanup
       - cp -r source/ _site
-      - ruby garbage.rb
+      - ruby _garbage.rb
 -
   title: Test local Rsync
   before: 

data/test/_git_deploy_local.yml

@@ -1,5 +1,5 @@
 method: git                               # How do you want to deploy? git, rsync or s3.
-site_dir: _site                           # Location of your your static site files.
+site_dir: _site                           # Location of your static site files.
 
 git_url: /Users/imathis/workspace/octodev/deploy/test/local-git  # remote repository url, e.g. git@github.com:username/repo_name
 

data/test/_rsync_deploy_local.yml

@@ -1,5 +1,5 @@
 method: rsync                             # How do you want to deploy? git, rsync or s3.
-site_dir: _site                           # Location of your your static site files.
+site_dir: _site                           # Location of your static site files.
 
 user:                                     # The user for your host, e.g. user@host.com
 remote_path: local-rsync                  # Destination directory

data/test/source/index.html

@@ -0,0 +1 @@
+This is a test, ignore the follwing garbage:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -115,7 +115,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".clash.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -130,15 +129,13 @@ files:
 - lib/octopress-deploy/s3.rb
 - lib/octopress-deploy/version.rb
 - octopress-deploy.gemspec
-- test/.gitignore
-- test/Gemfile
+- test/_clash.yml
 - test/_git_deploy_local.yml
 - test/_rsync_deploy_local.yml
 - test/garbage.rb
 - test/source/.hidden
 - test/source/dir/file
-- test/source/test_file
-- test/test.rb
+- test/source/index.html
 homepage: https://github.com/octopress/deploy
 licenses:
 - MIT
@@ -164,12 +161,10 @@ signing_key:
 specification_version: 4
 summary: Easily deploy any Jekyll or Octopress site using S3, Git, or Rsync.
 test_files:
-- test/.gitignore
-- test/Gemfile
+- test/_clash.yml
 - test/_git_deploy_local.yml
 - test/_rsync_deploy_local.yml
 - test/garbage.rb
 - test/source/.hidden
 - test/source/dir/file
-- test/source/test_file
-- test/test.rb
+- test/source/index.html

data/test/.gitignore

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

data/test/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: "../"
-gem "aws-sdk"

data/test/source/test_file

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

data/test/test.rb

@@ -1,163 +0,0 @@
-require File.expand_path("../../lib/octopress-deploy.rb", __FILE__)
-require 'fileutils'
-require 'find'
-require 'pry-byebug'
-
-@has_failed = false
-@failures = {}
-
-def setup_tests
-  `rm -rf build` # clean up from previous tests
-  generate_site
-end
-
-def generate_site
-  system "cp -r source/ build"
-  Find.find('build').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
-end
-
-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
-
-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(method: 'git', config_file: config, force: true, site_dir: 'build', git_branch: 'test_git_deploy', git_url: repo)
-  Octopress::Deploy.push(config_file: config)
-  Octopress::Deploy.pull(dir: 'pull-git', config_file: config)
-  diff_dir('build', '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.init_config(method: 'git', config_file: config, force: true, site_dir: 'build', git_branch: 'test_git_deploy', git_url: File.expand_path(repo), remote_path: 'site')
-  Octopress::Deploy.push(config_file: config)
-  Octopress::Deploy.pull(dir: 'pull-git', config_file: config, git_url: File.expand_path(repo), remote_path: 'site')
-  diff_dir('build', '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(method: 'rsync', config_file: config, site_dir: 'build', force: true, user: 'imathis@imathis.com', remote_path: '~/octopress-deploy/rsync/')
-  Octopress::Deploy.push(config_file: config)
-  Octopress::Deploy.pull(dir: 'pull-rsync', config_file: config)
-  diff_dir('build', '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(method: 'rsync', config_file: config, site_dir: 'build', force: true, remote_path: 'local-rsync')
-  Octopress::Deploy.push(config_file: config)
-  Octopress::Deploy.pull(dir: 'pull-rsync', config_file: config, user: false, remote_path: 'local-rsync')
-  diff_dir('build', '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(dir: 'pull-s3', config_file: config)
-  diff_dir('build', '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
-