stack_master 2.17.1 → 2.18.0

data/lib/stack_master/stack_differ.rb

@@ -1,5 +1,5 @@
-require "diffy"
-require "hashdiff"
+require 'diffy'
+require 'hashdiff'
 
 module StackMaster
   class StackDiffer
@@ -34,7 +34,7 @@ module StackMaster
       params = @proposed_stack.parameters_with_defaults
       if @current_stack
         noecho_keys.each do |key|
-          params[key] = "****"
+          params[key] = '****'
         end
       end
       YAML.dump(sort_params(params))
@@ -61,20 +61,43 @@ module StackMaster
                                after: proposed_parameters)
     end
 
+    def tags_different?
+      tags_diff.different?
+    end
+
+    def tags_diff
+      @tags_diff ||= Diff.new(name: 'Tags',
+                              before: current_tags,
+                              after: proposed_tags)
+    end
+
+    def current_tags
+      tags_hash = @current_stack&.tags
+      return '' if tags_hash.nil? || tags_hash.empty?
+
+      YAML.dump(sort_params(tags_hash))
+    end
+
+    def proposed_tags
+      tags_hash = @proposed_stack.tags
+      return '' if tags_hash.nil? || tags_hash.empty?
+
+      YAML.dump(sort_params(tags_hash))
+    end
+
     def output_diff
       body_diff.display
       parameters_diff.display
+      tags_diff.display
 
-      unless noecho_keys.empty?
-        StackMaster.stdout.puts " * can not tell if NoEcho parameters are different."
-      end
-      StackMaster.stdout.puts "No stack found" if @current_stack.nil?
+      StackMaster.stdout.puts ' * can not tell if NoEcho parameters are different.' unless noecho_keys.empty?
+      StackMaster.stdout.puts 'No stack found' if @current_stack.nil?
     end
 
     def noecho_keys
       if @current_stack
         @current_stack.parameters_with_defaults.select do |key, value|
-          value == "****"
+          value == '****'
         end.keys
       else
         []
@@ -88,7 +111,7 @@ module StackMaster
       return false if differences.count != 1
 
       diff = differences[0]
-      diff[0] == "~" && diff[1] == param_name
+      diff[0] == '~' && diff[1] == param_name
     end
 
     private

data/lib/stack_master/template_compilers/json.rb

@@ -1,6 +1,6 @@
 module StackMaster::TemplateCompilers
   class Json
-    MAX_TEMPLATE_SIZE = 51200
+    MAX_TEMPLATE_SIZE = 51_200
     private_constant :MAX_TEMPLATE_SIZE
 
     def self.require_dependencies

data/lib/stack_master/template_compilers/sparkle_formation.rb

@@ -36,13 +36,13 @@ module StackMaster::TemplateCompilers
 
       collection = ::SparkleFormation::SparkleCollection.new
       root_pack = ::SparkleFormation::Sparkle.new(
-        :root => sparkle_path,
+        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)
+          pack = ::SparkleFormation::SparklePack.new(name: pack_name)
           collection.add_sparkle(pack)
         end
       end

data/lib/stack_master/template_utils.rb

@@ -1,7 +1,7 @@
 module StackMaster
   module TemplateUtils
-    MAX_TEMPLATE_SIZE = 51200
-    MAX_S3_TEMPLATE_SIZE = 460800
+    MAX_TEMPLATE_SIZE = 51_200
+    MAX_S3_TEMPLATE_SIZE = 460_800
     # Matches if the first non-whitespace character is a '{', handling cases
     # with leading whitespace and extra (whitespace-only) lines.
     JSON_IDENTIFICATION_PATTERN = Regexp.new('\A\s*{', Regexp::MULTILINE)

data/lib/stack_master/test_driver/cloud_formation.rb

@@ -28,6 +28,14 @@ module StackMaster
                          parameter_value: hash[:parameter_value])
         end
       end
+
+      def tags
+        return [] if @tags.nil?
+
+        @tags.map do |hash|
+          OpenStruct.new(key: hash[:key], value: hash[:value])
+        end
+      end
     end
 
     class StackEvent
@@ -139,11 +147,11 @@ module StackMaster
         stack_name = options[:stack_name]
         stacks =
           if stack_name
-            if @stacks[stack_name]
-              [@stacks[stack_name]]
-            else
+            unless @stacks[stack_name]
               raise Aws::CloudFormation::Errors::ValidationError.new('', 'Stack does not exist')
             end
+
+            [@stacks[stack_name]]
           else
             @stacks.values
           end

data/lib/stack_master/test_driver/s3.rb

@@ -5,11 +5,10 @@ module StackMaster
         reset
       end
 
-      def set_region(_)
-      end
+      def set_region(_); end
 
       def reset
-        @files = Hash.new { |hash, key| hash[key] = Hash.new }
+        @files = Hash.new { |hash, key| hash[key] = {} }
       end
 
       def upload_files(bucket: nil, prefix: nil, region: nil, files: {})

data/lib/stack_master/utils.rb

@@ -22,18 +22,16 @@ module StackMaster
     end
 
     def hash_to_aws_parameters(params)
-      params.inject([]) do |params, (key, value)|
+      params.each_with_object([]) do |(key, value), params|
         params << { parameter_key: key, parameter_value: value }
-        params
       end
     end
 
     def hash_to_aws_tags(tags)
       return [] if tags.nil?
 
-      tags.inject([]) do |aws_tags, (key, value)|
+      tags.each_with_object([]) do |(key, value), aws_tags|
         aws_tags << { key: key, value: value }
-        aws_tags
       end
     end
 
@@ -42,9 +40,8 @@ module StackMaster
     end
 
     def underscore_keys_to_hyphen(hash)
-      hash.inject({}) do |hash, (key, value)|
+      hash.each_with_object({}) do |(key, value), hash|
         hash[underscore_to_hyphen(key)] = value
-        hash
       end
     end
   end

data/lib/stack_master/validator.rb

@@ -17,7 +17,7 @@ module StackMaster
         return false
       end
       cf.validate_template(template_body: TemplateUtils.maybe_compressed_template_body(stack.template_body))
-      StackMaster.stdout.puts "valid"
+      StackMaster.stdout.puts 'valid'
       true
     rescue Aws::CloudFormation::Errors::ValidationError => e
       StackMaster.stdout.puts "invalid. #{e.message}"

data/lib/stack_master/version.rb

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

data/lib/stack_master.rb

@@ -172,7 +172,7 @@ module StackMaster
   @non_interactive_answer = 'y'
 
   def base_dir
-    File.expand_path(File.join(File.dirname(__FILE__), ".."))
+    File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end
 
   def cloud_formation_driver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.18.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -616,14 +616,15 @@ files:
 - stacktemplates/parameter_stack_name.yml
 - stacktemplates/stack.json.erb
 - stacktemplates/stack_master.yml.erb
-homepage: https://opensource.envato.com/projects/stack_master.html
+homepage: https://github.com/envato/stack_master
 licenses:
 - MIT
 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.17.1
-  source_code_uri: https://github.com/envato/stack_master/tree/v2.17.1
+  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
 rdoc_options: []
 require_paths:
 - lib
@@ -638,7 +639,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.5
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track
   of Amazon (AWS) CloudFormation stacks.