fastlane-plugin-try_scan 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 674d55524df14f5d8442d245b9d6bac1c076db872a47528b9e3c469e6c641fdc
-  data.tar.gz: 6a948848f0c9114bb2b35eccbad122e6c242867f2ad55c5a402918cf6127d732
+  metadata.gz: 12d650730323d7c47cfcf510d28238dd5e4864bb4cf169e65139d14c909c33a0
+  data.tar.gz: c5fceb554ef538e90917244e5ef303b79102289908aedd005e53a1b0a4d056d8
 SHA512:
-  metadata.gz: b5c673c0d2738041016915e1028c1f78b2954c0bb8b8344e284703f4a99c4cfbfde4ecd0fc73f5740856731b1cc3fda528998580b015b1f031100e093b223292
-  data.tar.gz: e69f6713be6793ae96a559aaabbf0932b545430955dc070b8abdf7916d6f092598dfa5ca7ccf8414cc6583918c0f2ee6937906a377d66b131b8c1bc133d2c6ca
+  metadata.gz: 0eaea36a94853fb1c5ba8eec440ba5329744c671c1970f6edc36df3db69cadb647e64023b3abfbcdf327b30813d69bef6b70566b2951323f6f0afd98574d9888
+  data.tar.gz: 3bdfc6aede5d51e8ba1ae4089fc17be7e2cd6aa7ada7e0a09e696dfbf9412e001559d9341a7ee5ad659ae737460c00d7511e5064457416b06035fe3b356708e8

data/lib/fastlane/plugin/try_scan/actions/try_scan_action.rb

@@ -2,6 +2,7 @@ module Fastlane
   module Actions
 
     require 'json'
+    require 'nokogiri'
     require 'fastlane/actions/scan'
     require_relative '../helper/scan_helper'
     require_relative '../helper/try_scan_runner'
@@ -90,7 +91,7 @@ module Fastlane
             description: "The number of times to retry running tests via scan",
             type: Integer,
             is_string: false,
-            default_value: 0
+            default_value: 1
           )
         ]
       end

data/lib/fastlane/plugin/try_scan/helper/scan_helper.rb

@@ -88,18 +88,6 @@ module TryScanManager
           end
         end
       end
-
-      def self.update_xctestrun_after_build(scan_options)
-        xctestrun_files = Dir.glob("#{Scan.config[:derived_data_path]}/Build/Products/*.xctestrun")
-        FastlaneCore::UI.verbose("After building, found xctestrun files #{xctestrun_files} (choosing 1st)")
-        scan_options[:xctestrun] = xctestrun_files.first
-      end
-
-      def self.remove_preexisting_xctestrun_files
-        xctestrun_files = Dir.glob("#{Scan.config[:derived_data_path]}/Build/Products/*.xctestrun")
-        FastlaneCore::UI.verbose("Before building, removing pre-existing xctestrun files: #{xctestrun_files}")
-        FileUtils.rm_rf(xctestrun_files)
-      end
     end
   end
 end

data/lib/fastlane/plugin/try_scan/helper/try_scan_runner.rb

@@ -10,18 +10,26 @@ module TryScanManager
     def run
       update_scan_config
       print_summary
-      attempt = 1
+      @attempt = 1
       begin
-        warn_of_performing_attempts(attempt)
+        warn_of_performing_attempts
         clear_preexisting_data
         Scan::Runner.new.run
+        print_parallel_scan_result
         return true
-      rescue FastlaneCore::Interface::FastlaneBuildFailure, FastlaneCore::Interface::FastlaneTestFailure => _
-        update_scan_reports(attempt)
-        return false if attempt > @options[:try_count]
+      rescue FastlaneCore::Interface::FastlaneTestFailure => _
+        failed_tests = extract_failed_tests
+        print_parallel_scan_result(failed_tests_count: failed_tests.size)
+        update_scan_junit_report
+        return false if @attempt >= @options[:try_count]
+
+        @attempt += 1
+        update_scan_options(failed_tests)
+        retry
+      rescue FastlaneCore::Interface::FastlaneBuildFailure => _
+        return false if @attempt >= @options[:try_count]
 
-        attempt += 1
-        update_scan_options
+        @attempt += 1
         retry
       end
     end
@@ -32,7 +40,7 @@ module TryScanManager
         output_types << 'junit'
         Scan.config[:output_types] = output_types.join(',')
       end
-      @options[:try_count] = 0 if @options[:try_count] < 0
+      @options[:try_count] = 1 if @options[:try_count] < 1
     end
 
     def print_summary
@@ -51,8 +59,8 @@ module TryScanManager
       )
     end
 
-    def warn_of_performing_attempts(attempt)
-      FastlaneCore::UI.important("TryScan shot №#{attempt}\n")
+    def warn_of_performing_attempts
+      FastlaneCore::UI.important("TryScan: Getting started #{ordinalized_attempt} shot\n")
     end
 
     def clear_preexisting_data
@@ -62,15 +70,34 @@ module TryScanManager
       FastlaneScanHelper.remove_report_files
     end
 
-    def update_scan_reports(attempt)
-      merge_junit_reports if attempt != 1 && !parallel_running?
+    def print_parallel_scan_result(failed_tests_count: 0)
+      return unless parallel_running?
+
+      FastlaneCore::UI.important("TryScan: result after #{ordinalized_attempt} shot 👇")
+      FastlaneCore::PrintTable.print_values(
+        config: {"Number of tests" => tests_count_from_xcresult_report, "Number of failures" => failed_tests_count},
+        title: "Test Results"
+      )
     end
 
-    def update_scan_options
+    def ordinalized_attempt
+      case @attempt
+      when 1
+        "#{@attempt}st"
+      when 2
+        "#{@attempt}nd"
+      when 3
+        "#{@attempt}rd"
+      else
+        "#{@attempt}th"
+      end
+    end
+
+    def update_scan_options(failed_tests)
       scan_options = @options.select { |key,  _|
         FastlaneScanHelper.valid_scan_keys.include?(key)
       }.merge(plugin_scan_options)
-      scan_options[:only_testing] = extract_failed_tests
+      scan_options[:only_testing] = failed_tests
       scan_options[:skip_build] = true
       scan_options[:test_without_building] = true
       scan_options[:build_for_testing] = false
@@ -99,9 +126,9 @@ module TryScanManager
 
     def extract_failed_tests
       if parallel_running?
-        extract_failed_tests_from_xcresult_report
+        failed_tests_from_xcresult_report
       else
-        extract_failed_tests_from_junit_report
+        failed_tests_from_junit_report
       end
     end
 
@@ -111,7 +138,7 @@ module TryScanManager
             (@options[:xcargs] && (@options[:xcargs] =~ /-parallel-testing-enabled(=|\s+)YES/ || @options[:xcargs].split('-destination').size > 2))
     end
 
-    def extract_failed_tests_from_junit_report
+    def failed_tests_from_junit_report
       report = junit_report
       suite_name = report.xpath('testsuites/@name').to_s.split('.')[0]
       test_cases = report.xpath('//testcase')
@@ -123,7 +150,6 @@ module TryScanManager
         test_name = test_case.xpath('@name')
         only_testing << "#{suite_name}/#{test_class}/#{test_name}"
       end
-      FastlaneCore::UI.verbose("Extracted tests to retry: #{only_testing}")
       only_testing
     end
 
@@ -139,7 +165,9 @@ module TryScanManager
       @cached_junit_report
     end
 
-    def merge_junit_reports
+    def update_scan_junit_report
+      return if @attempt == 1 || parallel_running?
+
       old_junit_report = junit_report(cached: true)
       new_junit_report = junit_report(cached: false)
 
@@ -169,7 +197,7 @@ module TryScanManager
       JSON.parse(`xcrun xcresulttool get --format json --path #{xcresult_report_files.first}`)
     end
 
-    def extract_failed_tests_from_xcresult_report
+    def failed_tests_from_xcresult_report
       only_testing = []
       parse_xcresult_report['issues']['testFailureSummaries']['_values'].each do |failed_test|
         suite_name = failed_test['producingTarget']['_value']
@@ -177,8 +205,11 @@ module TryScanManager
         test_name = failed_test['testCaseName']['_value'].split('.')[1].split('(').first
         only_testing << "#{suite_name}/#{test_class}/#{test_name}"
       end
-      FastlaneCore::UI.verbose("Extracted tests to retry: #{only_testing}")
       only_testing
     end
+
+    def tests_count_from_xcresult_report
+      parse_xcresult_report['metrics']['testsCount']['_value']
+    end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TryScan
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-try_scan
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexey Alter-Pesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement