cfndsl 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ada6bc0f4f3501974e843197f7566aefa9568735b87a4bf666a1d28e7d4585a1
-  data.tar.gz: c493f6da406cee7b39ad37d8baa27fdb36eedcb604fa2090fbfe4e6dd4724112
+  metadata.gz: 1dda569f61cd962d5edcf67c2732fc4ddd80259b21e3bd5858fe0a1d1065d51e
+  data.tar.gz: bf43293eef2e64331159bf403c8b9d13f5fb2bca54821b82aaae7b35770e97aa
 SHA512:
-  metadata.gz: 49303f6b20c5aa260473bc631cc661a0ea0552df6e2232cdedca52cb5e77ff1cf66906b080ff6ee94f90ada4a1bcdf3ea0dc7ca56b9c5d05bf8f6f271038bd60
-  data.tar.gz: de6d8e43c775700c64f56d70a5473ea0d05a6a3f715f027dcba4ff6f932ccb4adb6d80d93d3da9abdfffe57bcc3bd54f19a49196b31047d02a9028700584a734
+  metadata.gz: 79b518eff156a5fabf5d2035a63299fca23c05dcafe48781f86c0896b38c14e0de8690508be9405599bb74115b427dac88b965660fcf7dee155f5c4f49f493eb
+  data.tar.gz: 5655ab233f107f9ebed98ab42cd88d566236acad019bd004eae8c5a086b688d63c79bfe0ff7ffc3a405cae42c0345d3f36c474a6ee26dcda5d3a60292b25b8f0

data/CHANGELOG.md

@@ -1,7 +1,20 @@
 # Change Log
 
-## [0.16.2](https://github.com/cfndsl/cfndsl/tree/0.16.2) (2017-12-08)
-[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.1...0.16.2)
+## [0.16.3](https://github.com/cfndsl/cfndsl/tree/0.16.3) (2018-03-20)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.2...0.16.3)
+
+**Closed issues:**
+
+- Schedule Event Rule creates an invalid JSON on FnGetAtt Arn. [\#344](https://github.com/cfndsl/cfndsl/issues/344)
+
+**Merged pull requests:**
+
+- add Fn::Cidr [\#364](https://github.com/cfndsl/cfndsl/pull/364) ([gergnz](https://github.com/gergnz))
+- fixes for rubocop [\#363](https://github.com/cfndsl/cfndsl/pull/363) ([gergnz](https://github.com/gergnz))
+- 0.x changes to 1.0.0.pre [\#361](https://github.com/cfndsl/cfndsl/pull/361) ([gergnz](https://github.com/gergnz))
+
+## [v0.16.2](https://github.com/cfndsl/cfndsl/tree/v0.16.2) (2017-12-07)
+[Full Changelog](https://github.com/cfndsl/cfndsl/compare/v0.16.1...v0.16.2)
 
 **Closed issues:**
 

data/Rakefile

@@ -35,9 +35,7 @@ task :bump, :type do |_, args|
 
   raise unless types.include?(type)
 
-  if `git rev-parse --abbrev-ref HEAD`.strip != 'master'
-    raise "Looks like you're trying to create a release in a branch, you can only create one in 'master'"
-  end
+  raise "Looks like you're trying to create a release in a branch, you can only create one in 'master'" if `git rev-parse --abbrev-ref HEAD`.strip != 'master'
 
   version_segments = CfnDsl::VERSION.split('.').map(&:to_i)
 

data/cfndsl.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cfndsl/version'
 

data/lib/cfndsl/external_parameters.rb

@@ -27,16 +27,16 @@ module CfnDsl
       @parameters = self.class.defaults.clone
     end
 
-    def set_param(k, v)
-      parameters[k.to_sym] = v
+    def set_param(key, val)
+      parameters[key.to_sym] = val
     end
 
-    def merge_param(x)
-      parameters.deep_merge!(x)
+    def merge_param(xray)
+      parameters.deep_merge!(xray)
     end
 
-    def get_param(k)
-      parameters[k.to_sym]
+    def get_param(key)
+      parameters[key.to_sym]
     end
     alias [] get_param
 

data/lib/cfndsl/json_serialisable_object.rb

@@ -5,8 +5,8 @@ module CfnDsl
       @value
     end
 
-    def to_json(*a)
-      as_json.to_json(*a)
+    def to_json(*args)
+      as_json.to_json(*args)
     end
   end
 end

data/lib/cfndsl/jsonable.rb

@@ -43,9 +43,7 @@ module CfnDsl
 
     # Equivalent to the CloudFormation template built in function Fn::And
     def FnAnd(array)
-      if !array || array.count < 2 || array.count > 10
-        raise 'The array passed to Fn::And must have at least 2 elements and no more than 10'
-      end
+      raise 'The array passed to Fn::And must have at least 2 elements and no more than 10' if !array || array.count < 2 || array.count > 10
       Fn.new('And', array)
     end
 
@@ -70,9 +68,7 @@ module CfnDsl
 
     # Equivalent to the CloudFormation template built in function Fn::Or
     def FnOr(array)
-      if !array || array.count < 2 || array.count > 10
-        raise 'The array passed to Fn::Or must have at least 2 elements and no more than 10'
-      end
+      raise 'The array passed to Fn::Or must have at least 2 elements and no more than 10' if !array || array.count < 2 || array.count > 10
       Fn.new('Or', array)
     end
 
@@ -145,6 +141,11 @@ module CfnDsl
       end
       Fn.new('Join', ['', array])
     end
+
+    # Equivalent to the CloudFormation template built in function Fn::Cidr
+    def FnCidr(ipblock, count, sizemask)
+      Fn.new('Cidr', [ipblock, count, sizemask])
+    end
     # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
   end
 
@@ -187,8 +188,8 @@ module CfnDsl
       hash
     end
 
-    def to_json(*a)
-      as_json.to_json(*a)
+    def to_json(*args)
+      as_json.to_json(*args)
     end
 
     def ref_children
@@ -214,8 +215,8 @@ module CfnDsl
       hash
     end
 
-    def to_json(*a)
-      as_json.to_json(*a)
+    def to_json(*args)
+      as_json.to_json(*args)
     end
 
     def references

data/lib/cfndsl/orchestration_template.rb

@@ -11,7 +11,7 @@ module CfnDsl
     dsl_attr_setter :AWSTemplateFormatVersion, :Description, :Metadata, :Transform
     dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping
 
-    GlobalRefs = {
+    GLOBAL_REFS = {
       'AWS::NotificationARNs' => 1,
       'AWS::Region' => 1,
       'AWS::StackId' => 1,
@@ -117,13 +117,11 @@ module CfnDsl
       ref = ref.to_s
       origin = origin.to_s if origin
 
-      return true if GlobalRefs.key?(ref)
+      return true if GLOBAL_REFS.key?(ref)
 
       return true if @Parameters && @Parameters.key?(ref)
 
-      if @Resources.key?(ref)
-        return !origin || !@_resource_refs || !@_resource_refs[ref] || !@_resource_refs[ref].key?(origin)
-      end
+      return !origin || !@_resource_refs || !@_resource_refs[ref] || !@_resource_refs[ref].key?(origin) if @Resources.key?(ref)
 
       false
     end

data/lib/cfndsl/patches.rb

@@ -43,6 +43,7 @@ module CfnDsl
         }
       }
     end
+    # rubocop:enable Metrics/MethodLength
 
     # Missing/malformed types from the resource specification
     def self.types

data/lib/cfndsl/specification.rb

@@ -2,7 +2,7 @@ module CfnDsl
   # Helper module for bridging the gap between a static types file included in the repo
   # and dynamically generating the types directly from the AWS specification
   module Specification
-    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
     def self.extract_resources(spec)
       spec.each_with_object({}) do |(resource_name, resource_info), resources|
         properties = resource_info['Properties'].each_with_object({}) do |(property_name, property_info), extracted|
@@ -36,7 +36,9 @@ module CfnDsl
         resources
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
+    # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
     def self.extract_types(spec)
       primitive_types = {
         'String'    => 'String',
@@ -78,10 +80,11 @@ module CfnDsl
         types
       end
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
 
     def self.determine_spec_file
       return CfnDsl.specification_file if File.exist? CfnDsl.specification_file
-      File.expand_path('../aws/resource_specification.json', __FILE__)
+      File.expand_path('aws/resource_specification.json', __dir__)
     end
 
     def self.extract_from_resource_spec!

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.16.2'.freeze
+  VERSION = '0.16.3'.freeze
 end

data/lib/deep_merge/core.rb

@@ -146,9 +146,7 @@ module DeepMerge
         if array_split_char
           puts "#{di} split/join on source: #{source.inspect}" if merge_debug
           source = source.join(array_split_char).split(array_split_char)
-          if dest.is_a?(Array)
-            dest = dest.join(array_split_char).split(array_split_char)
-          end
+          dest = dest.join(array_split_char).split(array_split_char) if dest.is_a?(Array)
         end
         # if there's a naked knockout_prefix in source, that means we are to truncate dest
         if knockout_prefix && source.index(knockout_prefix)
@@ -242,3 +240,5 @@ module DeepMerge
     obj
   end
 end
+# rubocop:enable Metrics/AbcSize, Metrics/BlockNesting, Metrics/CyclomaticComplexity, Metrics/MethodLength
+# rubocop:enable Metrics/ModuleLength, Metrics/PerceivedComplexity, Style/IfInsideElse, Style/Semicolon

data/spec/cfndsl_spec.rb

@@ -248,5 +248,12 @@ describe CfnDsl::CloudFormationTemplate do
         expect(func.to_json).to eq('{"Fn::Join":["",["123",{"Ref":"Test"},"456"]]}')
       end
     end
+
+    context 'FnCidr', 'Array' do
+      it 'formats correctly' do
+        func = subject.FnCidr('10.0.0.0', '256', '8')
+        expect(func.to_json).to eq('{"Fn::Cidr":["10.0.0.0","256","8"]}')
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -10,12 +10,12 @@ if ENV['CFNDSL_COV']
 end
 
 require 'cfndsl/globals'
-CfnDsl.specification_file File.expand_path('../../lib/cfndsl/aws/resource_specification.json', __FILE__)
+CfnDsl.specification_file File.expand_path('../lib/cfndsl/aws/resource_specification.json', __dir__)
 # use local fixture for tests
 require 'cfndsl'
 require 'cfnlego'
 
-bindir = File.expand_path('../../bin', __FILE__)
+bindir = File.expand_path('../bin', __dir__)
 ENV['PATH'] = [ENV['PATH'], bindir].join(':')
 
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }

data/spec/types_definition_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 # This is a somewhat temporary test class to compare functionality
 # between the AWS, OS and new ways of defining types
 RSpec.describe 'Type Definitions' do
-  aws_spec = YAML.load_file File.expand_path('../../lib/cfndsl/aws/types.yaml', __FILE__)
-  os_spec = YAML.load_file File.expand_path('../../lib/cfndsl/os/types.yaml', __FILE__)
+  aws_spec = YAML.load_file File.expand_path('../lib/cfndsl/aws/types.yaml', __dir__)
+  os_spec = YAML.load_file File.expand_path('../lib/cfndsl/os/types.yaml', __dir__)
   new_spec = CfnDsl::Specification.extract_from_resource_spec!
 
   { 'AWS' => aws_spec, 'OS' => os_spec, 'New' => new_spec }.each_pair do |cloud, specdef|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL