firespring_dev_commands 2.2.7 → 2.5.0.pre.alpha.1

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

@@ -7,29 +7,15 @@ module Dev
       module Node
         # Class for default rake tasks associated with a node project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :node, :start_container_dependencies_on_test
-
-          # Create the templated rake tasks for the node application
-          #
-          # @param application [String] The name of the application
-          # @param container_path [String] The path to the application inside of the container
-          # @param local_path [String] The path to the application on your local system
-          # @param start_container_dependencies_on_test [Boolean] Whether or not to start up container dependencies when running tests
-          # @param exclude [Array<Symbol>] An array of default template tasks to exclude
-          def initialize(
-            application,
-            container_path: nil,
-            local_path: nil,
-            start_container_dependencies_on_test: true,
-            exclude: []
-          )
+          attr_reader :node
+
+          # Allow for custom container path for the application
+          def initialize(application, container_path: nil, local_path: nil, exclude: [])
             @node = Dev::Node.new(container_path:, local_path:)
-            @start_container_dependencies_on_test = start_container_dependencies_on_test
             super(application, exclude:)
           end
 
           # Create the rake task which runs linting for the application name
-          # rubocop:disable Metrics/MethodLength
           def create_lint_task!
             application = @name
             node = @node
@@ -43,13 +29,6 @@ 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
@@ -74,14 +53,12 @@ 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!
             application = @name
             node = @node
             exclude = @exclude
-            up_cmd = @start_container_dependencies_on_test ? :up : :up_no_deps
             return if exclude.include?(:test)
 
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -93,7 +70,7 @@ module Dev
 
                 namespace :node do
                   desc "Run all node tests against the #{application}'s codebase"
-                  task test: %W(init_docker #{up_cmd}) do
+                  task test: %w(init_docker up) do
                     LOG.debug("Running all node tests in the #{application} codebase")
 
                     options = []
@@ -163,33 +140,6 @@ 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

@@ -1,4 +1,5 @@
 require_relative '../../base_interface'
+require 'securerandom'
 
 module Dev
   module Template
@@ -7,24 +8,14 @@ module Dev
       module Php
         # Class for default rake tasks associated with a php project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :php, :start_container_dependencies_on_test
-
-          # Create the templated rake tasks for the php application
-          #
-          # @param application [String] The name of the application
-          # @param container_path [String] The path to the application inside of the container
-          # @param local_path [String] The path to the application on your local system
-          # @param start_container_dependencies_on_test [Boolean] Whether or not to start up container dependencies when running tests
-          def initialize(
-            application,
-            container_path: nil,
-            local_path: nil,
-            start_container_dependencies_on_test: true,
-            coverage: nil,
-            exclude: []
-          )
-            @php = Dev::Php.new(container_path:, local_path:, coverage:)
-            @start_container_dependencies_on_test = start_container_dependencies_on_test
+          attr_reader :php, :siloed_tests
+
+          # Allow for custom container path for the application
+          def initialize(application, container_path: nil, local_path: nil, siloed_tests: nil, exclude: [])
+            @php = Dev::Php.new(container_path:, local_path:)
+            # TODO: Better name
+            # TODO: Should this apply to all or just tests?
+            @siloed_tests = siloed_tests
 
             super(application, exclude:)
           end
@@ -74,7 +65,6 @@ 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
@@ -88,13 +78,6 @@ 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
@@ -119,14 +102,13 @@ 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!
             application = @name
             php = @php
+            siloed_tests = @siloed_tests
             exclude = @exclude
-            up_cmd = @start_container_dependencies_on_test ? :up : :up_no_deps
             return if exclude.include?(:test)
 
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -138,13 +120,16 @@ module Dev
 
                 namespace :php do
                   desc "Run all php tests against the #{application}'s codebase"
-                  task test: %W(init_docker #{up_cmd}) do
+                  task test: %w(init_docker up) do
                     LOG.debug("Running all php tests in the #{application} codebase")
 
+                    project_name = nil
+                    project_name = SecureRandom.hex if siloed_tests
+
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
-                    Dev::Docker::Compose.new(services: application, options:).exec(*php.test_command)
-                    php.check_test_coverage(application:)
+                    Dev::Docker::Compose.new(project_name:, services: application, options:).exec(*php.test_command)
+                    # TODO: Add clean if we are siloed
                   end
                 end
               end
@@ -210,33 +195,6 @@ 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

@@ -7,28 +7,15 @@ module Dev
       module Ruby
         # Class for default rake tasks associated with a ruby project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :ruby, :start_container_dependencies_on_test
-
-          # Create the templated rake tasks for the ruby application
-          #
-          # @param application [String] The name of the application
-          # @param container_path [String] The path to the application inside of the container
-          # @param local_path [String] The path to the application on your local system
-          # @param start_container_dependencies_on_test [Boolean] Whether or not to start up container dependencies when running tests
-          def initialize(
-            application,
-            container_path: nil,
-            local_path: nil,
-            start_container_dependencies_on_test: true,
-            exclude: []
-          )
+          attr_reader :ruby
+
+          # Allow for custom container path for the application
+          def initialize(application, container_path: nil, local_path: nil, exclude: [])
             @ruby = Dev::Ruby.new(container_path:, local_path:)
-            @start_container_dependencies_on_test = start_container_dependencies_on_test
             super(application, exclude:)
           end
 
           # Create the rake task which runs linting for the application name
-          # rubocop:disable Metrics/MethodLength
           def create_lint_task!
             application = @name
             ruby = @ruby
@@ -42,13 +29,6 @@ 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
@@ -73,14 +53,12 @@ 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!
             application = @name
             ruby = @ruby
             exclude = @exclude
-            up_cmd = @start_container_dependencies_on_test ? :up : :up_no_deps
             return if exclude.include?(:test)
 
             DEV_COMMANDS_TOP_LEVEL.instance_eval do
@@ -92,7 +70,7 @@ module Dev
 
                 namespace :ruby do
                   desc "Run all ruby tests against the #{application}'s codebase"
-                  task test: %W(init_docker #{up_cmd}) do
+                  task test: %w(init_docker up_no_deps) do
                     LOG.debug("Running all ruby tests in the #{application} codebase")
 
                     options = []
@@ -163,33 +141,6 @@ 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

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

data/lib/firespring_dev_commands/templates/git.rb

@@ -4,23 +4,6 @@ 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
@@ -159,154 +142,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.7'.freeze
+    VERSION = '2.5.0.pre.alpha.1'.freeze
   end
 end

data/lib/firespring_dev_commands.rb

@@ -11,7 +11,7 @@ DEV_COMMANDS_TOP_LEVEL = self
 
 # Load all gems referenced in the Gemfile
 require 'bundler'
-Bundler.require(:default)
+Bundler.require
 
 # Add libdir to the default ruby path
 libdir = File.realpath(File.dirname(__FILE__))