stack_master 2.18.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa37da4e3a6d6d80804a60be1b868180a67470009472b02a0c838354028efb6
-  data.tar.gz: e04ddf265d427425f0a1a60973eec74e2e6cc42e3cc47f00b8cbf584f1cdac93
+  metadata.gz: 607ab539b978fab2e12639668d933f93f57e0313fadc0ba4bbca9e91acc2dd55
+  data.tar.gz: 46c1b5546ed2e64375ebd16ea3703361e173bd766b346b56f9b8bb1357c06737
 SHA512:
-  metadata.gz: fb887f7ebe035ec7ffd808af93ad5cd69329a161dfcef8f6986e1eb79d975ce81c8b7d344403d21ca9bcaa3faafa9e91d1ef50b17cbdf79d35f88fd4cf69926f
-  data.tar.gz: d59f604ca4b6881c928525ea5c8c88f3d07a8dde8899b27ed427223f6102d78c27a59e1cbcb51588e39653221c3c90fceaa758b809ab2d161df8d6bfed3da036
+  metadata.gz: f3141ebe8c68a84ea43a47822f697186a1c03466be28cf20c9c78ce3ec54cb631687d2b847dbe220ea960118a28768495c00699bb1d37bc3c4031c8eb06f0fb2
+  data.tar.gz: 698d19f1b98155df1e1441f372e58becf1af0d4d54d5281565ccd0f213adf1099eb42c2fed79e3690fdc8a5d184b4c36212aa345c61b3d47e73c964cdbe9c214

data/lib/stack_master/cli.rb

@@ -263,7 +263,7 @@ module StackMaster
     def load_config(file)
       stack_file = file || default_config_file
       StackMaster::Config.load!(stack_file)
-    rescue Errno::ENOENT => e
+    rescue Errno::ENOENT
       say "Failed to load config file #{stack_file}"
       @kernel.exit false
     end
@@ -301,7 +301,7 @@ module StackMaster
     end
 
     def show_other_region_candidates(config, stack_name)
-      candidates = config.filter(region = '', stack_name = stack_name)
+      candidates = config.filter('', stack_name = stack_name)
       return if candidates.empty?
 
       StackMaster.stdout.puts "Stack name #{stack_name} exists in regions: #{candidates.map(&:region).join(', ')}"

data/lib/stack_master/commands/tidy.rb

@@ -5,13 +5,10 @@ module StackMaster
       include StackMaster::Commands::TerminalHelper
 
       def perform
-        used_templates = []
-        used_parameter_files = []
-
         templates = Set.new(find_templates)
         parameter_files = Set.new(find_parameter_files)
 
-        status = @config.stacks.each do |stack_definition|
+        @config.stacks.each do |stack_definition|
           parameter_files.subtract(stack_definition.parameter_files_from_globs)
           template = File.absolute_path(stack_definition.template_file_path)
 

data/lib/stack_master/parameter_loader.rb

@@ -1,46 +1,48 @@
 require 'active_support/core_ext/object/deep_dup'
 
 module StackMaster
-  class ParameterLoader
+  module ParameterLoader
     COMPILE_TIME_PARAMETERS_KEY = 'compile_time_parameters'
 
-    def self.load(parameter_files: [], parameters: {})
-      StackMaster.debug 'Searching for parameter files...'
-      all_parameters = parameter_files.map { |file_name| load_parameters(file_name) } + [parameters]
-      all_parameters.each_with_object({ template_parameters: {}, compile_time_parameters: {} }) do |parameters, hash|
-        template_parameters = create_template_parameters(parameters)
-        compile_time_parameters = create_compile_time_parameters(parameters)
-
-        merge_and_camelize(hash[:template_parameters], template_parameters)
-        merge_and_camelize(hash[:compile_time_parameters], compile_time_parameters)
+    class << self
+      def load(parameter_files: [], parameters: {})
+        StackMaster.debug 'Searching for parameter files...'
+        all_parameters = parameter_files.map { |file_name| load_parameters(file_name) } + [parameters]
+        all_parameters.each_with_object({ template_parameters: {}, compile_time_parameters: {} }) do |parameters, hash|
+          template_parameters = create_template_parameters(parameters)
+          compile_time_parameters = create_compile_time_parameters(parameters)
+
+          merge_and_camelize(hash[:template_parameters], template_parameters)
+          merge_and_camelize(hash[:compile_time_parameters], compile_time_parameters)
+        end
       end
-    end
 
-    private
+      private
 
-    def self.load_parameters(file_name)
-      file_exists = File.exist?(file_name)
-      StackMaster.debug file_exists ? "  #{file_name} found" : "  #{file_name} not found"
-      file_exists ? load_file(file_name) : {}
-    end
+      def load_parameters(file_name)
+        file_exists = File.exist?(file_name)
+        StackMaster.debug file_exists ? "  #{file_name} found" : "  #{file_name} not found"
+        file_exists ? load_file(file_name) : {}
+      end
 
-    def self.load_file(file_name)
-      YAML.load(File.read(file_name)) || {}
-    end
+      def load_file(file_name)
+        YAML.load(File.read(file_name)) || {}
+      end
 
