Merge pull request #318 from envato/require-core-ext

Fewer ActiveSupport core extensions

CHANGELOG.md

@@ -12,6 +12,9 @@ The format is based on [Keep a Changelog], and this project adheres to
 
 ### Changed
 
+- Load fewer Ruby files: remove several ActiveSupport core extensions and
+  Rubygems `require`s ([#318]).
+
 ### Fixed
 
 - `stack_master apply` prints list of parameter file locations if no stack
@@ -23,6 +26,7 @@ The format is based on [Keep a Changelog], and this project adheres to
 [Unreleased]: https://github.com/envato/stack_master/compare/v2.2.0...HEAD
 [#316]: https://github.com/envato/stack_master/pull/316
 [#317]: https://github.com/envato/stack_master/pull/317
+[#318]: https://github.com/envato/stack_master/pull/318
 
 ## [2.2.0]
 
@@ -53,6 +57,7 @@ The format is based on [Keep a Changelog], and this project adheres to
 [2.2.0]: https://github.com/envato/stack_master/compare/v2.1.0...v2.2.0
 [#248]: https://github.com/envato/stack_master/issues/248
 [#310]: https://github.com/envato/stack_master/pull/310
+[#312]: https://github.com/envato/stack_master/pull/312
 [#313]: https://github.com/envato/stack_master/pull/313
 [#314]: https://github.com/envato/stack_master/pull/314
 [#315]: https://github.com/envato/stack_master/pull/315

bin/stack_master

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'stack_master'
 
 if ENV['STUB_AWS'] == 'true'

lib/stack_master.rb

@@ -8,7 +8,9 @@
 require 'aws-sdk-sns'
 require 'aws-sdk-ssm'
 require 'colorize'
-require 'active_support/core_ext/string'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/inflections'
 require 'multi_json'
 
 MultiJson.use :json_gem

lib/stack_master/parameter_resolvers/latest_ami.rb

@@ -12,7 +12,7 @@ def resolve(value)
         owners = Array(value.fetch('owners', 'self').to_s)
         ami_finder = AmiFinder.new(@stack_definition.region)
         filters = ami_finder.build_filters_from_hash(value.fetch('filters'))
-        ami_finder.find_latest_ami(filters, owners).try(:image_id)
+        ami_finder.find_latest_ami(filters, owners)&.image_id
       end
     end
   end

lib/stack_master/parameter_resolvers/latest_ami_by_tags.rb

@@ -11,7 +11,7 @@ def initialize(config, stack_definition)
 
       def resolve(value)
         filters = @ami_finder.build_filters_from_string(value, prefix = "tag")
-        @ami_finder.find_latest_ami(filters).try(:image_id)
+        @ami_finder.find_latest_ami(filters)&.image_id
       end
     end
   end

lib/stack_master/sparkle_formation/template_file.rb

@@ -71,7 +71,7 @@ def format
             newlines = lines.split("\n").map do |line|
               "#{line}#{newlines.pop}"
             end
-            if lines.starts_with?("\n")
+            if lines.start_with?("\n")
               newlines.insert(0, "\n")
             end
             newlines