middleman-s3_sync 3.0.17 → 3.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NDFlMjY1ZDIzOWVjYTk3OTczNDlhYTM0NGQyNTVjZWNmNzE2Y2Q3Mw==
4
+ NDhlMDE0OGUyYmFkYzg4ZDY0NTJhZmVhZDM3YTEwODBjZDE2MGQ2NA==
5
5
  data.tar.gz: !binary |-
6
- MDA0YmI3MGY4YWQ1NmVlOGFmOTVlZjVhZDcxYzk5YThlY2E0MzhlMQ==
6
+ ZDI0NWRjOWY5NDU0Y2RjNTM3MWQ0NzEwN2NmY2M1MjU5ODY1ZjMwMw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NWNjMjIwOTdiNmVkYjFkOTYxOWU2OWE0ODRkZDBiOGNhZDIwYWNkNWI5ZmU5
10
- MWEzYjc2NjI2NDVlZmRiNjRhNzE2ZDZiYjdkMjg5MDdmYTQ0MTNlY2RhOTg2
11
- YzM0NTIyNWY1MDc4NjQ5MzMzNWZhZTIxN2Q1MDc4ODEzM2Q1MzI=
9
+ MTI2MWM0ODVjZmEzZDFkZGQ5NzhlYmY2MzI3Yzc2MWQ4MzRlNDk1MDhjN2Y3
10
+ MDQzMGUxMTcwZmVmNzc2MGE4OTBiYWEzNTFiYjQzYTI5M2I3ZDVlZThiOTk1
11
+ ZmJkMWJiOGMxZjg4YzAxZDEyM2ZmOTAwMjMyYzdjNjgwZmE4ZmE=
12
12
  data.tar.gz: !binary |-
13
- NTJhNDhhZjc0ZGM2YWQ0Y2E3YjU0OWY0MDQxY2RlYjQxZDViOWZlMzA5Y2Yx
14
- ZjQwNWI4MjY2ODk5YWYyYTdiOTk0YmNhMzM1Yjk1YWU4OWZiZTJkNmUwYWUy
15
- MjhjZmIxMjRmMzc3MDE5MmNmNDI4ODQ0ZjY0NDI3NzY2OGFlNWE=
13
+ ZGExM2VhMzkyMDlkMWNlNDQzZTNmODgwY2MxMjUzODE5ZmM2NjRhODQ4Yjgx
14
+ OWY5N2NlODYwYWUwNTZmZWVmMTdhZWM4ZThiNzI0Y2ZlMGMxZjMxZDEwZmYz
15
+ YTI2NzY4YmEyNDZjNmMxMTgwYjcyZjI5N2NlZTI0ZGZhOWI4ZWM=
data/README.md CHANGED
@@ -41,6 +41,7 @@ activate :s3_sync do |s3_sync|
41
41
  s3_sync.delete = false # We delete stray files by default.
42
42
  s3_sync.after_build = false # We chain after the build step by default. This may not be your desired behavior...
43
43
  s3_sync.prefer_gzip = true
44
+ s3_sync.path_style = true
44
45
  s3_sync.reduced_redundancy_storage = false
45
46
  end
46
47
  ```
@@ -53,12 +54,13 @@ The following defaults apply to the configuration items:
53
54
 
54
55
  | Setting | Default |
55
56
  | ----------------- | ---------------------------- |
56
- | aws_access_key_id | ```ENV['AWS_ACCESS_KEY_ID``` |
57
+ | aws_access_key_id | ```ENV['AWS_ACCESS_KEY_ID']``` |
57
58
  | aws_secret_access_key | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
58
59
  | delete | ```true``` |
59
60
  | after_build | ```false``` |
60
61
  | prefer_gzip | ```true``` |
61
62
  | reduced_redundancy_storage | ```false``` |
63
+ | path_style | ```true``` |
62
64
 
63
65
  You do not need to specify the settings that match the defaults. This
64
66
  simplify the configuration of the extension:
@@ -9,8 +9,6 @@ require 'middleman/s3_sync/resource'
9
9
  require 'middleman-s3_sync/extension'
10
10
  require 'ruby-progressbar'
11
11
 
12
- Fog::Logger[:warning] = nil
13
-
14
12
  module Middleman
15
13
  module S3Sync
16
14
  class << self
@@ -40,7 +38,8 @@ module Middleman
40
38
  :provider => 'AWS',
41
39
  :aws_access_key_id => s3_sync_options.aws_access_key_id,
42
40
  :aws_secret_access_key => s3_sync_options.aws_secret_access_key,
43
- :region => s3_sync_options.region
41
+ :region => s3_sync_options.region,
42
+ :path_style => s3_sync_options.path_style
44
43
  })
45
44
  end
46
45
 
@@ -14,6 +14,7 @@ module Middleman
14
14
  :force,
15
15
  :prefer_gzip,
16
16
  :reduced_redundancy_storage,
17
+ :path_style,
17
18
  :verbose
18
19
 
19
20
  def initialize
@@ -57,6 +58,10 @@ module Middleman
57
58
  (@prefer_gzip.nil? ? true : @prefer_gzip)
58
59
  end
59
60
 
61
+ def path_style
62
+ (@path_style.nil? ? true : @path_style)
63
+ end
64
+
60
65
  # Read config options from an IO stream and set them on `self`. Defaults
61
66
  # to reading from the `.s3_sync` file in the MM project root if it exists.
62
67
  #
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module S3Sync
3
- VERSION = "3.0.17"
3
+ VERSION = "3.0.18"
4
4
  end
5
5
  end
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
19
19
  gem.require_paths = ["lib"]
20
20
 
21
21
  gem.add_runtime_dependency 'middleman-core', '>= 3.0.0'
22
- gem.add_runtime_dependency 'fog'
22
+ gem.add_runtime_dependency 'fog', '>= 1.10.1'
23
23
  gem.add_runtime_dependency 'map'
24
24
  gem.add_runtime_dependency 'pmap'
25
25
  gem.add_runtime_dependency 'ruby-progressbar'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-s3_sync
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.17
4
+ version: 3.0.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Frederic Jean
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-09-18 00:00:00.000000000 Z
12
+ date: 2013-10-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: middleman-core
@@ -31,14 +31,14 @@ dependencies:
31
31
  requirements:
32
32
  - - ! '>='
33
33
  - !ruby/object:Gem::Version
34
- version: '0'
34
+ version: 1.10.1
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - ! '>='
40
40
  - !ruby/object:Gem::Version
41
- version: '0'
41
+ version: 1.10.1
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: map
44
44
  requirement: !ruby/object:Gem::Requirement