-    def self.create_template_parameters(parameters)
-      parameters.deep_dup.tap do |parameters_clone|
-        parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY) ||
-          parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY.camelize)
+      def create_template_parameters(parameters)
+        parameters.deep_dup.tap do |parameters_clone|
+          parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY) ||
+            parameters_clone.delete(COMPILE_TIME_PARAMETERS_KEY.camelize)
+        end
       end
-    end
 
-    def self.create_compile_time_parameters(parameters)
-      (parameters[COMPILE_TIME_PARAMETERS_KEY] || parameters[COMPILE_TIME_PARAMETERS_KEY.camelize] || {}).deep_dup
-    end
+      def create_compile_time_parameters(parameters)
+        (parameters[COMPILE_TIME_PARAMETERS_KEY] || parameters[COMPILE_TIME_PARAMETERS_KEY.camelize] || {}).deep_dup
+      end
 
-    def self.merge_and_camelize(hash, parameters)
-      parameters.each { |key, value| hash[key.camelize] = value }
+      def merge_and_camelize(hash, parameters)
+        parameters.each { |key, value| hash[key.camelize] = value }
+      end
     end
   end
 end

data/lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb

@@ -10,7 +10,7 @@ module StackMaster
       end
 
       def resolve(value)
-        filters = @ami_finder.build_filters_from_string(value, prefix = 'tag')
+        filters = @ami_finder.build_filters_from_string(value, 'tag')
         @ami_finder.find_latest_ami(filters)&.image_id
       end
     end

data/lib/stack_master/parameter_resolvers/latest_container.rb

@@ -37,7 +37,7 @@ module StackMaster
       def fetch_images(repository_name, registry_id, ecr)
         images = []
         next_token = nil
-        while resp = ecr.describe_images(
+        while (resp = ecr.describe_images(
           {
             repository_name: repository_name,
             registry_id: registry_id,
@@ -46,7 +46,7 @@ module StackMaster
               tag_status: 'TAGGED'
             }
           }
-        )
+        ))
 
           images += resp.image_details
           next_token = resp.next_token

data/lib/stack_master/sparkle_formation/template_file.rb

@@ -61,5 +61,5 @@ module StackMaster
   end
 end
 
-SparkleFormation::SparkleAttribute::Aws.send(:include, StackMaster::SparkleFormation::UserDataFile)
-SparkleFormation::SparkleAttribute::Aws.send(:include, StackMaster::SparkleFormation::JoinedFile)
+SparkleFormation::SparkleAttribute::Aws.include StackMaster::SparkleFormation::UserDataFile
+SparkleFormation::SparkleAttribute::Aws.include StackMaster::SparkleFormation::JoinedFile

data/lib/stack_master/stack_differ.rb

@@ -96,7 +96,7 @@ module StackMaster
 
     def noecho_keys
       if @current_stack
-        @current_stack.parameters_with_defaults.select do |key, value|
+        @current_stack.parameters_with_defaults.select do |_key, value|
           value == '****'
         end.keys
       else

data/lib/stack_master/template_compiler.rb

@@ -10,7 +10,7 @@ module StackMaster
                  end
       compiler.require_dependencies
       compiler.compile(template_dir, template, compile_time_parameters, compiler_options)
-    rescue StandardError => e
+    rescue StandardError
       raise TemplateCompilationFailed, "Failed to compile #{template}"
     end
 

data/lib/stack_master/template_compilers/sparkle_formation.rb

@@ -3,80 +3,82 @@ require 'stack_master/sparkle_formation/compile_time/definitions_validator'
 require 'stack_master/sparkle_formation/compile_time/state_builder'
 
 module StackMaster::TemplateCompilers
-  class SparkleFormation
+  module SparkleFormation
     CompileTime = StackMaster::SparkleFormation::CompileTime
 
-    def self.require_dependencies
-      require 'sparkle_formation'
-      require 'stack_master/sparkle_formation/template_file'
-    end
+    class << self
+      def require_dependencies
+        require 'sparkle_formation'
+        require 'stack_master/sparkle_formation/template_file'
+      end
 
-    def self.compile(template_dir, template, compile_time_parameters, compiler_options = {})
-      sparkle_template = compile_sparkle_template(template_dir, template, compiler_options)
-      definitions = sparkle_template.parameters
-      validate_definitions(definitions)
-      validate_parameters(definitions, compile_time_parameters)
+      def compile(template_dir, template, compile_time_parameters, compiler_options = {})
+        sparkle_template = compile_sparkle_template(template_dir, template, compiler_options)
+        definitions = sparkle_template.parameters
+        validate_definitions(definitions)
+        validate_parameters(definitions, compile_time_parameters)
 
-      sparkle_template.compile_time_parameter_setter do
-        sparkle_template.compile_state = create_state(definitions, compile_time_parameters)
+        sparkle_template.compile_time_parameter_setter do
+          sparkle_template.compile_state = create_state(definitions, compile_time_parameters)
+        end
+
+        JSON.pretty_generate(sparkle_template.dump)
       end
 
-      JSON.pretty_generate(sparkle_template.dump)
-    end
+      private
+
+      def compile_sparkle_template(template_dir, template, compiler_options)
+        sparkle_path =
+          if compiler_options['sparkle_path']
+            File.expand_path(compiler_options['sparkle_path'])
+          else
+            template_dir
+          end
+
+        collection = ::SparkleFormation::SparkleCollection.new
+        root_pack = ::SparkleFormation::Sparkle.new(
+          root: sparkle_path
+        )
+        collection.set_root(root_pack)
+        if compiler_options['sparkle_packs']
+          compiler_options['sparkle_packs'].each do |pack_name|
+            require pack_name
+            pack = ::SparkleFormation::SparklePack.new(name: pack_name)
+            collection.add_sparkle(pack)
+          end
+        end
 
-    private
+        if compiler_options['sparkle_pack_template']
+          unless collection.templates['aws'].include? template
+            raise ArgumentError.new("Template #{template.inspect} not found in any sparkle pack")
+          end
 
-    def self.compile_sparkle_template(template_dir, template, compiler_options)
-      sparkle_path =
-        if compiler_options['sparkle_path']
-          File.expand_path(compiler_options['sparkle_path'])
+          template_file_path = collection.templates['aws'][template].top['path']
         else
-          template_dir
+          template_file_path = File.join(template_dir, template)
         end
 
-      collection = ::SparkleFormation::SparkleCollection.new
-      root_pack = ::SparkleFormation::Sparkle.new(
-        root: sparkle_path
-      )
-      collection.set_root(root_pack)
-      if compiler_options['sparkle_packs']
-        compiler_options['sparkle_packs'].each do |pack_name|
-          require pack_name
-          pack = ::SparkleFormation::SparklePack.new(name: pack_name)
-          collection.add_sparkle(pack)
-        end
+        sparkle_template = compile_template_with_sparkle_path(template_file_path, sparkle_path)
+        sparkle_template.sparkle.apply(collection)
+        sparkle_template
       end
 
-      if compiler_options['sparkle_pack_template']
-        unless collection.templates['aws'].include? template
-          raise ArgumentError.new("Template #{template.inspect} not found in any sparkle pack")
-        end
-
-        template_file_path = collection.templates['aws'][template].top['path']
-      else
-        template_file_path = File.join(template_dir, template)
+      def compile_template_with_sparkle_path(template_path, sparkle_path)
+        ::SparkleFormation.sparkle_path = sparkle_path
+        ::SparkleFormation.compile(template_path, :sparkle)
       end
 
-      sparkle_template = compile_template_with_sparkle_path(template_file_path, sparkle_path)
-      sparkle_template.sparkle.apply(collection)
-      sparkle_template
-    end
-
-    def self.compile_template_with_sparkle_path(template_path, sparkle_path)
-      ::SparkleFormation.sparkle_path = sparkle_path
-      ::SparkleFormation.compile(template_path, :sparkle)
-    end
-
-    def self.validate_definitions(definitions)
-      CompileTime::DefinitionsValidator.new(definitions).validate
-    end
+      def validate_definitions(definitions)
+        CompileTime::DefinitionsValidator.new(definitions).validate
+      end
 
-    def self.validate_parameters(definitions, compile_time_parameters)
-      CompileTime::ParametersValidator.new(definitions, compile_time_parameters).validate
-    end
+      def validate_parameters(definitions, compile_time_parameters)
+        CompileTime::ParametersValidator.new(definitions, compile_time_parameters).validate
+      end
 
-    def self.create_state(definitions, compile_time_parameters)
-      CompileTime::StateBuilder.new(definitions, compile_time_parameters).build
+      def create_state(definitions, compile_time_parameters)
+        CompileTime::StateBuilder.new(definitions, compile_time_parameters).build
+      end
     end
 
     StackMaster::TemplateCompiler.register(:sparkle_formation, self)

data/lib/stack_master/test_driver/cloud_formation.rb

@@ -192,7 +192,7 @@ module StackMaster
         @stacks.delete(stack_name)
       end
 
-      def validate_template(options)
+      def validate_template(_options)
         true
       end
 

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = '2.18.0'
+  VERSION = '2.19.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -173,7 +173,7 @@ dependencies:
         version: 4.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ dependencies:
         version: 4.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-acm
   requirement: !ruby/object:Gem::Requirement
@@ -623,8 +623,8 @@ metadata:
   allowed_push_host: https://rubygems.org
   bug_tracker_uri: https://github.com/envato/stack_master/issues
   changelog_uri: https://github.com/envato/stack_master/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/stack_master/2.18.0
-  source_code_uri: https://github.com/envato/stack_master/tree/v2.18.0
+  documentation_uri: https://www.rubydoc.info/gems/stack_master/2.19.0
+  source_code_uri: https://github.com/envato/stack_master/tree/v2.19.0
 rdoc_options: []
 require_paths:
 - lib
@@ -639,7 +639,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.16
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track
   of Amazon (AWS) CloudFormation stacks.