firespring_dev_commands 2.1.20.pre.alpha.1 → 2.1.21.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e6f6e9665d308f1b5eaf8e583b58cec2aa6d8b7713467d4cf4fcd9b5344121e
-  data.tar.gz: e90341c8c7504ab07a931a556a28efb69385f763b0867077815a429173406b7c
+  metadata.gz: beba9e91440acb52b0d11b471288857a0dca2322339dc97332f1e1c2d0233689
+  data.tar.gz: f5c188acfd23e35ef90b1b2f34ab198b5855659a16593563f59bdd4cdc3b242e
 SHA512:
-  metadata.gz: 885a57c44650a6b8341afab4368343245059ad095645f831725acf96b16c1f1cfc245cdeaceaed07e1ca25bbe925a4dcb824249cc6887e849915b4e10c655de5
-  data.tar.gz: b8789921740596fcf49853e7e8d3baa5fde3506cfc90ba15580fdf15ed9e58afa7cf2bf35cbb0e8723a978b0503bb04d701eb11ad3ba238863140796fe090f78
+  metadata.gz: 6bf7a75e329def5150ed99b105dc7c0da490c0078e5da88bb2cbf2477ef00b6f7b8b44dc98de36fc187f199095780cfbfa10e6e1b4cfd358ae7e760ae2bce684
+  data.tar.gz: af4215015156cf33254dddb558bd2bfd633c25735e00260e624f1ef18dae350749b66b91d13ecd1a086fa4d0d7fafa1d8ee9e3b88677701648bf5c6879b73f89

data/lib/firespring_dev_commands/coverage/cobertura.rb

@@ -0,0 +1,30 @@
+module Dev
+  module Coverage
+    class Cobertura
+      attr_reader :local_filename, :container_filename, :filename, :threshold
+
+      def initialize(filename: 'cobertura.xml', threshold: nil, container_path: nil, local_path: nil)
+        @filename = filename
+        @local_filename = File.join(local_path || '.', @filename)
+        @container_filename = File.join(container_path || '.', @filename)
+        @threshold = threshold.to_f
+
+        # Remove any previous coverage info
+        FileUtils.rm_f(local_filename, verbose: true)
+      end
+
+      def options
+        %W(--coverage-cobertura #{container_filename})
+      end
+
+      def check
+        report = Ox.load(File.read(local_filename), mode: :hash)
+        attrs, = report[:coverage]
+        cov_pct = attrs[:'line-rate'].to_f * 100
+        raise format('Line coverage %.2f%% is less than the threshold %.2f%%', cov_pct, threshold) if cov_pct < threshold
+
+        puts format('Line coverage %.2f%% is above the threshold %.2f%%', cov_pct, threshold)
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/php.rb

@@ -8,11 +8,12 @@ module Dev
     DEFAULT_PACKAGE_FILE = 'composer.json'.freeze
 
     # Config object for setting top level git config options
-    Config = Struct.new(:container_path, :local_path, :package_file) do
+    Config = Struct.new(:container_path, :local_path, :package_file, :coverage_threshold) do
       def initialize
         self.container_path = DEFAULT_PATH
         self.local_path = DEV_COMMANDS_ROOT_DIR
         self.package_file = DEFAULT_PACKAGE_FILE
+        self.coverage_threshold = nil
       end
     end
 
@@ -30,12 +31,13 @@ module Dev
       alias_method :configure, :config
     end
 
-    attr_accessor :container_path, :local_path, :package_file
+    attr_accessor :container_path, :local_path, :package_file, :coverage
 
-    def initialize(container_path: nil, local_path: nil, package_file: nil)
+    def initialize(container_path: nil, local_path: nil, package_file: nil, coverage_threshold: nil)
       @container_path = container_path || self.class.config.container_path
       @local_path = local_path || self.class.config.local_path
       @package_file = package_file || self.class.config.package_file
+      @coverage = Dev::Coverage::Cobertura.new(container_path:, local_path:, threshold: coverage_threshold)
     end
 
     # The base npm command that is the starting point for all subsequent commands
@@ -93,6 +95,7 @@ module Dev
     def test_command
       test = []
       test << './vendor/bin/phpunit'
+      test << coverage.options if coverage
       test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       test
     end

data/lib/firespring_dev_commands/platform.rb

@@ -8,7 +8,7 @@ module Dev
       # Normalize the ruby platform to return a docker platform architecture format
       def determine_compute_architecture
         case RUBY_PLATFORM
-        when /x86_64|amd64/
+        when /x86_64|amd64|x64-mingw/
           'linux/amd64' # 64-bit Intel/AMD architecture
         when /arm|aarch64/
           'linux/arm64' # ARM architecture

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 _pre_sh_hooks) do
+              task sh: %W(init_docker #{application}:up_no_deps _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) do
+              task reload: %w(init_docker _pre_reload_hooks down up_no_deps) do
                 Rake::Task[:_post_reload_hooks].execute
               end
             end

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

@@ -7,11 +7,24 @@ module Dev
       module Node
         # Class for default rake tasks associated with a node project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :node
-
-          # Allow for custom container path for the application
-          def initialize(application, container_path: nil, local_path: nil, exclude: [])
+          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: []
+          )
             @node = Dev::Node.new(container_path:, local_path:)
+            @start_container_dependencies_on_test = start_container_dependencies_on_test
             super(application, exclude:)
           end
 
@@ -59,6 +72,7 @@ module Dev
             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
@@ -70,7 +84,7 @@ module Dev
 
                 namespace :node do
                   desc "Run all node tests against the #{application}'s codebase"
-                  task test: %w(init_docker up) do
+                  task test: %W(init_docker #{up_cmd}) do
                     LOG.debug("Running all node tests in the #{application} codebase")
 
                     options = []

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

@@ -7,11 +7,25 @@ module Dev
       module Php
         # Class for default rake tasks associated with a php project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :php
+          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_threshold: nil,
+            exclude: []
+          )
+            @php = Dev::Php.new(container_path:, local_path:, coverage_threshold:)
+            @start_container_dependencies_on_test = start_container_dependencies_on_test
 
-          # Allow for custom container path for the application
-          def initialize(application, container_path: nil, local_path: nil, exclude: [])
-            @php = Dev::Php.new(container_path:, local_path:)
             super(application, exclude:)
           end
 
@@ -103,6 +117,7 @@ module Dev
             application = @name
             php = @php
             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
@@ -114,12 +129,13 @@ module Dev
 
                 namespace :php do
                   desc "Run all php tests against the #{application}'s codebase"
-                  task test: %w(init_docker up) do
+                  task test: %W(init_docker #{up_cmd}) do
                     LOG.debug("Running all php tests in the #{application} codebase")
 
                     options = []
                     options << '-T' if Dev::Common.new.running_codebuild?
                     Dev::Docker::Compose.new(services: application, options:).exec(*php.test_command)
+                    php.coverage.check
                   end
                 end
               end

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

@@ -7,11 +7,23 @@ module Dev
       module Ruby
         # Class for default rake tasks associated with a ruby project
         class Application < Dev::Template::ApplicationInterface
-          attr_reader :ruby
-
-          # Allow for custom container path for the application
-          def initialize(application, container_path: nil, local_path: nil, exclude: [])
+          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: []
+          )
             @ruby = Dev::Ruby.new(container_path:, local_path:)
+            @start_container_dependencies_on_test = start_container_dependencies_on_test
             super(application, exclude:)
           end
 
@@ -59,6 +71,7 @@ module Dev
             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
@@ -70,7 +83,7 @@ module Dev
 
                 namespace :ruby do
                   desc "Run all ruby tests against the #{application}'s codebase"
-                  task test: %w(init_docker up_no_deps) do
+                  task test: %W(init_docker #{up_cmd}) do
                     LOG.debug("Running all ruby tests in the #{application} codebase")
 
                     options = []

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.20.pre.alpha.1'.freeze
+    VERSION = '2.1.21.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.20.pre.alpha.1
+  version: 2.1.21.pre.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -333,6 +333,7 @@ files:
 - lib/firespring_dev_commands/bloom_growth/user.rb
 - lib/firespring_dev_commands/boolean.rb
 - lib/firespring_dev_commands/common.rb
+- lib/firespring_dev_commands/coverage/cobertura.rb
 - lib/firespring_dev_commands/daterange.rb
 - lib/firespring_dev_commands/docker.rb
 - lib/firespring_dev_commands/docker/compose.rb