sfn 3.0.28 → 3.0.30

data/lib/sfn/config/list.rb

@@ -4,25 +4,23 @@ module Sfn
   class Config
     # List command configuration
     class List < Sfn::Config
-
       attribute(
         :attribute, String,
         :multiple => true,
         :description => 'Attribute of stack to print',
-        :short_flag => 'a'
+        :short_flag => 'a',
       )
       attribute(
         :all_attributes, [TrueClass, FalseClass],
         :description => 'Print all available attributes',
-        :short_flag => 'A'
+        :short_flag => 'A',
       )
       attribute(
         :status, String,
         :multiple => true,
         :description => 'Match stacks with given status. Use "none" to disable.',
-        :short_flag => 's'
+        :short_flag => 's',
       )
-
     end
   end
 end

data/lib/sfn/config/print.rb

@@ -4,23 +4,21 @@ module Sfn
   class Config
     # Print command configurationUpdate command configuration
     class Print < Validate
-
       attribute(
         :write_to_file, String,
         :description => 'Write compiled SparkleFormation template to path provided',
-        :short_flag => 'w'
+        :short_flag => 'w',
       )
 
       attribute(
         :sparkle_dump, [TrueClass, FalseClass],
-        :description => 'Do not use provider customized dump behavior'
+        :description => 'Do not use provider customized dump behavior',
       )
 
       attribute(
         :yaml, [TrueClass, FalseClass],
-        :description => 'Output template content in YAML format'
+        :description => 'Output template content in YAML format',
       )
-
     end
   end
 end

data/lib/sfn/config/promote.rb

@@ -4,20 +4,18 @@ module Sfn
   class Config
     # Promote command configuration
     class Promote < Config
-
       attribute(
         :accounts, String,
-        :description => 'JSON accounts file path'
+        :description => 'JSON accounts file path',
       )
       attribute(
         :bucket, String,
-        :description => 'Bucket name containing the exports'
+        :description => 'Bucket name containing the exports',
       )
       attribute(
         :bucket_prefix, String,
-        :description => 'Key prefix within remote bucket'
+        :description => 'Key prefix within remote bucket',
       )
-
     end
   end
 end

data/lib/sfn/config/update.rb

@@ -4,22 +4,21 @@ module Sfn
   class Config
     # Update command configuration
     class Update < Validate
-
       attribute(
         :apply_stack, String,
         :multiple => true,
         :description => 'Apply outputs from stack to input parameters',
-        :short_flag => 'A'
+        :short_flag => 'A',
       )
       attribute(
         :apply_mapping, Smash,
-        :description => 'Customize apply stack mapping as [StackName__]OutputName:ParameterName'
+        :description => 'Customize apply stack mapping as [StackName__]OutputName:ParameterName',
       )
       attribute(
         :parameter, Smash,
         :multiple => true,
         :description => '[DEPRECATED - use `parameters`] Pass template parameters directly (ParamName:ParamValue)',
-        :coerce => lambda{|v, inst|
+        :coerce => lambda { |v, inst|
           result = inst.data[:parameter] || Array.new
           case v
           when String
@@ -31,41 +30,40 @@ module Sfn
           end
           {:bogo_multiple => result}
         },
-        :short_flag => 'R'
+        :short_flag => 'R',
       )
       attribute(
         :parameters, Smash,
         :description => 'Pass template parameters directly',
-        :short_flag => 'm'
+        :short_flag => 'm',
       )
       attribute(
         :plan, [TrueClass, FalseClass],
         :default => true,
         :description => 'Provide planning information prior to update',
-        :short_flag => 'l'
+        :short_flag => 'l',
       )
       attribute(
         :plan_only, [TrueClass, FalseClass],
         :default => false,
-        :description => 'Exit after plan display'
+        :description => 'Exit after plan display',
       )
       attribute(
         :diffs, [TrueClass, FalseClass],
         :description => 'Show planner content diff',
-        :short_flag => 'D'
+        :short_flag => 'D',
       )
       attribute(
         :merge_api_options, [TrueClass, FalseClass],
         :description => 'Merge API options defined within configuration on update',
-        :default => false
+        :default => false,
       )
       attribute(
         :parameter_validation, String,
         :allowed => ['default', 'none', 'current', 'expected'],
         :description => 'Stack parameter validation behavior',
-        :default => 'default'
+        :default => 'default',
       )
-
     end
   end
 end

data/lib/sfn/config/validate.rb

@@ -4,79 +4,78 @@ module Sfn
   class Config
     # Validate command configuration
     class Validate < Config
-
       attribute(
         :processing, [TrueClass, FalseClass],
         :description => 'Call the unicorns and explode the glitter bombs',
         :default => true,
-        :short_flag => 'P'
+        :short_flag => 'P',
       )
       attribute(
         :file, String,
         :description => 'Path to template file',
         :default => nil,
-        :short_flag => 'f'
+        :short_flag => 'f',
       )
       attribute(
         :file_path_prompt, [TrueClass, FalseClass],
         :default => true,
         :description => 'Enable interactive prompt for template path discovery',
-        :short_flag => 'F'
+        :short_flag => 'F',
       )
       attribute(
         :base_directory, String,
         :description => 'Path to root of of templates directory',
-        :short_flag => 'b'
+        :short_flag => 'b',
       )
       attribute(
         :no_base_directory, [TrueClass, FalseClass],
         :description => 'Unset any value used for the template root directory path',
-        :short_flag => 'n'
+        :short_flag => 'n',
       )
       attribute(
         :translate, String,
         :description => 'Translate generated template to given provider',
-        :short_flag => 't'
+        :short_flag => 't',
       )
       attribute(
         :translate_chunk, Integer,
         :description => 'Chunk length for serialization',
-        :coerce => lambda{|v| v.to_i},
-        :short_flag => 'T'
+        :coerce => lambda { |v| v.to_i },
+        :short_flag => 'T',
       )
       attribute(
         :apply_nesting, [String, Symbol],
         :default => 'deep',
         :description => 'Apply stack nesting',
-        :short_flag => 'a'
+        :short_flag => 'a',
       )
       attribute(
         :nesting_bucket, String,
         :description => 'Bucket to use for storing nested stack templates',
-        :short_flag => 'N'
+        :short_flag => 'N',
       )
       attribute(
         :nesting_prefix, String,
         :description => 'File name prefix for storing template in bucket',
-        :short_flag => 'Y'
+        :short_flag => 'Y',
       )
       attribute(
         :print_only, [TrueClass, FalseClass],
         :description => 'Print the resulting stack template',
-        :short_flag => 'r'
+        :short_flag => 'r',
       )
       attribute(
         :sparkle_pack, String,
         :multiple => true,
         :description => 'Load SparklePack gem',
-        :coerce => lambda{|s| s.to_s},
-        :short_flag => 's'
+        :coerce => lambda { |s| s.to_s },
+        :short_flag => 's',
       )
       attribute(
         :compile_parameters, Smash,
         :description => 'Pass template compile time parameters directly',
         :short_flag => 'o',
-        :coerce => lambda{|v|
+        :coerce => lambda { |v|
           case v
           when String
             result = Smash.new
@@ -90,7 +89,7 @@ module Sfn
             extractor = lambda do |data, prefix|
               data.each_pair do |key, value|
                 local_key = "#{prefix}__#{key}"
-                if(value.is_a?(Hash))
+                if value.is_a?(Hash)
                   extractor.call(value, local_key)
                 else
                   result[local_key] = data
@@ -101,13 +100,12 @@ module Sfn
           else
             v
           end
-        }
+        },
       )
       attribute(
         :upload_root_template, [TrueClass, FalseClass],
-        :description => 'Upload root template to storage bucket'
+        :description => 'Upload root template to storage bucket',
       )
-
     end
   end
 end

data/lib/sfn/lint.rb

@@ -3,10 +3,8 @@ require 'jmespath'
 
 module Sfn
   module Lint
-
     autoload :Definition, 'sfn/lint/definition'
     autoload :Rule, 'sfn/lint/rule'
     autoload :RuleSet, 'sfn/lint/rule_set'
-
   end
 end

data/lib/sfn/lint/definition.rb

@@ -18,8 +18,8 @@ module Sfn
       # @param provider [String, Symbol] target provider
       # @param evaluator [Proc] logic used to handle match
       # @return [self]
-      def initialize(expr, provider=:aws, evaluator=nil, &block)
-        if(evaluator && block)
+      def initialize(expr, provider = :aws, evaluator = nil, &block)
+        if evaluator && block
           raise ArgumentError.new 'Only evaluator or block can be provided, not both.'
         end
         @provider = Bogo::Utility.snake(provider).to_sym
@@ -45,13 +45,11 @@ module Sfn
       # @return [TrueClass, Array<String>] true if passed. List of string results that failed
       # @note override this method when subclassing
       def run(result, template)
-        unless(evaluator)
+        unless evaluator
           raise NotImplementedError.new 'No evaluator has been defined for this definition!'
         end
         evaluator.call(result, template)
       end
-
     end
-
   end
 end

data/lib/sfn/lint/rule.rb

@@ -21,7 +21,7 @@ module Sfn
       # @param fail_message [String] message to describe failure
       # @param provider [String, Symbol] target provider
       # @return [self]
-      def initialize(name, definitions, fail_message, provider=:aws)
+      def initialize(name, definitions, fail_message, provider = :aws)
         @name = name.to_sym
         @definitions = definitions.dup.uniq.freeze
         @fail_message = fail_message
@@ -33,13 +33,13 @@ module Sfn
       # result set.
       def generate_fail_message(results)
         msg = fail_message.dup
-        unless(results.empty?)
+        unless results.empty?
           failed_items = results.map do |item|
             f_item = item[:failures]
             next if f_item.nil? || f_item == true || f_item == false
             f_item
           end.flatten.compact.map(&:to_s)
-          unless(failed_items.empty?)
+          unless failed_items.empty?
             msg = "#{msg} (failures: `#{failed_items.join('`, `')}`)"
           end
         end
@@ -55,10 +55,10 @@ module Sfn
           result = definition.apply(template)
           result == true ? result : Smash.new(:definition => definition, :failures => result)
         end
-        if(results.all?{|item| item == true})
+        if results.all? { |item| item == true }
           true
         else
-          results.delete_if{|item| item == true}
+          results.delete_if { |item| item == true }
           results
         end
       end
@@ -107,12 +107,11 @@ module Sfn
         non_match = definitions.find_all do |definition|
           definition.provider != provider
         end
-        unless(non_match.empty?)
+        unless non_match.empty?
           raise ArgumentError.new "Rule defines `#{provider}` as provider but includes definitions for " \
-            "non matching providers. (#{non_match.map(&:provider).map(&:to_s).uniq.sort.join(', ')})"
+                                  "non matching providers. (#{non_match.map(&:provider).map(&:to_s).uniq.sort.join(', ')})"
         end
       end
-
     end
   end
 end

data/lib/sfn/lint/rule_set.rb

@@ -7,7 +7,6 @@ module Sfn
 
       # Helper class for ruleset generation
       class Creator
-
         attr_reader :items, :provider
 
         def initialize(provider)
@@ -16,34 +15,28 @@ module Sfn
         end
 
         class RuleSet < Creator
-
           def rule(name, &block)
             r = Rule.new(provider)
             r.instance_exec(&block)
             items << Sfn::Lint::Rule.new(name, r.items, r.fail_message, provider)
           end
-
         end
 
         class Rule < Creator
-
-          def definition(expr, evaluator=nil, &block)
+          def definition(expr, evaluator = nil, &block)
             items << Sfn::Lint::Definition.new(expr, provider, evaluator, &block)
           end
 
-          def fail_message(val=nil)
-            unless(val.nil?)
+          def fail_message(val = nil)
+            unless val.nil?
               @fail_message = val
             end
             @fail_message
           end
-
         end
-
       end
 
       class << self
-
         @@_rule_set_registry = Smash.new
 
         # RuleSet generator helper for quickly building simple rule sets
@@ -51,7 +44,7 @@ module Sfn
         # @param name [String] name of rule set
         # @param provider [String, Symbol] target provider
         # @yieldblock rule set content
-        def build(name, provider=:aws, &block)
+        def build(name, provider = :aws, &block)
           provider = Bogo::Utility.snake(provider).to_sym
           rs = Creator::RuleSet.new(provider)
           rs.instance_exec(&block)
@@ -72,7 +65,7 @@ module Sfn
         # @param name [String] name of rule set
         # @param provider [String] target provider
         # @return [RuleSet, NilClass]
-        def get(name, provider=:aws)
+        def get(name, provider = :aws)
           provider = Bogo::Utility.snake(provider)
           @@_rule_set_registry.get(provider, name)
         end
@@ -81,10 +74,9 @@ module Sfn
         #
         # @param provider [String] target provider
         # @return [Array<RuleSet>]
-        def get_all(provider=:aws)
+        def get_all(provider = :aws)
           @@_rule_set_registry.fetch(provider, {}).values
         end
-
       end
 
       include Bogo::Memoization
@@ -102,7 +94,7 @@ module Sfn
       # @param provider [String, Symbol] name of target provider
       # @param rules [Array<Rule>] list of rules defining this set
       # @return [self]
-      def initialize(name, provider=:aws, rules=[])
+      def initialize(name, provider = :aws, rules = [])
         @name = name.to_sym
         @provider = Bogo::Utility.snake(provider).to_sym
         @rules = rules.dup.uniq.freeze
@@ -138,7 +130,7 @@ module Sfn
       # @return [TrueClass, Array<String>] true on success, list failure messages on failure
       def apply(template)
         failures = collect_failures(template)
-        if(failures.empty?)
+        if failures.empty?
           true
         else
           failures.map do |failure|
@@ -157,7 +149,7 @@ module Sfn
           result = rule.apply(template)
           result == true ? true : Smash.new(:rule => rule, :result => result)
         end
-        results.delete_if{|i| i == true}
+        results.delete_if { |i| i == true }
         results
       end
 
@@ -166,12 +158,11 @@ module Sfn
         non_match = rules.find_all do |rule|
           rule.provider != provider
         end
-        unless(non_match.empty?)
+        unless non_match.empty?
           raise ArgumentError.new "Rule set defines `#{provider}` as provider but includes rules for " \
-            "non matching providers. (#{non_match.map(&:provider).map(&:to_s).uniq.sort.join(', ')})"
+                                  "non matching providers. (#{non_match.map(&:provider).map(&:to_s).uniq.sort.join(', ')})"
         end
       end
-
     end
   end
 end