RuboCop: resolve Layout/* issues

Author: orien

.rubocop_todo.yml

@@ -10,7 +10,12 @@ The format is based on [Keep a Changelog], and this project adheres to
 
 ## [Unreleased]
 
+### Changed
+
+- Resolve layout issues identified by RuboCop ([#393])
+
 [Unreleased]: https://github.com/envato/stack_master/compare/v2.17.0...HEAD
+[#393]: https://github.com/envato/stack_master/pull/393
 
 ## [2.17.0] - 2025-07-11
 

CHANGELOG.md

@@ -14,7 +14,7 @@ end
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "features --format pretty"
+    t.cucumber_opts = %w[features --format pretty]
   end
 
   require 'rspec/core/rake_task'

Rakefile

@@ -1,7 +1,11 @@
 Then(/^I expect the role "([^"]*)" is assumed in account "([^"]*)"$/) do |role, account|
-  expect(Aws::AssumeRoleCredentials).to receive(:new).with({
-    region: instance_of(String),
-    role_arn: "arn:aws:iam::#{account}:role/#{role}",
-    role_session_name: instance_of(String)
-  })
+  expect(Aws::AssumeRoleCredentials)
+    .to receive(:new)
+    .with(
+      {
+        region: instance_of(String),
+        role_arn: "arn:aws:iam::#{account}:role/#{role}",
+        role_session_name: instance_of(String)
+      }
+    )
 end

features/step_definitions/asume_role_steps.rb

@@ -1,4 +1,5 @@
-Given(/^(?:a|the) SSM parameter(?: named)? "([^"]*)" with value "([^"]*)" in region "([^"]*)"$/) do |parameter_name, parameter_value, parameter_region|
+Given(/^(?:a|the)\ SSM\ parameter(?:\ named)?\ "([^"]*)"
+  \ with\ value\ "([^"]*)"\ in\ region\ "([^"]*)"$/x) do |parameter_name, parameter_value, parameter_region|
   Aws.config[:ssm] = {
     stub_responses: {
       get_parameter: {

features/step_definitions/parameter_store_steps.rb

@@ -28,7 +28,6 @@ def extract_hash_from_kv_string(string)
   end
 end
 
-
 Given(/^I stub the following stacks:$/) do |table|
   table.hashes.each do |row|
     row.symbolize_keys!
@@ -62,7 +61,9 @@ def extract_hash_from_kv_string(string)
 end
 
 Given(/^I stub CloudFormation validate calls to fail validation with message "([^"]*)"$/) do |message|
-  allow(StackMaster.cloud_formation_driver).to receive(:validate_template).and_raise(Aws::CloudFormation::Errors::ValidationError.new('', message))
+  allow(StackMaster.cloud_formation_driver)
+    .to receive(:validate_template)
+    .and_raise(Aws::CloudFormation::Errors::ValidationError.new('', message))
 end
 
 Given(/^I stub the CloudFormation driver$/) do

features/step_definitions/stack_steps.rb

@@ -140,6 +140,7 @@ def debug?
 
   def debug(message)
     return unless debug?
+
     stderr.puts Rainbow("[DEBUG] #{message}").color(:green)
   end
 
@@ -167,6 +168,7 @@ def skip_account_check?
   end
 
   attr_accessor :non_interactive_answer
+
   @non_interactive_answer = 'y'
 
   def base_dir

lib/stack_master.rb

@@ -14,31 +14,33 @@ def set_region(value)
         end
       end
 
-      def_delegators :cf, :create_change_set,
-                          :describe_change_set,
-                          :execute_change_set,
-                          :delete_change_set,
-                          :delete_stack,
-                          :cancel_update_stack,
-                          :describe_stack_resources,
-                          :get_template,
-                          :get_stack_policy,
-                          :set_stack_policy,
-                          :describe_stack_events,
-                          :update_stack,
-                          :create_stack,
-                          :validate_template,
-                          :describe_stacks,
-                          :detect_stack_drift,
-                          :describe_stack_drift_detection_status,
-                          :describe_stack_resource_drifts
+      def_delegators(
+        :cf,
+        :create_change_set,
+        :describe_change_set,
+        :execute_change_set,
+        :delete_change_set,
+        :delete_stack,
+        :cancel_update_stack,
+        :describe_stack_resources,
+        :get_template,
+        :get_stack_policy,
+        :set_stack_policy,
+        :describe_stack_events,
+        :update_stack,
+        :create_stack,
+        :validate_template,
+        :describe_stacks,
+        :detect_stack_drift,
+        :describe_stack_drift_detection_status,
+        :describe_stack_resource_drifts
+      )
 
       private
 
       def cf
         @cf ||= Aws::CloudFormation::Client.new({ region: region, retry_limit: 10 })
       end
-
     end
   end
 end

lib/stack_master/aws_driver/cloud_formation.rb

@@ -11,16 +11,20 @@ def set_region(region)
       end
 
       def upload_files(bucket: nil, prefix: nil, region: nil, files: {})
-        raise StackMaster::AwsDriver::S3ConfigurationError, 'A bucket must be specified in order to use S3' unless bucket
+        unless bucket
+          raise StackMaster::AwsDriver::S3ConfigurationError, 'A bucket must be specified in order to use S3'
+        end
 
         return if files.empty?
 
         s3 = new_s3_client(region: region)
 
-        current_objects = s3.list_objects({
-          prefix: prefix,
-          bucket: bucket
-        }).map(&:contents).flatten.inject({}){|h,obj|
+        current_objects = s3.list_objects(
+          {
+            prefix: prefix,
+            bucket: bucket
+          }
+        ).map(&:contents).flatten.inject({}) { |h, obj|
           h.merge(obj.key => obj)
         }
 
@@ -35,15 +39,18 @@ def upload_files(bucket: nil, prefix: nil, region: nil, files: {})
           s3_md5 = current_objects[object_key] ? current_objects[object_key].etag.gsub("\"", '') : nil
 
           next if compiled_template_md5 == s3_md5
+
           s3_uri = "s3://#{bucket}/#{object_key}"
           StackMaster.stdout.print "- #{File.basename(path)} => #{s3_uri} "
 
-          s3.put_object({
-            bucket: bucket,
-            key: object_key,
-            body: body,
-            metadata: { md5: compiled_template_md5 }
-          })
+          s3.put_object(
+            {
+              bucket: bucket,
+              key: object_key,
+              body: body,
+              metadata: { md5: compiled_template_md5 }
+            }
+          )
           StackMaster.stdout.puts "done."
         end
       end

lib/stack_master/aws_driver/s3.rb

@@ -42,15 +42,15 @@ def initialize(describe_change_set_response)
     end
 
     def display(io)
-      io.puts <<-EOL
+      io.puts <<~EOL
 
-========================================
-Proposed change set:
-EOL
+        ========================================
+        Proposed change set:
+      EOL
       @response.changes.each do |change|
         display_resource_change(io, change.resource_change)
       end
-io.puts "========================================"
+      io.puts "========================================"
     end
 
     def failed?