cloudformation-ruby-dsl 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96d9566c8f7eb64af7c88c4d809d6c6b6cd79ac
-  data.tar.gz: d43e2ce163a5047f8aeecd15cf936bdf422bfff8
+  metadata.gz: 0c0ff566160bc6cd49546a86129814e4f7456149
+  data.tar.gz: f2b3e70794460d1214c1c336762f2d4e238b3247
 SHA512:
-  metadata.gz: 457204dfb740fbccc51371e4017006bab15e9b03e3ced9bace517850f0494008dc653171b60626c02addc13fe191c25c5601cd466a469c16d0381c4ae12a67e6
-  data.tar.gz: 12a0a10691d43c267fb2172a9a0ba7b703f4f16ecebd95f856a1028ac4b5924def354dae0f10d1ea60d6e27371a33e31b035fd99244b37142ea294b978439c53
+  metadata.gz: 87f36d247b8db1ec5fcbe951f35a84a71d127883185788fc29676d0be65bac0e5f05648ad81f9d4c0f602a0b52b00d52c4c4b958c837f0b0069b1ac42eff1c9b
+  data.tar.gz: 63de25f85683010039ec5215b41fd05a2e0924b6b69582d691a512c152aff19e98f1f6bbe8950d4580fc68c0eafafc29c03e170c4ccca1d5b76a644a12a17cea

data/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,30 @@
+## Description
+Describe the objective of this PR.
+
+## Steps to Test or Reproduce
+Outline the steps to test or reproduce the PR here.
+```
+Code that reproduces the behaviour of the PR/to be fixed by the PR
+```
+### Environment
+Describe the environment the bug or feature can be observed in. This may include platform, ruby version, DSL info, etc.
+
+## Deploy Notes
+If the change affects the way in which the gem is released, or requires a bump in version, note this here.
+
+## Related Issues and PRs
+
+### Issues
+ - [issue_link]()
+
+### PRs
+ - [pr1]()
+ - [pr2]()
+
+## Todos
+- [x] Pull Request
+- [ ] Tests
+- [ ] Documentation
+
+## Request to Review
+@jonaf/@temujin9 

data/lib/cloudformation-ruby-dsl/cfntemplate.rb

@@ -78,32 +78,26 @@ end
 
 # Parse command-line arguments and return the parameters and region
 def parse_args
-  args = {
-    :stack_name  => nil,
-    :parameters  => {},
-    :interactive => false,
-    :region      => default_region,
-    :profile     => nil,
-    :nopretty    => false,
-  }
+  stack_name = nil
+  parameters = {}
+  region     = default_region
+  profile    = nil
+  nopretty   = false
   ARGV.slice_before(/^--/).each do |name, value|
     case name
     when '--stack-name'
-      args[:stack_name] = value
+      stack_name = value
     when '--parameters'
-      args[:parameters] = Hash[value.split(/;/).map { |pair| pair.split(/=/, 2) }]  #/# fix for syntax highlighting
-    when '--interactive'
-      args[:interactive] = true
+      parameters = Hash[value.split(/;/).map { |pair| pair.split(/=/, 2) }]  #/# fix for syntax highlighting
     when '--region'
-      args[:region] = value
+      region = value
     when '--profile'
-      args[:profile] = value
+      profile = value
     when '--nopretty'
-      args[:nopretty] = true
+      nopretty = true
     end
   end
-
-  args
+  [stack_name, parameters, region, profile, nopretty]
 end
 
 def validate_action(action)
@@ -300,16 +294,13 @@ def cfn(template)
           template_body: template_string,
           parameters: template.parameters.map { |k,v| {parameter_key: k, parameter_value: v}}.to_a,
           tags: cfn_tags.map { |k,v| {"key" => k.to_s, "value" => v} }.to_a,
-          capabilities: ["CAPABILITY_NAMED_IAM"],
+          capabilities: ["CAPABILITY_IAM"],
       }
 
       # fill in options from the command line
       extra_options = parse_arg_array_as_hash(options)
       create_stack_opts = extra_options.merge(create_stack_opts)
 
-      # remove custom options
-      create_stack_opts.delete(:interactive)
-
       # create stack
       create_result = cfn_client.create_stack(create_stack_opts)
       if create_result.successful?
@@ -495,16 +486,13 @@ def cfn(template)
           template_body: template_string,
           parameters: template.parameters.map { |k,v| {parameter_key: k, parameter_value: v}}.to_a,
           tags: cfn_tags.map { |k,v| {"key" => k.to_s, "value" => v.to_s} }.to_a,
-          capabilities: ["CAPABILITY_NAMED_IAM"],
+          capabilities: ["CAPABILITY_IAM"],
       }
 
       # fill in options from the command line
       extra_options = parse_arg_array_as_hash(options)
       update_stack_opts = extra_options.merge(update_stack_opts)
 
-      # remove custom options
-      update_stack_opts.delete(:interactive)
-
       # update the stack
       update_result = cfn_client.update_stack(update_stack_opts)
       if update_result.successful?
@@ -579,6 +567,6 @@ end
 
 # Main entry point
 def template(&block)
-  options = parse_args
-  raw_template(options, &block)
+  stack_name, parameters, aws_region, aws_profile, nopretty = parse_args
+  raw_template(parameters, stack_name, aws_region, aws_profile, nopretty, &block)
 end

data/lib/cloudformation-ruby-dsl/dsl.rb

@@ -44,8 +44,8 @@ end
 ############################# CloudFormation DSL
 
 # Main entry point
-def raw_template(options, &block)
-  TemplateDSL.new(options, &block)
+def raw_template(parameters = {}, stack_name = nil, aws_region = default_region, aws_profile = nil, nopretty = false, &block)
+  TemplateDSL.new(parameters, stack_name, aws_region, aws_profile, nopretty, &block)
 end
 
 def default_region
@@ -54,20 +54,14 @@ end
 
 # Core interpreter for the DSL
 class TemplateDSL < JsonObjectDSL
-  attr_reader :parameters,
-              :parameter_cli,
-              :aws_region,
-              :nopretty,
-              :stack_name,
-              :aws_profile
-
-  def initialize(options)
-    @parameters  = options[:parameters]
-    @interactive = options[:interactive]
-    @stack_name  = options[:stack_name]
-    @aws_region  = options[:region]
-    @aws_profile = options[:profile]
-    @nopretty    = options[:nopretty]
+  attr_reader :parameters, :aws_region, :nopretty, :stack_name, :aws_profile
+
+  def initialize(parameters = {}, stack_name = nil, aws_region = default_region, aws_profile = nil, nopretty = false)
+    @parameters = parameters
+    @stack_name = stack_name
+    @aws_region = aws_region
+    @aws_profile = aws_profile
+    @nopretty = nopretty
     super()
   end
 
@@ -77,12 +71,7 @@ class TemplateDSL < JsonObjectDSL
 
   def parameter(name, options)
     default(:Parameters, {})[name] = options
-
-    if @interactive
-      @parameters[name] ||= _get_parameter_from_cli(name, options)
-    else
-      @parameters[name] ||= options[:Default]
-    end
+    @parameters[name] ||= options[:Default]
   end
 
   # Find parameters where the specified attribute is true then remove the attribute from the cfn template.
@@ -173,73 +162,6 @@ class TemplateDSL < JsonObjectDSL
       { :'Fn::FindInMap' => [ map, key, name ] }
     end
   end
-
-  private
-  def _get_parameter_from_cli(name, options)
-    # basic request
-    param_request = "Parameter '#{name}' (#{options[:Type]})"
-
-    # add description to request
-    if options.has_key?(:Description)
-      param_request += "\nDescription: #{options[:Description]}"
-    end
-
-    # add validation to the request
-
-    # allowed pattern
-    if options.has_key?(:AllowedPattern)
-      param_request += "\nAllowed Pattern: /#{options[:AllowedPattern]}/"
-    end
-
-    # allowed values
-    if options.has_key?(:AllowedValues)
-      param_request += "\nAllowed Values: #{options[:AllowedValues].join(', ')}"
-    end
-
-    # min/max length
-    if options.has_key?(:MinLength) or options.has_key?(:MaxLength)
-      min_length = "-infinity"
-      max_length = "+infinity"
-      if options.has_key?(:MinLength)
-        min_length = options[:MinLength]
-      end
-      if options.has_key?(:MaxLength)
-        max_length = options[:MaxLength]
-      end
-      param_request += "\nValid Length: #{min_length} < string < #{max_length}"
-    end
-
-    # min/max value
-    if options.has_key?(:MinValue) or options.has_key?(:MaxValue)
-      min_value = "-infinity"
-      max_value = "+infinity"
-      if options.has_key?(:MinValue)
-        min_value = options[:MinValue]
-      end
-      if options.has_key?(:MaxValue)
-        max_value = options[:MaxValue]
-      end
-      param_request += "\nValid Number: #{min_value} < number < #{max_value}"
-    end
-
-    # add default to request
-    if options.has_key?(:Default) and !options[:Default].nil?
-      param_request += "\nLeave value empty for default: #{options[:Default]}"
-    end
-
-    param_request += "\nValue: "
-
-    # request the param
-    $stdout.puts "===================="
-    $stdout.print param_request
-    input = $stdin.gets.chomp
-
-    if input.nil? or input.empty?
-      options[:Default]
-    else
-      input
-    end
-  end
 end
 
 def base64(value) { :'Fn::Base64' => value } end
@@ -250,8 +172,6 @@ def get_att(resource, attribute) { :'Fn::GetAtt' => [ resource, attribute ] } en
 
 def get_azs(region = '') { :'Fn::GetAZs' => region } end
 
-def import_value(value) { :'Fn::ImportValue' => value } end
-
 def join(delim, *list)
   case list.length
     when 0 then ''

data/lib/cloudformation-ruby-dsl/version.rb

@@ -15,7 +15,7 @@
 module Cfn
   module Ruby
     module Dsl
-      VERSION = "1.2.4"
+      VERSION = "1.2.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-ruby-dsl
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Shawn Smith
@@ -15,132 +15,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detabulator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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: Ruby DSL library that provides a wrapper around the CloudFormation.
@@ -158,10 +158,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - OWNERS
+- PULL_REQUEST_TEMPLATE.md
 - README.md
 - Rakefile
 - bin/cfntemplate-to-ruby
@@ -199,17 +200,17 @@ require_paths:
 - bin
 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby DSL library that provides a wrapper around the CloudFormation.  Written