firespring_dev_commands 2.1.25 → 2.1.26.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9847230008bd64de5eeb1b3d03dfea4c2222473792e590622b14f4ca6f2918b8
-  data.tar.gz: f076b876953f243f7774e700ae6c88e54ae4773e8421f12bde55c6b8201246ae
+  metadata.gz: e85fa03c8d3741894c226c3ea8b84616eebb28287ba855d4da44a242370200de
+  data.tar.gz: 8468adbf7fa2821686d14cce1efd1c083e1a732471ae90330c49f9e566af7c43
 SHA512:
-  metadata.gz: 287349f25bc4e94967d135d517f2d92790f6470050991f4ff023252f500cf24d1965e138fd06ebcf1b7bb1bc1171845fa82cacb028df65cacc0792f8207837ac
-  data.tar.gz: eb7c1110790eb1dd0c07e2704bd7f1c6887e41361ce5182341748c67461e754a89f51987d719fd6e49f6a84f7f6c7d9425c99ff46b9ff7e6a6d1b4cf82c47252
+  metadata.gz: 3abd512246b31b86a045d84b19cddc4f0a193e0c76701dc26b19fa44b10b19a97aa054f2b29ee47d4d692c71e67e25c621a432825d8d1d14581ad14c237a7d83
+  data.tar.gz: 3cb0d1738d5ff0ad5a5e45e2af5371ca45c8ceeb2e55d9fdcbba7f29b4e91fa5cbfaa4989f20a966a2674f4d5fa920c2d1b0f2f387707bc3c2499ebbd61c8e2a

data/lib/firespring_dev_commands/common.rb

@@ -187,5 +187,13 @@ module Dev
         return false
       end
     end
+
+    # Center the string and pad on either side with the given padding character
+    def center_pad(string = '', pad: '-', len: 80)
+      center_dash = len / 2
+      string = string.to_s
+      center_str = string.length / 2
+      string.rjust(center_dash + center_str - 1, pad).ljust(len - 1, pad)
+    end
   end
 end

data/lib/firespring_dev_commands/eol.rb

@@ -5,8 +5,9 @@ module Dev
     END_OF_LIFE_API_URL = 'https://endoflife.date/api'.freeze
 
     # Config object for setting top level git config options
-    Config = Struct.new(:product_versions, :manual_dates) do
+    Config = Struct.new(:check_aws_resources, :product_versions, :manual_dates) do
       def initialize
+        self.check_aws_resources = false
         self.product_versions = []
         self.manual_dates = {}
       end
@@ -26,9 +27,10 @@ module Dev
       alias_method :configure, :config
     end
 
-    attr_accessor :url, :products, :product_versions
+    attr_accessor :url, :products, :check_aws_resources, :product_versions
 
-    def initialize(product_versions: self.class.config.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
       @product_versions = Array(product_versions)
       raise 'product version must be of type Dev::EndOfLife::ProductVersions' unless @product_versions.all?(Dev::EndOfLife::ProductVersion)
     end
@@ -50,7 +52,14 @@ module Dev
     # Raises an error if any products are EOL
     def check
       puts
-      product_versions.sort_by(&:name).each(&:print_status)
+      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)
       puts
       raise 'found EOL versions' if product_versions.any?(&:eol)
     end

data/lib/firespring_dev_commands/git.rb

@@ -114,9 +114,9 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         header = " #{repo_basename} (#{original_branches[project_dir]}) "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(header).light_green
         @success &= status(dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -166,9 +166,9 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         header = " #{repo_basename} (#{original_branches[project_dir]}) "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(header).light_green
         reset(dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
     end
@@ -192,9 +192,9 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(header).light_green
         @success &= checkout(branch, dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -286,9 +286,9 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(header).light_green
         @success &= merge(branch, dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -335,9 +335,9 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(header).light_green
         @success &= pull(dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -374,9 +374,9 @@ module Dev
 
         repo_basename = File.basename(File.realpath(project_dir))
         header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(header).light_green
         @success &= push(dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -438,14 +438,6 @@ 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
-    def center_pad(string = '', pad: '-', len: 80)
-      center_dash = len / 2
-      string = string.to_s
-      center_str = string.length / 2
-      string.rjust(center_dash + center_str - 1, pad).ljust(len - 1, pad)
-    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/ruby.rb

@@ -90,14 +90,16 @@ module Dev
 
     # Build the bundle lint command
     def lint_command
-      lint = ['rubocop']
+      lint = base_command
+      lint << 'exec' << 'rubocop'
       lint.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint
     end
 
     # Build the bundle lint fix command
     def lint_fix_command
-      lint_fix = ['rubocop']
+      lint_fix = base_command
+      lint_fix << 'exec' << 'rubocop'
       lint_fix << '-A'
       lint_fix.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       lint_fix
@@ -105,7 +107,8 @@ module Dev
 
     # Build the bundle test command
     def test_command
-      test = ['rspec']
+      test = base_command
+      test << 'exec' << 'rspec'
       test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       test
     end

data/lib/firespring_dev_commands/templates/aws.rb

@@ -94,21 +94,20 @@ module Dev
       end
       # rubocop:enable Metrics/MethodLength
 
-      # Create the rake task for the eol method
+      # Set the EOL library to also check AWS resources
       def create_eol_task!
-        # Have to set a local variable to be accessible inside of the instance_eval block
-        exclude = @exclude
+        return if exclude.include?(:eol)
 
-        DEV_COMMANDS_TOP_LEVEL.instance_eval do
-          return if exclude.include?(:eol)
+        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
 
-          desc 'Compares the current date to the EOL date for supported resources'
-          task eol: %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
-
-            Dev::EndOfLife.new(product_versions: Dev::EndOfLife::Aws.new.default_products).check
+            task eol: %w(ensure_aws_credentials) do
+              # Require the user is logged in to aws since those resources will be checked
+            end
           end
         end
       end

data/lib/firespring_dev_commands/templates/docker/node/application.rb

@@ -29,6 +29,7 @@ module Dev
           end
 
           # Create the rake task which runs linting for the application name
+          # rubocop:disable Metrics/MethodLength
           def create_lint_task!
             application = @name
             node = @node
@@ -42,6 +43,13 @@ module Dev
                   # This is just a placeholder to execute the dependencies
                 end
 
+                namespace :lint do
+                  desc 'Run all linting software and apply all available fixes'
+                  task fix: %w(node:lint:fix) do
+                    # This is just a placeholder to execute the dependencies
+                  end
+                end
+
                 namespace :node do
                   desc "Run the node linting software against the #{application}'s codebase"
                   task lint: %w(init_docker up_no_deps) do
@@ -66,6 +74,7 @@ module Dev
               end
             end
           end
+          # rubocop:enable Metrics/MethodLength
 
           # Create the rake task which runs all tests for the application name
           def create_test_task!

data/lib/firespring_dev_commands/templates/docker/php/application.rb

@@ -74,6 +74,7 @@ module Dev
           end
 
           # Create the rake task which runs linting for the application name
+          # rubocop:disable Metrics/MethodLength
           def create_lint_task!
             application = @name
             php = @php
@@ -87,6 +88,13 @@ module Dev
                   # This is just a placeholder to execute the dependencies
                 end
 
+                namespace :lint do
+                  desc 'Run all linting software and apply all available fixes'
+                  task fix: %w(php:lint:fix) do
+                    # This is just a placeholder to execute the dependencies
+                  end
+                end
+
                 namespace :php do
                   desc "Run the php linting software against the #{application}'s codebase"
                   task lint: %w(init_docker up_no_deps) do
@@ -111,6 +119,7 @@ module Dev
               end
             end
           end
+          # rubocop:enable Metrics/MethodLength
 
           # Create the rake task which runs all tests for the application name
           def create_test_task!

data/lib/firespring_dev_commands/templates/docker/ruby/application.rb

@@ -28,6 +28,7 @@ module Dev
           end
 
           # Create the rake task which runs linting for the application name
+          # rubocop:disable Metrics/MethodLength
           def create_lint_task!
             application = @name
             ruby = @ruby
@@ -41,6 +42,13 @@ module Dev
                   # This is just a placeholder to execute the dependencies
                 end
 
+                namespace :lint do
+                  desc 'Run all linting software and apply all available fixes'
+                  task fix: %w(ruby:lint:fix) do
+                    # This is just a placeholder to execute the dependencies
+                  end
+                end
+
                 namespace :ruby do
                   desc "Run the ruby linting software against the #{application}'s codebase"
                   task lint: %w(init_docker up_no_deps) do
@@ -65,6 +73,7 @@ module Dev
               end
             end
           end
+          # rubocop:enable Metrics/MethodLength
 
           # Create the rake task which runs all tests for the application name
           def create_test_task!

data/lib/firespring_dev_commands/templates/eol.rb

@@ -12,7 +12,8 @@ module Dev
         DEV_COMMANDS_TOP_LEVEL.instance_eval do
           return if exclude.include?(:eol)
 
-          desc 'Compares the current date to the EOL date for all configured projects'
+          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
           end

data/lib/firespring_dev_commands/templates/git.rb

@@ -4,6 +4,23 @@ module Dev
   module Template
     # Class contains rake templates for managing your git project
     class Git < Dev::Template::BaseInterface
+      # Create the rake task for cloning all defined repos
+      def create_clone_task!
+        # Have to set a local variable to be accessible inside of the instance_eval block
+        exclude = @exclude
+
+        DEV_COMMANDS_TOP_LEVEL.instance_eval do
+          namespace :git do
+            return if exclude.include?(:clone)
+
+            desc 'Make sure all repos are cloned'
+            task :clone do
+              Dev::Git.new.clone_repos
+            end
+          end
+        end
+      end
+
       # Create the rake task for the git checkout method
       def create_checkout_task!
         # Have to set a local variable to be accessible inside of the instance_eval block

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.25'.freeze
+    VERSION = '2.1.26.pre.alpha.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.25
+  version: 2.1.26.pre.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -409,9 +409,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: