cloud_former 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd6d9f6dbfc9a3c4482fe94dfb730ca0b53cf34
-  data.tar.gz: 862b1859cd76c1881948f4ca66de6b4719bb5c33
+  metadata.gz: 05bbd10279a64112c993fb0b38f75eae4f643aba
+  data.tar.gz: 6a8030ea2638dde56cb4046c7bd4182c331b66fa
 SHA512:
-  metadata.gz: 8e54874d7ec4b7e589200ded983750a96be0bba2e7a78967896073e2532eee992596a3abeb5438cba7297f2c48f5780db68b33f5bc102f22adb6aa5af002099e
-  data.tar.gz: f1b2c39d7ce2fd544c137ffe7d852ed4a8b354b84609c7c45f520324330dd2e70043b49cf11eeb1774af8ae58a11828b6be2749f84674e0746215052df8740ef
+  metadata.gz: 6a81e66c520ccc88f73d77720f58555af8e2b2bea09411622210cf5bfbb90456dc7ea1440b218909085eac5fac27e0904cc4001371d41a0c9b9994f05c143dfe
+  data.tar.gz: ce9b8e427965f7c3a81465019a6c9bd899f2dc2e0105136a9025fdb7267026772f8dbcf0315bb664787998eaa872f41dc083f3d66b1b1b21b1fb9e3c1a6e1a5e

data/.rubocop.yml

@@ -1,3 +1,9 @@
+AllCops:
+  TargetRubyVersion: 2.2
+
+Metrics/BlockNesting:
+  Enabled: false
+
 Metrics/LineLength:
   Max: 140
 
@@ -23,16 +29,41 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 600
 
+# See: https://github.com/bbatsov/rubocop/issues/2614
+Performance/Casecmp:
+  Enabled: false
+
+Performance/RedundantBlockCall:
+  Enabled: false
+
+Performance/TimesMap:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+
 Style/ClassAndModuleChildren:
   Enabled: false
 
+Style/ConditionalAssignment:
+  Enabled: false
+
 Style/GuardClause:
   Enabled: false
 
+Style/IndentArray:
+  EnforcedStyle: consistent
+
+Style/IndentArray:
+  EnforcedStyle: consistent
+
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/Next:
+Style/MutableConstant:
+  Enabled: false
+
+Style/NegatedIf:
   Enabled: false
 
 Style/PredicateName:
@@ -50,8 +81,8 @@ Style/StringLiterals:
 Style/SpaceInsideBrackets:
   Enabled: false
 
-Style/TrailingComma:
-  EnforcedStyleForMultiline: comma
+Style/UnneededInterpolation:
+  Enabled: false
 
 Style/WordArray:
   MinSize: 5
@@ -62,10 +93,22 @@ Style/EmptyLinesAroundClassBody:
 Style/MultilineOperationIndentation:
   EnforcedStyle: indented
 
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/Next:
+  Enabled: false
+
 Style/PerlBackrefs:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrivialAccessors:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
 Lint/EndAlignment:

data/cloud_former.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = CloudFormer::VERSION
   spec.authors       = ["Aubrey Holland"]
   spec.email         = ["aubreyholland@gmail.com"]
-  spec.summary       = %q{A Ruby DSL for creating CloudFormation templates}
-  spec.description   = %q{This gem creates a Ruby DSL around the AWS CloudFormation JSON template structure.}
+  spec.summary       = 'A Ruby DSL for creating CloudFormation templates'
+  spec.description   = 'This gem creates a Ruby DSL around the AWS CloudFormation JSON template structure.'
   spec.homepage      = 'http://github.com/custora/cloud_former'
   spec.license       = "MIT"
 
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", '~> 10.3'
   spec.add_development_dependency "rspec", '~> 3.0'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/cloud_former/conditions/and.rb

@@ -0,0 +1,6 @@
+module CloudFormer
+  module Conditions
+    class And < Condition
+    end
+  end
+end

data/lib/cloud_former/conditions/condition.rb

@@ -0,0 +1,13 @@
+module CloudFormer
+  module Conditions
+    class Condition
+      def initialize(name)
+        @name = name
+      end
+
+      def get_name
+        @name
+      end
+    end
+  end
+end

data/lib/cloud_former/conditions/equals.rb

@@ -0,0 +1,28 @@
+module CloudFormer
+  module Conditions
+    class Equals < Condition
+
+      def initialize(name, value1, value2)
+        super(name)
+        @value1 = value1
+        @value2 = value2
+      end
+
+      def dump_json
+        if @value1.respond_to?(:get_name)
+          val1 = { 'Ref' => @value1.get_name }
+        elsif @value1.respond_to?(:to_s)
+          val1 = @value1.to_s
+        end
+
+        if @value2.respond_to?(:get_name)
+          val2 = { 'Ref' => @value2.get_name }
+        elsif @value2.respond_to?(:to_s)
+          val2 = @value2.to_s
+        end
+
+        { 'Fn::Equals' => [val1, val2] }
+      end
+    end
+  end
+end

data/lib/cloud_former/conditions/if.rb

@@ -0,0 +1,6 @@
+module CloudFormer
+  module Conditions
+    class If < Condition
+    end
+  end
+end

data/lib/cloud_former/conditions/not.rb

@@ -0,0 +1,6 @@
+module CloudFormer
+  module Conditions
+    class Not < Condition
+    end
+  end
+end

data/lib/cloud_former/conditions/or.rb

@@ -0,0 +1,6 @@
+module CloudFormer
+  module Conditions
+    class Or < Condition
+    end
+  end
+end

data/lib/cloud_former/template.rb

@@ -5,6 +5,7 @@ module CloudFormer
       @resources = []
       @parameters = []
       @outputs = []
+      @conditions = []
     end
 
     def add_parameter(parameter)
@@ -19,6 +20,10 @@ module CloudFormer
       @outputs << [key, value]
     end
 
+    def add_condition(condition)
+      @conditions << condition
+    end
+
     def dump_json
       res = { 'AWSTemplateFormatVersion' => '2010-09-09' }
 
@@ -30,6 +35,14 @@ module CloudFormer
         res['Parameters'] = parameter_res
       end
 
+      if @conditions.any?
+        condition_res = {}
+        @conditions.each do |condition|
+          condition_res[condition.get_name] = condition.dump_json
+        end
+        res['Conditions'] = condition_res
+      end
+
       if @resources.any?
         resource_res = {}
         @resources.each do |resource|

data/lib/cloud_former/version.rb

@@ -1,3 +1,3 @@
 module CloudFormer
-  VERSION = '0.5.11'
+  VERSION = '0.5.12'
 end

data/lib/cloud_former.rb

@@ -83,6 +83,15 @@ module CloudFormer
     autoload :MetricDimension, 'cloud_former/resource_properties/cloud_watch/metric_dimension'
   end
 
+  module Conditions
+    autoload :And, 'cloud_former/conditions/and'
+    autoload :Condition, 'cloud_former/conditions/condition'
+    autoload :Equals, 'cloud_former/conditions/equals'
+    autoload :If, 'cloud_former/conditions/if'
+    autoload :Not, 'cloud_former/conditions/not'
+    autoload :Or, 'cloud_former/conditions/or'
+  end
+
   module DirectoryService
     autoload :MicrosoftAD, 'cloud_former/resources/directory_service/microsoft_ad'
     autoload :SimpleAD, 'cloud_former/resources/directory_service/simple_ad'

data/spec/conditions_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe CloudFormer::Template do
+  let(:template) { CloudFormer::Template.new }
+  let(:parameter1) { CloudFormer::StringParameter.new('sweet') }
+  let(:resource) do
+    CloudFormer::IAM::AccessKey.new('KEY') do
+      status 'Active'
+      user_name 'Aubrey'
+    end
+  end
+  let(:simple_equals) do
+    CloudFormer::Conditions::Equals.new('TestEquals', 1, 2)
+  end
+  let(:param_equals) do
+    CloudFormer::Conditions::Equals.new('TestEquals', parameter, 2)
+  end
+
+  it 'should include parameters' do
+    template.add_condition(simple_equals)
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      "Conditions" => {
+        "TestEquals" => {
+          "Fn::Equals" => ["1", "2"],
+        },
+      },
+    )
+  end
+
+  it 'should include slightly mode complex parameters' do
+    template.add_parameter(parameter)
+    template.add_condition(param_equals)
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+      "Parameters" => {
+        "sweet" => { "Type" => "String" },
+      },
+      "Conditions" => {
+        "TestEquals" => {
+          "Fn::Equals" => [{ "Ref" => "sweet" }, "2"],
+        },
+      },
+    )
+  end
+end

data/spec/template_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe CloudFormer::Template do
-
   let(:template) { CloudFormer::Template.new }
   let(:parameter) { CloudFormer::StringParameter.new('sweet') }
   let(:resource) do
@@ -16,38 +15,36 @@ describe CloudFormer::Template do
   end
 
   it 'should include the AWSTemplateFormatVersion by default' do
-    expect(template.dump_json).to eq({
-      'AWSTemplateFormatVersion' => '2010-09-09'
-    })
+    expect(template.dump_json).to eq(
+      'AWSTemplateFormatVersion' => '2010-09-09',
+    )
   end
 
   it 'should include parameters' do
     template.add_parameter(parameter)
-    expect(template.dump_json).to eq({
+    expect(template.dump_json).to eq(
       'AWSTemplateFormatVersion' => '2010-09-09',
       'Parameters' => {
         'sweet' => {
-          'Type' => 'String'
-        }
-      }
-    })
+          'Type' => 'String',
+        },
+      },
+    )
   end
 
   it 'should include resources' do
     template.add_resource(resource)
-    expect(template.dump_json).to eq({
+    expect(template.dump_json).to eq(
       'AWSTemplateFormatVersion' => '2010-09-09',
       'Resources' => {
         resource.name => {
           'Type' => resource.aws_type,
           'Properties' => {
             'Status' => 'Active',
-            'UserName' => 'Aubrey'
-          }
-        }
-      }
-    })
+            'UserName' => 'Aubrey',
+          },
+        },
+      },
+    )
   end
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_former
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Aubrey Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: This gem creates a Ruby DSL around the AWS CloudFormation JSON template
   structure.
 email:
@@ -85,6 +99,12 @@ files:
 - cloud_former.gemspec
 - lib/cloud_former.rb
 - lib/cloud_former/boolean.rb
+- lib/cloud_former/conditions/and.rb
+- lib/cloud_former/conditions/condition.rb
+- lib/cloud_former/conditions/equals.rb
+- lib/cloud_former/conditions/if.rb
+- lib/cloud_former/conditions/not.rb
+- lib/cloud_former/conditions/or.rb
 - lib/cloud_former/functions/base_64.rb
 - lib/cloud_former/functions/find_in_map.rb
 - lib/cloud_former/functions/function.rb
@@ -268,6 +288,7 @@ files:
 - lib/cloud_former/resources/sqs/queue_policy.rb
 - lib/cloud_former/template.rb
 - lib/cloud_former/version.rb
+- spec/conditions_spec.rb
 - spec/has_properties_and_attributes_spec.rb
 - spec/metadata_spec.rb
 - spec/output_spec.rb
@@ -303,11 +324,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby DSL for creating CloudFormation templates
 test_files:
+- spec/conditions_spec.rb
 - spec/has_properties_and_attributes_spec.rb
 - spec/metadata_spec.rb
 - spec/output_spec.rb