fastlane-plugin-try_scan 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3bf2f28d3558be4e3d2cd068beb9a4968f1957532a554aa902134c0db1e5e05
-  data.tar.gz: b4f5d09eede219e2425efce5487481947bee2a30075aac8448ba9f014ddbb48e
+  metadata.gz: 674d55524df14f5d8442d245b9d6bac1c076db872a47528b9e3c469e6c641fdc
+  data.tar.gz: 6a948848f0c9114bb2b35eccbad122e6c242867f2ad55c5a402918cf6127d732
 SHA512:
-  metadata.gz: 575e434210450543a657cdcae55e88573183e552a2e12125d83ac4fc5cbdaa0ef715699268a6b1059a12f23ffb4a6fea47a3093683d95fc61146a6dc359d1b76
-  data.tar.gz: 4670941d32adf903ff77ebf024555c40295ad64b7e267cb027b40def51d45183f4df0e1521778ac623857bb30a180e42990ac04b3aa30343083b3f9910992080
+  metadata.gz: b5c673c0d2738041016915e1028c1f78b2954c0bb8b8344e284703f4a99c4cfbfde4ecd0fc73f5740856731b1cc3fda528998580b015b1f031100e093b223292
+  data.tar.gz: e69f6713be6793ae96a559aaabbf0932b545430955dc070b8abdf7916d6f092598dfa5ca7ccf8414cc6583918c0f2ee6937906a377d66b131b8c1bc133d2c6ca

data/README.md

@@ -4,7 +4,7 @@
 
 ## Getting Started
 
-This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `fastlane-plugin-try_scan`, add it to your project by running:
+This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `try_scan`, add it to your project by running:
 
 ```bash
 fastlane add_plugin try_scan
@@ -12,27 +12,16 @@ fastlane add_plugin try_scan
 
 ## About try_scan
 
-Simple way to retry your scan action
+Simple way to retry your scan action 🚀
 
-**Note to author:** Add a more detailed description about this plugin here. If your plugin contains multiple actions, make sure to mention them here.
+## Usage
 
-## 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 test`.
-
-**Note to author:** Please set up a sample project to make it easy for users to explore what your plugin does. Provide everything that is necessary to try out the plugin in this project (including a sample Xcode/Android project if necessary)
-
-## Run tests for this plugin
-
-To run both the tests, and code style validation, run
-
-```
-rake
-```
-
-To automatically fix many of the styling issues, use
-```
-rubocop -a
+```ruby
+try_scan(
+  workspace: "Example.xcworkspace",
+  devices: ["iPhone 6s", "iPad Air"],
+  try_count: 3
+)
 ```
 
 ## Issues and Feedback
@@ -43,10 +32,6 @@ For any other issues and feedback about this plugin, please submit it to this re
 
 If you have trouble using plugins, check out the [Plugins Troubleshooting](https://docs.fastlane.tools/plugins/plugins-troubleshooting/) guide.
 
-## Using _fastlane_ Plugins
-
-For more information about how the `fastlane` plugin system works, check out the [Plugins documentation](https://docs.fastlane.tools/plugins/create-plugin/).
-
 ## About _fastlane_
 
 _fastlane_ is the easiest way to automate beta deployments and releases for your iOS and Android apps. To learn more, check out [fastlane.tools](https://fastlane.tools).

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

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

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

@@ -5,7 +5,6 @@ module TryScanManager
 
     def initialize(options = {})
       @options = options
-      warn_of_try_scan_option
     end
 
     def run
@@ -18,7 +17,7 @@ module TryScanManager
         Scan::Runner.new.run
         return true
       rescue FastlaneCore::Interface::FastlaneBuildFailure, FastlaneCore::Interface::FastlaneTestFailure => _
-        merge_junit_reports if attempt != 1
+        update_scan_reports(attempt)
         return false if attempt > @options[:try_count]
 
         attempt += 1
@@ -28,7 +27,12 @@ module TryScanManager
     end
 
     def update_scan_config
-      Scan.config[:output_types] << 'junit' unless Scan.config[:output_types].include?('junit')
+      if !Scan.config[:output_types].include?('junit') && !parallel_running?
+        output_types = Scan.config[:output_types].split(',')
+        output_types << 'junit'
+        Scan.config[:output_types] = output_types.join(',')
+      end
+      @options[:try_count] = 0 if @options[:try_count] < 0
     end
 
     def print_summary
@@ -51,13 +55,6 @@ module TryScanManager
       FastlaneCore::UI.important("TryScan shot №#{attempt}\n")
     end
 
-    def warn_of_try_scan_option
-      if @options[:try_count] <= 0
-        FastlaneCore::UI.important(":try_count can't be less than or equal to zero. Setting a default value equal to `1`")
-        @options[:try_count] = 1
-      end
-    end
-
     def clear_preexisting_data
       FastlaneScanHelper.remove_preexisting_simulator_logs(@options)
       FastlaneScanHelper.remove_preexisting_test_result_bundles(@options)
@@ -65,8 +62,14 @@ module TryScanManager
       FastlaneScanHelper.remove_report_files
     end
 
+    def update_scan_reports(attempt)
+      merge_junit_reports if attempt != 1 && !parallel_running?
+    end
+
     def update_scan_options
-      scan_options = @options.select { |key,  _| FastlaneScanHelper.valid_scan_keys.include?(key) }.merge(plugin_scan_options)
+      scan_options = @options.select { |key,  _|
+        FastlaneScanHelper.valid_scan_keys.include?(key)
+      }.merge(plugin_scan_options)
       scan_options[:only_testing] = extract_failed_tests
       scan_options[:skip_build] = true
       scan_options[:test_without_building] = true
@@ -91,11 +94,24 @@ module TryScanManager
         FastlaneCore::UI.important('Disabling -quiet as failing tests cannot be found with it enabled.')
         xcargs.gsub!('-quiet', '')
       end
-      xcargs.gsub!(/-parallel-testing-enabled(=|\s+)(YES|NO)/, '')
-      @options.select { |k,v| FastlaneScanHelper.valid_scan_keys.include?(k) }.merge({ xcargs: "#{xcargs} -parallel-testing-enabled NO " })
+      @options.select { |key, _| FastlaneScanHelper.valid_scan_keys.include?(key) }.merge({ xcargs: xcargs })
     end
 
     def extract_failed_tests
+      if parallel_running?
+        extract_failed_tests_from_xcresult_report
+      else
+        extract_failed_tests_from_junit_report
+      end
+    end
+
+    def parallel_running?
+      return @options[:concurrent_workers].to_i > 0 ||
+            (@options[:devices] && @options[:devices].size > 1) ||
+            (@options[:xcargs] && (@options[:xcargs] =~ /-parallel-testing-enabled(=|\s+)YES/ || @options[:xcargs].split('-destination').size > 2))
+    end
+
+    def extract_failed_tests_from_junit_report
       report = junit_report
       suite_name = report.xpath('testsuites/@name').to_s.split('.')[0]
       test_cases = report.xpath('//testcase')
@@ -107,6 +123,7 @@ 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
 
@@ -141,5 +158,27 @@ module TryScanManager
 
       File.open(@junit_report_path, "w+") { |f| f.write(old_junit_report.to_xml) }
     end
+
+    def parse_xcresult_report
+      report_options = FastlaneScanHelper.report_options
+      output_directory = report_options.instance_variable_get(:@output_directory)
+      xcresult_report_files = Dir["#{output_directory}/*.xcresult"]
+      raise FastlaneCore::UI.test_failure!('There are no xcresult reports to parse') if xcresult_report_files.empty?
+
+      FastlaneCore::UI.verbose("Parsing xcresult report by path: '#{xcresult_report_files.first}'")
+      JSON.parse(`xcrun xcresulttool get --format json --path #{xcresult_report_files.first}`)
+    end
+
+    def extract_failed_tests_from_xcresult_report
+      only_testing = []
+      parse_xcresult_report['issues']['testFailureSummaries']['_values'].each do |failed_test|
+        suite_name = failed_test['producingTarget']['_value']
+        test_class = failed_test['testCaseName']['_value'].split('.').first
+        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
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-try_scan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexey Alter-Pesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry