xcresult 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b6282d5f831eef163252d3fe270db888524996f034a2ae2cf5c861607c12af0
-  data.tar.gz: ebe2a795f4087b6ed890fd0ffe47c3ec656af23a7ff738a7ec24cc98681e7829
+  metadata.gz: 2921dd40608732e79c8bb256a734378aec36dfb3bd3996cfbd9771167a0ed365
+  data.tar.gz: 2c775b6af08a176f5dc9c4ed94a4b4eb99b712abb650c27d606a1951d5795198
 SHA512:
-  metadata.gz: 021774567136d57469be3bd4e978883dfb5fcec491f9b4a7af9581f87585a70800bf080b32a568b5871d705066c0c770baa0af7972bba640cd7644475eb10d87
-  data.tar.gz: 4a8304b642581168ded62f78393739605c05a830db811a3863d399b59476d7ca16f4f7ca253531065121b61ac6bd138aa73914ca5e0b554f1dbe477c8b7742df
+  metadata.gz: 7d2b6fbac41e64114e8f4acb29ae6960cf6968283a4feb4eee901a9ccebfa0598bccbc71739993799ecd519ac5d5f8f57b7c9833a7aa704ff69074ebf0dc768b
+  data.tar.gz: 89a8f191f264e1946f0eae9ca91bd37186400744fc7613da740ead7a95f3ee24951877a0679da4ccd6bc780e5aaafe639b4422d117f83cae46bd48b70934c56d

data/Gemfile.lock

@@ -1,19 +1,25 @@
 PATH
   remote: .
   specs:
-    xcresult (0.2.1)
+    xcresult (0.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.2)
     diff-lcs (1.3)
-    jaro_winkler (1.5.3)
-    parallel (1.17.0)
-    parser (2.6.4.1)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    parallel (1.25.1)
+    parser (3.3.4.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.1)
+    rainbow (3.1.1)
     rake (13.0.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.4)
+      strscan
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -27,15 +33,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubocop (0.73.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.65.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.0)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -44,8 +57,8 @@ DEPENDENCIES
   bundler (~> 2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop
+  rubocop (~> 1.65)
   xcresult!
 
 BUNDLED WITH
-   2.0.2
+   2.5.10

data/lib/xcresult/parser.rb

@@ -28,7 +28,7 @@ module XCResult
       # Maps ids into ActionTestPlanRunSummaries by executing xcresulttool to get JSON
       # containing specific information for each test summary
       @action_test_plan_summaries = ids.map do |id|
-        raw = execute_cmd("xcrun xcresulttool get --format json --path #{path} --id #{id}")
+        raw = execute_cmd(xcresulttool_command("get", "--format json --path #{path} --id #{id}"))
         json = JSON.parse(raw)
         XCResult::ActionTestPlanRunSummaries.new(json)
       end
@@ -48,7 +48,7 @@ module XCResult
       # Exports all xccovreport files from the report references
       ids.each_with_index.map do |id, i|
         output_path = File.join(destination, "action_#{i}.xccovreport")
-        cmd = "xcrun xcresulttool export --path #{path} --id '#{id}' --output-path #{output_path} --type file"
+        cmd = xcresulttool_command("export", "--path #{path} --id '#{id}' --output-path #{output_path} --type file")
         execute_cmd(cmd)
 
         output_path
@@ -67,7 +67,7 @@ module XCResult
       # Exports all xcovarchive directories from the archive references
       ids.each_with_index.map do |id, i|
         output_path = File.join(destination, "action_#{i}.xccovarchive")
-        cmd = "xcrun xcresulttool export --path #{path} --id '#{id}' --output-path #{output_path} --type directory"
+        cmd = xcresulttool_command("export", "--path #{path} --id '#{id}' --output-path #{output_path} --type directory")
         execute_cmd(cmd)
 
         output_path
@@ -77,11 +77,24 @@ module XCResult
     private
 
     def get_result_bundle_json(id: nil)
-      cmd = "xcrun xcresulttool get --format json --path #{path}"
+      cmd = xcresulttool_command("get", "--format json --path #{path}")
       cmd += " --id #{id}" if id
       execute_cmd(cmd)
     end
 
+    def xcresulttool_command(subcommand, args)
+      # Find the current xcresulttool version based on Fastlane's implementation
+      # xcresulttool version 23024, format version 3.53 (current)
+      match = `xcrun xcresulttool version`.match(/xcresulttool version (?<version>\d+),/)
+
+      version = match[:version]&.to_f
+
+      requires_legacy = version >= 23_021.0
+      legacy_flag = requires_legacy ? ' --legacy' : ''
+  
+      cmd = "xcrun xcresulttool #{subcommand}#{legacy_flag} #{args}"
+    end
+
     def execute_cmd(cmd)
       output = `#{cmd}`
       raise "Failed to execute - #{cmd}" unless $?.success?

data/lib/xcresult/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XCResult
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/xcresult.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 1.65'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcresult
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Josh Holtz
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.65'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.65'
 description: Parses xcresult files for viewing test summaries and code coverages
 email:
 - me@joshholtz.com
@@ -91,7 +91,7 @@ homepage: https://github.com/fastlane-community/xcresult
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Parses xcresult files
 test_files: []