firespring_dev_commands 2.1.21.pre.alpha.8 → 2.1.21.pre.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b69d61d6649aaa851e8000d68b651193d265b29be96318e5bbbf0383a901e7
-  data.tar.gz: 880ff091de3b0318a4c6b2838494ba4d68c47a325457d98a88008acee6d2bcf0
+  metadata.gz: 4189e443ce57ccf4e992178ad2dd0de137017a8d78f6d63a4e4f7b55f76fe61b
+  data.tar.gz: ab87b579efff5fe40edfad306c6088504b176b61f4d0997e8ab8804f65a61177
 SHA512:
-  metadata.gz: d5dfffdc56f103e23c0a00331003a1499a9cb9444a732a71355143b1e34682ee0d9a07215c096b29b42cbbd46d24d6ac43cc9ac890d6e4f2042fe31f463f8833
-  data.tar.gz: f08ea0a75721208a727934db0c3bd1b896b28f5f59e3c14efbd7a5468ac792df49543e175e73ad430cfcad8694318e1607d167ca06adccc17c91be9ac3456378
+  metadata.gz: 329dc4520ff98700950aef5c5b67920e8f8b520d6f8eba693150526e7144c962b55c31924e0d956b108fe8914777d4d21daf14c20393bb3f61902c19dd92a315
+  data.tar.gz: 873fcd5623d4e007cd2018285656caa029fdbf9dc34714b64df4223a10cb118b95919bbc428176ee7d68b29da6aea130163881a5480cd0fe2db7a033795af8ae

data/lib/firespring_dev_commands/coverage/base.rb

@@ -0,0 +1,13 @@
+module Dev
+  module Coverage
+    class Base
+      def php_options
+        raise 'not implemented'
+      end
+
+      def check(*)
+        raise 'not implemented'
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/coverage/cobertura.rb

@@ -2,15 +2,21 @@ module Dev
   # Module containing different classes for interfacing with coverage files
   module Coverage
     # Class for checking code coverage using cobertura
-    class Cobertura
+    class Cobertura < Base
       attr_reader :local_filename, :container_filename, :filename, :threshold, :exclude
 
       def initialize(filename: File.join('coverage', 'cobertura.xml'), threshold: nil, container_path: nil, local_path: nil, exclude: nil)
+        super()
+
         @filename = filename
         @local_filename = File.join(local_path || '.', @filename)
         @container_filename = File.join(container_path || '.', @filename)
         @threshold = threshold
-        @exclude = exclude || []
+        @exclude = (exclude || []).map do |it|
+          next it if it.is_a?(Regex)
+
+          Regex.new(it)
+        end
       end
 
       # Remove any previous versions of the local file that will be output
@@ -55,12 +61,14 @@ module Dev
           missed += 1 unless line.attributes[:hits].to_i.positive?
         end
         total = lines_processed.length
+
         sanity_check_coverage_against_cobertura_values(package, missed, total)
         missed
       end
 
       # Calculate the coverage percent based off the numbers we got and compare to the
       # value cobertura reported. This is meant as a sanity check that we are reading the data correctly
+      # TODO: This should be removed after the above logic has been vetted
       private def sanity_check_coverage_against_cobertura_values(package, missed, total)
         line_rate = package.attributes[:'line-rate']
         cobertura_reported_coverage = line_rate.to_f
@@ -71,7 +79,7 @@ module Dev
         return if file_coverage == cobertura_reported_coverage
 
         filename = package.attributes[:name]
-        puts "WARNINNG: #{filename} coverage (#{file_coverage}) differed from what cobertura reported (#{cobertura_reported_coverage})".light_yellow
+        puts "WARNINNG: #{filename} coverage (#{file_coverage}) differed from what cobertura reported (#{cobertura_reported_coverage})"
       end
     end
   end

data/lib/firespring_dev_commands/coverage/none.rb

@@ -0,0 +1,17 @@
+module Dev
+  module Coverage
+    class None < Base
+      def initialize(*)
+        super()
+      end
+
+      def php_options
+        []
+      end
+
+      def check(*)
+        puts 'Coverage not configured'
+      end
+    end
+  end
+end

data/lib/firespring_dev_commands/php.rb

@@ -8,12 +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, :coverage_threshold) do
+    Config = Struct.new(:container_path, :local_path, :package_file, :coverage) 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
+        self.coverage = nil
       end
     end
 
@@ -33,11 +33,11 @@ module Dev
 
     attr_accessor :container_path, :local_path, :package_file, :coverage
 
-    def initialize(container_path: nil, local_path: nil, package_file: nil, coverage_threshold: nil)
+    def initialize(container_path: nil, local_path: nil, package_file: nil, coverage: 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)
+      @coverage = coverage || Dev::Coverage::None.new
     end
 
     # The base npm command that is the starting point for all subsequent commands
@@ -95,7 +95,7 @@ module Dev
     def test_command
       test = []
       test << './vendor/bin/phpunit'
-      test << coverage.php_options if coverage
+      test.concat(coverage.php_options) if coverage
       test.concat(Dev::Common.new.tokenize(ENV['OPTS'].to_s))
       test
     end

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

@@ -20,10 +20,10 @@ module Dev
             container_path: nil,
             local_path: nil,
             start_container_dependencies_on_test: true,
-            coverage_threshold: nil,
+            coverage: nil,
             exclude: []
           )
-            @php = Dev::Php.new(container_path:, local_path:, coverage_threshold:)
+            @php = Dev::Php.new(container_path:, local_path:, coverage:)
             @start_container_dependencies_on_test = start_container_dependencies_on_test
 
             super(application, exclude:)

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.21.pre.alpha.8'.freeze
+    VERSION = '2.1.21.pre.alpha.9'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firespring_dev_commands
 version: !ruby/object:Gem::Version
-  version: 2.1.21.pre.alpha.8
+  version: 2.1.21.pre.alpha.9
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -333,7 +333,9 @@ 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/base.rb
 - lib/firespring_dev_commands/coverage/cobertura.rb
+- lib/firespring_dev_commands/coverage/none.rb
 - lib/firespring_dev_commands/daterange.rb
 - lib/firespring_dev_commands/docker.rb
 - lib/firespring_dev_commands/docker/compose.rb