firespring_dev_commands 2.1.26.pre.alpha.3 → 2.1.26.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85fa03c8d3741894c226c3ea8b84616eebb28287ba855d4da44a242370200de
-  data.tar.gz: 8468adbf7fa2821686d14cce1efd1c083e1a732471ae90330c49f9e566af7c43
+  metadata.gz: 63e2a31f96bc3e440c404c63414e94fc30f7a00bfc120f8375b60297ee2e1ffa
+  data.tar.gz: 5f9f3e37d9c51930359adefb194906c325152dc239b52bb8b281b35f4fa287f2
 SHA512:
-  metadata.gz: 3abd512246b31b86a045d84b19cddc4f0a193e0c76701dc26b19fa44b10b19a97aa054f2b29ee47d4d692c71e67e25c621a432825d8d1d14581ad14c237a7d83
-  data.tar.gz: 3cb0d1738d5ff0ad5a5e45e2af5371ca45c8ceeb2e55d9fdcbba7f29b4e91fa5cbfaa4989f20a966a2674f4d5fa920c2d1b0f2f387707bc3c2499ebbd61c8e2a
+  metadata.gz: 73d72bd8822cb2547109d02a6ae5b5c41dfd9396d1bf8a3b7f330eb34b86f1f1ef9f1c2ad3e2c01b0a38cc9fa1347355ed7b91000978b43a1e94b599bb4972a5
+  data.tar.gz: 461631bb28facb7d699ae86f2dd6cf119da3946a7b4d38533b6a366d7e567b6a71cfdcfb4547f3622bb8c41e9f9e4dd726c82a1f5d7a298b218b2d4bd65a6d97

data/lib/firespring_dev_commands/common.rb

@@ -190,6 +190,7 @@ module Dev
 
     # Center the string and pad on either side with the given padding character
     def center_pad(string = '', pad: '-', len: 80)
+      string = " #{string} " unless string.strip.empty?
       center_dash = len / 2
       string = string.to_s
       center_str = string.length / 2

data/lib/firespring_dev_commands/eol.rb

@@ -5,9 +5,8 @@ module Dev
     END_OF_LIFE_API_URL = 'https://endoflife.date/api'.freeze
 
     # Config object for setting top level git config options
-    Config = Struct.new(:check_aws_resources, :product_versions, :manual_dates) do
+    Config = Struct.new(:product_versions, :manual_dates) do
       def initialize
-        self.check_aws_resources = false
         self.product_versions = []
         self.manual_dates = {}
       end
@@ -27,10 +26,9 @@ module Dev
       alias_method :configure, :config
     end
 
-    attr_accessor :url, :products, :check_aws_resources, :product_versions
+    attr_accessor :url, :products, :product_versions
 
-    def initialize(check_aws_resources: self.class.config.check_aws_resources, product_versions: self.class.config.product_versions)
-      @check_aws_resources = check_aws_resources
+    def initialize(product_versions: self.class.config.product_versions)
       @product_versions = Array(product_versions)
       raise 'product version must be of type Dev::EndOfLife::ProductVersions' unless @product_versions.all?(Dev::EndOfLife::ProductVersion)
     end
@@ -48,20 +46,23 @@ module Dev
       @products
     end
 
+    # Prints all of the product version statuses
+    def status
+      product_versions.sort_by(&:name).each(&:print_status)
+    end
+
+    # Returns true if any of the products are EOL
+    def eol?
+      product_versions.any?(&:eol)
+    end
+
     # Prints all of the product version statuses
     # Raises an error if any products are EOL
     def check
       puts
-      checks_to_perform = product_versions.clone
-      if check_aws_resources
-        account_id = Dev::Aws::Profile.new.current
-        account_name = Dev::Aws::Account.new.name_by_account(account_id)
-        LOG.info "  Current AWS Account is #{account_name} (#{account_id})\n".light_yellow
-        checks_to_perform.concat(Dev::EndOfLife::Aws.new.default_products)
-      end
-      checks_to_perform.sort_by(&:name).each(&:print_status)
+      status
       puts
-      raise 'found EOL versions' if product_versions.any?(&:eol)
+      raise 'found EOL versions' if eol?
     end
   end
 end

data/lib/firespring_dev_commands/git.rb

@@ -113,7 +113,7 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} (#{original_branches[project_dir]}) "
+        header = "#{repo_basename} (#{original_branches[project_dir]})"
         puts Dev::Common.new.center_pad(header).light_green
         @success &= status(dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
@@ -165,7 +165,7 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} (#{original_branches[project_dir]}) "
+        header = "#{repo_basename} (#{original_branches[project_dir]})"
         puts Dev::Common.new.center_pad(header).light_green
         reset(dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
@@ -191,8 +191,7 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts Dev::Common.new.center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= checkout(branch, dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
       end
@@ -285,8 +284,7 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts Dev::Common.new.center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= merge(branch, dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
       end
@@ -334,8 +332,7 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts Dev::Common.new.center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= pull(dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
       end
@@ -373,8 +370,7 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts Dev::Common.new.center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= push(dir: project_dir)
         puts Dev::Common.new.center_pad.light_green
       end
@@ -438,6 +434,13 @@ module Dev
       string.to_s.split("\n").each { |line| puts "#{padding}#{line}" }
     end
 
+    # Center the string and pad on either side with the given padding character
+    # @deprecated Please use {Dev::Common#center_pad} instead
+    def center_pad(string = '', pad: '-', len: 80)
+      warn '[DEPRECATION] `Dev::Git#center_pad` is deprecated. Please use `Dev::Common#center_pad` instead.'
+      Dev::Common.new.center_pad(string, pad:, len:)
+    end
+
     # Exclude the command from the message and print all error lines
     private def print_errors(message)
       indent message.split('error:')[1..].join

data/lib/firespring_dev_commands/templates/aws.rb

@@ -94,19 +94,28 @@ module Dev
       end
       # rubocop:enable Metrics/MethodLength
 
-      # Set the EOL library to also check AWS resources
+      # Create the rake task for the eol method
       def create_eol_task!
-        return if exclude.include?(:eol)
+        # Have to set a local variable to be accessible inside of the instance_eval block
+        exclude = @exclude
 
-        Dev::EndOfLife.config do |c|
-          env_check = ENV.fetch('CHECK_AWS', nil).to_s.strip
-          if env_check == 'false'
-            c.check_aws_resources = false
-          else
-            c.check_aws_resources = true
+        DEV_COMMANDS_TOP_LEVEL.instance_eval do
+          return if exclude.include?(:eol)
+          return if ENV.fetch('CHECK_AWS', nil).to_s.strip == 'false'
+
+          task eol: [:'eol:aws'] do
+            # This is just a placeholder to execute the dependencies
+          end
 
-            task eol: %w(ensure_aws_credentials) do
-              # Require the user is logged in to aws since those resources will be checked
+          namespace :eol do
+            desc 'Compares the current date to the EOL date for supported aws resources'
+            task aws: %w(init ensure_aws_credentials) do
+              account_id = Dev::Aws::Profile.new.current
+              account_name = Dev::Aws::Account.new.name_by_account(account_id)
+              LOG.info "  Current AWS Account is #{account_name} (#{account_id})".light_yellow
+              puts
+              Dev::EndOfLife.new(product_versions: Dev::EndOfLife::Aws.new.default_products).status
+              puts
             end
           end
         end

data/lib/firespring_dev_commands/templates/eol.rb

@@ -15,7 +15,7 @@ module Dev
           desc 'Compares the current date to the EOL date for all configured projects' \
                "\n\toptionally specify CHECK_AWS=<true/false> to toggle whether AWS resources are checked for EOL (defaults to true)"
           task eol: %w(init) do
-            Dev::EndOfLife.new.check
+            Dev::EndOfLife.new.status
           end
         end
       end

data/lib/firespring_dev_commands/version.rb

@@ -6,6 +6,6 @@ module Dev
     # Use 'v.v.v.pre.alpha.v' for pre-release vesions
     # Use 'v.v.v.beta.v for beta versions
     # Use semantic versioning for any releases (https://semver.org/)
-    VERSION = '2.1.26.pre.alpha.3'.freeze
+    VERSION = '2.1.26.pre.alpha.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.26.pre.alpha.3
+  version: 2.1.26.pre.alpha.4
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport