jekyll-s3-yearofmoo 0.0.33 → 0.0.35

data/lib/jekyll-s3-yearofmoo/uploader.rb

@@ -4,6 +4,7 @@ module Jekyll
 
       SITE_DIR = "_site"
       CONFIGURATION_FILE = '_jekyll_s3.yml'
+      CONFIGURATION_FILE_SECRET = '_jekyll_s3_secret.yml'
       CONFIGURATION_FILE_TEMPLATE = <<-EOF
 s3_id: YOUR_AWS_S3_ACCESS_KEY_ID
 s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
@@ -231,12 +232,16 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
         @config = YAML.load_file(CONFIGURATION_FILE) rescue nil
         raise MalformedConfigurationFileError unless @config
 
-        @s3_id = @config['s3_id']
-        @s3_secret = @config['s3_secret']
-        @s3_bucket = @config['s3_bucket']
-        @cloudfront_distribution_id = @config['cloudfront_distribution_id']
+        @config2 = YAML.load_file(CONFIGURATION_FILE_SECRET) rescue nil
+        raise MalformedConfigurationFileError unless @config2
+
         @production_directory = @config['production_directory']
 
+        @s3_id                        = @config2['s3_id']
+        @s3_secret                    = @config2['s3_secret']
+        @s3_bucket                    = @config2['s3_bucket']
+        @cloudfront_distribution_id   = @config2['cloudfront_distribution_id']
+
         raise MalformedConfigurationFileError unless
           [@s3_id, @s3_secret, @s3_bucket].select { |k| k.nil? || k == '' }.empty?
       end

data/lib/jekyll-s3-yearofmoo/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module S3
-    VERSION = "0.0.33"
+    VERSION = "0.0.35"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 33
-  version: 0.0.33
+  - 35
+  version: 0.0.35
 platform: ruby
 authors: 
 - Matias Niemela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-26 00:00:00 -04:00
+date: 2012-12-14 00:00:00 -05:00
 default_executable: jekyll-s3-yearofmoo
 dependencies: 
 - !ruby/object:Gem::Dependency