fastlane-plugin-test_center 3.6.2 → 3.6.3.parallelizing

data/lib/fastlane/plugin/test_center/helper/xcodebuild_string.rb

@@ -1,3 +1,8 @@
+module TestCenter
+  module Helper
+    MUST_SHELLESCAPE_TESTIDENTIFIER = Gem::Version.new(Fastlane::VERSION) < Gem::Version.new('2.114.0')
+  end
+end
 
 class String
   def testsuite_swift?
@@ -11,4 +16,8 @@ class String
       self
     end
   end
+
+  def shellsafe_testidentifier
+    TestCenter::Helper::MUST_SHELLESCAPE_TESTIDENTIFIER ? self.shellescape : self
+  end
 end

data/lib/fastlane/plugin/test_center/helper/xctestrun_info.rb

@@ -0,0 +1,42 @@
+module TestCenter
+  module Helper
+    require 'plist'
+
+    class XCTestrunInfo
+      def initialize(xctestrun_filepath)
+        raise Errno::ENOENT, xctestrun_filepath unless File.exist?(xctestrun_filepath)
+
+        @xctestrun = Plist.parse_xml(xctestrun_filepath)
+        @xctestrun_rootpath = File.dirname(xctestrun_filepath)
+      end
+
+      def app_path_for_testable(testable)
+        @xctestrun[testable].fetch('UITargetAppPath') do |_|
+          @xctestrun[testable]['TestHostPath']
+        end.sub('__TESTROOT__', @xctestrun_rootpath)
+      end
+
+      def app_plist_for_testable(testable)
+        binary_plistfile = File.join(app_path_for_testable(testable), 'Info.plist')
+
+        Plist.parse_binary_xml(binary_plistfile)
+      end
+    end
+  end
+end
+
+require 'plist'
+
+class Hash
+  def save_binary_plist(filename, options = {})
+    Plist::Emit.save_plist(self, filename)
+    `plutil -convert binary1 \"#{filename}\"`
+  end
+end
+
+module Plist
+  def self.parse_binary_xml(filename)
+    `plutil -convert xml1 \"#{filename}\"`
+    Plist.parse_xml(filename)
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "3.6.2"
+    VERSION = "3.6.3.parallelizing"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3.parallelizing
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -67,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.7
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.56.0
+        version: 2.108.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.56.0
+        version: 2.108.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -235,16 +235,26 @@ files:
 - lib/fastlane/plugin/test_center/actions/collate_junit_reports.rb
 - lib/fastlane/plugin/test_center/actions/collate_test_result_bundles.rb
 - lib/fastlane/plugin/test_center/actions/multi_scan.rb
+- lib/fastlane/plugin/test_center/actions/restart_core_simulator_service.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests.rb
 - lib/fastlane/plugin/test_center/actions/suppress_tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/suppressed_tests.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_junit.rb
 - lib/fastlane/plugin/test_center/actions/tests_from_xctestrun.rb
-- lib/fastlane/plugin/test_center/helper/correcting_scan_helper.rb
 - lib/fastlane/plugin/test_center/helper/junit_helper.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/device_manager.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/interstitial.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/report_collator.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/retrying_scan_helper.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/runner.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/simulator_helper.rb
+- lib/fastlane/plugin/test_center/helper/multi_scan_manager/simulator_manager.rb
 - lib/fastlane/plugin/test_center/helper/reportname_helper.rb
 - lib/fastlane/plugin/test_center/helper/test_collector.rb
 - lib/fastlane/plugin/test_center/helper/xcodebuild_string.rb
+- lib/fastlane/plugin/test_center/helper/xctestrun_info.rb
 - lib/fastlane/plugin/test_center/version.rb
 homepage: https://github.com/lyndsey-ferguson/fastlane-plugin-test_center
 licenses:
@@ -261,12 +271,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Makes testing your iOS app easier

data/lib/fastlane/plugin/test_center/helper/correcting_scan_helper.rb

@@ -1,293 +0,0 @@
-module TestCenter
-  module Helper
-    require 'fastlane_core/ui/ui.rb'
-    require 'plist'
-    require 'json'
-    class CorrectingScanHelper
-      attr_reader :retry_total_count
-
-      def initialize(multi_scan_options)
-        @batch_count = multi_scan_options[:batch_count] || 1
-        @output_directory = multi_scan_options[:output_directory] || 'test_results'
-        @try_count = multi_scan_options[:try_count]
-        @quit_simulators = multi_scan_options[:quit_simulators]
-        @retry_total_count = 0
-        @testrun_completed_block = multi_scan_options[:testrun_completed_block]
-        @given_custom_report_file_name = multi_scan_options[:custom_report_file_name]
-        @given_output_types = multi_scan_options[:output_types]
-        @given_output_files = multi_scan_options[:output_files]
-        @scan_options = multi_scan_options.reject do |option, _|
-          %i[
-            output_directory
-            only_testing
-            skip_testing
-            clean
-            try_count
-            batch_count
-            quit_simulators
-            custom_report_file_name
-            fail_build
-            testrun_completed_block
-            output_types
-            output_files
-          ].include?(option)
-        end
-        @scan_options[:clean] = false
-        @test_collector = TestCollector.new(multi_scan_options)
-      end
-
-      def scan
-        tests_passed = true
-        @testables_count = @test_collector.testables.size
-        @test_collector.testables.each do |testable|
-          tests_passed = scan_testable(testable) && tests_passed
-        end
-        tests_passed
-      end
-
-      def scan_testable(testable)
-        tests_passed = true
-        reportnamer = ReportNameHelper.new(
-          @given_output_types,
-          @given_output_files,
-          @given_custom_report_file_name
-        )
-        output_directory = @output_directory
-        testable_tests = @test_collector.testables_tests[testable]
-        if testable_tests.empty?
-          FastlaneCore::UI.important("There are no tests to run in testable '#{testable}'. Skipping")
-          return true
-        end
-
-        if @batch_count > 1 || @testables_count > 1
-          current_batch = 1
-          testable_tests.each_slice((testable_tests.length / @batch_count.to_f).round).to_a.each do |tests_batch|
-            if @testables_count > 1
-              output_directory = File.join(@output_directory, "results-#{testable}")
-            end
-            FastlaneCore::UI.header("Starting test run on testable '#{testable}'")
-            if @scan_options[:result_bundle]
-              FastlaneCore::UI.message("Clearing out previous test_result bundles in #{output_directory}")
-              FileUtils.rm_rf(Dir.glob("#{output_directory}/*.test_result"))
-            end
-
-            tests_passed = correcting_scan(
-              {
-                only_testing: tests_batch,
-                output_directory: output_directory
-              },
-              current_batch,
-              reportnamer
-            ) && tests_passed
-            current_batch += 1
-            reportnamer.increment
-          end
-        else
-          options = {
-            output_directory: output_directory,
-            only_testing: testable_tests
-          }
-          tests_passed = correcting_scan(options, 1, reportnamer) && tests_passed
-        end
-        collate_reports(output_directory, reportnamer)
-        tests_passed
-      end
-
-      def test_result_bundlepaths(output_directory, reportnamer)
-        [
-          File.join(output_directory, @scan_options[:scheme]) + '.test_result',
-          File.join(output_directory, @scan_options[:scheme]) + "_#{reportnamer.report_count}.test_result"
-        ]
-      end
-
-      def collate_reports(output_directory, reportnamer)
-        collate_junit_reports(output_directory, reportnamer)
-
-        if reportnamer.includes_html?
-          collate_html_reports(output_directory, reportnamer)
-        end
-
-        if reportnamer.includes_json?
-          collate_json_reports(output_directory, reportnamer)
-        end
-
-        if @scan_options[:result_bundle]
-          collate_test_result_bundles(output_directory, reportnamer)
-        end
-      end
-
-      def passed_test_count_from_summary(summary)
-        /.*Executed (?<test_count>\d+) test, with (?<test_failures>\d+) failure/ =~ summary
-        test_count.to_i - test_failures.to_i
-      end
-
-      def collate_test_result_bundles(output_directory, reportnamer)
-        test_result_bundlepaths = Dir.glob("#{output_directory}/#{@scan_options[:scheme]}*.test_result").map do |relative_test_result_bundle_filepath|
-          File.absolute_path(relative_test_result_bundle_filepath)
-        end
-        if test_result_bundlepaths.size > 1
-          config = FastlaneCore::Configuration.create(
-            Fastlane::Actions::CollateTestResultBundlesAction.available_options,
-            {
-              bundles: test_result_bundlepaths.sort { |f1, f2| File.mtime(f1) <=> File.mtime(f2) },
-              collated_bundle: File.join(output_directory, @scan_options[:scheme]) + '.test_result'
-            }
-          )
-          Fastlane::Actions::CollateTestResultBundlesAction.run(config)
-        end
-        retried_test_result_bundlepaths = Dir.glob("#{output_directory}/#{@scan_options[:scheme]}_*.test_result")
-        FileUtils.rm_rf(retried_test_result_bundlepaths)
-      end
-
-      def collate_json_reports(output_directory, reportnamer)
-        report_filepaths = Dir.glob("#{output_directory}/#{reportnamer.json_fileglob}").map do |relative_filepath|
-          File.absolute_path(relative_filepath)
-        end
-        if report_filepaths.size > 1
-          config = FastlaneCore::Configuration.create(
-            Fastlane::Actions::CollateJsonReportsAction.available_options,
-            {
-              reports: report_filepaths.sort { |f1, f2| File.mtime(f1) <=> File.mtime(f2) },
-              collated_report: File.absolute_path(File.join(output_directory, reportnamer.json_reportname))
-            }
-          )
-          Fastlane::Actions::CollateJsonReportsAction.run(config)
-        end
-        retried_json_reportfiles = Dir.glob("#{output_directory}/#{reportnamer.json_numbered_fileglob}")
-        FileUtils.rm_f(retried_json_reportfiles)
-      end
-
-      def collate_html_reports(output_directory, reportnamer)
-        report_files = Dir.glob("#{output_directory}/#{reportnamer.html_fileglob}").map do |relative_filepath|
-          File.absolute_path(relative_filepath)
-        end
-        if report_files.size > 1
-          config = FastlaneCore::Configuration.create(
-            Fastlane::Actions::CollateHtmlReportsAction.available_options,
-            {
-              reports: report_files.sort { |f1, f2| File.mtime(f1) <=> File.mtime(f2) },
-              collated_report: File.absolute_path(File.join(output_directory, reportnamer.html_reportname))
-            }
-          )
-          Fastlane::Actions::CollateHtmlReportsAction.run(config)
-        end
-        retried_html_reportfiles = Dir.glob("#{output_directory}/#{reportnamer.html_numbered_fileglob}")
-        FileUtils.rm_f(retried_html_reportfiles)
-      end
-
-      def collate_junit_reports(output_directory, reportnamer)
-        report_files = Dir.glob("#{output_directory}/#{reportnamer.junit_fileglob}").map do |relative_filepath|
-          File.absolute_path(relative_filepath)
-        end
-        if report_files.size > 1
-          config = FastlaneCore::Configuration.create(
-            Fastlane::Actions::CollateJunitReportsAction.available_options,
-            {
-              reports: report_files.sort { |f1, f2| File.mtime(f1) <=> File.mtime(f2) },
-              collated_report: File.absolute_path(File.join(output_directory, reportnamer.junit_reportname))
-            }
-          )
-          Fastlane::Actions::CollateJunitReportsAction.run(config)
-        end
-        retried_junit_reportfiles = Dir.glob("#{output_directory}/#{reportnamer.junit_numbered_fileglob}")
-        FileUtils.rm_f(retried_junit_reportfiles)
-      end
-
-      def correcting_scan(scan_run_options, batch, reportnamer)
-        scan_options = @scan_options.merge(scan_run_options)
-        try_count = 0
-        tests_passed = true
-        xcpretty_json_file_output = ENV['XCPRETTY_JSON_FILE_OUTPUT']
-        begin
-          try_count += 1
-          config = FastlaneCore::Configuration.create(
-            Fastlane::Actions::ScanAction.available_options,
-            scan_options.merge(reportnamer.scan_options)
-          )
-          quit_simulators
-          if reportnamer.includes_json?
-            ENV['XCPRETTY_JSON_FILE_OUTPUT'] = File.join(
-              scan_options[:output_directory],
-              reportnamer.json_last_reportname
-            )
-          end
-          Fastlane::Actions::ScanAction.run(config)
-          @testrun_completed_block && @testrun_completed_block.call(
-            testrun_info(batch, try_count, reportnamer, scan_options[:output_directory])
-          )
-          tests_passed = true
-        rescue FastlaneCore::Interface::FastlaneTestFailure => e
-          FastlaneCore::UI.verbose("Scan failed with #{e}")
-          info = testrun_info(batch, try_count, reportnamer, scan_options[:output_directory])
-          @testrun_completed_block && @testrun_completed_block.call(
-            info
-          )
-          if try_count < @try_count
-            @retry_total_count += 1
-            scan_options.delete(:code_coverage)
-            scan_options[:only_testing] = info[:failed].map(&:shellescape)
-            FastlaneCore::UI.message('Re-running scan on only failed tests')
-            reportnamer.increment
-            if @scan_options[:result_bundle]
-              built_test_result, moved_test_result = test_result_bundlepaths(
-                scan_options[:output_directory], reportnamer
-              )
-              FileUtils.mv(built_test_result, moved_test_result)
-            end
-            retry
-          end
-          tests_passed = false
-        ensure
-          ENV['XCPRETTY_JSON_FILE_OUTPUT'] = xcpretty_json_file_output
-        end
-        tests_passed
-      end
-
-      def testrun_info(batch, try_count, reportnamer, output_directory)
-        report_filepath = File.join(output_directory, reportnamer.junit_last_reportname)
-        config = FastlaneCore::Configuration.create(
-          Fastlane::Actions::TestsFromJunitAction.available_options,
-          {
-            junit: File.absolute_path(report_filepath)
-          }
-        )
-        junit_results = Fastlane::Actions::TestsFromJunitAction.run(config)
-
-        info = {
-          failed: junit_results[:failed],
-          passing: junit_results[:passing],
-          batch: batch,
-          try_count: try_count,
-          report_filepath: report_filepath
-        }
-        if reportnamer.includes_html?
-          html_report_filepath = File.join(output_directory, reportnamer.html_last_reportname)
-          info[:html_report_filepath] = html_report_filepath
-        end
-        if reportnamer.includes_json?
-          json_report_filepath = File.join(output_directory, reportnamer.json_last_reportname)
-          info[:json_report_filepath] = json_report_filepath
-        end
-        if @scan_options[:result_bundle]
-          test_result_suffix = '.test_result'
-          test_result_suffix.prepend("_#{reportnamer.report_count}") unless reportnamer.report_count.zero?
-          test_result_bundlepath = File.join(output_directory, @scan_options[:scheme]) + test_result_suffix
-          info[:test_result_bundlepath] = test_result_bundlepath
-        end
-        info
-      end
-
-      def quit_simulators
-        return unless @quit_simulators
-
-        Fastlane::Actions.sh("killall -9 'iPhone Simulator' 'Simulator' 'SimulatorBridge' &> /dev/null || true", log: false)
-        launchctl_list_count = 0
-        while Fastlane::Actions.sh('launchctl list | grep com.apple.CoreSimulator.CoreSimulatorService || true', log: false) != ''
-          break if (launchctl_list_count += 1) > 10
-          Fastlane::Actions.sh('launchctl remove com.apple.CoreSimulator.CoreSimulatorService &> /dev/null || true', log: false)
-          sleep(1)
-        end
-      end
-    end
-  end
-end