middleman-s3_sync 3.0.31 → 3.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f431194b1a96375b88da5f61aae633e9281bd3b
-  data.tar.gz: 1ee6ebd0ff9c2c793917db1caa3f44fc3d00e3bd
+  metadata.gz: b3ce2090b4283bf6444fb03b7b96dc6f9937054f
+  data.tar.gz: be1f3af6a566204373a92c67092c0c5baa90677d
 SHA512:
-  metadata.gz: 37ec664a5db9d9225ab9634a1a481f0e248926ee247a0c5f0a1b653737edd1b900865de2830c2f0db1356d8d9763022663b38574b8d4f2514ec81c4a833c698d
-  data.tar.gz: f6088910de0c27cd4b60ea18579709bbe0c56c45d75be7fb701e2f67d4da80246c077605c2afa74faf88b79097de1064a1c16004584bcc1b85d4ad016040782c
+  metadata.gz: 2629ce0cd38aa495a15e29ba5f75034036e079cbfd9cab5a489501f026ea5617f50ac2805e6f55d6b4cc0dcdc180d1dc68c57fb8b0daeee0bf46e159f422ffd7
+  data.tar.gz: d64dc99cfdf998310b396dd16da776c257c42e3ff9a79f00ddeefd78eb212f64e9be01a80ae27f1a0e0656d8fd2d252ddeec96f9126aab029464076231a17afe

data/README.md

@@ -105,12 +105,37 @@ map to the following values:
 
 | Setting               | Environment Variable               |
 | --------------------- | ---------------------------------- |
-| aws_access_key_id     | ```ENV['AWS_ACCESS_KEY_ID```       |
+| aws_access_key_id     | ```ENV['AWS_ACCESS_KEY_ID']```     |
 | aws_secret_access_key | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
 
 The environment is used when the credentials are not set in the activate
 method or passed through the ```.s3_sync``` configuration file.
 
+### IAM Policy
+
+Here's a sample IAM policy that will allow a user to update the site
+contained in a bucket named "mysite.com":
+
+```
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": "s3:*",
+      "Resource": "arn:aws:s3:::mysite.com"
+    },
+    {
+      "Effect": "Allow",
+      "Action": "s3:*",
+      "Resource": "arn:aws:s3:::mysite.com/*"
+    }
+  ]
+}
+```
+
+This will give full access to both the bucket and it's contents.
+
 ## Push All Content to S3
 
 There are situations where you might need to push the files to S3. In

data/lib/middleman-s3_sync/commands.rb

@@ -1,10 +1,12 @@
 require 'middleman-core/cli'
-require 'middleman-s3_sync/extension'
 
 module Middleman
   module Cli
     class S3Sync < Thor
       include Thor::Actions
+
+      check_unknown_options!
+
       namespace :s3_sync
 
       def self.exit_on_failure?
@@ -12,15 +14,15 @@ module Middleman
       end
 
       desc "s3_sync", "Pushes the minimum set of files needed to S3"
-      option :force, type: :boolean,
-                     desc: "Push all local files to the server",
-                     aliases: :f
-      option :bucket, type: :string,
-                      desc: "Specify which bucket to use, overrides the configured bucket.",
-                      aliases: :b
-      option :verbose, type: :boolean,
-                       desc: "Adds more verbosity...",
-                       aliases: :v
+      method_option :force, type: :boolean,
+        desc: "Push all local files to the server",
+        aliases: '-f'
+      method_option :bucket, type: :string,
+        desc: "Specify which bucket to use, overrides the configured bucket.",
+        aliases: '-b'
+      method_option :verbose, type: :boolean,
+        desc: "Adds more verbosity...",
+        aliases: '-v'
 
       def s3_sync
         shared_inst = ::Middleman::Application.server.inst
@@ -29,13 +31,16 @@ module Middleman
           raise Thor::Error.new "You need to activate the s3_sync extension."
         end
 
+        s3_sync_options = shared_inst.s3_sync_options
+
         # Override options based on what was passed on the command line...
-        shared_inst.s3_sync_options.force = options[:force] if options[:force]
-        shared_inst.s3_sync_options.bucket = options[:bucket] if options[:bucket]
-        shared_inst.s3_sync_options.verbose = options[:verbose] if options[:verbose]
+        s3_sync_options.force = options[:force] if options[:force]
+        s3_sync_options.bucket = options[:bucket] if options[:bucket]
+        s3_sync_options.verbose = options[:verbose] if options[:verbose]
 
-        ::Middleman::S3Sync.sync
+        ::Middleman::S3Sync.sync(s3_sync_options)
       end
     end
+    Base.map('sync' => 's3_sync')
   end
 end

data/lib/middleman-s3_sync/extension.rb

@@ -21,7 +21,7 @@ module Middleman
           # Define the after_build step after during configuration so
           # that it's pushed to the end of the callback chain
           app.after_build do |builder|
-            ::Middleman::S3Sync.sync if options.after_build
+            ::Middleman::S3Sync.sync(@option) if options.after_build
           end
 
           options.build_dir ||= build_dir
@@ -33,6 +33,10 @@ module Middleman
         @options
       end
 
+      def s3_sync_options=(options)
+        @options = options
+      end
+
       module Helpers
         def s3_sync_options
           ::Middleman::S3Sync.s3_sync_options

data/lib/middleman/s3_sync.rb

@@ -14,9 +14,11 @@ module Middleman
     class << self
       include Status
 
-      def sync
+      def sync(options)
         @app = ::Middleman::Application.server.inst
 
+        self.s3_sync_options = options
+
         unless work_to_be_done?
           say_status "\nAll S3 files are up to date."
           return

data/lib/middleman/s3_sync/resource.rb

@@ -123,7 +123,7 @@ module Middleman
                  elsif directory?
                    :directory
                  end
-        unless alternate_encoding?
+        if options.verbose
           say_status "Ignoring".yellow + " #{remote_path} #{ reason ? "(#{reason})".white : "" }"
         end
       end

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.31"
+    VERSION = "3.0.32"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.31
+  version: 3.0.32
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core