firespring_dev_commands 2.1.21.pre.alpha.5 → 2.1.21.pre.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 831bd71e091dc6ad04f4ce368c343207845a6d9ae175fe12f40e36dee14717c3
-  data.tar.gz: 5eb6f226edc9309bb1a6873127decc4b678aea8d3e8005c5686d9c082096b05d
+  metadata.gz: 8854ab66747e26c22780c4e6756df86dac09bc5a8029fae51f1382d29d18c27f
+  data.tar.gz: ca3ddd354a8faddb180d827891886ce78483accb7e7f1e2e5b5b9d6bcc9d36f7
 SHA512:
-  metadata.gz: 7fb65d68db2549227de42ee2f5921e7a2586020aabfe9fcd54d1e923f089c9ba0e3e16338c8d800c0e526dc18e49d38819364df4a99db209140b13c19cb58680
-  data.tar.gz: e8da4354c580c083584c7e2850bce7865e99ecb4646224170e4a5b519e8a0b0d09557c6125e5fde99f29980eb917ec5b4218bd465c352250b101e564944bd835
+  metadata.gz: 4aace4ef89ab6ec98008184ffb58d71febc920bcc85195a3fe2fa645a4109f8523348cdfae5e281a731d6ce6ddac3769a101800ee7b6e63ad31f4efcfa2f84c4
+  data.tar.gz: c700fd928018dc384757fddeae412eb4990323b94b47a16026736738d43e4a8ff12202b15014ebd0b92d30f5705dcffeab439a78e61ea711e0074ecff22d6cec

data/lib/firespring_dev_commands/coverage/cobertura.rb

@@ -5,11 +5,11 @@ module Dev
     class Cobertura
       attr_reader :local_filename, :container_filename, :filename, :threshold
 
-      def initialize(filename: 'cobertura.xml', threshold: nil, container_path: nil, local_path: nil)
+      def initialize(filename: File.join('coverage', '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
+        @threshold = threshold
       end
 
       # Remove any previous versions of the local file that will be output
@@ -32,10 +32,24 @@ module Dev
 
         # Load the file from disk and parse with ox
         report = Ox.load(File.read(local_filename), mode: :hash)
-        attrs, = report[:coverage]
-        cov_pct = attrs[:'line-rate'].to_f * 100
-        puts format('Line coverage was %.2f%%. Configured threshold was %.2f%%', cov_pct, threshold)
-        raise 'Code coverage not met' if cov_pct < threshold
+        _, _, files = report[:coverage]
+
+        covered = missed = 0
+        files.dig(:packages, :package)&.each do |_attrs, packages|
+          _, _, lines = *packages&.dig(:classes, :class)
+          lines&.dig(:lines, :line)&.each do |it|
+            it = it&.first if it.is_a?(Array)
+            if it&.dig(:hits).to_i.positive?
+              covered += 1
+            else
+              missed += 1
+            end
+          end
+        end
+
+        puts "Lines missing coverage was #{missed}"
+        puts "Configured threshold was #{threshold}" if threshold
+        raise 'Code coverage not met' if threshold && missed > threshold
       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.21.pre.alpha.5'.freeze
+    VERSION = '2.1.21.pre.alpha.7'.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.5
+  version: 2.1.21.pre.alpha.7
 platform: ruby
 authors:
 - Firespring
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport