cfndsl 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec8f14026c73cf30f2b15660933dd4bb4e23a8d
-  data.tar.gz: 45910720285f290437fe380244d6394985519a62
+  metadata.gz: 8852a97814954a3b9d681a67246a8319b26f2642
+  data.tar.gz: 5ecf2b8ac6d0e1a3ad71605bed8ce2fc0f8f3873
 SHA512:
-  metadata.gz: 251253ac278a5af596210327a1ee1d3bd05298b54c4cb1cc9c894532a09f16db9e66b2343aec6965072318266ec4490bea50297dfae1eddd34e50805acc3471f
-  data.tar.gz: 67dfc04df4c642e5ce092a097f6829f0dee63b90d56ce0113878835a121b796ba93f0132b0b98c176baabe152ae73a3fbc35f0e656a403b5e48bcc7a268b12ec
+  metadata.gz: 54539f355c4fb532a90e006fad49e61f1fbd38ec7fd7cf18c5119529723766bfed855509b5180c2dd995c35fb2d85b9d4848d4271d7ef808e2181632fa23a2bd
+  data.tar.gz: 82b118e315415b8acf8e2490d7ca3e2120f1b6282e9932eee5ff2039fa1dd92c4ccc797f95bf0a94a0954e2b57f5f5cb8188e9d63da247c52965c797c71f8932

data/CHANGELOG.md

@@ -1,7 +1,26 @@
 # Change Log
 
-## [0.15.2](https://github.com/stevenjack/cfndsl/tree/0.15.2) (2017-06-20)
-[Full Changelog](https://github.com/stevenjack/cfndsl/compare/v0.15.1...0.15.2)
+## [0.15.3](https://github.com/stevenjack/cfndsl/tree/0.15.3) (2017-09-05)
+[Full Changelog](https://github.com/stevenjack/cfndsl/compare/v0.15.2...0.15.3)
+
+**Implemented enhancements:**
+
+- list cfndsl equivalents [\#336](https://github.com/stevenjack/cfndsl/issues/336)
+
+**Closed issues:**
+
+- backtrace shown when incorrect resource name is passed to -g [\#338](https://github.com/stevenjack/cfndsl/issues/338)
+- Condition and ALB ListenerRule Conditions get merged [\#337](https://github.com/stevenjack/cfndsl/issues/337)
+- Request to include support for AWS::Logs::SubscriptionFilter [\#335](https://github.com/stevenjack/cfndsl/issues/335)
+- Support for Lambda backed custom resources with shorthand [\#315](https://github.com/stevenjack/cfndsl/issues/315)
+- Merging cfnlego, cfn2dsl into cfndsl [\#272](https://github.com/stevenjack/cfndsl/issues/272)
+
+**Merged pull requests:**
+
+- Fix parameter parsing when its value contains equal symbol [\#340](https://github.com/stevenjack/cfndsl/pull/340) ([ans0600](https://github.com/ans0600))
+
+## [v0.15.2](https://github.com/stevenjack/cfndsl/tree/v0.15.2) (2017-06-20)
+[Full Changelog](https://github.com/stevenjack/cfndsl/compare/v0.15.1...v0.15.2)
 
 **Implemented enhancements:**
 

data/lib/cfndsl.rb

@@ -74,7 +74,8 @@ module CfnDsl
           b.eval(File.read(file), file)
         end
       when :raw
-        params.set_param(*file.split('='))
+        file_parts = file.split("=")
+        params.set_param(file_parts[0],file_parts[1..-1].join("="))
         unless disable_binding?
           logstream.puts("Running raw ruby code #{file}") if logstream
           b.eval(file, 'raw code')

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.15.2'.freeze
+  VERSION = '0.15.3'.freeze
 end

data/spec/cfndsl_spec.rb

@@ -1,16 +1,30 @@
 require 'spec_helper'
 
 describe CfnDsl do
+  let(:test_template_file_name) { "#{File.dirname(__FILE__)}/fixtures/test.rb" }
+  let(:heat_test_template_file_name) { "#{File.dirname(__FILE__)}/fixtures/heattest.rb" }
+
   after(:example) { CfnDsl::ExternalParameters.refresh! }
 
   it 'evaluates a cloud formation' do
-    filename = "#{File.dirname(__FILE__)}/fixtures/test.rb"
-    subject.eval_file_with_extras(filename, [[:raw, 'test=123']])
+    subject.eval_file_with_extras(test_template_file_name, [[:raw, 'test=123']])
   end
 
   it 'evaluates a heat' do
-    filename = "#{File.dirname(__FILE__)}/fixtures/heattest.rb"
-    subject.eval_file_with_extras(filename)
+    subject.eval_file_with_extras(heat_test_template_file_name)
+  end
+
+  context 'when binding is disabed' do
+    let(:param_value) { 'www.google.com?a=1&b=2' }
+    before do
+      CfnDsl.disable_binding
+    end
+
+    it 'evaluates parameters correctly when its value contains "="' do
+      template = subject.eval_file_with_extras(test_template_file_name, [[:raw, "three=#{param_value}"]]).to_json
+      parsed_template = JSON.parse(template)
+      expect(parsed_template['Parameters']['Three']['Default']).to eq param_value
+    end
   end
 end
 

data/spec/fixtures/test.rb

@@ -16,6 +16,11 @@ CloudFormation do
     MaxLength 15
   end
 
+  Parameter('Three') do
+    String
+    Default external_parameters[:three]
+  end
+
   # Condition Function examples
   Condition('OneIsTest', FnEquals(Ref('One'), 'Test'))
   Condition('OneIsNotTest', FnNot(FnEquals(Ref('One'), 'Test')))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL