s3_website 1.1.2 → 1.2.0

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.
Files changed (6) hide show
  1. data/README.md +5 -0
  2. data/bin/s3_website +7 -1
  3. data/changelog.md +5 -0
  4. data/s3_website.gemspec +1 -1
  5. metadata +52 -16
  6. checksums.yaml +0 -7
data/README.md CHANGED
@@ -48,6 +48,10 @@ Let's say the contents you wish to upload to your S3 website bucket are in
48
48
  *my_website_output*. You can upload the contents of that directory with
49
49
  `s3_website push --site my_website_output`.
50
50
 
51
+ If you want to store the `s3_website.yml` file in a directory other than
52
+ the project's root you can specify the directory.
53
+ `s3_website push --config_dir config`.
54
+
51
55
  ### Using environment variables
52
56
 
53
57
  You can use ERB in your `s3_website.yml` file which incorporates environment variables:
@@ -368,5 +372,6 @@ Contributors (in alphabetical order)
368
372
  * Philippe Creux
369
373
  * Shigeaki Matsumura
370
374
  * stanislas
375
+ * Tate Johnson
371
376
  * Trevor Fitzgerald
372
377
  * Zee Spencer
data/bin/s3_website CHANGED
@@ -36,6 +36,12 @@ class Cli < Thor
36
36
  :desc =>
37
37
  'When headless, s3_website will not require human interaction at any point'
38
38
  )
39
+ option(
40
+ :config_dir,
41
+ :type => :string,
42
+ :default => Dir.pwd,
43
+ :desc => "The directory where your config file is. When not defined, s3_website will look in the current working directory."
44
+ )
39
45
  desc 'push', 'Push local files with the S3 website'
40
46
  long_desc <<-LONGDESC
41
47
  `s3_website push` will upload new and changes files to S3. It will
@@ -43,7 +49,7 @@ class Cli < Thor
43
49
  LONGDESC
44
50
  def push
45
51
  site_path = S3Website::Paths.infer_site_path options[:site]
46
- S3Website::Tasks.push(Dir.pwd, site_path, options[:headless])
52
+ S3Website::Tasks.push(options[:config_dir], site_path, options[:headless])
47
53
  end
48
54
 
49
55
  desc 'cfg SUBCOMMAND ...ARGS', 'Operate on the config file'
data/changelog.md CHANGED
@@ -2,6 +2,11 @@
2
2
 
3
3
  This project uses [Semantic Versioning](http://semver.org).
4
4
 
5
+ ## 1.2.0
6
+
7
+ * Use the `--config_dir` CLI option to specify the directory from where to read
8
+ the `s3_website.yml` config file
9
+
5
10
  ## 1.1.2
6
11
 
7
12
  * Mention the MIT license in the gemspec file
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.1.2"
6
+ s.version = "1.2.0"
7
7
  s.platform = Gem::Platform::RUBY
8
8
  s.authors = ["Lauri Lehmijoki"]
9
9
  s.email = ["lauri.lehmijoki@iki.fi"]
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.1.2
4
+ version: 1.2.0
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-07-22 00:00:00.000000000 Z
12
+ date: 2013-07-26 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,6 +30,7 @@ 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
@@ -34,6 +38,7 @@ dependencies:
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
@@ -41,6 +46,7 @@ dependencies:
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
@@ -334,26 +363,33 @@ files:
334
363
  homepage: https://github.com/laurilehmijoki/s3_website
335
364
  licenses:
336
365
  - MIT
337
- metadata: {}
338
366
  post_install_message:
339
367
  rdoc_options: []
340
368
  require_paths:
341
369
  - lib
342
370
  required_ruby_version: !ruby/object:Gem::Requirement
371
+ none: false
343
372
  requirements:
344
- - - '>='
373
+ - - ! '>='
345
374
  - !ruby/object:Gem::Version
346
375
  version: '0'
376
+ segments:
377
+ - 0
378
+ hash: 4100098069468655376
347
379
  required_rubygems_version: !ruby/object:Gem::Requirement
380
+ none: false
348
381
  requirements:
349
- - - '>='
382
+ - - ! '>='
350
383
  - !ruby/object:Gem::Version
351
384
  version: '0'
385
+ segments:
386
+ - 0
387
+ hash: 4100098069468655376
352
388
  requirements: []
353
389
  rubyforge_project:
354
- rubygems_version: 2.0.3
390
+ rubygems_version: 1.8.24
355
391
  signing_key:
356
- specification_version: 4
392
+ specification_version: 3
357
393
  summary: Manage your S3 website
358
394
  test_files:
359
395
  - features/as-library.feature
checksums.yaml DELETED
@@ -1,7 +0,0 @@
1
- ---
2
- SHA1:
3
- metadata.gz: d81e9c5f3a36c3087e95b37366fe7922834674f1
4
- data.tar.gz: fd92f27010577f1b03ffec36701c187819fd5ee6
5
- SHA512:
6
- metadata.gz: fffe1fe8cd971b766a384d68179f1c2e491a2b86249c644b1158d91a36605962d03f680022355ebdf2105fc9633e274254b3caf4ac62aa54454059d6366ecd48
7
- data.tar.gz: 4f9214ea30b98d8517935fe0a364a85b10a956b4ae6e3251328c2eb63bbbcd507ee6ddddc5d5e79c9392661563f35825516b0c2d9c503d0432c4028f61741cab