cfndsl 0.16.9 → 0.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f221cb6dcd91c7c77e47c33e5505e9bf403be039798d939f7d56bde6fa4e34c0
-  data.tar.gz: d1bf20095128c3161b87a2d479a17996bf8bcc54153a2a988efb973788235aea
+  metadata.gz: 39d9297c9b0b126ba5ca1fdfb8966eddc6510044470b45f78fffc17d7567f523
+  data.tar.gz: 4f130cc2cb912dde576991edd1fc5b3fe418fbdc7bab360cb35dd8684aaeab44
 SHA512:
-  metadata.gz: 30a898f5a8d41868b0b0d40832055a53b31e138ed5eae65b28df7f54966662af33f0a6c3328d6d0f36bf88133ea5bc83d8de1b28991b11ef46d3fe1a42a8aaf0
-  data.tar.gz: 5f49a21b96cc5c4e8468a19e9bad3bd30af9483c822b296a47304af83503da5067c3d2e3226b39633f455ff5e2fd078c569436dd1993df1bc96dbbbf24e9a2c1
+  metadata.gz: e6861d876348dbc2c6400704e94707704ba51d3d6ea93defb11c33c16529d42e5a88d8f1b4c1f3ca411e959bd0d21830eabc202c068677aab6e8e1355fe5eaad
+  data.tar.gz: 70618152664b2c59225bebd0ad0bc0fa7ab59de1865795b7ae157dc143fa13bbb1138e3fa4ccae06813f184e2cfdb2d10b4281adc3d4ef045fc953c3e271047e

data/CHANGELOG.md

@@ -1,7 +1,45 @@
 # Change Log
 
-## [0.16.9](https://github.com/cfndsl/cfndsl/tree/0.16.9) (2018-12-08)
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17-pre...0.16.9)
+## [0.16.10](https://github.com/cfndsl/cfndsl/tree/0.16.10) (2019-02-13)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v1.0.0.pre...0.16.10)
+
+**Implemented enhancements:**
+
+- offer option to 'lock' resource\_specification.json version - Fix for \#393 [\#395](https://github.com/cfndsl/cfndsl/pull/395) ([blofeldthefish](https://github.com/blofeldthefish))
+
+**Closed issues:**
+
+- confirm we are using gzip download of cloudfomration specification. [\#394](https://github.com/cfndsl/cfndsl/issues/394)
+- support a version for cfndsl -u [\#393](https://github.com/cfndsl/cfndsl/issues/393)
+
+## [v1.0.0.pre](https://github.com/cfndsl/cfndsl/tree/v1.0.0.pre) (2019-01-19)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.pre.6...v1.0.0.pre)
+
+**Closed issues:**
+
+- 'require': cannot load such file -- hana \(0.17.pre.5\) [\#387](https://github.com/cfndsl/cfndsl/issues/387)
+
+## [v0.17.pre.6](https://github.com/cfndsl/cfndsl/tree/v0.17.pre.6) (2018-12-10)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.pre.5...v0.17.pre.6)
+
+## [v0.17.pre.5](https://github.com/cfndsl/cfndsl/tree/v0.17.pre.5) (2018-12-09)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.pre.4...v0.17.pre.5)
+
+## [v0.17.pre.4](https://github.com/cfndsl/cfndsl/tree/v0.17.pre.4) (2018-12-09)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.pre.3...v0.17.pre.4)
+
+## [v0.17.pre.3](https://github.com/cfndsl/cfndsl/tree/v0.17.pre.3) (2018-12-09)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17.pre.2...v0.17.pre.3)
+
+**Merged pull requests:**
+
+- implement json patch for patches and pull in patches from CDK [\#386](https://github.com/cfndsl/cfndsl/pull/386) ([gergnz](https://github.com/gergnz))
+
+## [v0.17.pre.2](https://github.com/cfndsl/cfndsl/tree/v0.17.pre.2) (2018-12-09)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.9...v0.17.pre.2)
+
+## [v0.16.9](https://github.com/cfndsl/cfndsl/tree/v0.16.9) (2018-12-07)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.17-pre...v0.16.9)
 
 **Closed issues:**
 

data/README.md

@@ -439,7 +439,8 @@ Usage: cfndsl [options] FILE
     -b, --disable-binding            Disable binding configuration
     -m, --disable-deep-merge         Disable deep merging of yaml
     -s, --specification-file FILE    Location of Cloudformation Resource Specification file
-    -u, --update-specification       Update the Cloudformation Resource Specification file
+    -u [VERSION],                    Update the Resource Specification file to latest, or specific version
+        --update-specification
     -g RESOURCE_TYPE,RESOURCE_LOGICAL_NAME,
         --generate                   Add resource type and logical name
     -l, --list                       List supported resources

data/bin/cfndsl

@@ -64,7 +64,8 @@ optparse = OptionParser.new do |opts|
     CfnDsl.specification_file File.expand_path(file)
   end
 
-  opts.on('-u', '--update-specification', 'Update the Cloudformation Resource Specification file') do
+  opts.on('-u', '--update-specification [VERSION]', 'Update the Resource Specification file to latest, or specific version') do |file|
+    options[:spec_version] = file || 'latest'.freeze
     options[:update_spec] = true
   end
 
@@ -95,7 +96,12 @@ optparse.parse!
 if options[:update_spec]
   STDERR.puts 'Updating specification file'
   FileUtils.mkdir_p File.dirname(CfnDsl.specification_file)
-  content = open('https://d1uauaxba7bl26.cloudfront.net/latest/CloudFormationResourceSpecification.json').read
+  begin
+    content = open("https://d1uauaxba7bl26.cloudfront.net/#{options[:spec_version]}/gzip/CloudFormationResourceSpecification.json").read
+  rescue OpenURI::HTTPError
+    STDERR.puts "Resource Specification version #{options[:spec_version]} not found, defaulting to 'latest'"
+    content = open('https://d1uauaxba7bl26.cloudfront.net/latest/gzip/CloudFormationResourceSpecification.json').read
+  end
   File.open(CfnDsl.specification_file, 'w') { |f| f.puts content }
   STDERR.puts "Specification successfully written to #{CfnDsl.specification_file}"
 end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.16.9'.freeze
+  VERSION = '0.16.10'.freeze
 end

data/spec/cli_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+WORKING_SPEC_VERSION = '2.19.0'.freeze
+
 describe 'cfndsl', type: :aruba do
   let(:usage) do
     <<-USAGE.gsub(/^ {6}/, '').chomp
@@ -15,7 +17,8 @@ describe 'cfndsl', type: :aruba do
           -b, --disable-binding            Disable binding configuration
           -m, --disable-deep-merge         Disable deep merging of yaml
           -s, --specification-file FILE    Location of Cloudformation Resource Specification file
-          -u, --update-specification       Update the Cloudformation Resource Specification file
+          -u [VERSION],                    Update the Resource Specification file to latest, or specific version
+              --update-specification
           -g RESOURCE_TYPE,RESOURCE_LOGICAL_NAME,
               --generate                   Add resource type and logical name
           -a, --assetversion               Print out the specification version
@@ -34,9 +37,9 @@ describe 'cfndsl', type: :aruba do
 
   before(:each) { write_file('template.rb', template_content) }
 
-  context 'cfndsl -u' do
+  context "cfndsl -u #{WORKING_SPEC_VERSION}" do
     it 'updates the specification file' do
-      run 'cfndsl -u'
+      run_command "cfndsl -u #{WORKING_SPEC_VERSION}"
       expect(last_command_started).to have_output_on_stderr(<<-OUTPUT.gsub(/^ {8}/, '').chomp)
         Updating specification file
         Specification successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json
@@ -47,7 +50,7 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl -a' do
     it 'prints out the specification file version' do
-      run 'cfndsl -a'
+      run_command 'cfndsl -a'
       expect(last_command_started).to have_output_on_stderr(/([0-9]+\.){2}[0-9]+/)
       expect(last_command_started).to have_exit_status(0)
     end
@@ -55,7 +58,7 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl' do
     it 'displays the usage' do
-      run 'cfndsl'
+      run_command 'cfndsl'
       expect(last_command_started).to have_output(usage)
       expect(last_command_started).to have_exit_status(1)
     end
@@ -63,14 +66,14 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl --help' do
     it 'displays the usage' do
-      run_simple 'cfndsl --help'
+      run_command_and_stop 'cfndsl --help'
       expect(last_command_started).to have_output(usage)
     end
   end
 
   context 'cfndsl FILE' do
     it 'gives a deprecation warning about bindings' do
-      run_simple 'cfndsl template.rb'
+      run_command_and_stop 'cfndsl template.rb'
       expect(last_command_started).to have_output_on_stderr(<<-WARN.gsub(/^ {8}/, '').chomp)
         The creation of constants as config is deprecated!
         Please switch to the #external_parameters method within your templates to access variables
@@ -80,14 +83,14 @@ describe 'cfndsl', type: :aruba do
     end
 
     it 'generates a JSON CloudFormation template' do
-      run_simple 'cfndsl template.rb'
+      run_command_and_stop 'cfndsl template.rb'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}')
     end
   end
 
   context 'cfndsl FILE --pretty' do
     it 'generates a pretty JSON CloudFormation template' do
-      run_simple 'cfndsl template.rb --pretty'
+      run_command_and_stop 'cfndsl template.rb --pretty'
       expect(last_command_started).to have_output_on_stdout(<<-OUTPUT.gsub(/^ {8}/, '').chomp)
         {
           "AWSTemplateFormatVersion": "2010-09-09",
@@ -99,7 +102,7 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl FILE --output FILE' do
     it 'writes the JSON CloudFormation template to a file' do
-      run_simple 'cfndsl template.rb --output template.json'
+      run_command_and_stop 'cfndsl template.rb --output template.json'
       expect(read('template.json')).to eq(['{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}'])
     end
   end
@@ -108,7 +111,7 @@ describe 'cfndsl', type: :aruba do
     before { write_file('params.yaml', 'DESC: yaml') }
 
     it 'interpolates the YAML file in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --yaml params.yaml'
+      run_command_and_stop 'cfndsl template.rb --yaml params.yaml'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"yaml"}')
     end
   end
@@ -117,7 +120,7 @@ describe 'cfndsl', type: :aruba do
     before { write_file('params.json', '{"DESC":"json"}') }
 
     it 'interpolates the JSON file in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --json params.json'
+      run_command_and_stop 'cfndsl template.rb --json params.json'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"json"}')
     end
   end
@@ -135,12 +138,12 @@ describe 'cfndsl', type: :aruba do
     before(:each) { write_file('params.rb', 'DESC = "ruby"') }
 
     it 'interpolates the Ruby file in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --ruby params.rb'
+      run_command_and_stop 'cfndsl template.rb --ruby params.rb'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"ruby"}')
     end
 
     it 'gives a deprecation warning and does not interpolate if bindings are disabled' do
-      run_simple 'cfndsl template.rb --ruby params.rb --disable-binding --verbose'
+      run_command_and_stop 'cfndsl template.rb --ruby params.rb --disable-binding --verbose'
       deprecation_warning = /Interpreting Ruby files was disabled\. .*params.rb will not be read/
       expect(last_command_started).to have_output_on_stderr(deprecation_warning)
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}')
@@ -149,7 +152,7 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl FILE --define VARIABLE=VALUE' do
     it 'interpolates the command line variables in the CloudFormation template' do
-      run "cfndsl template.rb --define \"DESC='cli'\""
+      run_command "cfndsl template.rb --define \"DESC='cli'\""
       expect(last_command_started).to have_output_on_stdout("{\"AWSTemplateFormatVersion\":\"2010-09-09\",\"Description\":\"'cli'\"}")
     end
   end
@@ -158,7 +161,7 @@ describe 'cfndsl', type: :aruba do
     before { write_file('params.yaml', 'DESC: yaml') }
 
     it 'displays the variables as they are interpolated in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --yaml params.yaml --verbose'
+      run_command_and_stop 'cfndsl template.rb --yaml params.yaml --verbose'
       verbose = /
         Using \s specification \s file .* \.json \n
         Loading \s YAML \s file \s .* params\.yaml \n

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.16.9
+  version: 0.16.10
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,8 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL