firespring_dev_commands 2.1.27.pre.alpha.1 → 2.1.27.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f810ca7ab797bb1ec56674b67d42de056d5f88cd95a8e9c45b67d26a3570d19
-  data.tar.gz: 487bdc8a74717f11bb48b5b81a33093fde87ddb2b44d97cdf84a0372e3b93627
+  metadata.gz: 74cb8d292f6a24d8229db1785ba9911e31b88a73dd102fb192266ed12834cdfb
+  data.tar.gz: 533e6747c1b5262c3a417f4bff11297dc9401fb116cd3c4dc142c3b1c0e13540
 SHA512:
-  metadata.gz: 212273f4a640214bf8001c12419f33bb6dc621dc37a29b95e75d06c5b5e4bd3f7b7231c003cd032ed1be1c2dc0667d3474fb74892a7577ddd57eca248d96ab09
-  data.tar.gz: 480720fd9de858a1ce969644958e61238e866fef1126fb91909992eca3301275d04fd42df45c1f34a7c5126758172a4c89f7bfc0ea3c1b8e2528816de97dbfba
+  metadata.gz: 525c93fe98d0301a321b1fbfa6c0133be6fdab762943d46d751cb5d50ed8ec59ee563c292afee118c66aa72c71cdd000e4dcff20b82de68aa9c33012c9203252
+  data.tar.gz: 7e8be2aa9d3f174d77a49a70430a7282203beadb12ac3672ccf4e1220a8091084c5a433308d96da413f2212e1f4196ae4a54970635b216d4fe98b7cba60d01f4

data/lib/firespring_dev_commands/certificate.rb

@@ -43,7 +43,7 @@ module Dev
     def save(dest_dir)
       raise "directory #{dest_dir} must be an existing directory" unless File.directory?(dest_dir)
 
-      domain = domains.first.sub(/^\*\./, '')
+      domain = domains.first.sub(/^\*\./, '') # Need to strip off the '*.' if this is a wildcard cert
       directories = Dir.glob("/etc/letsencrypt/live/#{domain}*/")
       no_suffix = directories.delete("/etc/letsencrypt/live/#{domain}/")
       biggest_suffix = directories.max

data/lib/firespring_dev_commands/common.rb

@@ -187,5 +187,14 @@ 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)
+      string = " #{string} " unless string.strip.empty?
+      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/docker.rb

@@ -144,7 +144,7 @@ module Dev
       puts "\nPulling #{name}:#{tag}"
       opts = {
         fromImage: "#{name}:#{tag}",
-        platform: Dev::Common::Platform.new.architecture
+        platform: Dev::Platform.new.architecture
       }
       ::Docker::Image.create(**opts) { |response| Dev::Docker::Status.new.response_callback(response) }
     end

data/lib/firespring_dev_commands/eol.rb

@@ -46,13 +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
-      product_versions.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,10 +113,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} (#{original_branches[project_dir]}) "
-        puts center_pad(header).light_green
+        header = "#{repo_basename} (#{original_branches[project_dir]})"
+        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
 
@@ -165,10 +165,10 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} (#{original_branches[project_dir]}) "
-        puts center_pad(header).light_green
+        header = "#{repo_basename} (#{original_branches[project_dir]})"
+        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
@@ -191,10 +191,9 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= checkout(branch, dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -285,10 +284,9 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= merge(branch, dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -334,10 +332,9 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= pull(dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -373,10 +370,9 @@ module Dev
         next unless File.exist?(project_dir)
 
         repo_basename = File.basename(File.realpath(project_dir))
-        header = " #{repo_basename} "
-        puts center_pad(header).light_green
+        puts Dev::Common.new.center_pad(repo_basename).light_green
         @success &= push(dir: project_dir)
-        puts center_pad.light_green
+        puts Dev::Common.new.center_pad.light_green
       end
       puts
 
@@ -439,11 +435,10 @@ module Dev
     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)
-      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)
+      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

data/lib/firespring_dev_commands/platform.rb

@@ -1,40 +1,33 @@
 module Dev
-  class Common
-    # Class which returns information about the current platform
-    class Platform
-      # Constant containing all supported architectures
-      ALLOWED_ARCHITECTURES = %w(arm64 amd64).freeze
+  # Class which returns information about the current platform
+  class Platform
+    # Constant containing all supported architectures
+    ALLOWED_ARCHITECTURES = %w(linux/arm64 linux/amd64).freeze
 
-      # Normalize the ruby platform to return a docker platform architecture format
-      def determine_compute_architecture
-        case RUBY_PLATFORM
-        when /x86_64|amd64|x64-mingw/
-          'linux/amd64' # 64-bit Intel/AMD architecture
-        when /arm|aarch64/
-          'linux/arm64' # ARM architecture
-        else
-          raise 'Unknown or unsupported architecture'
-        end
-      end
+    # If an architecture was specified in the ENV, use that. Otherwise auto-deted based of the OS reported architecture
+    def architecture
+      arch = env_architecture || os_architecture
+      raise "Invalid DOCKER_ARCHITECTURE: #{arch} (allowed are #{ALLOWED_ARCHITECTURES.join(', ')})" unless ALLOWED_ARCHITECTURES.include?(arch)
 
-      # Determine the platform architecture
-      # If one was specified in the DOCKER_ARCHITECTURE variable, use it
-      # Otherwise, use the RUBY_PLATFORM built-in to auto-detect and architecture
-      def architecture
-        docker_architecture = ENV['DOCKER_ARCHITECTURE'].to_s.strip.downcase
-        if docker_architecture.empty?
-          determine_compute_architecture
-        else
-          raise "Missing 'linux/' prefix in DOCKER_ARCHITECTURE: #{docker_architecture}" unless docker_architecture.start_with?('linux/')
+      arch
+    end
+
+    # Check to see if a docker architecture has been specified in the ENV
+    # If it has, verify the format and the value
+    private def env_architecture
+      arch = ENV['DOCKER_ARCHITECTURE'].to_s.strip.downcase
+      return nil if arch.empty?
+
+      "linux/#{arch}" unless arch.start_with?('linux/')
+      arch
+    end
 
-          architecture_name = docker_architecture.split('/')[1]
-          unless ALLOWED_ARCHITECTURES.include?(architecture_name)
-            raise "Invalid DOCKER_ARCHITECTURE: #{architecture_name}. Allowed architectures are #{ALLOWED_ARCHITECTURES.join(', ')}"
-          end
+    # Returns a valid docker architecture based off the RUBY_PLATFORM
+    private def os_architecture
+      return 'linux/amd64' if RUBY_PLATFORM.match?(/x86_64|amd64|x64-mingw/)
+      return 'linux/arm64' if RUBY_PLATFORM.match?(/arm|aarch64/)
 
-          docker_architecture
-        end
-      end
+      raise 'Unknown or unsupported architecture'
     end
   end
 end

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

@@ -101,14 +101,22 @@ module Dev
 
         DEV_COMMANDS_TOP_LEVEL.instance_eval do
           return if exclude.include?(:eol)
+          return if ENV.fetch('CHECK_AWS', nil).to_s.strip == 'false'
 
-          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
+          task eol: [:'eol:aws'] do
+            # This is just a placeholder to execute the dependencies
+          end
 
-            Dev::EndOfLife.new(product_versions: Dev::EndOfLife::Aws.new.default_products).check
+          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
       end

data/lib/firespring_dev_commands/templates/certificate.rb

@@ -4,10 +4,10 @@ module Dev
   module Template
     # Class contains rake templates for managing configured certificates
     class Certificate < Dev::Template::BaseInterface
-      attr_reader :names, :email, :paths
+      attr_reader :domains, :email, :paths
 
-      def initialize(names, email:, paths:, exclude: [])
-        @names = names
+      def initialize(domains, email:, paths:, exclude: [])
+        @domains = domains
         @email = email
         @paths = Array(paths)
 
@@ -17,7 +17,7 @@ module Dev
       # Create the rake task for the generate method
       def create_generate_task!
         # Have to set a local variable to be accessible inside of the instance_eval block
-        names = @names
+        domains = @domains
         email = @email
         paths = @paths
         exclude = @exclude
@@ -29,7 +29,7 @@ module Dev
             desc 'Requests a new certificate for the configured domain using the route53 validation and deposits it in the configured paths'
             task generate: %w(init_docker ensure_aws_credentials) do
               Dev::Docker.new.pull_image('certbot/dns-route53', 'latest')
-              c = Dev::Certificate.new(names, email)
+              c = Dev::Certificate.new(domains, email)
               c.request
               paths.each { |path| c.save(path) }
             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,9 +12,10 @@ 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
+            Dev::EndOfLife.new.status
           end
         end
       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.27.pre.alpha.1'.freeze
+    VERSION = '2.1.27.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.27.pre.alpha.1
+  version: 2.1.27.pre.alpha.3
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport