fastlane-plugin-xcodetestcoverage 1.0.3 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 28e58f915de088334b8b586ab4bcd9718da8289aad879bb67ab7bcb3ee03aa8e
4
- data.tar.gz: 96a3e4386aec4bbe17401fefa1c37f9be5dc00d5fc22f1fce38aa3199fe69a68
3
+ metadata.gz: e23696404cf27741d5c3fa1476463c0592c3841d19b511c6af84297a60327cce
4
+ data.tar.gz: 1a89337d4669faac257af5e0336149bdbe6755c4390ac4b4841777eb7d909f2d
5
5
  SHA512:
6
- metadata.gz: d6a76c7821b6d2fd0d9891b85c40828cf1d80283d0c31927d82aa7fee3dce2c159adaffe8c7d82024d3302147af84e2f8eb8ee681afa4edb95673bb91ca60c89
7
- data.tar.gz: 2c46b94fde49c93fdf9fe6b1e9c1950adf9d718a8f9d1f5d75e87e826faacd2cced3cf9093d818da5351f9391fdd1a617cb5403bc469e7a5f710d31709dcd356
6
+ metadata.gz: d7e83365dff6854378304635c136328c23f19e72e7112e1a74ff62a37abc4525bb98b62504b683b4f8f4dac22a21f754b0b445b929b3bfccbd00b0c77ce6fc1c
7
+ data.tar.gz: 3110536aee3831265ac50ef3be6f003119dd6f955f937514737ba010b283a0106894b592732dae2d2a2100ec6d2c699f775632c46465fc9067952b16d1a99752
data/README.md CHANGED
@@ -15,13 +15,14 @@ fastlane add_plugin xcodetestcoverage
15
15
  Plugin for getting test data from Xcode
16
16
 
17
17
  It has to be run after tests.
18
- Returns hash contains keys: coverage, coveredLines, executableLines:
18
+ Returns hash contains keys: name, coverage, coveredLines, executableLines:
19
19
 
20
20
  ```bash
21
21
  run_tests()
22
22
  result = xcodetestcoverage()
23
- puts(result["coverage"])
24
- puts(result["coveredLines"])
23
+ puts(result["name"]) #current test target name
24
+ puts(result["coverage"]) #current coverage percentage
25
+ puts(result["coveredLines"])
25
26
  puts(result["executableLines"])
26
27
  ```
27
28
 
@@ -38,6 +39,8 @@ type: Proc
38
39
 
39
40
  coverageExceptionCallback - Optional coverage exception callback argument" optional: true, type: Proc
40
41
 
42
+ 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
43
+
41
44
  xcresultPath - alternative path to xcresult, optional: true, type: String
42
45
 
43
46
  ## Example
@@ -8,33 +8,56 @@ module Fastlane
8
8
  enableDataFailedException = params[:enableDataFailedException]
9
9
  minimumCoveragePercentage = params[:minimumCoveragePercentage]
10
10
  enableDefaultCoverageException = params[:enableDefaultCoverageException]
11
+ targetName = params[:testTargetName]
11
12
  filePath = params[:xcresultPath]
12
- lineCoverage = nil
13
- coveredLines = nil
14
- executableLines = nil
13
+ foundElement = nil
15
14
 
16
15
  if !filePath
17
16
  filePath = lane_context[SharedValues::SCAN_GENERATED_XCRESULT_PATH]
18
17
  end
19
-
18
+
20
19
  if filePath && File.exists?(filePath)
21
20
  jsonResult = sh "xcrun xccov view --only-targets --report '#{filePath}' --json"
22
- if lineCoverageMatch = jsonResult.match('.*lineCoverage":(\d+.\d+).*')
23
- lineCoverage = lineCoverageMatch.captures[0].to_f * 100
24
- UI.message("Xcodetestcoverage: coverage: #{lineCoverage}")
21
+
22
+ #regex, reason: json parse does not work correctly
23
+ if resultMatch = jsonResult.match('(\[.*lineCoverage.*\])')
24
+ jsonArray = resultMatch.captures[0]
25
25
  end
26
26
 
27
- if coveredLinesMatch = jsonResult.match('.*coveredLines":(\d+).*')
28
- coveredLines = coveredLinesMatch.captures[0].to_i
29
- UI.message("Xcodetestcoverage: coveredLines: #{coveredLines}")
27
+ elements = Array.new()
28
+ element = ""
29
+ for pos in 0...jsonArray.length
30
+ if jsonArray[pos].chr == "}"
31
+ elements.push Helper::XcodetestcoverageHelper.buildElement(element: element)
32
+ element = ""
33
+ else
34
+ element = element + jsonArray[pos].chr
35
+ end
30
36
  end
31
37
 
32
- if executableLineMatch = jsonResult.match('.*executableLines":(\d+).*')
33
- executableLines = executableLineMatch.captures[0].to_i
34
- UI.message("Xcodetestcoverage: executableLines: #{executableLines}")
38
+ if elements.length > 0
39
+ for index in 0...elements.length
40
+ if targetName && elements[index]["name"] && elements[index]["name"] == targetName
41
+ foundElement = elements[index]
42
+ break
43
+ end
44
+
45
+ if !foundElement || (elements[index]["coverage"] && elements[index]["coverage"] > foundElement["coverage"])
46
+ foundElement = elements[index]
47
+ end
48
+ end
49
+ else
50
+ foundElement = Helper::XcodetestcoverageHelper.buildElement(element: jsonResult)
35
51
  end
36
52
  end
37
-
53
+
54
+ lineCoverage = foundElement["coverage"]
55
+
56
+ UI.message("Xcodetestcoverage: name: #{foundElement["name"]}")
57
+ UI.message("Xcodetestcoverage: coverage: #{lineCoverage}")
58
+ UI.message("Xcodetestcoverage: coveredLines: #{foundElement["coveredLines"]}")
59
+ UI.message("Xcodetestcoverage: executableLines: #{foundElement["executableLines"]}")
60
+
38
61
  if !lineCoverage
39
62
  params[:dataFailedExceptionCallback].call() if params[:dataFailedExceptionCallback]
40
63
  UI.user_error!("Xcodetestcoverage: Test data reading error!") if enableDataFailedException
@@ -46,11 +69,7 @@ module Fastlane
46
69
  UI.user_error!("Xcodetestcoverage: Coverage percentage is less than #{minimumCoveragePercentage} (minimumCoveragePercentage)") if enableDefaultCoverageException
47
70
  end
48
71
 
49
- return {
50
- "coverage" => lineCoverage,
51
- "coveredLines" => coveredLines,
52
- "executableLines" => executableLines,
53
- }
72
+ return foundElement
54
73
  end
55
74
 
56
75
  def self.description
@@ -105,6 +124,13 @@ module Fastlane
105
124
  description: "Optional coverage exception callback argument",
106
125
  optional: true,
107
126
  type: Proc),
127
+
128
+ FastlaneCore::ConfigItem.new(
129
+ key: :testTargetName,
130
+ env_name: "XCODETESTCOVERAGE_TEST_TARGET_NAME",
131
+ description: "Alternative path to xcresult",
132
+ type: String,
133
+ optional: true),
108
134
 
109
135
  FastlaneCore::ConfigItem.new(
110
136
  key: :xcresultPath,
@@ -5,11 +5,36 @@ module Fastlane
5
5
 
6
6
  module Helper
7
7
  class XcodetestcoverageHelper
8
- # class methods that you define here become available in your action
9
- # as `Helper::XcodetestcoverageHelper.your_method`
10
- #
11
- def self.show_message
12
- UI.message("Hello from the xcodetestcoverage plugin helper!")
8
+ def self.buildElement(element:)
9
+ name = nil
10
+ lineCoverage = nil
11
+ coveredLines = nil
12
+ executableLines = nil
13
+
14
+ if nameMatch = element.match('"name":"(.*?)"')
15
+ name = nameMatch.captures[0]
16
+ end
17
+
18
+ if lineCoverageFloatMatch = element.match('lineCoverage":(\d+.\d+)')
19
+ lineCoverage = lineCoverageFloatMatch.captures[0].to_f * 100
20
+ else
21
+ if lineCoverageIntMatch = element.match('lineCoverage":(\d+)')
22
+ lineCoverage = lineCoverageIntMatch.captures[0].to_f * 100
23
+ end
24
+ end
25
+
26
+ if coveredLinesMatch = element.match('coveredLines":(\d+)')
27
+ coveredLines = coveredLinesMatch.captures[0].to_i
28
+ end
29
+
30
+ if executableLineMatch = element.match('executableLines":(\d+)')
31
+ executableLines = executableLineMatch.captures[0].to_i
32
+ end
33
+
34
+ return {"name" => name,
35
+ "coverage" => lineCoverage,
36
+ "coveredLines" => coveredLines,
37
+ "executableLines" => executableLines}
13
38
  end
14
39
  end
15
40
  end
@@ -1,5 +1,5 @@
1
1
  module Fastlane
2
2
  module Xcodetestcoverage
3
- VERSION = "1.0.3"
3
+ VERSION = "1.1.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fastlane-plugin-xcodetestcoverage
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 1.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yury Savitsky
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-02-20 00:00:00.000000000 Z
11
+ date: 2023-02-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler