fastlane-plugin-test_center 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac301734c581a9473c523f60ea05897a756aabe9
-  data.tar.gz: db399e922c7eda6f9f88c0fcb02a235f92bc64ea
+  metadata.gz: e358292f8958ac882fcf7a1451e9cb8471ae195e
+  data.tar.gz: 2d70736d44380130d0f6b79bf5d5307ffc44f0fe
 SHA512:
-  metadata.gz: e58069d4c3f89808d4163d5f23d0f5dcd40619b195de30f18ecec67e1d7205907a3c6e2fda69d6fb6542e28b1cbbdb423d7bcf33c71be74e2d50100539585ed2
-  data.tar.gz: 61c9c61afb57eee86a1bdbd3a43880deec8221ec40d0e3a7babd23b6552bc5838a15b3681795a6742944d8275b20846f7f261c3fd02f6c3f8628dd456502749f
+  metadata.gz: 2e740176b0e29f4323975406ba7de2c0e1057f1147bc28c42b6f387d640aa692f39dc17cd051c9a1c60406cf3e8dba7f27d282bed52f334d1530893bdc6d0842
+  data.tar.gz: c4ded19826876cfef6c1a8eaaff02bc68ecce76767382ae0c49009293b99cc3a60145627b852381d40063bbeae19f6a3db5b8c61c5923591e8cd1aaae163c60b

data/lib/fastlane/plugin/test_center/actions/multi_scan.rb

@@ -1,6 +1,7 @@
 module Fastlane
   module Actions
     require 'fastlane/actions/scan'
+    require 'fastlane/plugin/merge_junit_report'
     require 'shellwords'
 
     class MultiScanAction < Action
@@ -8,10 +9,12 @@ module Fastlane
         try_count = 0
         scan_options = params.values.reject { |k| k == :try_count }
 
-        FastlaneCore::PrintTable.print_values(
-          config: params._values.reject { |k, v| scan_options.key?(k) },
-          title: "Summary for mult_scan (test_center v#{Fastlane::TestCenter::VERSION})"
-        )
+        unless Helper.test?
+          FastlaneCore::PrintTable.print_values(
+            config: params._values.reject { |k, v| scan_options.key?(k) },
+            title: "Summary for multi_scan (test_center v#{Fastlane::TestCenter::VERSION})"
+          )
+        end
 
         scan_options = config_with_junit_report(scan_options)
 
@@ -31,10 +34,30 @@ module Fastlane
             report_filepath = junit_report_filepath(scan_options)
             failed_tests = other_action.tests_from_junit(junit: report_filepath)[:failed]
             scan_options[:only_testing] = failed_tests.map(&:shellescape)
-            increment_junit_report_filename(scan_options)
+            increment_report_filenames(scan_options)
             retry
           end
         end
+        collate_reports(scan_options)
+      end
+
+      def self.collate_reports(scan_options)
+        extension = junit_report_fileextension(scan_options)
+        report_files = Dir.glob("#{scan_options[:output_directory]}/*#{extension}").map do |relative_filepath|
+          File.absolute_path(relative_filepath)
+        end
+        if report_files.size > 1
+          r = Regexp.new("^(?<filename>.*)-(\\d+)\\.(junit|xml|html)")
+          final_report_name = junit_report_filename(scan_options)
+          match = r.match(final_report_name)
+          if match
+            final_report_name = "#{match[:filename]}#{extension}"
+          end
+          other_action.merge_junit_report(
+            input_files: report_files.reverse,
+            output_file: File.absolute_path(File.join(scan_options[:output_directory], final_report_name))
+          )
+        end
       end
 
       def self.build_for_testing(scan_options)
@@ -78,25 +101,35 @@ module Fastlane
         report_filename
       end
 
+      def self.junit_report_fileextension(config)
+        File.extname(junit_report_filename(config))
+      end
+
       def self.junit_report_filepath(config)
         File.absolute_path(File.join(config[:output_directory], junit_report_filename(config)))
       end
 
-      def self.increment_junit_report_filename(config)
+      def self.increment_report_filename(filename)
         new_report_number = 2
-        report_filename = junit_report_filename(config)
-        if /^(?<report_filename_no_suffix>.*)-(?<report_number>\d+)\.xml/ =~ report_filename
-          new_report_number = report_number.to_i + 1
-          report_filename = report_filename_no_suffix
+        basename = File.basename(filename, '.*')
+        r = Regexp.new("^(?<filename>.*)-(?<report_number>\\d+)\\.(junit|xml|html)")
+        match = r.match(filename)
+        if match
+          new_report_number = match[:report_number].to_i + 1
+          basename = match[:filename]
         end
-        new_report_filename = "#{File.basename(report_filename, '.*')}-#{new_report_number}.xml"
-        if config[:custom_report_file_name]
-          config[:custom_report_file_name] = new_report_filename
-        else
-          junit_index = config[:output_types].split(',').find_index('junit')
+        "#{basename}-#{new_report_number}#{File.extname(filename)}"
+      end
+
+      def self.increment_report_filenames(config)
+        if config[:output_files]
           output_files = config[:output_files].to_s.split(',')
-          output_files[junit_index] = new_report_filename
+          output_files = output_files.map do |output_file|
+            increment_report_filename(output_file)
+          end
           config[:output_files] = output_files.join(',')
+        elsif config[:custom_report_file_name]
+          config[:custom_report_file_name] = increment_report_filename(config[:custom_report_file_name])
         end
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module TestCenter
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-test_center
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Lyndsey Ferguson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fastlane-plugin-merge_junit_report
+  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: bundler
   requirement: !ruby/object:Gem::Requirement