jekyll-s3-yearofmoo 0.0.33 → 0.0.35

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.
@@ -4,6 +4,7 @@ module Jekyll
4
4
 
5
5
  SITE_DIR = "_site"
6
6
  CONFIGURATION_FILE = '_jekyll_s3.yml'
7
+ CONFIGURATION_FILE_SECRET = '_jekyll_s3_secret.yml'
7
8
  CONFIGURATION_FILE_TEMPLATE = <<-EOF
8
9
  s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
9
10
  s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
@@ -231,12 +232,16 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
231
232
  @config = YAML.load_file(CONFIGURATION_FILE) rescue nil
232
233
  raise MalformedConfigurationFileError unless @config
233
234
 
234
- @s3_id = @config['s3_id']
235
- @s3_secret = @config['s3_secret']
236
- @s3_bucket = @config['s3_bucket']
237
- @cloudfront_distribution_id = @config['cloudfront_distribution_id']
235
+ @config2 = YAML.load_file(CONFIGURATION_FILE_SECRET) rescue nil
236
+ raise MalformedConfigurationFileError unless @config2
237
+
238
238
  @production_directory = @config['production_directory']
239
239
 
240
+ @s3_id = @config2['s3_id']
241
+ @s3_secret = @config2['s3_secret']
242
+ @s3_bucket = @config2['s3_bucket']
243
+ @cloudfront_distribution_id = @config2['cloudfront_distribution_id']
244
+
240
245
  raise MalformedConfigurationFileError unless
241
246
  [@s3_id, @s3_secret, @s3_bucket].select { |k| k.nil? || k == '' }.empty?
242
247
  end
@@ -1,5 +1,5 @@
1
1
  module Jekyll
2
2
  module S3
3
- VERSION = "0.0.33"
3
+ VERSION = "0.0.35"
4
4
  end
5
5
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 33
9
- version: 0.0.33
8
+ - 35
9
+ version: 0.0.35
10
10
  platform: ruby
11
11
  authors:
12
12
  - Matias Niemela
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2012-09-26 00:00:00 -04:00
17
+ date: 2012-12-14 00:00:00 -05:00
18
18
  default_executable: jekyll-s3-yearofmoo
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency