firespring_dev_commands 2.3.4 → 2.5.0.pre.alpha.1

data/lib/firespring_dev_commands/templates/aws.rb

@@ -18,22 +18,6 @@ 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
@@ -118,24 +102,13 @@ module Dev
         DEV_COMMANDS_TOP_LEVEL.instance_eval do
           return if exclude.include?(:eol)
 
-          task eol: [:'eol:aws'] 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 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?
+          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
 
-              puts
-              account_id = Dev::Aws::Profile.new.current
-              account_name = Dev::Aws::Account.new.name_by_account(account_id)
-              puts "AWS product versions (in account #{account_name} / #{account_id})".light_yellow
-              Dev::EndOfLife.new(product_versions: aws_products).status
-            end
+            Dev::EndOfLife.new(product_versions: Dev::EndOfLife::Aws.new.default_products).check
           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
-    # Default Base Init method
+    LOG.debug 'In base init'
   end
 end
 
 # Create the base init_docker command
 DEV_COMMANDS_TOP_LEVEL.instance_eval do
   task init_docker: %w(init) do
-    # Default Base Init Docker method
+    LOG.debug 'In base init docker'
   end
 end
 

data/lib/firespring_dev_commands/templates/ci.rb

@@ -20,17 +20,15 @@ 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?(:create)
+          return if exclude.include?(:status)
 
           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 show_account_info) do
+              task create: %w(init ensure_aws_credentials) do
+                LOG.info
                 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?
@@ -55,17 +53,15 @@ 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?(:update)
+          return if exclude.include?(:status)
 
           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 show_account_info) do
+              task update: %w(init ensure_aws_credentials) do
+                LOG.info
                 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?
@@ -90,17 +86,15 @@ 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?(:delete)
+          return if exclude.include?(:status)
 
           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 show_account_info) do
+              task delete: %w(init ensure_aws_credentials) do
+                LOG.info
                 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?
@@ -130,7 +124,8 @@ 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 show_account_info) do
+              task status: %w(init ensure_aws_credentials) do
+                LOG.info
                 next if cloudformations.empty?
 
                 pattern = /#{cloudformations.map(&:name).join('|')}/

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

@@ -72,7 +72,7 @@ module Dev
               return if exclude.include?(:sh)
 
               desc "Open a shell into a running #{application} container"
-              task sh: %W(init_docker #{application}:up_no_deps _pre_sh_hooks) do
+              task sh: %W(init_docker #{application}:up _pre_sh_hooks) do
                 Dev::Docker::Compose.new(services: [application]).sh
                 Rake::Task[:_post_sh_hooks].execute
               end
@@ -154,7 +154,7 @@ module Dev
               return if exclude.include?(:reload)
 
               desc "Reloads the #{application} container"
-              task reload: %w(init_docker _pre_reload_hooks down up_no_deps) do
+              task reload: %w(init_docker _pre_reload_hooks down up) do
                 Rake::Task[:_post_reload_hooks].execute
               end
             end

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