firespring_dev_commands 2.2.1.pre.alpha.4 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88b6624e61a9b925a68bcba5d681a07934dfb893df3a2b3015ab589bdb08d9e
-  data.tar.gz: 65ead36c027f263b188eabf9532d7a4d56024013aceef93502c14997d973d409
+  metadata.gz: b60fb9f23da32fe3006bd63627788753dc822b14d16782e253ecdfe3e516ae12
+  data.tar.gz: 94e3b4fc79749292e56e9db5de9f170def61c64e154daa11ef66e8bdbc4049cf
 SHA512:
-  metadata.gz: 0fda12454259b1364ef6561b63a03f8bec741ab92d04d2ecf34d6ef1eef21ea7a4bbf058368d8277b07734ba307f89c1d28893c37ab243f891500daa7a0d3846
-  data.tar.gz: c820bf2ecc04f71928accebeb6a1561d676cd06fbef5b5e3a889fee15218bc049b378ff9d749cfed21a8775457cd555901979a1a2439812fa1eb3df0ae2546ba
+  metadata.gz: 5a53e1b2ffd61b54eabf8ad81559054dec6fd40f9023ebf22ec27aea56cc9c3cd884cc329d0055b133da54792e77bce23ea44119fceb67e87493e8e80d5e25af
+  data.tar.gz: 10237fa32a8c41d9a9b9c7196d7ded272d5ec4c36ad2cb2d789956acb33ed66a70388d4368b4ac2ed2fc5024aca91381d682cb1ef9f73b226ee5a1c88a44e0bd

data/lib/firespring_dev_commands/eol/node.rb

@@ -1,5 +1,6 @@
 module Dev
   class EndOfLife
+    # Class which checks for eol packges referenced by the node package manager
     class Node
       attr_reader :node, :lockfile
 
@@ -8,10 +9,14 @@ module Dev
         @lockfile = File.join(node.local_path, "#{node.package_file.reverse.split('.')[-1].reverse}-lock.json")
       end
 
+      # Default to NPM products
       def default_products
         npm_products
       end
 
+      # 1.) Parse the npm lock file
+      # 2.) Do some package name and version manipulation
+      # 3.) Return the product if it looks like something that the EOL library tracks
       def npm_products
         eol = Dev::EndOfLife.new
         major_version_only_products = %w(ckeditor vue jquery)

data/lib/firespring_dev_commands/eol/php.rb

@@ -1,5 +1,6 @@
 module Dev
   class EndOfLife
+    # Class which checks for eol packges referenced by the php package manager
     class Php
       attr_reader :php, :lockfile
 
@@ -8,10 +9,14 @@ module Dev
         @lockfile = File.join(php.local_path, "#{php.package_file.reverse.split('.')[-1].reverse}.lock")
       end
 
+      # Default to Composer products
       def default_products
         composer_products
       end
 
+      # 1.) Parse the composer lock file
+      # 2.) Do some package name and version manipulation
+      # 3.) Return the product if it looks like something that the EOL library tracks
       def composer_products
         eol = Dev::EndOfLife.new
         major_version_only_products = ['laravel']

data/lib/firespring_dev_commands/eol/ruby.rb

@@ -1,5 +1,6 @@
 module Dev
   class EndOfLife
+    # Class which checks for eol packges referenced by the ruby package manager
     class Ruby
       attr_reader :ruby, :lockfile
 
@@ -8,11 +9,15 @@ module Dev
         @lockfile = File.join(ruby.local_path, "#{ruby.package_file.reverse.split('.')[-1].reverse}.lock")
       end
 
+      # Default to Rubygems products
       def default_products
-        composer_products
+        rubygems_products
       end
 
-      def composer_products
+      # 1.) Parse the rubygems lock file
+      # 2.) Do some package name and version manipulation
+      # 3.) Return the product if it looks like something that the EOL library tracks
+      def rubygems_products
         eol = Dev::EndOfLife.new
         major_version_only_products = []
 

data/lib/firespring_dev_commands/git.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'git'
-require 'octokit'
 
 module Dev
   # Class for performing git functions
@@ -409,10 +408,7 @@ module Dev
     # Clones the repo_name into the dir
     # Optionally specify a repo_org
     # Optionally specify a branch to check out (defaults to the repository default branch)
-    def clone_repo(dir:, repo_name:, repo_org: nil, branch: nil, depth: nil)
-      # TODO: Split out the default of 'firespring' into a configuration variable
-      repo_org = 'firespring' if repo_org.to_s.strip.empty?
-
+    def clone_repo(dir:, repo_name:, repo_org: 'firespring', branch: nil, depth: nil)
       if Dir.exist?("#{dir}/.git")
         puts "#{dir} already cloned".light_green
         return
@@ -429,19 +425,6 @@ module Dev
       g.fetch('origin', prune: true)
     end
 
-    def commit_status(token:, repo_name:, commit_id:, status:, repo_org: nil, options: {})
-      # TODO: Split out the default of 'firespring' into a configuration variable
-      repo_org = 'firespring' if repo_org.to_s.strip.empty?
-      repo = "#{repo_org}/#{repo_name}"
-
-      # Set up the GitHub client
-      client = Octokit::Client.new(access_token: token)
-
-      # Create the commit status
-      puts "Tagging commit #{commit_id} in #{repo} as #{status} for #{options[:context]}"
-      client.create_status(repo, commit_id, status, options)
-    end
-
     # Builds an ssh repo URL using the org and repo name given
     def ssh_repo_url(name, org)
       "git@github.com:#{org}/#{name}.git"

data/lib/firespring_dev_commands/php/audit.rb

@@ -16,6 +16,10 @@ module Dev
       def to_report
         Dev::Audit::Report.new(
           data['advisories'].map do |_, v|
+            # If there are multiple advisories for the same package, v changes from an array into a hash
+            v = v.values if v.is_a?(Hash)
+
+            # Iterate over the advisories and turn them into report items
             v.map do |it|
               Dev::Audit::Report::Item.new(
                 id: it['advisoryId'],

data/lib/firespring_dev_commands/templates/aws.rb

@@ -18,6 +18,22 @@ module Dev
         end
       end
 
+      # Create the rake task which shows the current AWS account information
+      def create_show_account_info_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
+          return if exclude.include?(:show_account_info)
+
+          task show_account_info: %w(init ensure_aws_credentials) do
+            account_id = Dev::Aws::Credentials.new.logged_in_account
+            account_name = Dev::Aws::Account.new.name_by_account(account_id)
+            LOG.info "\n  Current AWS Account is #{account_name} (#{account_id})\n".light_yellow
+          end
+        end
+      end
+
       # Create the rake task for the aws profile method
       def create_profile_task!
         # Have to set a local variable to be accessible inside of the instance_eval block

data/lib/firespring_dev_commands/templates/ci.rb

@@ -20,15 +20,17 @@ module Dev
           # Have to set a local variable to be accessible inside of the instance_eval block
           exclude = @exclude
           cloudformations = @cloudformations
-          return if exclude.include?(:status)
+          return if exclude.include?(:create)
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
             namespace :ci do
               desc 'Create the ci cloudformation stack in aws'
-              task create: %w(init ensure_aws_credentials) do
-                LOG.info
+              task create: %w(init ensure_aws_credentials show_account_info) do
                 next if cloudformations.empty?
 
+                names = cloudformations.map(&:name).join(', ')
+                Dev::Common.new.exit_unless_confirmed("  This will create the #{names} pipelines. Continue?")
+
                 # Start create on all stacks without waiting so they are created in parallel
                 cloudformations.each do |cloudformation|
                   next if cloudformation.exist?
@@ -53,15 +55,17 @@ module Dev
           # Have to set a local variable to be accessible inside of the instance_eval block
           exclude = @exclude
           cloudformations = @cloudformations
-          return if exclude.include?(:status)
+          return if exclude.include?(:update)
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
             namespace :ci do
               desc 'Update the ci cloudformation stack in aws'
-              task update: %w(init ensure_aws_credentials) do
-                LOG.info
+              task update: %w(init ensure_aws_credentials show_account_info) do
                 next if cloudformations.empty?
 
+                names = cloudformations.map(&:name).join(', ')
+                Dev::Common.new.exit_unless_confirmed("  This will update the #{names} pipelines. Continue?")
+
                 # Start update on all stacks without waiting so they are updated in parallel
                 cloudformations.each do |cloudformation|
                   next unless cloudformation.exist?
@@ -86,15 +90,17 @@ module Dev
           # Have to set a local variable to be accessible inside of the instance_eval block
           exclude = @exclude
           cloudformations = @cloudformations
-          return if exclude.include?(:status)
+          return if exclude.include?(:delete)
 
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
             namespace :ci do
               desc 'Delete the ci cloudformation stack in aws'
-              task delete: %w(init ensure_aws_credentials) do
-                LOG.info
+              task delete: %w(init ensure_aws_credentials show_account_info) do
                 next if cloudformations.empty?
 
+                names = cloudformations.map(&:name).join(', ')
+                Dev::Common.new.exit_unless_confirmed("  This will delete the #{names} pipelines. Continue?")
+
                 # Start delete on all stacks without waiting so they are deleted in parallel
                 cloudformations.each do |cloudformation|
                   next unless cloudformation.exist?
@@ -124,8 +130,7 @@ module Dev
           DEV_COMMANDS_TOP_LEVEL.instance_eval do
             namespace :ci do
               desc 'Show the current status of the pipelines associated with your branch'
-              task status: %w(init ensure_aws_credentials) do
-                LOG.info
+              task status: %w(init ensure_aws_credentials show_account_info) do
                 next if cloudformations.empty?
 
                 pattern = /#{cloudformations.map(&:name).join('|')}/

data/lib/firespring_dev_commands/templates/git.rb

@@ -159,154 +159,6 @@ module Dev
           end
         end
       end
-
-      # Create the rake task for the git commit status pending task.
-      def create_commit_status_pending_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?(:commit_status)
-
-            namespace :commit_status do
-              desc 'Add pending status to commit' \
-                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
-                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
-                   "\n\tuse COMMIT_ID=abc123 to specify the commit id of code (required)" \
-                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
-                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
-              task :pending do
-                status = 'pending'
-                token = ENV['GITHUB_TOKEN'].to_s.strip
-                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
-                commit_id = ENV['COMMIT_ID'].to_s.strip
-
-                raise 'GITHUB_TOKEN is required' unless token
-                raise 'REPOSITORY is required' unless repo_name
-                raise 'COMMIT_ID is required' unless commit_id
-
-                options = {}
-                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
-                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
-
-                Dev::Git.new.commit_status(token:, repo_name:, commit_id:, status:, repo_org:, options:)
-              end
-            end
-          end
-        end
-      end
-
-      # Create the rake task for the git commit status success task.
-      def create_commit_status_success_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?(:commit_status)
-
-            namespace :commit_status do
-              desc 'Add success status to commit' \
-                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
-                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
-                   "\n\tuse COMMIT_ID=abc123 to specify the commit id of code (required)" \
-                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
-                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
-              task :success do
-                status = 'success'
-                token = ENV['GITHUB_TOKEN'].to_s.strip
-                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
-                commit_id = ENV['COMMIT_ID'].to_s.strip
-
-                raise 'GITHUB_TOKEN is required' unless token
-                raise 'REPOSITORY is required' unless repo_name
-                raise 'COMMIT_ID is required' unless commit_id
-
-                options = {}
-                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
-                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
-
-                Dev::Git.new.commit_status(token:, repo_name:, commit_id:, status:, repo_org:, options:)
-              end
-            end
-          end
-        end
-      end
-
-      # Create the rake task for the git commit status error task.
-      def create_commit_status_error_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?(:commit_status)
-
-            namespace :commit_status do
-              desc 'Add error status to commit' \
-                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
-                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
-                   "\n\tuse COMMIT_ID=abc123 to specify the commit id of code (required)" \
-                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
-                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
-              task :error do
-                status = 'error'
-                token = ENV['GITHUB_TOKEN'].to_s.strip
-                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
-                commit_id = ENV['COMMIT_ID'].to_s.strip
-
-                raise 'GITHUB_TOKEN is required' unless token
-                raise 'REPOSITORY is required' unless repo_name
-                raise 'COMMIT_ID is required' unless commit_id
-
-                options = {}
-                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
-                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
-
-                Dev::Git.new.commit_status(token:, repo_name:, commit_id:, status:, repo_org:, options:)
-              end
-            end
-          end
-        end
-      end
-
-      # Create the rake task for the git commit status failure task.
-      def create_commit_status_failure_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?(:commit_status)
-
-            namespace :commit_status do
-              desc 'Add failure status to commit' \
-                   "\n\tuse GITHUB_TOKEN=abc123 enables write options for the check (required)" \
-                   "\n\tuse REPOSITORY=abc123 to specify the repository (required)" \
-                   "\n\tuse COMMIT_ID=abc123 to specify the commit id of code (required)" \
-                   "\n\tuse CONTEXT=abc123 names the check on the PR (optional)" \
-                   "\n\tuse TARGET_URL={url} adds 'detail' hyperlink to check on the PR (optional)"
-              task :failure do
-                status = 'failure'
-                token = ENV['GITHUB_TOKEN'].to_s.strip
-                repo_org, repo_name = ENV['REPOSITORY'].to_s.strip.split('/')
-                commit_id = ENV['COMMIT_ID'].to_s.strip
-
-                raise 'GITHUB_TOKEN is required' unless token
-                raise 'REPOSITORY is required' unless repo_name
-                raise 'COMMIT_ID is required' unless commit_id
-
-                options = {}
-                options[:context] = ENV['CONTEXT'].to_s.strip unless ENV['CONTEXT'].to_s.strip.empty?
-                options[:target_url] = ENV['TARGET_URL'].to_s.strip unless ENV['TARGET_URL'].to_s.strip.empty?
-
-                Dev::Git.new.commit_status(token:, repo_name:, commit_id:, status:, repo_org:, options:)
-              end
-            end
-          end
-        end
-      end
     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.2.1.pre.alpha.4'.freeze
+    VERSION = '2.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.2.1.pre.alpha.4
+  version: 2.2.2
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -220,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.1
-- !ruby/object:Gem::Dependency
-  name: faraday-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -276,20 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
@@ -460,9 +432,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: