s3_website 1.4.0 → 1.4.1

Sign up to get free protection for your applications and to get access to all the features.
data/README.md CHANGED
@@ -225,7 +225,7 @@ file:
225
225
 
226
226
  To recap, this setting instructs s3_website to invalidate the root resource
227
227
  (e.g., *article/*) instead of the filename'd resource (e.g.,
228
- *article/index.html).
228
+ *article/index.html*).
229
229
 
230
230
  No more index.htmls in your URLs!
231
231
 
data/changelog.md CHANGED
@@ -2,6 +2,14 @@
2
2
 
3
3
  This project uses [Semantic Versioning](http://semver.org).
4
4
 
5
+ ## 1.4.1
6
+
7
+ * Fix diff for Windows users
8
+
9
+ See
10
+ <https://github.com/laurilehmijoki/s3_website/issues/8#issuecomment-23683568>
11
+ for discussion.
12
+
5
13
  ## 1.4.0
6
14
 
7
15
  * Add setting `cloudfront_invalidate_root`
data/s3_website.gemspec CHANGED
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "s3_website"
6
- s.version = "1.4.0"
6
+ s.version = "1.4.1"
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.authors = ["Lauri Lehmijoki"]
9
9
  s.email = ["lauri.lehmijoki@iki.fi"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18
18
  s.default_executable = %q{s3_website}
19
19
 
20
20
  s.add_dependency 'aws-sdk', '~> 1.8.5'
21
- s.add_dependency 'filey-diff', '~> 1.4'
21
+ s.add_dependency 'filey-diff', '~> 1.4.1'
22
22
  s.add_dependency 'simple-cloudfront-invalidator', '~> 1'
23
23
  s.add_dependency 'erubis', '~> 2.7.0'
24
24
  s.add_dependency 'mime-types', '= 1.19'
@@ -2,21 +2,14 @@ require 'spec_helper'
2
2
 
3
3
  describe S3Website::Cloudfront::Invalidator do
4
4
  describe 'default behaviour' do
5
- let(:config) {
6
- {
7
- 's3_id' => 'aws id',
8
- 's3_secret' => 'aws secret',
9
- 'cloudfront_distribution_id' => 'EFXX'
10
- }
11
- }
5
+ let(:config) {{
6
+ 's3_id' => 'aws id',
7
+ 's3_secret' => 'aws secret',
8
+ 'cloudfront_distribution_id' => 'EFXX'
9
+ }}
12
10
 
13
11
  it 'invalidates the root resource' do
14
- invalidator = double('invalidator')
15
- SimpleCloudfrontInvalidator::CloudfrontClient.
16
- should_receive(:new).
17
- with('aws id', 'aws secret', 'EFXX').
18
- and_return(invalidator)
19
-
12
+ invalidator = create_simple_cloudfront_invalidator(config)
20
13
  invalidator.
21
14
  should_receive(:invalidate).
22
15
  with(['index.html', '']).
@@ -27,22 +20,15 @@ describe S3Website::Cloudfront::Invalidator do
27
20
  end
28
21
 
29
22
  describe 'option cloudfront_invalidate_root = true' do
30
- let(:config) {
31
- {
32
- 's3_id' => 'aws id',
33
- 's3_secret' => 'aws secret',
34
- 'cloudfront_distribution_id' => 'EFXX',
35
- 'cloudfront_invalidate_root' => true
36
- }
37
- }
23
+ let(:config) {{
24
+ 's3_id' => 'aws id',
25
+ 's3_secret' => 'aws secret',
26
+ 'cloudfront_distribution_id' => 'EFXX',
27
+ 'cloudfront_invalidate_root' => true
28
+ }}
38
29
 
39
30
  it 'invalidates all root resources' do
40
- invalidator = double('invalidator')
41
- SimpleCloudfrontInvalidator::CloudfrontClient.
42
- should_receive(:new).
43
- with('aws id', 'aws secret', 'EFXX').
44
- and_return(invalidator)
45
-
31
+ invalidator = create_simple_cloudfront_invalidator(config)
46
32
  invalidator.
47
33
  should_receive(:invalidate).
48
34
  with(['article/', '']).
@@ -51,4 +37,13 @@ describe S3Website::Cloudfront::Invalidator do
51
37
  S3Website::Cloudfront::Invalidator.invalidate(config, ['article/index.html'])
52
38
  end
53
39
  end
40
+
41
+ def create_simple_cloudfront_invalidator(config)
42
+ invalidator = double('invalidator')
43
+ SimpleCloudfrontInvalidator::CloudfrontClient.
44
+ should_receive(:new).
45
+ with(config['s3_id'], config['s3_secret'], config['cloudfront_distribution_id']).
46
+ and_return(invalidator)
47
+ invalidator
48
+ end
54
49
  end
metadata CHANGED
@@ -1,18 +1,20 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: s3_website
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.4.1
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Lauri Lehmijoki
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2013-08-28 00:00:00.000000000 Z
12
+ date: 2013-09-04 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: aws-sdk
15
16
  requirement: !ruby/object:Gem::Requirement
17
+ none: false
16
18
  requirements:
17
19
  - - ~>
18
20
  - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
20
22
  type: :runtime
21
23
  prerelease: false
22
24
  version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
23
26
  requirements:
24
27
  - - ~>
25
28
  - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
27
30
  - !ruby/object:Gem::Dependency
28
31
  name: filey-diff
29
32
  requirement: !ruby/object:Gem::Requirement
33
+ none: false
30
34
  requirements:
31
35
  - - ~>
32
36
  - !ruby/object:Gem::Version
33
- version: '1.4'
37
+ version: 1.4.1
34
38
  type: :runtime
35
39
  prerelease: false
36
40
  version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
37
42
  requirements:
38
43
  - - ~>
39
44
  - !ruby/object:Gem::Version
40
- version: '1.4'
45
+ version: 1.4.1
41
46
  - !ruby/object:Gem::Dependency
42
47
  name: simple-cloudfront-invalidator
43
48
  requirement: !ruby/object:Gem::Requirement
49
+ none: false
44
50
  requirements:
45
51
  - - ~>
46
52
  - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
48
54
  type: :runtime
49
55
  prerelease: false
50
56
  version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
51
58
  requirements:
52
59
  - - ~>
53
60
  - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
55
62
  - !ruby/object:Gem::Dependency
56
63
  name: erubis
57
64
  requirement: !ruby/object:Gem::Requirement
65
+ none: false
58
66
  requirements:
59
67
  - - ~>
60
68
  - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
62
70
  type: :runtime
63
71
  prerelease: false
64
72
  version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
65
74
  requirements:
66
75
  - - ~>
67
76
  - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
69
78
  - !ruby/object:Gem::Dependency
70
79
  name: mime-types
71
80
  requirement: !ruby/object:Gem::Requirement
81
+ none: false
72
82
  requirements:
73
83
  - - '='
74
84
  - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
76
86
  type: :runtime
77
87
  prerelease: false
78
88
  version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
79
90
  requirements:
80
91
  - - '='
81
92
  - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
83
94
  - !ruby/object:Gem::Dependency
84
95
  name: thor
85
96
  requirement: !ruby/object:Gem::Requirement
97
+ none: false
86
98
  requirements:
87
99
  - - '='
88
100
  - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
90
102
  type: :runtime
91
103
  prerelease: false
92
104
  version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
93
106
  requirements:
94
107
  - - '='
95
108
  - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
97
110
  - !ruby/object:Gem::Dependency
98
111
  name: configure-s3-website
99
112
  requirement: !ruby/object:Gem::Requirement
113
+ none: false
100
114
  requirements:
101
115
  - - ~>
102
116
  - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
107
122
  requirements:
108
123
  - - ~>
109
124
  - !ruby/object:Gem::Version
@@ -111,48 +126,55 @@ dependencies:
111
126
  - !ruby/object:Gem::Dependency
112
127
  name: rspec
113
128
  requirement: !ruby/object:Gem::Requirement
129
+ none: false
114
130
  requirements:
115
- - - '>='
131
+ - - ! '>='
116
132
  - !ruby/object:Gem::Version
117
133
  version: '0'
118
134
  type: :development
119
135
  prerelease: false
120
136
  version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
121
138
  requirements:
122
- - - '>='
139
+ - - ! '>='
123
140
  - !ruby/object:Gem::Version
124
141
  version: '0'
125
142
  - !ruby/object:Gem::Dependency
126
143
  name: rspec-expectations
127
144
  requirement: !ruby/object:Gem::Requirement
145
+ none: false
128
146
  requirements:
129
- - - '>='
147
+ - - ! '>='
130
148
  - !ruby/object:Gem::Version
131
149
  version: '0'
132
150
  type: :development
133
151
  prerelease: false
134
152
  version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
135
154
  requirements:
136
- - - '>='
155
+ - - ! '>='
137
156
  - !ruby/object:Gem::Version
138
157
  version: '0'
139
158
  - !ruby/object:Gem::Dependency
140
159
  name: cucumber
141
160
  requirement: !ruby/object:Gem::Requirement
161
+ none: false
142
162
  requirements:
143
- - - '>='
163
+ - - ! '>='
144
164
  - !ruby/object:Gem::Version
145
165
  version: '0'
146
166
  type: :development
147
167
  prerelease: false
148
168
  version_requirements: !ruby/object:Gem::Requirement
169
+ none: false
149
170
  requirements:
150
- - - '>='
171
+ - - ! '>='
151
172
  - !ruby/object:Gem::Version
152
173
  version: '0'
153
174
  - !ruby/object:Gem::Dependency
154
175
  name: aruba
155
176
  requirement: !ruby/object:Gem::Requirement
177
+ none: false
156
178
  requirements:
157
179
  - - ~>
158
180
  - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
160
182
  type: :development
161
183
  prerelease: false
162
184
  version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
163
186
  requirements:
164
187
  - - ~>
165
188
  - !ruby/object:Gem::Version
@@ -167,20 +190,23 @@ dependencies:
167
190
  - !ruby/object:Gem::Dependency
168
191
  name: rake
169
192
  requirement: !ruby/object:Gem::Requirement
193
+ none: false
170
194
  requirements:
171
- - - '>='
195
+ - - ! '>='
172
196
  - !ruby/object:Gem::Version
173
197
  version: '0'
174
198
  type: :development
175
199
  prerelease: false
176
200
  version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
177
202
  requirements:
178
- - - '>='
203
+ - - ! '>='
179
204
  - !ruby/object:Gem::Version
180
205
  version: '0'
181
206
  - !ruby/object:Gem::Dependency
182
207
  name: vcr
183
208
  requirement: !ruby/object:Gem::Requirement
209
+ none: false
184
210
  requirements:
185
211
  - - ~>
186
212
  - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
188
214
  type: :development
189
215
  prerelease: false
190
216
  version_requirements: !ruby/object:Gem::Requirement
217
+ none: false
191
218
  requirements:
192
219
  - - ~>
193
220
  - !ruby/object:Gem::Version
@@ -195,6 +222,7 @@ dependencies:
195
222
  - !ruby/object:Gem::Dependency
196
223
  name: webmock
197
224
  requirement: !ruby/object:Gem::Requirement
225
+ none: false
198
226
  requirements:
199
227
  - - ~>
200
228
  - !ruby/object:Gem::Version
@@ -202,11 +230,12 @@ dependencies:
202
230
  type: :development
203
231
  prerelease: false
204
232
  version_requirements: !ruby/object:Gem::Requirement
233
+ none: false
205
234
  requirements:
206
235
  - - ~>
207
236
  - !ruby/object:Gem::Version
208
237
  version: 1.8.0
209
- description: "\n Sync website files, set redirects, use HTTP performance optimisations,
238
+ description: ! "\n Sync website files, set redirects, use HTTP performance optimisations,
210
239
  deliver via\n CloudFront.\n "
211
240
  email:
212
241
  - lauri.lehmijoki@iki.fi
@@ -335,26 +364,33 @@ files:
335
364
  homepage: https://github.com/laurilehmijoki/s3_website
336
365
  licenses:
337
366
  - MIT
338
- metadata: {}
339
367
  post_install_message:
340
368
  rdoc_options: []
341
369
  require_paths:
342
370
  - lib
343
371
  required_ruby_version: !ruby/object:Gem::Requirement
372
+ none: false
344
373
  requirements:
345
- - - '>='
374
+ - - ! '>='
346
375
  - !ruby/object:Gem::Version
347
376
  version: '0'
377
+ segments:
378
+ - 0
379
+ hash: 2682610008512245094
348
380
  required_rubygems_version: !ruby/object:Gem::Requirement
381
+ none: false
349
382
  requirements:
350
- - - '>='
383
+ - - ! '>='
351
384
  - !ruby/object:Gem::Version
352
385
  version: '0'
386
+ segments:
387
+ - 0
388
+ hash: 2682610008512245094
353
389
  requirements: []
354
390
  rubyforge_project:
355
- rubygems_version: 2.0.3
391
+ rubygems_version: 1.8.24
356
392
  signing_key:
357
- specification_version: 4
393
+ specification_version: 3
358
394
  summary: Manage your S3 website
359
395
  test_files:
360
396
  - features/as-library.feature
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: bad4fc74f724a4017ad910badbaeaebd90d0f2b7
4
- data.tar.gz: 6c7e6efac417531ef5afec5b94a6bd74e795cc20
5
- SHA512:
6
- metadata.gz: 47b2d9003a269827e1e0b3f8ebe7bb6816f284209e510009c306c30cf9c426477ca1345af15147cb8ba699b74c23af00f2cb55780586b656909aeb0a969e12e9
7
- data.tar.gz: 9bbc213d27d7f8069e85031941252a2604ff28e2c2ac3656c402e43743b29991b7e990f7bac0f4c043883744957605e560eb53f9088ee94706e48aa72af19524