firespring_dev_commands 2.1.37.pre.alpha.1 → 2.2.1.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 949e0ea37725fa34286ed8c9a5c4712da3de87f290df3188a2eab503efa8fc9f
-  data.tar.gz: 6a8328a0d4286c45ef14ae1becaef4ec9799220fe65e8928ad585fb700d83a94
+  metadata.gz: 6b28be62e65a274b5dc6b3ac1476d926c6d1c9232a845a31279ca5f03d626a5d
+  data.tar.gz: 57ecb8d254a210ecc99b787577a58ea9e00fb761df350990fd9607c757ee71e6
 SHA512:
-  metadata.gz: f2dd84cb2b3d791a6ff5964b2beee0be31ab59fce94bce2b403b32e844a95509659a438cfc0486cff9406b340973c98feb0982849997b23962ea691f01c27b04
-  data.tar.gz: 228848de11d5bf71e563f57a3204d390cad1b04bbf2c09e8af399a64545eba3485acc41ba918df7d00b688b87ad9605883f207852c2a4a4f2e2ac7d62880ee46
+  metadata.gz: 5c8a062464820475012a32d643b62e68fba662fa6e1e0d87e5b5658d08916922000f62d35cd92708c8bdb765b382c08bf5f8dd64f7f4cb175591ec635f33e09e
+  data.tar.gz: 051f0483014854cc8bb4644c734b5b5b6171c5ec4dfd720f359c6b6c7e7b9d1beedcaae8975d8a65377be04b9f4e2393d2fa7bcc2af6a3df09da6a503cccf1aa

data/lib/firespring_dev_commands/common.rb

@@ -7,7 +7,7 @@ module Dev
     # By default, the subshell is connected to the stdin/stdout/stderr of the current program
     # By default, the current environment is passed to the subshell
     # You can capture the output of the command by setting capture to true
-    def run_command(command, stdin: $stdin, stdout: $stdout, stderr: $stderr, env: ENV, capture: false)
+    def run_command(command, stdin: $stdin, stdout: $stdout, stderr: $stderr, env: ENV, capture: false, fail_on_error: true)
       command = Array(command)
       output = nil
 
@@ -31,7 +31,7 @@ module Dev
       unless result.exitstatus.zero?
         puts output if capture
         LOG.error "#{result.exitstatus} exit status while running [ #{command.join(' ')} ]\n".red
-        exit result.exitstatus
+        exit result.exitstatus if fail_on_error
       end
 
       output

data/lib/firespring_dev_commands/eol/node.rb

@@ -0,0 +1,37 @@
+module Dev
+  class EndOfLife
+    class Node
+      attr_reader :node, :lockfile
+
+      def initialize(node = Dev::Node.new)
+        @node = node
+        @lockfile = File.join(node.local_path, "#{node.package_file.reverse.split('.')[-1].reverse}-lock.json")
+      end
+
+      def default_products
+        npm_products
+      end
+
+      def npm_products
+        eol = Dev::EndOfLife.new
+        major_version_only_products = %w(ckeditor vue jquery)
+
+        [].tap do |ary|
+          packages = JSON.parse(File.read(lockfile))&.fetch('packages', [])
+          packages.each do |key, info|
+            name = key.split('node_modules/').last
+            product = name
+
+            # Make sure what we found is supported by the EOL library
+            next unless eol.product?(product)
+
+            version = info['version'].reverse.split('.')[-2..].join('.').reverse.tr('v', '')
+            version = version.split('.').first if major_version_only_products.include?(product)
+            version.chop! if version.end_with?('.00')
+            ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/eol/php.rb

@@ -0,0 +1,45 @@
+module Dev
+  class EndOfLife
+    class Php
+      attr_reader :php, :lockfile
+
+      def initialize(php = Dev::Php.new)
+        @php = php
+        @lockfile = File.join(php.local_path, "#{php.package_file.reverse.split('.')[-1].reverse}.lock")
+      end
+
+      def default_products
+        composer_products
+      end
+
+      def composer_products
+        eol = Dev::EndOfLife.new
+        major_version_only_products = ['laravel']
+        laravel_products = ['laravel/framework']
+        symfony_products = ['symfony/http-client', 'symfony/mailer', 'symfony/mailchimp-mailer']
+
+        [].tap do |ary|
+          packages = JSON.parse(File.read(lockfile))&.fetch('packages', [])
+          packages&.each do |package|
+            name = package['name']
+            product = if laravel_products.include?(name)
+                        'laravel'
+                      elsif symfony_products.include?(name)
+                        'symfony'
+                      else
+                        name
+                      end
+
+            # Make sure what we found is supported by the EOL library
+            next unless eol.product?(product)
+
+            version = package['version'].reverse.split('.')[-2..].join('.').reverse.tr('v', '')
+            version = version.split('.').first if major_version_only_products.include?(product)
+            version.chop! if version.end_with?('.00')
+            ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/eol/ruby.rb

@@ -0,0 +1,37 @@
+module Dev
+  class EndOfLife
+    class Ruby
+      attr_reader :ruby, :lockfile
+
+      def initialize(ruby = Dev::Ruby.new)
+        @ruby = ruby
+        @lockfile = File.join(ruby.local_path, "#{ruby.package_file.reverse.split('.')[-1].reverse}.lock")
+      end
+
+      def default_products
+        composer_products
+      end
+
+      def composer_products
+        eol = Dev::EndOfLife.new
+        major_version_only_products = []
+
+        [].tap do |ary|
+          packages = Bundler::LockfileParser.new(Bundler.read_file(lockfile)).specs
+          packages.each do |package|
+            name = package.name
+            product = name
+
+            # Make sure what we found is supported by the EOL library
+            next unless eol.product?(product)
+
+            version = package.version.to_s.reverse.split('.')[-2..].join('.').reverse.tr('v', '')
+            version = version.split('.').first if major_version_only_products.include?(product)
+            version.chop! if version.end_with?('.00')
+            ary << Dev::EndOfLife::ProductVersion.new(product, version, name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/eol.rb

@@ -46,8 +46,18 @@ module Dev
       @products
     end
 
+    # Returns true if the given product is supported either in the endoflife api products or a manual product
+    def product?(product)
+      products.include?(product) || self.class.config.manual_dates.any? { |key, _| key.to_s.start_with?("#{product}_") }
+    end
+
     # Prints all of the product version statuses
     def status
+      if product_versions.empty?
+        puts '  no tracked products'
+        return
+      end
+
       product_versions.sort_by(&:name).each(&:print_status)
     end
 

data/lib/firespring_dev_commands/git.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'git'
-require 'octokit'
 
 module Dev
   # Class for performing git functions
@@ -97,7 +96,8 @@ module Dev
     def branch_name(dir: default_project_dir)
       return unless File.exist?(dir)
 
-      ::Git.open(dir).current_branch
+      g = ::Git.open(dir)
+      g.current_branch || "HEAD detached at #{g.object('HEAD').sha[0..7]}"
     end
 
     # Returns true if the remote branch exists, false otherwise
@@ -425,22 +425,6 @@ module Dev
       g.fetch('origin', prune: true)
     end
 
-    def commit_status(repository:, branch:, status:, organization: 'firespring', options: {})
-      token = ENV['GITHUB_TOKEN'].to_s.strip
-      raise 'GITHUB_TOKEN is required' unless token
-
-      # Set up the GitHub client
-      client = Octokit::Client.new(access_token: token)
-
-      # Fetch the latest commit SHA for the given branch
-      repo = "#{organization}/#{repository}"
-      ref = "heads/#{branch}"
-      sha = client.ref(repo, ref).object.sha
-
-      # Create the commit status
-      client.create_status(repo, sha, 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/templates/aws.rb

@@ -101,7 +101,6 @@ 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'
 
           task eol: [:'eol:aws'] do
             # This is just a placeholder to execute the dependencies
@@ -110,12 +109,16 @@ module Dev
           namespace :eol do
             desc 'Compares the current date to the EOL date for supported aws resources'
             task aws: %w(init ensure_aws_credentials) do
+              next if ENV.fetch('CHECK_AWS', nil).to_s.strip == 'false'
+
+              aws_products = Dev::EndOfLife::Aws.new.default_products
+              next if aws_products.empty?
+
+              puts
               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
+              puts "AWS product versions (in account #{account_name} / #{account_id})".light_yellow
+              Dev::EndOfLife.new(product_versions: aws_products).status
             end
           end
         end

data/lib/firespring_dev_commands/templates/base_interface.rb

@@ -47,14 +47,14 @@ end
 # Create the base init command
 DEV_COMMANDS_TOP_LEVEL.instance_eval do
   task :init do
-    LOG.debug 'In base init'
+    # Default Base Init method
   end
 end
 
 # Create the base init_docker command
 DEV_COMMANDS_TOP_LEVEL.instance_eval do
   task init_docker: %w(init) do
-    LOG.debug 'In base init docker'
+    # Default Base Init Docker method
   end
 end
 

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

@@ -163,6 +163,33 @@ module Dev
               end
             end
           end
+
+          # Create the rake task for the node eol method
+          def create_eol_task!
+            # Have to set a local variable to be accessible inside of the instance_eval block
+            exclude = @exclude
+            node = @node
+
+            DEV_COMMANDS_TOP_LEVEL.instance_eval do
+              return if exclude.include?(:eol)
+
+              task eol: [:'eol:node'] do
+                # This is just a placeholder to execute the dependencies
+              end
+
+              namespace :eol do
+                desc 'Compares the current date to the EOL date for supported packages in the node package file'
+                task node: %w(init) do
+                  eol = Dev::EndOfLife::Node.new(node)
+                  node_products = eol.default_products
+
+                  puts
+                  puts "Node product versions (in #{eol.lockfile})".light_yellow
+                  Dev::EndOfLife.new(product_versions: node_products).status
+                end
+              end
+            end
+          end
         end
       end
     end

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

@@ -210,6 +210,33 @@ module Dev
               end
             end
           end
+
+          # Create the rake task for the php eol method
+          def create_eol_task!
+            # Have to set a local variable to be accessible inside of the instance_eval block
+            exclude = @exclude
+            php = @php
+
+            DEV_COMMANDS_TOP_LEVEL.instance_eval do
+              return if exclude.include?(:eol)
+
+              task eol: [:'eol:php'] do
+                # Thie is just a placeholder to execute the dependencies
+              end
+
+              namespace :eol do
+                desc 'Compares the current date to the EOL date for supported packages in the php package file'
+                task php: %w(init) do
+                  eol = Dev::EndOfLife::Php.new(php)
+                  php_products = eol.default_products
+
+                  puts
+                  puts "Php product versions (in #{eol.lockfile})".light_yellow
+                  Dev::EndOfLife.new(product_versions: php_products).status
+                end
+              end
+            end
+          end
         end
       end
     end

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

@@ -163,6 +163,33 @@ module Dev
               end
             end
           end
+
+          # Create the rake task for the ruby eol method
+          def create_eol_task!
+            # Have to set a local variable to be accessible inside of the instance_eval block
+            exclude = @exclude
+            ruby = @ruby
+
+            DEV_COMMANDS_TOP_LEVEL.instance_eval do
+              return if exclude.include?(:eol)
+
+              task eol: [:'eol:ruby'] do
+                # This is just a placeholder to execute the dependencies
+              end
+
+              namespace :eol do
+                desc 'Compares the current date to the EOL date for supported packages in the ruby package file'
+                task ruby: %w(init) do
+                  eol = Dev::EndOfLife::Ruby.new(ruby)
+                  ruby_products = eol.default_products
+
+                  puts
+                  puts "Ruby product versions (in #{eol.lockfile})".light_yellow
+                  Dev::EndOfLife.new(product_versions: ruby_products).status
+                end
+              end
+            end
+          end
         end
       end
     end

data/lib/firespring_dev_commands/templates/eol.rb

@@ -15,7 +15,13 @@ 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.status
+            manual_products = Dev::EndOfLife.new.product_versions
+            next if manual_products.empty?
+
+            puts
+            puts 'Manual product versions'
+            Dev::EndOfLife.new(product_versions: manual_products).status
+            puts
           end
         end
       end

data/lib/firespring_dev_commands/templates/git.rb

@@ -159,49 +159,6 @@ module Dev
           end
         end
       end
-
-      # Create the rake task for the git commit status task.
-      def create_commit_status_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)
-
-            # TODO: Clean, comments and description
-            desc 'Add status to commit' \
-                 "\n\tuse TODO"
-
-            task :create_commit_status do
-              # Key Values
-              repository = ENV['REPOSITORY'].to_s.strip
-              branch = ENV['BRANCH'].to_s.strip
-              status = ENV['STATUS'].to_s.strip
-
-              raise 'Repository name is required' unless repository
-              raise 'Branch name is required' unless branch
-              raise 'Status is required' unless status
-
-              # Validate status
-              valid_statuses = %w(error failure pending success)
-              raise "Invalid status: #{status}. Valid statuses are: #{valid_statuses.join(', ')}" unless valid_statuses.include?(status)
-
-              # Optional Values
-              context = ENV['CONTEXT'].to_s.strip
-              description = ENV['DESCRIPTION'].to_s.strip
-              target_url = ENV['TARGET_URL'].to_s.strip
-
-              options = {}
-              options[:context] = context unless context.empty?
-              options[:description] = description unless description.empty?
-              options[:target_url] = target_url unless target_url.empty?
-
-              Dev::Git.new.commit_status(repository:, branch:, status:, options:)
-            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.1.37.pre.alpha.1'.freeze
+    VERSION = '2.2.1.pre.alpha.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.37.pre.alpha.1
+  version: 2.2.1.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-10 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
@@ -389,7 +361,10 @@ files:
 - lib/firespring_dev_commands/env.rb
 - lib/firespring_dev_commands/eol.rb
 - lib/firespring_dev_commands/eol/aws.rb
+- lib/firespring_dev_commands/eol/node.rb
+- lib/firespring_dev_commands/eol/php.rb
 - lib/firespring_dev_commands/eol/product_version.rb
+- lib/firespring_dev_commands/eol/ruby.rb
 - lib/firespring_dev_commands/git.rb
 - lib/firespring_dev_commands/git/info.rb
 - lib/firespring_dev_commands/jira.rb