middleman-s3_sync 3.0.17 → 3.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFlMjY1ZDIzOWVjYTk3OTczNDlhYTM0NGQyNTVjZWNmNzE2Y2Q3Mw==
+    NDhlMDE0OGUyYmFkYzg4ZDY0NTJhZmVhZDM3YTEwODBjZDE2MGQ2NA==
   data.tar.gz: !binary |-
-    MDA0YmI3MGY4YWQ1NmVlOGFmOTVlZjVhZDcxYzk5YThlY2E0MzhlMQ==
+    ZDI0NWRjOWY5NDU0Y2RjNTM3MWQ0NzEwN2NmY2M1MjU5ODY1ZjMwMw==
 SHA512:
   metadata.gz: !binary |-
-    NWNjMjIwOTdiNmVkYjFkOTYxOWU2OWE0ODRkZDBiOGNhZDIwYWNkNWI5ZmU5
-    MWEzYjc2NjI2NDVlZmRiNjRhNzE2ZDZiYjdkMjg5MDdmYTQ0MTNlY2RhOTg2
-    YzM0NTIyNWY1MDc4NjQ5MzMzNWZhZTIxN2Q1MDc4ODEzM2Q1MzI=
+    MTI2MWM0ODVjZmEzZDFkZGQ5NzhlYmY2MzI3Yzc2MWQ4MzRlNDk1MDhjN2Y3
+    MDQzMGUxMTcwZmVmNzc2MGE4OTBiYWEzNTFiYjQzYTI5M2I3ZDVlZThiOTk1
+    ZmJkMWJiOGMxZjg4YzAxZDEyM2ZmOTAwMjMyYzdjNjgwZmE4ZmE=
   data.tar.gz: !binary |-
-    NTJhNDhhZjc0ZGM2YWQ0Y2E3YjU0OWY0MDQxY2RlYjQxZDViOWZlMzA5Y2Yx
-    ZjQwNWI4MjY2ODk5YWYyYTdiOTk0YmNhMzM1Yjk1YWU4OWZiZTJkNmUwYWUy
-    MjhjZmIxMjRmMzc3MDE5MmNmNDI4ODQ0ZjY0NDI3NzY2OGFlNWE=
+    ZGExM2VhMzkyMDlkMWNlNDQzZTNmODgwY2MxMjUzODE5ZmM2NjRhODQ4Yjgx
+    OWY5N2NlODYwYWUwNTZmZWVmMTdhZWM4ZThiNzI0Y2ZlMGMxZjMxZDEwZmYz
+    YTI2NzY4YmEyNDZjNmMxMTgwYjcyZjI5N2NlZTI0ZGZhOWI4ZWM=

data/README.md

@@ -41,6 +41,7 @@ activate :s3_sync do |s3_sync|
   s3_sync.delete                     = false # We delete stray files by default.
   s3_sync.after_build                = false # We chain after the build step by default. This may not be your desired behavior...
   s3_sync.prefer_gzip                = true
+  s3_sync.path_style                 = true
   s3_sync.reduced_redundancy_storage = false
   end
 ```
@@ -53,12 +54,13 @@ The following defaults apply to the configuration items:
 
 | Setting                    | Default                            |
 | -----------------          | ----------------------------       |
-| 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']``` |
 | delete                     | ```true```                         |
 | after_build                | ```false```                        |
 | prefer_gzip                | ```true```                         |
 | reduced_redundancy_storage | ```false```                        |
+| path_style                 | ```true```                         |
 
 You do not need to specify the settings that match the defaults. This
 simplify the configuration of the extension:

data/lib/middleman/s3_sync.rb

@@ -9,8 +9,6 @@ require 'middleman/s3_sync/resource'
 require 'middleman-s3_sync/extension'
 require 'ruby-progressbar'
 
-Fog::Logger[:warning] = nil
-
 module Middleman
   module S3Sync
     class << self
@@ -40,7 +38,8 @@ module Middleman
           :provider => 'AWS',
           :aws_access_key_id => s3_sync_options.aws_access_key_id,
           :aws_secret_access_key => s3_sync_options.aws_secret_access_key,
-          :region => s3_sync_options.region
+          :region => s3_sync_options.region,
+          :path_style => s3_sync_options.path_style
         })
       end
 

data/lib/middleman/s3_sync/options.rb

@@ -14,6 +14,7 @@ module Middleman
         :force,
         :prefer_gzip,
         :reduced_redundancy_storage,
+        :path_style,
         :verbose
 
       def initialize
@@ -57,6 +58,10 @@ module Middleman
         (@prefer_gzip.nil? ? true : @prefer_gzip)
       end
 
+      def path_style
+        (@path_style.nil? ? true : @path_style)
+      end
+
       # Read config options from an IO stream and set them on `self`. Defaults
       # to reading from the `.s3_sync` file in the MM project root if it exists.
       #

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.17"
+    VERSION = "3.0.18"
   end
 end

data/middleman-s3_sync.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'middleman-core', '>= 3.0.0'
-  gem.add_runtime_dependency 'fog'
+  gem.add_runtime_dependency 'fog', '>= 1.10.1'
   gem.add_runtime_dependency 'map'
   gem.add_runtime_dependency 'pmap'
   gem.add_runtime_dependency 'ruby-progressbar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.18
 platform: ruby
 authors:
 - Frederic Jean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement