fastlane-plugin-try_scan 0.5.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6423da17416a0d0718726d80c011463f8c11763bea4305c77db114fdca0bac98
-  data.tar.gz: a6650bda5beb09a03105ee929904c8c2b25b9df3faf69e4dbe3db9cccba97f90
+SHA1:
+  metadata.gz: 8dbabd07feebaef1f230a9c2afd3dd991a3a3de7
+  data.tar.gz: ed9495eec01b730ab3476c7c76ddd935fe573e6b
 SHA512:
-  metadata.gz: e9e2661f541ba9b72aa57317e3d9b5cea705086b0360827cbd56722361bf1f56a480b23fdbcaad520070b2bdade410680af2ac6de2d3791cb3e77057d604f2a8
-  data.tar.gz: 22ced8f5d7bc59bfa915557f1febb8b9fdf46556feb555063210f15d6658f423f73d8fe79d9a2afc8b1182a0dafc4fcb0fb8efac6dfac0fabedca4edf58fa5f8
+  metadata.gz: 8741546e7347f4f8f7e92c80c7543a9453b72e2a597f0a400168490e6e78709a31ebf99a196037021053bcae05cee765a0326a7d4847c06aed225cb0701b42c2
+  data.tar.gz: 331ac99fbcda25606b17ef06c19bb8f32227213ba146511f719b5dc94abcf6b5183c834fc1803e61ed95d662170b720ac27e9335f9d0b1870d6cf14453c42e69

data/README.md

@@ -1,3 +1,9 @@
+## Important Announcement ⚠️
+
+**Xcode 13** provides test repetitions out of the box. For more details check out [WWDC21](https://developer.apple.com/videos/play/wwdc2021/10296).
+
+---
+
 # try_scan plugin
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-try_scan)
@@ -14,6 +20,9 @@ Under the hood `try_scan` uses official [`fastlane scan action`](https://docs.fa
 | 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` |  |
+| retry_build | Should building be retried after failure? | false |
+| retry_strategy | What would you like to retry after failure: test, class or suite? | test |
+| backup | Back up an output of each execution to a separate folder | false |
 
 ## Requirements
 
@@ -32,7 +41,10 @@ $ fastlane add_plugin try_scan
 ```ruby
 try_scan(
   workspace: "Example.xcworkspace",
-  devices: ["iPhone 7", "iPad Air"],
-  try_count: 3
+  device: "iPhone 11 Pro Max",
+  try_count: 3,
+  parallel_workers: 2,
+  try_parallel: true,
+  retry_parallel: false
 )
 ```

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

@@ -1,6 +1,5 @@
 module Fastlane
   module Actions
-
     require 'json'
     require 'fastlane/actions/scan'
     require_relative '../helper/scan_helper'
@@ -66,6 +65,34 @@ module Fastlane
             type: Integer,
             is_string: false,
             optional: true
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :retry_build,
+            env_name: "FL_TRY_SCAN_RETRY_BUILD",
+            description: "Should building be retried after failure?",
+            is_string: false,
+            optional: true,
+            default_value: false
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :retry_strategy,
+            env_name: "FL_TRY_SCAN_RETRY_STRATEGY",
+            description: "What would you like to retry after failure: test, class or suite?",
+            is_string: true,
+            optional: true,
+            default_value: 'test',
+            verify_block: proc do |strategy|
+              possible_strategies = ['test', 'class', 'suite']
+              UI.user_error!("Error: :retry_strategy must equal to one of the following values: #{possible_strategies}") unless possible_strategies.include?(strategy)
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :backup,
+            env_name: "FL_TRY_SCAN_BACKUP",
+            description: "Back up an output of each execution to a separate folder",
+            is_string: false,
+            optional: true,
+            default_value: false
           )
         ]
       end

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

@@ -66,6 +66,27 @@ module TryScanManager
           end
         end
       end
+
+      def self.backup_output_folder(attempt)
+        output_files = report_options.instance_variable_get(:@output_files)
+        output_directory = report_options.instance_variable_get(:@output_directory)
+
+        unless output_files.empty?
+          FastlaneCore::UI.verbose("Back up an output folder")
+          backup = "#{output_directory}_#{attempt}"
+          FileUtils.mkdir_p(backup)
+          FileUtils.copy_entry(output_directory, backup)
+        end
+      end
+
+      def self.clean_up_backup
+        output_directory = report_options.instance_variable_get(:@output_directory)
+
+        Dir["#{output_directory}_*"].each do |backup|
+          FastlaneCore::UI.verbose("Removing backup: #{backup}")
+          FileUtils.rm_rf(backup)
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,5 @@
 module TryScanManager
   class Runner
-
     FastlaneScanHelper = TryScanManager::Helper::FastlaneScanHelper
 
     def initialize(options = {})
@@ -12,6 +11,7 @@ module TryScanManager
     def run
       configure_xcargs
       prepare_scan_config(@options)
+      FastlaneScanHelper.clean_up_backup
       print_summary
       @attempt = 1
       begin
@@ -23,13 +23,14 @@ module TryScanManager
       rescue FastlaneCore::Interface::FastlaneTestFailure => _
         failed_tests = failed_tests_from_xcresult_report
         print_try_scan_result(failed_tests_count: failed_tests.size)
+        backup_output_folder if @options[:backup]
         return false if finish?
 
         @attempt += 1
         update_scan_options(failed_tests)
         retry
       rescue FastlaneCore::Interface::FastlaneBuildFailure => _
-        return false if finish?
+        return false if finish? || !@options[:retry_build]
 
         @attempt += 1
         retry
@@ -70,7 +71,7 @@ module TryScanManager
     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},
+        config: { "Number of tests" => tests_count_from_xcresult_report, "Number of failures" => failed_tests_count },
         title: "Test Results"
       )
     end
@@ -112,14 +113,18 @@ module TryScanManager
         @options[:build_for_testing] = nil
       end
 
-      if @options[:try_parallel] && !@options[:disable_concurrent_testing]
-        xcargs = ['-parallel-testing-enabled YES']
+      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
-        @options[:xcargs] = "#{@options[:xcargs].to_s} #{xcargs.join(' ')}"
+      else
+        xcargs << '-parallel-testing-enabled NO'
       end
+      @options[:xcargs] = "#{@options[:xcargs]} #{xcargs.join(' ')}"
     end
 
     def update_scan_options(failed_tests)
@@ -137,10 +142,22 @@ module TryScanManager
         next if val.nil?
 
         Scan.config.set(key, val)
-        FastlaneCore::UI.verbose("\tSetting #{key.to_s} to #{val}")
+        FastlaneCore::UI.verbose("\tSetting #{key} to #{val}")
       end
     end
 
+    def retry_failed_test?
+      @options[:retry_strategy] == 'test'
+    end
+
+    def retry_failed_class?
+      @options[:retry_strategy] == 'class'
+    end
+
+    def retry_failed_suite?
+      @options[:retry_strategy] == 'suite'
+    end
+
     def parse_xcresult_report
       report_options = FastlaneScanHelper.report_options
       output_directory = report_options.instance_variable_get(:@output_directory)
@@ -159,17 +176,28 @@ module TryScanManager
         begin
           test_class = test_path.split('.').first
           test_name = test_path.split('.')[1].split('(').first
-        rescue NoMethodError => _
+        rescue
           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}"
+        only_testing <<
+          if retry_failed_test?
+            "#{suite_name}/#{test_class}/#{test_name}"
+          elsif retry_failed_class?
+            "#{suite_name}/#{test_class}"
+          elsif retry_failed_suite?
+            suite_name
+          end
       end
-      only_testing
+      only_testing.uniq
     end
 
     def tests_count_from_xcresult_report
       parse_xcresult_report['metrics']['testsCount']['_value']
     end
+
+    def backup_output_folder
+      FastlaneScanHelper.backup_output_folder(@attempt)
+    end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-try_scan
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexey Alter-Pesotskiy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -39,21 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  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: rspec_junit_formatter
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fasterer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -136,8 +122,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.144.0
-description: 
-email: 33gri@bk.ru
+description:
+email: a.alterpesotskiy@mail.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -154,7 +140,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +155,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.8
+signing_key:
 specification_version: 4
-summary: Simple way to retry your scan action
+summary: The easiest way to retry your fastlane scan action
 test_files: []