configure-s3-website 1.5.2 → 1.5.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDNhYmY2NGJlNDViMDU4NjFhYzdkY2ZkZGVhMmM1MmZlOGRiZmY4ZA==
-  data.tar.gz: !binary |-
-    ODhmMzJiNGUxMjk5NTcyM2Y5MzBhMDMxNTEyYTM1MzFiNGUwYmM3MA==
+SHA1:
+  metadata.gz: 9009f525df4e262e682b12eb2aff7f0a0ee05495
+  data.tar.gz: 7c36f88fdc7866a2bdaa57ed49ea43b49fd4c429
 SHA512:
-  metadata.gz: !binary |-
-    YTljYzYwZjQ2OTU1MTFkZjQ5ZWJkYmE5MGQxZTdiZTQ3MzU0MWRhMzhlNGU3
-    MjFjYjVmNTM5ZTUzNjBkM2NmZTU1NDMxNzdmODhlOGU5OTQ3YzBhZGM0YzVk
-    MzQ1YjM5YWJhN2UyNDI2YjE1MDg3YmI5ZGE0MzJkMzA0NDc4MWY=
-  data.tar.gz: !binary |-
-    MGFiMWRhMGVkNGJkMWRlNzcxMGVhZGMzNjdlMjZjNWVlODg4ZDUyNGE2YjRh
-    ZmRkZDg2NTQwODg1ZmE3NTIyMWZiOWFmZDBmOWMxNGFlOTU3ZmVkNGIyMTJi
-    ZTQzOWI4NmE4NzgwZGJlMzQzMDlkMGM0OTk1ODNkZDMxN2YxMjk=
+  metadata.gz: a4b2354911916484cf7ece5bb24f2a287693cbd025f2272e8b7e6119510792efcb88c386f6dc0e30746266e24465ac1a90f3b7935870773ecfe74b77a5bc528a
+  data.tar.gz: 7395f0885c5791fc7ef6c5e080dd739262fc1527d69c981f4e69d285a447fd323d53d3404a99cffdc12f4ba4b53f048d74bc273e482d5e8836444b1a49159bee

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.5.3
+
+* Do not override ERB code when adding CloudFront dist
+
 ## 1.5.2
 
 * Support location constraint eu-west-1

data/lib/configure-s3-website/config_source/file_config_source.rb

@@ -50,8 +50,13 @@ module ConfigureS3Website
 
     def cloudfront_distribution_id=(dist_id)
       @config['cloudfront_distribution_id'] = dist_id
-      File.open(@yaml_file_path, 'w') do |yaml_file|
-        yaml_file.puts @config.to_yaml
+      file_contents = File.open(@yaml_file_path).read
+      File.open(@yaml_file_path, 'w') do |file|
+        result = file_contents.gsub(
+          /(s3_bucket:.*$)/,
+          "\\1\ncloudfront_distribution_id: #{dist_id}"
+        )
+        file.write result
       end
     end
 

data/lib/configure-s3-website/version.rb

@@ -1,3 +1,3 @@
 module ConfigureS3Website
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/spec/config_source/file_config_source_spec.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require 'configure-s3-website'
+require 'tempfile'
 
 describe ConfigureS3Website::FileConfigSource do
   let(:yaml_file_path) {
@@ -19,4 +20,41 @@ describe ConfigureS3Website::FileConfigSource do
   it 'returns the yaml file path as description' do
     config_source.description.should eq(yaml_file_path)
   end
+
+  describe 'setter for cloudfront_distribution_id' do
+    let(:original_yaml_contents) {
+      %Q{
+s3_id: foo
+s3_secret: <%= ENV['my-s3-secret'] %>
+s3_bucket: helloworld.com
+
+# This is a comment
+      }
+    }
+
+    let(:result) {
+      config_file = Tempfile.new 'testfile'
+      config_file.write original_yaml_contents
+      config_file.close
+      config_source = ConfigureS3Website::FileConfigSource.new(config_file.path)
+      config_source.cloudfront_distribution_id = 'xxyyzz'
+      File.open(config_file.path).read
+    }
+
+    it 'retains the ERB code' do
+      result.should include "<%= ENV['my-s3-secret'] %>"
+    end
+
+    it 'appends the CloudFront id as the last enabled value in the YAML file' do
+      expected = %Q{
+s3_id: foo
+s3_secret: <%= ENV['my-s3-secret'] %>
+s3_bucket: helloworld.com
+cloudfront_distribution_id: xxyyzz
+
+# This is a comment
+      }
+      result.should == expected
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configure-s3-website
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -202,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Configure your AWS S3 bucket to function as a web site