fastlane-plugin-try_scan 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1cf8ffd4f2e1a0558797b6bdd7094d7b36f42306d28d10bea3172be11c42688
-  data.tar.gz: c286e3609e7900a837322e36dc86ed3ead3a17fe0a32a3239a87de8feb8a742a
+  metadata.gz: 6423da17416a0d0718726d80c011463f8c11763bea4305c77db114fdca0bac98
+  data.tar.gz: a6650bda5beb09a03105ee929904c8c2b25b9df3faf69e4dbe3db9cccba97f90
 SHA512:
-  metadata.gz: 27fea4e492a529eee6953d601914075b0042549345bfb4fc91e28bf0562fc514c943bbebdb929777c5973d863ec8b09795b9445e46c76cd3da142a14c42d08fa
-  data.tar.gz: 12bab09a883ab80263e01a65b07ec9670df952a2800d1296a87688af7bf8736de240ebf35f05cf6f54df822d405cc3cf3c50f40b2c6ca3f908b0db69e1288d32
+  metadata.gz: e9e2661f541ba9b72aa57317e3d9b5cea705086b0360827cbd56722361bf1f56a480b23fdbcaad520070b2bdade410680af2ac6de2d3791cb3e77057d604f2a8
+  data.tar.gz: 22ced8f5d7bc59bfa915557f1febb8b9fdf46556feb555063210f15d6658f423f73d8fe79d9a2afc8b1182a0dafc4fcb0fb8efac6dfac0fabedca4edf58fa5f8

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

@@ -11,8 +11,7 @@ module Fastlane
     class TryScanAction < Action
       def self.run(params)
         if Helper.xcode_at_least?('11.0.0')
-          prepare_scan_config(params.values)
-          prepare_destination(params)
+          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
@@ -21,20 +20,6 @@ module Fastlane
         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
-
-      def self.prepare_destination(params)
-        destination = params[:destination] || Scan.config[:destination] || []
-        unless destination.kind_of?(Array)
-          params[:destination] = Scan.config[:destination] = [destination]
-        end
-      end
-
       #####################################################
       #                   Documentation                   #
       #####################################################
@@ -52,10 +37,35 @@ module Fastlane
           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
@@ -65,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/try_scan_runner.rb

@@ -6,13 +6,15 @@ module TryScanManager
     def initialize(options = {})
       @options = options
       @options[:try_count] = 1 if @options[:try_count] < 1
+      @options[:result_bundle] = true
     end
 
     def run
+      configure_xcargs
+      prepare_scan_config(@options)
       print_summary
       @attempt = 1
       begin
-        essential_scan_config_updates
         warn_of_performing_attempts
         clear_preexisting_data
         Scan::Runner.new.run
@@ -86,12 +88,50 @@ module TryScanManager
       end
     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 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
+
+      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
+
+      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
+
+      if @options[:try_parallel] && !@options[:disable_concurrent_testing]
+        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}"
+        end
+        @options[:xcargs] = "#{@options[:xcargs].to_s} #{xcargs.join(' ')}"
+      end
+    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[:test_without_building] = 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
+
       Scan.cache.clear
       scan_options.each do |key, val|
         next if val.nil?
@@ -101,12 +141,6 @@ module TryScanManager
       end
     end
 
-    def essential_scan_config_updates
-      Scan.config[:result_bundle] = true
-      Scan.config[:build_for_testing] = nil if Scan.config[:build_for_testing]
-      Scan.config[:xcargs].slice!('build-for-testing') if Scan.config[:xcargs]&.include?('build-for-testing')
-    end
-
     def parse_xcresult_report
       report_options = FastlaneScanHelper.report_options
       output_directory = report_options.instance_variable_get(:@output_directory)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TryScan
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

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