fastlane-plugin-xcodetestcoverage 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbbeb5ada9ae797c979dc0400ea7bb0e20fec4fa20c50c7541e340fa179de39a
-  data.tar.gz: eaf4dd8e7c14280ea49ca6df7ee8692b78d3bfad85ff35353b47f3f0f8273175
+  metadata.gz: e23696404cf27741d5c3fa1476463c0592c3841d19b511c6af84297a60327cce
+  data.tar.gz: 1a89337d4669faac257af5e0336149bdbe6755c4390ac4b4841777eb7d909f2d
 SHA512:
-  metadata.gz: f5283f51ab7317c0184c4df2cf22c21151c1e46daed21c1e1fad5ef30336656c84c042f3d6852f4cc04385bac94f88b34ff76983498d3332c02e93e9c0b24f59
-  data.tar.gz: '09cf0f7cbb343d30e0b7eee1c46735389d11f68b58239ed9b6755b93a10edde78c07ccada618b9fba9c9c8965029bfc80cacae886648d872cf473ee68dedb487'
+  metadata.gz: d7e83365dff6854378304635c136328c23f19e72e7112e1a74ff62a37abc4525bb98b62504b683b4f8f4dac22a21f754b0b445b929b3bfccbd00b0c77ce6fc1c
+  data.tar.gz: 3110536aee3831265ac50ef3be6f003119dd6f955f937514737ba010b283a0106894b592732dae2d2a2100ec6d2c699f775632c46465fc9067952b16d1a99752

data/README.md

@@ -15,13 +15,14 @@ fastlane add_plugin xcodetestcoverage
 Plugin for getting test data from Xcode
 
 It has to be run after tests.
-Returns hash contains keys: coverage, coveredLines, executableLines:
+Returns hash contains keys: name, coverage, coveredLines, executableLines:
 
 ```bash
 run_tests()
 result = xcodetestcoverage()
-puts(result["coverage"])
-puts(result["coveredLines"])
+puts(result["name"]) #current test target name
+puts(result["coverage"]) #current coverage percentage
+puts(result["coveredLines"]) 
 puts(result["executableLines"])	
 ```
 
@@ -38,6 +39,10 @@ type: Proc
 
 coverageExceptionCallback - Optional coverage exception callback argument" optional: true, type: Proc
 
+testTargetName - searches test target to display coverage percentages, if it is empty the results contains the target with the highest percentage value, optional: true, type: String
+
+xcresultPath - alternative path to xcresult, optional: true, type: String
+
 ## Example
 
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane tests`.
@@ -62,7 +67,13 @@ xcodetestcoverage(minimumCoveragePercentage: 45.0,
 		  }
 )
 ```
-
+You can use alternative path to xcresult. In this case, running a test via fastlane (with the command scan or run_tests) before xcodetestcoverage is optional.
+```bash
+ reportPath = "test.xcresult"
+ xcodetestcoverage(minimumCoveragePercentage: 30.0,
+ 		   enableDataFailedException: true,
+                   xcresultPath: reportPath)
+```
 
 ## Issues and Feedback
 

data/lib/fastlane/plugin/xcodetestcoverage/actions/xcodetestcoverage_action.rb

@@ -8,30 +8,56 @@ module Fastlane
         enableDataFailedException = params[:enableDataFailedException]
 	      minimumCoveragePercentage = params[:minimumCoveragePercentage]
         enableDefaultCoverageException = params[:enableDefaultCoverageException]
-        lineCoverage = nil
-        coveredLines = nil
-        executableLines = nil
+        targetName = params[:testTargetName]
+        filePath = params[:xcresultPath]
+        foundElement = nil     
         
-        filePath = lane_context[SharedValues::SCAN_GENERATED_XCRESULT_PATH]   
+        if !filePath 
+          filePath = lane_context[SharedValues::SCAN_GENERATED_XCRESULT_PATH]
+        end
 
         if filePath && File.exists?(filePath)
           jsonResult = sh "xcrun xccov view --only-targets --report '#{filePath}' --json"
-          if lineCoverageMatch = jsonResult.match('.*lineCoverage":(\d+.\d+).*')
-            lineCoverage = lineCoverageMatch.captures[0].to_f * 100
-            UI.message("Xcodetestcoverage: coverage: #{lineCoverage}")
+
+          #regex, reason: json parse does not work correctly
+          if resultMatch = jsonResult.match('(\[.*lineCoverage.*\])')
+            jsonArray = resultMatch.captures[0]
           end
 
-          if coveredLinesMatch = jsonResult.match('.*coveredLines":(\d+).*')
-            coveredLines = coveredLinesMatch.captures[0].to_i
-            UI.message("Xcodetestcoverage: coveredLines: #{coveredLines}")
+          elements = Array.new()    
+          element = ""
+          for pos in 0...jsonArray.length
+            if jsonArray[pos].chr == "}"
+              elements.push Helper::XcodetestcoverageHelper.buildElement(element: element)
+              element = ""
+            else         
+              element = element + jsonArray[pos].chr
+            end
           end
 
-          if executableLineMatch = jsonResult.match('.*executableLines":(\d+).*')
-            executableLines = executableLineMatch.captures[0].to_i
-            UI.message("Xcodetestcoverage: executableLines: #{executableLines}")
+          if elements.length > 0 
+            for index in 0...elements.length              
+              if targetName && elements[index]["name"] && elements[index]["name"] == targetName
+                foundElement = elements[index]              
+              break
+              end
+              
+              if !foundElement || (elements[index]["coverage"] && elements[index]["coverage"] > foundElement["coverage"])
+                foundElement = elements[index]                
+              end
+            end
+          else 
+            foundElement = Helper::XcodetestcoverageHelper.buildElement(element: jsonResult)
           end
         end
-        
+
+        lineCoverage = foundElement["coverage"]
+   
+        UI.message("Xcodetestcoverage: name: #{foundElement["name"]}")
+        UI.message("Xcodetestcoverage: coverage: #{lineCoverage}")
+        UI.message("Xcodetestcoverage: coveredLines: #{foundElement["coveredLines"]}")
+        UI.message("Xcodetestcoverage: executableLines: #{foundElement["executableLines"]}")
+
         if !lineCoverage
           params[:dataFailedExceptionCallback].call() if params[:dataFailedExceptionCallback]
           UI.user_error!("Xcodetestcoverage: Test data reading error!") if enableDataFailedException
@@ -43,11 +69,7 @@ module Fastlane
           UI.user_error!("Xcodetestcoverage: Coverage percentage is less than #{minimumCoveragePercentage} (minimumCoveragePercentage)") if enableDefaultCoverageException
         end
         
-        return {
-          "coverage" => lineCoverage,
-          "coveredLines" => coveredLines,
-          "executableLines" => executableLines,
-        }
+        return foundElement
       end
 
       def self.description
@@ -101,7 +123,21 @@ module Fastlane
 	        key: :coverageExceptionCallback,
 	        description: "Optional coverage exception callback argument",
 	        optional: true,
-	        type: Proc)
+	        type: Proc),
+        
+        FastlaneCore::ConfigItem.new(
+          key: :testTargetName,
+          env_name: "XCODETESTCOVERAGE_TEST_TARGET_NAME",
+          description: "Alternative path to xcresult",
+          type: String,
+          optional: true),
+
+        FastlaneCore::ConfigItem.new(
+          key: :xcresultPath,
+          env_name: "XCODETESTCOVERAGE_XCRESULTPATH",
+          description: "Alternative path to xcresult",
+          type: String,
+          optional: true)
         ]
       end
 

data/lib/fastlane/plugin/xcodetestcoverage/helper/xcodetestcoverage_helper.rb

@@ -5,11 +5,36 @@ module Fastlane
 
   module Helper
     class XcodetestcoverageHelper
-      # class methods that you define here become available in your action
-      # as `Helper::XcodetestcoverageHelper.your_method`
-      #
-      def self.show_message
-        UI.message("Hello from the xcodetestcoverage plugin helper!")
+    def self.buildElement(element:)
+        name = nil
+        lineCoverage = nil
+        coveredLines = nil
+        executableLines = nil
+              
+        if nameMatch = element.match('"name":"(.*?)"')
+          name = nameMatch.captures[0]    
+        end
+      
+        if lineCoverageFloatMatch = element.match('lineCoverage":(\d+.\d+)')
+          lineCoverage = lineCoverageFloatMatch.captures[0].to_f * 100
+        else 
+          if lineCoverageIntMatch = element.match('lineCoverage":(\d+)')
+            lineCoverage = lineCoverageIntMatch.captures[0].to_f * 100
+          end
+        end
+        
+        if coveredLinesMatch = element.match('coveredLines":(\d+)')
+          coveredLines = coveredLinesMatch.captures[0].to_i
+        end
+      
+        if executableLineMatch = element.match('executableLines":(\d+)')
+          executableLines = executableLineMatch.captures[0].to_i
+        end
+
+        return   {"name" => name,
+                  "coverage" => lineCoverage,
+                  "coveredLines" => coveredLines,
+                  "executableLines" => executableLines}
       end
     end
   end

data/lib/fastlane/plugin/xcodetestcoverage/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Xcodetestcoverage
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-xcodetestcoverage
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yury Savitsky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler