Skip to content

Commit a55a548

Browse files
committed
RuboCop: resolve Style/StringLiterals issues
1 parent 0e4d84b commit a55a548

82 files changed

Lines changed: 432 additions & 513 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.rubocop_todo.yml

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -602,92 +602,6 @@ Style/StringConcatenation:
602602
- 'spec/stack_master/commands/compile_spec.rb'
603603
- 'spec/stack_master/template_utils_spec.rb'
604604

605-
# This cop supports safe autocorrection (--autocorrect).
606-
# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
607-
# SupportedStyles: single_quotes, double_quotes
608-
Style/StringLiterals:
609-
Exclude:
610-
- 'Rakefile'
611-
- 'bin/stack_master'
612-
- 'example/simple/templates/myapp_vpc.rb'
613-
- 'example/simple/templates/myapp_web.rb'
614-
- 'features/step_definitions/parameter_store_steps.rb'
615-
- 'features/support/env.rb'
616-
- 'lib/stack_master.rb'
617-
- 'lib/stack_master/aws_driver/s3.rb'
618-
- 'lib/stack_master/change_set.rb'
619-
- 'lib/stack_master/cli.rb'
620-
- 'lib/stack_master/commands/apply.rb'
621-
- 'lib/stack_master/commands/delete.rb'
622-
- 'lib/stack_master/commands/drift.rb'
623-
- 'lib/stack_master/commands/init.rb'
624-
- 'lib/stack_master/commands/lint.rb'
625-
- 'lib/stack_master/commands/status.rb'
626-
- 'lib/stack_master/commands/terminal_helper.rb'
627-
- 'lib/stack_master/commands/tidy.rb'
628-
- 'lib/stack_master/config.rb'
629-
- 'lib/stack_master/diff.rb'
630-
- 'lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb'
631-
- 'lib/stack_master/parameter_resolvers/latest_container.rb'
632-
- 'lib/stack_master/parameter_resolvers/one_password.rb'
633-
- 'lib/stack_master/prompter.rb'
634-
- 'lib/stack_master/role_assumer.rb'
635-
- 'lib/stack_master/security_group_finder.rb'
636-
- 'lib/stack_master/sns_topic_finder.rb'
637-
- 'lib/stack_master/stack_definition.rb'
638-
- 'lib/stack_master/stack_differ.rb'
639-
- 'lib/stack_master/validator.rb'
640-
- 'lib/stack_master/version.rb'
641-
- 'spec/fixtures/sparkle_pack_integration/my_sparkle_pack/lib/sparkleformation/dynamics/my_dynamic.rb'
642-
- 'spec/fixtures/sparkle_pack_integration/my_sparkle_pack/lib/sparkleformation/templates/dynamics/local_dynamic.rb'
643-
- 'spec/fixtures/templates/rb/cfndsl/sample-ctp-repeated.rb'
644-
- 'spec/fixtures/templates/rb/cfndsl/sample-ctp.rb'
645-
- 'spec/fixtures/templates/rb/cfndsl/sample.rb'
646-
- 'spec/fixtures/templates/rb/sparkle_formation/templates/template.rb'
647-
- 'spec/integration/drift_spec.rb'
648-
- 'spec/spec_helper.rb'
649-
- 'spec/stack_master/aws_driver/s3_spec.rb'
650-
- 'spec/stack_master/commands/apply_spec.rb'
651-
- 'spec/stack_master/commands/compile_spec.rb'
652-
- 'spec/stack_master/commands/delete_spec.rb'
653-
- 'spec/stack_master/commands/drift_spec.rb'
654-
- 'spec/stack_master/commands/init_spec.rb'
655-
- 'spec/stack_master/commands/lint_spec.rb'
656-
- 'spec/stack_master/commands/nag_spec.rb'
657-
- 'spec/stack_master/commands/status_spec.rb'
658-
- 'spec/stack_master/commands/validate_spec.rb'
659-
- 'spec/stack_master/config_spec.rb'
660-
- 'spec/stack_master/parameter_loader_spec.rb'
661-
- 'spec/stack_master/parameter_resolver_spec.rb'
662-
- 'spec/stack_master/parameter_resolvers/ami_finder_spec.rb'
663-
- 'spec/stack_master/parameter_resolvers/ejson_spec.rb'
664-
- 'spec/stack_master/parameter_resolvers/latest_container_spec.rb'
665-
- 'spec/stack_master/parameter_resolvers/one_password_spec.rb'
666-
- 'spec/stack_master/parameter_resolvers/parameter_store_spec.rb'
667-
- 'spec/stack_master/parameter_resolvers/security_group_spec.rb'
668-
- 'spec/stack_master/parameter_resolvers/security_groups_spec.rb'
669-
- 'spec/stack_master/parameter_resolvers/stack_output_spec.rb'
670-
- 'spec/stack_master/parameter_validator_spec.rb'
671-
- 'spec/stack_master/security_group_finder_spec.rb'
672-
- 'spec/stack_master/sparkle_formation/template_file_spec.rb'
673-
- 'spec/stack_master/sso_group_id_finder_spec.rb'
674-
- 'spec/stack_master/stack_definition_spec.rb'
675-
- 'spec/stack_master/stack_differ_spec.rb'
676-
- 'spec/stack_master/stack_events/presenter_spec.rb'
677-
- 'spec/stack_master/stack_events/streamer_spec.rb'
678-
- 'spec/stack_master/stack_spec.rb'
679-
- 'spec/stack_master/template_compiler_spec.rb'
680-
- 'spec/stack_master/template_compilers/cfndsl_spec.rb'
681-
- 'spec/stack_master/template_compilers/json_spec.rb'
682-
- 'spec/stack_master/template_compilers/sparkle_formation_spec.rb'
683-
- 'spec/stack_master/template_utils_spec.rb'
684-
- 'spec/stack_master/test_driver/cloud_formation_spec.rb'
685-
- 'spec/stack_master/utils_spec.rb'
686-
- 'spec/stack_master/validator_spec.rb'
687-
- 'spec/stack_master_spec.rb'
688-
- 'spec/support/aws_stubs.rb'
689-
- 'stack_master.gemspec'
690-
691605
# This cop supports unsafe autocorrection (--autocorrect-all).
692606
# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
693607
# AllowedMethods: define_method

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ The format is based on [Keep a Changelog], and this project adheres to
1010

1111
## [Unreleased]
1212

13+
### Changed
14+
15+
- Resolve style issues identified by RuboCop ([#396])
16+
1317
[Unreleased]: https://github.com/envato/stack_master/compare/v2.17.1...HEAD
18+
[#396]: https://github.com/envato/stack_master/pull/396
1419

1520
## [2.17.1] - 2025-12-19
1621

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require "bundler/gem_tasks"
1+
require 'bundler/gem_tasks'
22
require 'bundler/setup'
33

44
task :environment do
@@ -19,7 +19,7 @@ begin
1919

2020
require 'rspec/core/rake_task'
2121
RSpec::Core::RakeTask.new(:spec) do |t|
22-
t.rspec_opts = "--format doc"
22+
t.rspec_opts = '--format doc'
2323
end
2424

2525
require 'rubocop/rake_task'

bin/stack_master

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ require 'stack_master'
44

55
require 'stack_master/testing' if ENV['STUB_AWS'] == 'true'
66

7-
trap("SIGINT") { raise StackMaster::CtrlC }
7+
trap('SIGINT') { raise StackMaster::CtrlC }
88

99
begin
1010
StackMaster::CLI.new(ARGV.dup).execute!
1111
rescue StackMaster::CtrlC
12-
StackMaster.stdout.puts "Exiting..."
12+
StackMaster.stdout.puts 'Exiting...'
1313
end

example/simple/templates/myapp_vpc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SparkleFormation.new(:myapp_vpc) do
2-
description "A test VPC template"
2+
description 'A test VPC template'
33

44
resources.vpc do
55
type 'AWS::EC2::VPC'

example/simple/templates/myapp_web.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SparkleFormation.new(:myapp_web) do
2-
description "Test web template"
2+
description 'Test web template'
33

44
parameters.vpc_id do
55
description 'VPC ID'

features/step_definitions/parameter_store_steps.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
parameter: {
77
name: parameter_name,
88
value: parameter_value,
9-
type: "SecureString",
9+
type: 'SecureString',
1010
version: 1
1111
}
1212
}

features/support/env.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
Timecop.return
2323
end
2424

25-
lib = File.join(File.dirname(__FILE__), "../../spec/fixtures/sparkle_pack_integration/my_sparkle_pack/lib")
25+
lib = File.join(File.dirname(__FILE__), '../../spec/fixtures/sparkle_pack_integration/my_sparkle_pack/lib')
2626
$LOAD_PATH << lib

lib/stack_master.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def skip_account_check?
172172
@non_interactive_answer = 'y'
173173

174174
def base_dir
175-
File.expand_path(File.join(File.dirname(__FILE__), ".."))
175+
File.expand_path(File.join(File.dirname(__FILE__), '..'))
176176
end
177177

178178
def cloud_formation_driver

lib/stack_master/aws_driver/s3.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ def upload_files(bucket: nil, prefix: nil, region: nil, files: {})
2828
h.merge(obj.key => obj)
2929
end
3030

31-
StackMaster.stdout.puts "Uploading files to S3:"
31+
StackMaster.stdout.puts 'Uploading files to S3:'
3232

3333
files.each do |template, file|
3434
body = file.fetch(:body)
3535
path = file.fetch(:path)
3636
object_key = template.dup
3737
object_key.prepend("#{prefix}/") if prefix
3838
compiled_template_md5 = Digest::MD5.hexdigest(body).to_s
39-
s3_md5 = current_objects[object_key] ? current_objects[object_key].etag.gsub("\"", '') : nil
39+
s3_md5 = current_objects[object_key] ? current_objects[object_key].etag.gsub('"', '') : nil
4040

4141
next if compiled_template_md5 == s3_md5
4242

@@ -51,14 +51,14 @@ def upload_files(bucket: nil, prefix: nil, region: nil, files: {})
5151
metadata: { md5: compiled_template_md5 }
5252
}
5353
)
54-
StackMaster.stdout.puts "done."
54+
StackMaster.stdout.puts 'done.'
5555
end
5656
end
5757

5858
def url(bucket:, prefix:, region:, template:)
5959
if region == 'us-east-1'
60-
["https://s3.amazonaws.com", bucket, prefix, template].compact.join('/')
61-
elsif region.start_with? "cn-"
60+
['https://s3.amazonaws.com', bucket, prefix, template].compact.join('/')
61+
elsif region.start_with? 'cn-'
6262
["https://s3.#{region}.amazonaws.com.cn", bucket, prefix, template].compact.join('/')
6363
else
6464
["https://s3-#{region}.amazonaws.com", bucket, prefix, template].compact.join('/')

0 commit comments

Comments
 (0)