cfndsl 0.4.4 → 0.5.0.pre

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Steven Jack
@@ -15,14 +15,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: DSL for creating AWS Cloudformation templates
@@ -34,8 +34,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -43,41 +44,46 @@ files:
 - bin/cfndsl
 - cfndsl.gemspec
 - lib/cfndsl.rb
-- lib/cfndsl/CloudFormationTemplate.rb
-- lib/cfndsl/Conditions.rb
-- lib/cfndsl/CreationPolicy.rb
-- lib/cfndsl/Errors.rb
-- lib/cfndsl/JSONable.rb
-- lib/cfndsl/Mappings.rb
-- lib/cfndsl/Metadata.rb
-- lib/cfndsl/Outputs.rb
-- lib/cfndsl/Parameters.rb
-- lib/cfndsl/Plurals.rb
-- lib/cfndsl/Properties.rb
-- lib/cfndsl/RefCheck.rb
-- lib/cfndsl/Resources.rb
-- lib/cfndsl/Types.rb
-- lib/cfndsl/UpdatePolicy.rb
-- lib/cfndsl/aws_types.yaml
+- lib/cfndsl/aws/cloud_formation_template.rb
+- lib/cfndsl/aws/types.rb
+- lib/cfndsl/aws/types.yaml
+- lib/cfndsl/conditions.rb
+- lib/cfndsl/creation_policy.rb
+- lib/cfndsl/errors.rb
+- lib/cfndsl/generate_types.rb
+- lib/cfndsl/jsonable.rb
+- lib/cfndsl/mappings.rb
+- lib/cfndsl/metadata.rb
 - lib/cfndsl/module.rb
 - lib/cfndsl/names.rb
-- lib/cfndsl/os_types.yaml
+- lib/cfndsl/orchestration_template.rb
+- lib/cfndsl/os/heat_template.rb
+- lib/cfndsl/os/types.rb
+- lib/cfndsl/os/types.yaml
+- lib/cfndsl/outputs.rb
+- lib/cfndsl/parameters.rb
+- lib/cfndsl/plurals.rb
+- lib/cfndsl/properties.rb
 - lib/cfndsl/rake_task.rb
+- lib/cfndsl/ref_check.rb
+- lib/cfndsl/resources.rb
+- lib/cfndsl/types.rb
+- lib/cfndsl/update_policy.rb
 - lib/cfndsl/version.rb
 - sample/autoscale.rb
 - sample/autoscale.template
 - sample/autoscale2.rb
 - sample/circular.rb
 - sample/codedeploy.rb
-- sample/config-service.rb
+- sample/config_service.rb
 - sample/ecs.rb
-- sample/iam-policies.rb
+- sample/iam_policies.rb
 - sample/lambda.rb
 - sample/s3.rb
 - sample/t1.rb
 - sample/t1.yaml
-- sample/vpc-example.rb
-- sample/vpc-with-vpn-example.rb
+- sample/vpc_example.rb
+- sample/vpc_with_vpn_example.rb
 - spec/cfndsl_spec.rb
 - spec/fixtures/heattest.rb
 - spec/fixtures/test.rb
@@ -92,17 +98,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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL

data/lib/cfndsl/CloudFormationTemplate.rb

@@ -1,267 +0,0 @@
-require 'cfndsl/JSONable'
-require 'cfndsl/names'
-
-module CfnDsl
-  class OrchestrationTemplate < JSONable
-    ##
-    # Handles the overall template object
-    dsl_attr_setter :AWSTemplateFormatVersion, :Description
-    dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping
-
-    def initialize
-      @AWSTemplateFormatVersion = "2010-09-09"
-    end
-
-    @@globalRefs = {
-       "AWS::NotificationARNs" => 1,
-       "AWS::Region" => 1,
-       "AWS::StackId" => 1,
-       "AWS::StackName" => 1,
-       "AWS::AccountId" => 1,
-       "AWS::NoValue" => 1
-    }
-
-    def isValidRef( ref, origin=nil)
-      ref = ref.to_s
-      origin = origin.to_s if origin
-
-      return true if @@globalRefs.has_key?( ref )
-
-      return true if @Parameters && @Parameters.has_key?( ref )
-
-      if( @Resources.has_key?( ref ) ) then
-          return !origin || !@_ResourceRefs || !@_ResourceRefs[ref] || !@_ResourceRefs[ref].has_key?(origin)
-      end
-
-      return false
-    end
-
-    def checkRefs()
-      invalids = []
-      @_ResourceRefs = {}
-      if(@Resources)  then
-        @Resources.keys.each do |resource|
-          @_ResourceRefs[resource.to_s] = @Resources[resource].references({})
-        end
-        @_ResourceRefs.keys.each do |origin|
-          @_ResourceRefs[origin].keys.each do |ref|
-            invalids.push "Invalid Reference: Resource #{origin} refers to #{ref}" unless isValidRef(ref,origin)
-          end
-        end
-      end
-      outputRefs = {}
-      if(@Outputs) then
-        @Outputs.keys.each do |resource|
-          outputRefs[resource.to_s] = @Outputs[resource].references({})
-        end
-        outputRefs.keys.each do |origin|
-          outputRefs[origin].keys.each do |ref|
-            invalids.push "Invalid Reference: Output #{origin} refers to #{ref}" unless isValidRef(ref,nil)
-          end
-        end
-      end
-      return invalids.length>0 ? invalids : nil
-    end
-  end
-
-  class CloudFormationTemplate < OrchestrationTemplate
-    def self.template_types
-      CfnDsl::AWSTypes::AWS_Types
-    end
-    def self.type_module
-      CfnDsl::AWSTypes
-    end
-
-    names = {}
-    nametypes = {}
-    self.template_types["Resources"].each_pair do |name, type|
-      # Subclass ResourceDefintion and generate property methods
-      klass = Class.new(CfnDsl::ResourceDefinition)
-      klassname = name.split("::").join("_")
-      type_module.const_set( klassname, klass )
-      type["Properties"].each_pair do |pname, ptype|
-        if( ptype.instance_of? String )
-          create_klass = type_module.const_get( ptype );
-
-          klass.class_eval do
-            CfnDsl::methodNames(pname) do |method|
-              define_method(method) do |*values, &block|
-                if( values.length <1 ) then
-                  values.push create_klass.new
-                end
-                @Properties ||= {}
-                @Properties[pname] = CfnDsl::PropertyDefinition.new( *values )
-                @Properties[pname].value.instance_eval &block if block
-                @Properties[pname].value
-              end
-            end
-          end
-        else
-          #Array version
-          sing_name = CfnDsl::Plurals.singularize( pname )
-          create_klass = type_module.const_get( ptype[0] )
-          klass.class_eval do
-            CfnDsl::methodNames(pname) do |method|
-              define_method(method) do |*values, &block|
-                if( values.length < 1 ) then
-                  values.push []
-                end
-                @Properties ||= {}
-                @Properties[pname] ||= PropertyDefinition.new( *values )
-                @Properties[pname].value.instance_eval &block if block
-                @Properties[pname].value
-              end
-            end
-
-            CfnDsl::methodNames(sing_name) do |method|
-              define_method(method) do |value=nil, &block|
-                @Properties ||= {}
-                @Properties[pname] ||= PropertyDefinition.new( [] )
-                if( !value ) then
-                  value = create_klass.new
-                end
-                @Properties[pname].value.push value
-                value.instance_eval &block if block
-                value
-              end
-            end
-          end
-        end
-
-      end
-      parts = name.split "::"
-      while( parts.length > 0)
-        abreve_name = parts.join "_"
-        if( names.has_key? abreve_name ) then
-          # this only happens if there is an ambiguity
-          names[abreve_name] = nil
-        else
-          names[abreve_name] = self.type_module.const_get(klassname)
-          nametypes[abreve_name] = name
-        end
-        parts.shift
-      end
-
-
-    end
-
-    #Define property setter methods for each of the unambiguous type names
-    names.each_pair do |typename,type|
-      if(type) then
-        class_eval do
-          CfnDsl::methodNames(typename) do |method|
-            define_method(method) do |name,*values,&block|
-              name = name.to_s
-              @Resources ||= {}
-              resource = @Resources[name] ||= type.new(*values)
-              resource.instance_eval &block if block
-              resource.instance_variable_set( "@Type", nametypes[typename] )
-              resource
-            end
-          end
-        end
-      end
-    end
-
-
-  end
-
-  class HeatTemplate < OrchestrationTemplate 
-    def self.template_types
-      CfnDsl::OSTypes::OS_Types
-    end
-    def self.type_module
-      CfnDsl::OSTypes
-    end
-
-    names = {}
-    nametypes = {}
-    self.template_types["Resources"].each_pair do |name, type|
-      # Subclass ResourceDefintion and generate property methods
-      klass = Class.new(CfnDsl::ResourceDefinition)
-      klassname = name.split("::").join("_")
-      type_module.const_set( klassname, klass )
-      type["Properties"].each_pair do |pname, ptype|
-        if( ptype.instance_of? String )
-          create_klass = type_module.const_get( ptype );
-
-          klass.class_eval do
-            CfnDsl::methodNames(pname) do |method|
-              define_method(method) do |*values, &block|
-                if( values.length <1 ) then
-                  values.push create_klass.new
-                end
-                @Properties ||= {}
-                @Properties[pname] = CfnDsl::PropertyDefinition.new( *values )
-                @Properties[pname].value.instance_eval &block if block
-                @Properties[pname].value
-              end
-            end
-          end
-        else
-          #Array version
-          sing_name = CfnDsl::Plurals.singularize( pname )
-          create_klass = type_module.const_get( ptype[0] )
-          klass.class_eval do
-            CfnDsl::methodNames(pname) do |method|
-              define_method(method) do |*values, &block|
-                if( values.length < 1 ) then
-                  values.push []
-                end
-                @Properties ||= {}
-                @Properties[pname] ||= PropertyDefinition.new( *values )
-                @Properties[pname].value.instance_eval &block if block
-                @Properties[pname].value
-              end
-            end
-
-            CfnDsl::methodNames(sing_name) do |method|
-              define_method(method) do |value=nil, &block|
-                @Properties ||= {}
-                @Properties[pname] ||= PropertyDefinition.new( [] )
-                if( !value ) then
-                  value = create_klass.new
-                end
-                @Properties[pname].value.push value
-                value.instance_eval &block if block
-                value
-              end
-            end
-          end
-        end
-
-      end
-      parts = name.split "::"
-      while( parts.length > 0)
-        abreve_name = parts.join "_"
-        if( names.has_key? abreve_name ) then
-          # this only happens if there is an ambiguity
-          names[abreve_name] = nil
-        else
-          names[abreve_name] = self.type_module.const_get(klassname)
-          nametypes[abreve_name] = name
-        end
-        parts.shift
-      end
-    end
-
-    #Define property setter methods for each of the unambiguous type names
-    names.each_pair do |typename,type|
-      if(type) then
-        class_eval do
-          CfnDsl::methodNames(typename) do |method|
-            define_method(method) do |name,*values,&block|
-              name = name.to_s
-              @Resources ||= {}
-              resource = @Resources[name] ||= type.new(*values)
-              resource.instance_eval &block if block
-              resource.instance_variable_set( "@Type", nametypes[typename] )
-              resource
-            end
-          end
-        end
-      end
-    end
-  end
-
-end

data/lib/cfndsl/CreationPolicy.rb

@@ -1,25 +0,0 @@
-require 'cfndsl/JSONable'
-
-module CfnDsl  
-  class CreationPolicyDefinition < JSONable
-    ##
-    # Handles creation policy objects for Resources
-    #
-    # Usage
-    #   Resource("aaa") {
-    #     CreationPolicy('ResourceSignal', { 'Count' => 1,  'Timeout' => 'PT10M' })
-    #   }
-    #
-    def initialize(value) 
-      @value = value;
-    end
-
-    def value
-      return @value
-    end
-    
-    def to_json(*a) 
-      @value.to_json(*a)
-    end
-  end
-end

data/lib/cfndsl/Errors.rb

@@ -1,31 +0,0 @@
-module CfnDsl
-  module Errors
-    @@errors = []
-
-    def self.error( err, idx=nil )
-      if(idx.nil?) then
-        @@errors.push ( err + "\n" + caller.join("\n") + "\n" )
-      else
-        if( m = caller[idx].match(/^.*?:\d+:/ ) ) then
-          err_loc = m[0];
-        else
-          err_loc = caller[idx]
-        end
-
-        @@errors.push ( err_loc + " " + err + "\n" )
-      end
-    end
-
-    def self.clear()
-      @@errors = []
-    end
-
-    def self.errors()
-      @@errors
-    end
-
-    def self.errors?()
-      return @@errors.length > 0
-    end
-  end
-end