fastlane-plugin-try_scan 0.2.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12d650730323d7c47cfcf510d28238dd5e4864bb4cf169e65139d14c909c33a0
-  data.tar.gz: c5fceb554ef538e90917244e5ef303b79102289908aedd005e53a1b0a4d056d8
+  metadata.gz: 9b2cd7acb930212c6e8cf756c89e71741878e510c46af3f3f747feaafc3d5bac
+  data.tar.gz: 8e11f9f1caf48d396983cfd2aabdb30c49d5da44a7ef0db43ec4314765dbb7aa
 SHA512:
-  metadata.gz: 0eaea36a94853fb1c5ba8eec440ba5329744c671c1970f6edc36df3db69cadb647e64023b3abfbcdf327b30813d69bef6b70566b2951323f6f0afd98574d9888
-  data.tar.gz: 3bdfc6aede5d51e8ba1ae4089fc17be7e2cd6aa7ada7e0a09e696dfbf9412e001559d9341a7ee5ad659ae737460c00d7511e5064457416b06035fe3b356708e8
+  metadata.gz: 98f4a9b2f8db939dcf38507ad52ad275799b56a14cb3cc804fa20f9133e6bc01a7106ca3c38709d71b698941fff16b9b40b4330107b19545a2053810eff565a1
+  data.tar.gz: 8b0bcc7346f9fc389946e74fd1e22880e1f1cf82199c82f3cc3d2c2c21f416ad8ac84e734a130de5d62114c84c968d29a2c32d4073d37e6d34479430994d469b

data/README.md

@@ -2,36 +2,37 @@
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-try_scan)
 
+## About try_scan
+
+The easiest way to rerun tests of your iOS and Mac app 🚀
+
+Under the hood `try_scan` uses official [`fastlane scan action`](https://docs.fastlane.tools/actions/scan/), it means that you are able to provide any `scan` options and use `Scanfile` as before — everything will work like a charm, `try_scan` just brings couple of new amazing options:
+
+| Option | Description | Default |
+| ------- |------------ | ------- |
+| try_count | Number of times to try to get your tests green | 1 |
+| try_parallel | Should first run be executed in parallel? Equivalent to `-parallel-testing-enabled` | true |
+| retry_parallel | Should subsequent runs be executed in parallel? Required `try_parallel: true` | true |
+| parallel_workers | Specify the exact number of test runners that will be spawned during parallel testing. Equivalent to `-parallel-testing-worker-count` and `concurrent_workers` |  |
+
+## Requirements
+
+* Xcode 11.x or greater. Download it at the [Apple Developer - Downloads](https://developer.apple.com/downloads) or the [Mac App Store](https://apps.apple.com/us/app/xcode/id497799835?mt=12).
+
 ## Getting Started
 
-This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `try_scan`, add it to your project by running:
+To get started with `try_scan`, add it to your project by running:
 
 ```bash
-fastlane add_plugin try_scan
+$ fastlane add_plugin try_scan
 ```
 
-## About try_scan
-
-Simple way to retry your scan action 🚀
-
 ## Usage
 
 ```ruby
 try_scan(
   workspace: "Example.xcworkspace",
-  devices: ["iPhone 6s", "iPad Air"],
+  devices: ["iPhone 7", "iPad Air"],
   try_count: 3
 )
 ```
-
-## Issues and Feedback
-
-For any other issues and feedback about this plugin, please submit it to this repository.
-
-## Troubleshooting
-
-If you have trouble using plugins, check out the [Plugins Troubleshooting](https://docs.fastlane.tools/plugins/plugins-troubleshooting/) guide.
-
-## 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

@@ -2,7 +2,6 @@ module Fastlane
   module Actions
 
     require 'json'
-    require 'nokogiri'
     require 'fastlane/actions/scan'
     require_relative '../helper/scan_helper'
     require_relative '../helper/try_scan_runner'
@@ -11,61 +10,16 @@ module Fastlane
 
     class TryScanAction < Action
       def self.run(params)
-        prepare_for_testing(params)
-        success = TryScanManager::Runner.new(params.values).run
+        if Helper.xcode_at_least?('11.0.0')
+          params[:destination] = [params[:destination]] if params[:destination] && !params[:destination].kind_of?(Array)
+          success = TryScanManager::Runner.new(params.values).run
 
-        raise FastlaneCore::UI.test_failure!('Tests have failed') if params[:fail_build] && !success
-      end
-
-      def self.prepare_for_testing(params)
-        warn_of_xcode11_result_bundle_incompatability(params)
-        use_scanfile_to_override_settings(params.values)
-        turn_off_concurrent_workers(params.values)
-        prepare_scan_config(params.values)
-        coerce_destination_to_array(params)
-      end
-
-      def self.warn_of_xcode11_result_bundle_incompatability(params)
-        if FastlaneCore::Helper.xcode_at_least?('11.0.0')
-          if params[:result_bundle]
-            FastlaneCore::UI.important('As of Xcode 11, test_result bundles created in the output directory are actually symbolic links to an xcresult bundle')
-          end
-        elsif params[:output_types]&.include?('xcresult')
-          FastlaneCore::UI.important("The 'xcresult' :output_type is only supported for Xcode 11 and greater. You are using #{FastlaneCore::Helper.xcode_version}.")
-        end
-      end
-
-      def self.coerce_destination_to_array(params)
-        destination = params[:destination] || Scan.config[:destination] || []
-        unless destination.kind_of?(Array)
-          params[:destination] = Scan.config[:destination] = [destination]
+          raise FastlaneCore::UI.test_failure!('Tests have failed') if params[:fail_build] && !success
+        else
+          raise FastlaneCore::UI.user_error!("Minimum supported Xcode: `v11.0.0` (used: `v#{Helper.xcode_version}`)")
         end
       end
 
-      def self.turn_off_concurrent_workers(scan_options)
-        if Gem::Version.new(Fastlane::VERSION) >= Gem::Version.new('2.142.0')
-          scan_options.delete(:concurrent_workers) if scan_options[:concurrent_workers].to_i > 0
-        end
-      end
-
-      def self.use_scanfile_to_override_settings(scan_options)
-        overridden_options = FastlaneScanHelper.options_from_configuration_file(
-          FastlaneScanHelper.scan_options_from_try_scan_options(scan_options)
-        )
-
-        unless overridden_options.empty?
-          FastlaneCore::UI.important("Scanfile found: overriding try_scan options with it's values.")
-          overridden_options.each { |key, val| scan_options[key] = val }
-        end
-      end
-
-      def self.prepare_scan_config(scan_options)
-        Scan.config ||= FastlaneCore::Configuration.create(
-          Fastlane::Actions::ScanAction.available_options,
-          FastlaneScanHelper.scan_options_from_try_scan_options(scan_options)
-        )
-      end
-
       #####################################################
       #                   Documentation                   #
       #####################################################
@@ -78,20 +32,40 @@ module Fastlane
         ["Alexey Alter-Pesotskiy"]
       end
 
-      def self.scan_options
-        ScanAction.available_options.reject { |config| %i[output_types].include?(config.key) }
-      end
-
       def self.available_options
-        scan_options = ScanAction.available_options.reject { |config| %i[output_types].include?(config.key) }
-        scan_options + [
+        ScanAction.available_options + [
           FastlaneCore::ConfigItem.new(
             key: :try_count,
             env_name: "FL_TRY_SCAN_TRY_COUNT",
-            description: "The number of times to retry running tests via scan",
+            description: "Number of times to try to get your tests green",
             type: Integer,
             is_string: false,
+            optional: true,
             default_value: 1
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :try_parallel,
+            env_name: "FL_TRY_SCAN_TRY_PARALLEL",
+            description: "Should first run be executed in parallel? Equivalent to -parallel-testing-enabled",
+            is_string: false,
+            optional: true,
+            default_value: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :retry_parallel,
+            env_name: "FL_TRY_SCAN_RETRY_PARALLEL",
+            description: "Should subsequent runs be executed in parallel? Required :try_parallel: true",
+            is_string: false,
+            optional: true,
+            default_value: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :parallel_workers,
+            env_name: "FL_TRY_SCAN_PARALLEL_WORKERS",
+            description: "Specify the exact number of test runners that will be spawned during parallel testing. Equivalent to -parallel-testing-worker-count and :concurrent_workers",
+            type: Integer,
+            is_string: false,
+            optional: true
           )
         ]
       end
@@ -101,7 +75,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios].include?(platform)
+        [:ios, :mac].include?(platform)
       end
     end
   end

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

@@ -19,31 +19,9 @@ module TryScanManager
       end
 
       def self.scan_options_from_try_scan_options(params)
-        valid_scan_keys = Fastlane::Actions::ScanAction.available_options.map(&:key)
         params.select { |key, _| valid_scan_keys.include?(key) }
       end
 
-      def self.options_from_configuration_file(params)
-        config = FastlaneCore::Configuration.create(
-          Fastlane::Actions::ScanAction.available_options,
-          params
-        )
-        config_file = config.load_configuration_file(Scan.scanfile_name, nil, true)
-        overridden_options = config_file ? config_file.options : {}
-
-        FastlaneCore::Project.detect_projects(config)
-        project = FastlaneCore::Project.new(config)
-
-        imported_path = File.expand_path(Scan.scanfile_name)
-        Dir.chdir(File.expand_path("..", project.path)) do
-          if File.expand_path(Scan.scanfile_name) != imported_path
-            config_file = config.load_configuration_file(Scan.scanfile_name, nil, true)
-          end
-          overridden_options.merge!(config_file.options) if config_file
-        end
-        overridden_options
-      end
-
       def self.remove_preexisting_simulator_logs(params)
         return unless params[:include_simulator_logs]
 
@@ -90,4 +68,4 @@ module TryScanManager
       end
     end
   end
-end
+end

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

@@ -5,42 +5,39 @@ module TryScanManager
 
     def initialize(options = {})
       @options = options
+      @options[:try_count] = 1 if @options[:try_count] < 1
+      @options[:result_bundle] = true
     end
 
     def run
-      update_scan_config
+      configure_xcargs
+      prepare_scan_config(@options)
       print_summary
       @attempt = 1
       begin
         warn_of_performing_attempts
         clear_preexisting_data
         Scan::Runner.new.run
-        print_parallel_scan_result
+        print_try_scan_result
         return true
       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]
+        failed_tests = failed_tests_from_xcresult_report
+        print_try_scan_result(failed_tests_count: failed_tests.size)
+        return false if finish?
 
         @attempt += 1
         update_scan_options(failed_tests)
         retry
       rescue FastlaneCore::Interface::FastlaneBuildFailure => _
-        return false if @attempt >= @options[:try_count]
+        return false if finish?
 
         @attempt += 1
         retry
       end
     end
 
-    def update_scan_config
-      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] = 1 if @options[:try_count] < 1
+    def finish?
+      @attempt >= @options[:try_count]
     end
 
     def print_summary
@@ -70,9 +67,7 @@ module TryScanManager
       FastlaneScanHelper.remove_report_files
     end
 
-    def print_parallel_scan_result(failed_tests_count: 0)
-      return unless parallel_running?
-
+    def print_try_scan_result(failed_tests_count: 0)
       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},
@@ -93,98 +88,61 @@ module TryScanManager
       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] = failed_tests
-      scan_options[:skip_build] = true
-      scan_options[:test_without_building] = true
-      scan_options[:build_for_testing] = false
-      scan_options.delete(:skip_testing)
-      Scan.cache.clear
-      scan_options.each do |key, val|
-        next if val.nil?
-
-        Scan.config.set(key, val) unless val.nil?
-        FastlaneCore::UI.verbose("\tSetting #{key.to_s} to #{val}")
-      end
+    def prepare_scan_config(scan_options)
+      Scan.config = FastlaneCore::Configuration.create(
+        Fastlane::Actions::ScanAction.available_options,
+        FastlaneScanHelper.scan_options_from_try_scan_options(scan_options)
+      )
     end
 
-    def plugin_scan_options
-      xcargs = @options[:xcargs] || ''
-      if xcargs&.include?('build-for-testing')
-        FastlaneCore::UI.important(":xcargs, #{xcargs}, contained 'build-for-testing', removing it")
-        xcargs.slice!('build-for-testing')
-      end
-      if xcargs.include?('-quiet')
-        FastlaneCore::UI.important('Disabling -quiet as failing tests cannot be found with it enabled.')
-        xcargs.gsub!('-quiet', '')
+    def configure_xcargs
+      if @options[:xcargs]&.include?('-parallel-testing-enabled')
+        FastlaneCore::UI.important("TryScan overwrites `-parallel-testing-enabled` in :xcargs, use :try_parallel option instead")
+        @options[:xcargs].gsub!(/-parallel-testing-enabled(=|\s+)(YES|NO)/, '')
       end
-      @options.select { |key, _| FastlaneScanHelper.valid_scan_keys.include?(key) }.merge({ xcargs: xcargs })
-    end
 
-    def extract_failed_tests
-      if parallel_running?
-        failed_tests_from_xcresult_report
-      else
-        failed_tests_from_junit_report
+      if @options[:xcargs]&.include?('-parallel-testing-worker-count')
+        FastlaneCore::UI.important("TryScan overwrites `-parallel-testing-worker-count` in :xcargs, use :concurrent_workers option instead")
+        @options[:xcargs].gsub!(/-parallel-testing-worker-count(=|\s+)(\d+)/, '')
       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 failed_tests_from_junit_report
-      report = junit_report
-      suite_name = report.xpath('testsuites/@name').to_s.split('.')[0]
-      test_cases = report.xpath('//testcase')
-      only_testing = []
-      test_cases.each do |test_case|
-        next if test_case.xpath('failure').empty?
-
-        test_class = test_case.xpath('@classname').to_s.split('.')[1]
-        test_name = test_case.xpath('@name')
-        only_testing << "#{suite_name}/#{test_class}/#{test_name}"
+      if @options[:xcargs]&.include?('build-for-testing') || @options[:build_for_testing]
+        FastlaneCore::UI.important("TryScan rejects `build-for-testing` request, use it in a separate scan lane")
+        @options[:xcargs].slice!('build-for-testing')
+        @options[:build_for_testing] = nil
       end
-      only_testing
-    end
 
-    def junit_report(cached: false)
-      unless cached
-        report_options = FastlaneScanHelper.report_options
-        output_files = report_options.instance_variable_get(:@output_files)
-        output_directory = report_options.instance_variable_get(:@output_directory)
-        file_name = output_files.select { |name| name.include?('.xml') }.first
-        @junit_report_path = "#{output_directory}/#{file_name}"
-        @cached_junit_report = File.open(@junit_report_path) { |f| Nokogiri::XML(f) }
+      xcargs = []
+      if @options[:try_parallel]
+        xcargs << '-parallel-testing-enabled YES'
+        if @options[:parallel_workers] || @options[:concurrent_workers]
+          workers_count = [@options[:parallel_workers].to_i, @options[:concurrent_workers].to_i].max
+          xcargs << "-parallel-testing-worker-count #{workers_count}"
+          @options[:concurrent_workers] = nil
+        end
+      else
+        xcargs << '-parallel-testing-enabled NO'
       end
-      @cached_junit_report
+      @options[:xcargs] = "#{@options[:xcargs].to_s} #{xcargs.join(' ')}"
     end
 
-    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)
-
-      new_junit_report.css("testsuites").zip(old_junit_report.css("testsuites")).each do |new_suites, old_suites|
-        old_suites.attributes["failures"].value = new_suites.attributes["failures"].value
-        new_suites.css("testsuite").zip(old_suites.css("testsuite")).each do |new_suite, old_suite|
-          old_suite.attributes["failures"].value = new_suite.attributes["failures"].value
-        end
+    def update_scan_options(failed_tests)
+      scan_options = FastlaneScanHelper.scan_options_from_try_scan_options(@options)
+      scan_options[:only_testing] = failed_tests
+      scan_options[:skip_build] = true
+      scan_options.delete(:skip_testing)
+      if @options[:try_parallel] && !@options[:retry_parallel]
+        scan_options[:xcargs].gsub!(/-parallel-testing-enabled(=|\s+)(YES|NO)/, '-parallel-testing-enabled NO')
+        scan_options[:xcargs].gsub!(/-parallel-testing-worker-count(=|\s+)(\d+)/, '')
       end
 
-      new_junit_report.css('testcase').each do |node1|
-        old_junit_report.css('testcase').each do |node2|
-          node2.children = node1.children if node1['name'] == node2['name']
-        end
-      end
+      Scan.cache.clear
+      scan_options.each do |key, val|
+        next if val.nil?
 
-      File.open(@junit_report_path, "w+") { |f| f.write(old_junit_report.to_xml) }
+        Scan.config.set(key, val)
+        FastlaneCore::UI.verbose("\tSetting #{key.to_s} to #{val}")
+      end
     end
 
     def parse_xcresult_report
@@ -201,8 +159,14 @@ module TryScanManager
       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
+        test_path = failed_test['testCaseName']['_value']
+        begin
+          test_class = test_path.split('.').first
+          test_name = test_path.split('.')[1].split('(').first
+        rescue NoMethodError => _
+          test_class = test_path.split('[')[1].split(' ').first
+          test_name = test_path.split(' ')[1].split(']').first
+        end
         only_testing << "#{suite_name}/#{test_class}/#{test_name}"
       end
       only_testing

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

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

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-try_scan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Alexey Alter-Pesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-06-25 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