convection 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1076761e16a97104ae559f9b56201d1cbb76287a
-  data.tar.gz: 6f85f6950fb4e34863fcee35f6b8ffc1e2779fec
+  metadata.gz: d2a32482c234ff9f7b1e21880c89a908f56e6941
+  data.tar.gz: 2e85ff91a4f8a3113f79dbd4419eb9a8fd40154b
 SHA512:
-  metadata.gz: 574c6935f6220ee9f93b82d31278d7380f3f9e966a9cfa4e22b9731325d954449e2248a619b6057c0e2387ac3b71ca7e1b1356ee43a5bba0b41d3c8d023f335e
-  data.tar.gz: d6834e569ba8d687b612cdb0765885f2a7738c7c7392640aacc9e0d8ce3c54db8bab14179450dbe2782e07ac7bc2f2b3730ba93c2808a505883542f25549da0e
+  metadata.gz: b020485dc81ae2cda1f2e144804f2ddd051086c3c1203241e7869877c8a45842d7005de6e5a7f3fbe23040ae83f70cb939c5ed57147a26612611fa3b1a861cb1
+  data.tar.gz: 6573b5f42ec7252432e0b9ac26d29fb4c27286ccdaf5af3d7002920016c04b5ada75932f18e271c4925ba6c642c03fbb33eb90d7bf162ff82b6491741e400bad

data/.rubocop.yml

@@ -10,6 +10,7 @@ AllCops:
     - Thorfile
   Exclude:
     - example/**/*
+    - 'lib/convection/model/template/mapping.rb' # Something is causing this file to fail
 
 Encoding:
  Enabled: false
@@ -19,6 +20,10 @@ HashSyntax:
  Enabled: false
 SpaceInsideStringInterpolation:
   Enabled: false
+Performance/RedundantBlockCall:
+  Enabled: false
+Style/SignalException:
+  Enabled: false
 
 # AbcSize:
 #   Max: 24

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-09-14 17:06:32 -0400 using RuboCop version 0.34.1.
+# on 2016-02-05 13:27:18 -0500 using RuboCop version 0.37.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -16,30 +16,31 @@ Lint/UselessAssignment:
   Exclude:
     - 'lib/convection/model/template.rb'
 
-# Offense count: 9
+# Offense count: 30
 Metrics/AbcSize:
   Max: 57
 
-# Offense count: 1
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 267
 
-# Offense count: 1
+# Offense count: 6
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 9
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 122
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 151
 
-# Offense count: 1
+# Offense count: 32
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 35
 
-# Offense count: 1
+# Offense count: 5
 Metrics/PerceivedComplexity:
   Max: 13
 
@@ -48,30 +49,43 @@ Style/AccessorMethodName:
   Exclude:
     - 'lib/convection/control/stack.rb'
 
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: prefer_alias, prefer_alias_method
+Style/Alias:
+  Exclude:
+    - 'lib/convection/control/stack.rb'
+    - 'lib/convection/model/template/resource.rb'
+    - 'lib/convection/model/template/resource_property.rb'
+    - 'lib/convection/model/template/resource_property/aws_ec2_network_interface.rb'
+
 # Offense count: 3
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'lib/convection/model/template.rb'
     - 'test/test_helper.rb'
 
-# Offense count: 11
+# Offense count: 4
 Style/Documentation:
   Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
     - 'lib/convection/model/attributes.rb'
     - 'lib/convection/model/mixin/colorize.rb'
     - 'lib/convection/model/template/condition.rb'
-    - 'test/convection/model/test_conditions.rb'
-    - 'test/convection/model/test_elasticache.rb'
-    - 'test/convection/model/test_loggroups.rb'
-    - 'test/convection/model/test_rds.rb'
-    - 'test/convection/model/test_template.rb'
-    - 'test/convection/model/test_validation.rb'
-    - 'test/test_helper.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
 Style/FirstParameterIndentation:
   Exclude:
     - 'lib/convection/model/mixin/taggable.rb'
+
+# Added manually
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/convection/model/template/condition.rb'

data/lib/convection/control/stack.rb

@@ -31,26 +31,26 @@ module Convection
       attr_accessor :on_failure
 
       ## Valid Stack Statuses
-      CREATE_COMPLETE = 'CREATE_COMPLETE'
-      CREATE_FAILED = 'CREATE_FAILED'
-      CREATE_IN_PROGRESS = 'CREATE_IN_PROGRESS'
-      DELETE_COMPLETE = 'DELETE_COMPLETE'
-      DELETE_FAILED = 'DELETE_FAILED'
-      DELETE_IN_PROGRESS = 'DELETE_IN_PROGRESS'
-      ROLLBACK_COMPLETE = 'ROLLBACK_COMPLETE'
-      ROLLBACK_FAILED = 'ROLLBACK_FAILED'
-      ROLLBACK_IN_PROGRESS = 'ROLLBACK_IN_PROGRESS'
-      UPDATE_COMPLETE = 'UPDATE_COMPLETE'
-      UPDATE_COMPLETE_CLEANUP_IN_PROGRESS = 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS'
-      UPDATE_FAILED = 'UPDATE_FAILED'
-      UPDATE_IN_PROGRESS = 'UPDATE_IN_PROGRESS'
-      UPDATE_ROLLBACK_COMPLETE = 'UPDATE_ROLLBACK_COMPLETE'
-      UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS = 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS'
-      UPDATE_ROLLBACK_FAILED = 'UPDATE_ROLLBACK_FAILED'
-      UPDATE_ROLLBACK_IN_PROGRESS = 'UPDATE_ROLLBACK_IN_PROGRESS'
+      CREATE_COMPLETE = 'CREATE_COMPLETE'.freeze
+      CREATE_FAILED = 'CREATE_FAILED'.freeze
+      CREATE_IN_PROGRESS = 'CREATE_IN_PROGRESS'.freeze
+      DELETE_COMPLETE = 'DELETE_COMPLETE'.freeze
+      DELETE_FAILED = 'DELETE_FAILED'.freeze
+      DELETE_IN_PROGRESS = 'DELETE_IN_PROGRESS'.freeze
+      ROLLBACK_COMPLETE = 'ROLLBACK_COMPLETE'.freeze
+      ROLLBACK_FAILED = 'ROLLBACK_FAILED'.freeze
+      ROLLBACK_IN_PROGRESS = 'ROLLBACK_IN_PROGRESS'.freeze
+      UPDATE_COMPLETE = 'UPDATE_COMPLETE'.freeze
+      UPDATE_COMPLETE_CLEANUP_IN_PROGRESS = 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS'.freeze
+      UPDATE_FAILED = 'UPDATE_FAILED'.freeze
+      UPDATE_IN_PROGRESS = 'UPDATE_IN_PROGRESS'.freeze
+      UPDATE_ROLLBACK_COMPLETE = 'UPDATE_ROLLBACK_COMPLETE'.freeze
+      UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS = 'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS'.freeze
+      UPDATE_ROLLBACK_FAILED = 'UPDATE_ROLLBACK_FAILED'.freeze
+      UPDATE_ROLLBACK_IN_PROGRESS = 'UPDATE_ROLLBACK_IN_PROGRESS'.freeze
 
       ## Internal status
-      NOT_CREATED = 'NOT_CREATED'
+      NOT_CREATED = 'NOT_CREATED'.freeze
 
       def initialize(name, template, options = {})
         @name = name

data/lib/convection/dsl/helpers.rb

@@ -45,9 +45,9 @@ module Convection
           ## Cammel-case to snake-case
           nodes.map! do |n|
             n.split(/([A-Z0-9])(?![A-Z0-9])(?<!$)/)
-              .reject(&:empty?)
-              .reduce('') { |a, e| (e.length == 1 && !a.empty?) ? a + "_#{e}" : a + e }
-              .downcase
+             .reject(&:empty?)
+             .reduce('') { |a, e| (e.length == 1 && !a.empty?) ? a + "_#{e}" : a + e }
+             .downcase
           end
 
           nodes.join('_').downcase

data/lib/convection/model/mixin/policy.rb

@@ -9,7 +9,7 @@ module Convection
       class Policy
         include DSL::Helpers
 
-        DEFAULT_VERSION = '2012-10-17'
+        DEFAULT_VERSION = '2012-10-17'.freeze
 
         attribute :name
         attribute :id

data/lib/convection/model/template.rb

@@ -170,7 +170,7 @@ module Convection
       include DSL::IntrinsicFunctions
       include DSL::Template
 
-      DEFAULT_VERSION = '2010-09-09'
+      DEFAULT_VERSION = '2010-09-09'.freeze
 
       attr_reader :stack
       attr_reader :attribute_mappings

data/lib/convection/model/template/condition.rb

@@ -11,7 +11,7 @@ module Convection
             fn_equals: 'Fn::Equals',
             fn_if: 'Fn::If',
             fn_not: 'Fn::Not',
-            fn_or: 'Fn::Or' }
+            fn_or: 'Fn::Or' }.freeze
 
         attr_reader :condition
         attr_reader :template

data/lib/convection/model/template/resource/aws_elasticache_replication_group.rb

@@ -0,0 +1,34 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElastiCache::ReplicationGroup
+        ##
+        class ElastiCacheReplicationGroup < Resource
+          type 'AWS::ElastiCache::ReplicationGroup', :elasticache_replication_group
+          property :auto_failover_enabled, 'AutomaticFailoverEnabled'
+          property :auto_minor_version_upgrade, 'AutoMinorVersionUpgrade'
+          property :cache_node_type, 'CacheNodeType'
+          property :cache_parameter_group_name, 'CacheParameterGroupName'
+          property :cache_security_group_names, 'CacheSecurityGroupNames', :type => :list
+          property :cache_subnet_group_name, 'CacheSubnetGroupName'
+          property :engine, 'Engine'
+          property :engine_version, 'EngineVersion'
+          property :notification_topic_arn, 'NotificationTopicArn'
+          property :num_cache_clusters, 'NumCacheClusters'
+          property :port, 'Port'
+          property :preferred_cache_cluster_azs, 'PreferredCacheClusterAZs', :type => :list
+          property :preferred_maintenance_window, 'PreferredMaintenanceWindow'
+          property :replication_group_description, 'ReplicationGroupDescription'
+          property :security_group_ids, 'SecurityGroupIds', :type => :list
+          property :snapshot_arns, 'SnapshotArns', :type => :list
+          property :snapshot_retention_limit, 'SnapshotRetentionLimit'
+          property :snapshot_window, 'SnapshotWindow'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_elasticbeanstalk_application.rb

@@ -0,0 +1,17 @@
+require_relative '../resource'
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        #  AWS::ElasticBeanstalk::Application
+        ##
+        class ElasticBeanstalkApplication < Resource
+          type 'AWS::ElasticBeanstalk::Application', :elasticbeanstalk_application
+          property :application_name, 'ApplicationName'
+          property :description, 'Description'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_elasticbeanstalk_applicationversion.rb

@@ -0,0 +1,18 @@
+require_relative '../resource'
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        #  AWS::ElasticBeanstalk::ApplicationVersion
+        ##
+        class ElasticBeanstalkApplicationVersion < Resource
+          type 'AWS::ElasticBeanstalk::ApplicationVersion', :elasticbeanstalk_applicationversion
+          property :application_name, 'ApplicationName'
+          property :description, 'Description'
+          property :source_bundle, 'SourceBundle'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_elasticbeanstalk_configurationtemplate.rb

@@ -0,0 +1,21 @@
+require_relative '../resource'
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        #  AWS::ElasticBeanstalk::ConfigurationTemplate
+        ##
+        class ElasticBeanstalkConfigurationTemplate < Resource
+          type 'AWS::ElasticBeanstalk::ConfigurationTemplate', :elasticbeanstalk_configurationtemplate
+          property :application_name, 'ApplicationName'
+          property :description, 'Description'
+          property :environment, 'Environment'
+          property :option_settings, 'OptionSettings'
+          property :solution_stack_name, 'SolutionStackName'
+          property :source_configuration, 'SourceConfiguration'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_elasticbeanstalk_environment.rb

@@ -0,0 +1,25 @@
+require_relative '../resource'
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        #  AWS::ElasticBeanstalk::Environment
+        ##
+        class ElasticBeanstalkEnvironment < Resource
+          type 'AWS::ElasticBeanstalk::Environment', :elasticbeanstalk_environment
+          property :application_name, 'ApplicationName'
+          property :cname_prefix, 'CNAMEPrefix'
+          property :description, 'Description'
+          property :environment_name, 'EnvironmentName'
+          property :option_settings, 'OptionSettings'
+          property :solution_stack_name, 'SolutionStackName'
+          property :tags, 'Tags'
+          property :template_name, 'TemplateName'
+          property :tier, 'Tier'
+          property :version_label, 'VersionLabel'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_s3_bucket.rb

@@ -17,7 +17,7 @@ module Convection
           property :lifecycle_configuration, 'LifecycleConfiguration'
           property :logging_configuration, 'LoggingConfiguration'
           property :notification_configuration, 'NotificationConfiguration'
-          property :version_configuration, 'VersionConfiguration'
+          property :versioning_configuration, 'VersioningConfiguration'
 
           def render(*args)
             super.tap do |resource|

data/lib/convection/version.rb

@@ -1,6 +1,6 @@
 # nodoc
 module Convection
   VERSION = IO.read(File.expand_path('../../../VERSION', __FILE__)) rescue '0.0.1'
-  SUMMARY = 'A fully generic, modular DSL for AWS CloudFormation'
+  SUMMARY = 'A fully generic, modular DSL for AWS CloudFormation'.freeze
   DESCRIPTION = IO.read(File.expand_path('../../../README.md', __FILE__)) rescue ''
 end

data/test/convection/model/test_validation.rb

@@ -128,7 +128,7 @@ class TestValidations < Minitest::Test
       end
     end
 
-    assert_raises(ExcessiveMappingAttributesError)do
+    assert_raises(ExcessiveMappingAttributesError) do
       @excessive_mapping_attributes.to_json
     end
     assert_raises(ExcessiveMappingAttributeNameError) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -395,9 +395,14 @@ files:
 - lib/convection/model/template/resource/aws_ec2_vpc_gateway_attachment.rb
 - lib/convection/model/template/resource/aws_elasticache_cluster.rb
 - lib/convection/model/template/resource/aws_elasticache_parameter_group.rb
+- lib/convection/model/template/resource/aws_elasticache_replication_group.rb
 - lib/convection/model/template/resource/aws_elasticache_security_group.rb
 - lib/convection/model/template/resource/aws_elasticache_security_group_ingress.rb
 - lib/convection/model/template/resource/aws_elasticache_subnet_group.rb
+- lib/convection/model/template/resource/aws_elasticbeanstalk_application.rb
+- lib/convection/model/template/resource/aws_elasticbeanstalk_applicationversion.rb
+- lib/convection/model/template/resource/aws_elasticbeanstalk_configurationtemplate.rb
+- lib/convection/model/template/resource/aws_elasticbeanstalk_environment.rb
 - lib/convection/model/template/resource/aws_elb.rb
 - lib/convection/model/template/resource/aws_iam_access_key.rb
 - lib/convection/model/template/resource/aws_iam_group.rb