fastlane 2.201.0.rc1 → 2.201.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0748d7414d5df9609fbffecf573937a1b74cbdebc81f9ee203e1197b58ecc5b1'
-  data.tar.gz: 6f07f231bb899663f8d4e46561b6c2fe982aad07cc531a9796ec285b0495d8bb
+  metadata.gz: 41a222588b957ee2de626c4f5d4c68b06c225aa154d0a022b601c69676cde448
+  data.tar.gz: 50ea7458c9abe457367e1833e6f4fcafe820a52392191a0ce8e3dcf7e52cafc8
 SHA512:
-  metadata.gz: 79d8d561694712d172f2fcb925abfab4ce52a5be9d5af2e5645dd88813e0a65581e192c4ee21b792571685293a615d839442e156322f0cea7d6ef0303487747b
-  data.tar.gz: 8f5abd82eed5601477648a67bef8275c7ce4a48926550f409220f91fd54626ba375fef8827c5625ea6bf7d2ab833fbf8cdb49aa15ff9f02b51b93cde806cb144
+  metadata.gz: 0af11e8d7527c5c9fa47f76ad1ccd34b4c0a9ac4fc9ceb4aa5613f5a929761a4c4daa416717fae3e9be6c561c5ca59b58ce267ab8db4ef0722e3a1518d47ea90
+  data.tar.gz: 294ddfa23c72c683fa336d0437a2456d91d9bbb598a162af2f971eee012a476baca979e58e5702443c8b5f29218c50d6a25ed6f12d74a6f9bff1a417c945eceb

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.201.0.rc1'.freeze
+  VERSION = '2.201.0.rc2'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '1.12.1'.freeze

data/gym/lib/gym/options.rb

@@ -234,7 +234,7 @@ module Gym
 
         FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
                                      env_names: ["GYM_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
-                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test')",
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter",
                                      type: String,
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),

data/scan/lib/scan/options.rb

@@ -264,7 +264,7 @@ module Scan
 
         FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
                                      env_names: ["SCAN_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
-                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test')",
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter",
                                      type: String,
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),

data/scan/lib/scan/runner.rb

@@ -137,6 +137,36 @@ module Scan
       return retryable_tests.uniq
     end
 
+    def find_filename(type)
+      index = Scan.config[:output_types].split(',').index(type)
+      return nil if index.nil?
+      return (Scan.config[:output_files] || "").split(',')[index]
+    end
+
+    def output_html?
+      return Scan.config[:output_types].split(',').include?('html')
+    end
+
+    def output_junit?
+      return Scan.config[:output_types].split(',').include?('junit')
+    end
+
+    def output_json_compilation_database?
+      return Scan.config[:output_types].split(',').include?('json-compilation-database')
+    end
+
+    def output_html_filename
+      return find_filename('html')
+    end
+
+    def output_junit_filename
+      return find_filename('junit')
+    end
+
+    def output_json_compilation_database_filename
+      return find_filename('json-compilation-database')
+    end
+
     def trainer_test_results
       require "trainer"
 
@@ -147,17 +177,37 @@ module Scan
       }
 
       result_bundle_path = Scan.cache[:result_bundle_path]
+
       output_path = Scan.config[:output_directory] || Dir.mktmpdir
+      output_path = File.absolute_path(output_path)
 
       UI.crash!("A -resultBundlePath is needed to parse the test results. This should not have happened. Please file an issue.") unless result_bundle_path
 
       params = {
         path: result_bundle_path,
-        output_path: output_path,
-        silent: true,
-        extension: "xml"
+        silent: true
       }
 
+      formatter = Scan.config[:xcodebuild_formatter].chomp
+
+      if output_html? && formatter != 'xcpretty'
+        UI.error("HTML output is only available with `xcodebuild_formatter: 'xcpretty'` right now...")
+      end
+
+      if output_json_compilation_database? && formatter != 'xcpretty'
+        UI.error("JSON Compilation Database output is only available with `xcodebuild_formatter: 'xcpretty'` right now...")
+      end
+
+      if output_junit?
+        if formatter == 'xcpretty'
+          UI.verbose("Generating junit report with xcpretty")
+        else
+          UI.verbose("Generating junit report with trainer")
+          params[:output_filename] = output_junit_filename || "report.junit"
+          params[:output_directory] = output_path
+        end
+      end
+
       resulting_paths = Trainer::TestParser.auto_convert(params)
       resulting_paths.each do |path, data|
         results[:number_of_tests] += data[:number_of_tests_excluding_retries]

data/scan/lib/scan/test_command_generator.rb

@@ -119,7 +119,9 @@ module Scan
       formatter = Scan.config[:xcodebuild_formatter].chomp
       options = legacy_xcpretty_options
 
-      if !options.empty?
+      if formatter == ''
+        UI.verbose("Not using an xcodebuild formatter")
+      elsif !options.empty?
         UI.important("Detected legacy xcpretty being used so formatting wth xcpretty")
         UI.important("Option(s) used: #{options.join(', ')}")
         pipe << pipe_xcpretty
@@ -150,7 +152,6 @@ module Scan
       options << "formatter" if Scan.config[:formatter]
       options << "xcpretty_formatter" if Scan.config[:xcpretty_formatter]
       options << "output_style" if Scan.config[:output_style]
-      options << "output_files" if Scan.config[:output_files]
       options << "output_types" if (Scan.config[:output_types] || "").include?("json-compilation-database")
       options << "custom_report_file_name" if Scan.config[:custom_report_file_name]
 

data/snapshot/lib/snapshot/options.rb

@@ -291,7 +291,7 @@ module Snapshot
 
         FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
                                      env_names: ["SNAPSHOT_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
-                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test')",
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter",
                                      type: String,
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),

data/trainer/lib/trainer/test_parser.rb

@@ -50,29 +50,40 @@ module Trainer
 
       return_hash = {}
       files.each do |path|
-        if config[:output_directory]
-          FileUtils.mkdir_p(config[:output_directory])
-          # Remove .xcresult or .plist extension
-          if path.end_with?(".xcresult")
-            filename = File.basename(path).gsub(".xcresult", config[:extension])
-          else
-            filename = File.basename(path).gsub(".plist", config[:extension])
-          end
-          to_path = File.join(config[:output_directory], filename)
-        else
-          # Remove .xcresult or .plist extension
-          if path.end_with?(".xcresult")
-            to_path = path.gsub(".xcresult", config[:extension])
+        extension = config[:extension]
+        output_filename = config[:output_filename]
+
+        should_write_file = !extension.nil? || !output_filename.nil?
+
+        if should_write_file
+          if config[:output_directory]
+            FileUtils.mkdir_p(config[:output_directory])
+            # Remove .xcresult or .plist extension
+            # Use custom file name ONLY if one file otherwise issues
+            if files.size == 1 && output_filename
+              filename = output_filename
+            elsif path.end_with?(".xcresult")
+              filename ||= File.basename(path).gsub(".xcresult", extension)
+            else
+              filename ||= File.basename(path).gsub(".plist", extension)
+            end
+            to_path = File.join(config[:output_directory], filename)
           else
-            to_path = path.gsub(".plist", config[:extension])
+            # Remove .xcresult or .plist extension
+            if path.end_with?(".xcresult")
+              to_path = path.gsub(".xcresult", extension)
+            else
+              to_path = path.gsub(".plist", extension)
+            end
           end
         end
 
         tp = Trainer::TestParser.new(path, config)
-        File.write(to_path, tp.to_junit)
-        UI.success("Successfully generated '#{to_path}'") unless config[:silent]
+        File.write(to_path, tp.to_junit) if should_write_file
+        UI.success("Successfully generated '#{to_path}'") if should_write_file && !config[:silent]
 
-        return_hash[to_path] = {
+        return_hash[path] = {
+          to_path: to_path,
           successful: tp.tests_successful?,
           number_of_tests: tp.number_of_tests,
           number_of_failures: tp.number_of_failures,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.201.0.rc1
+  version: 2.201.0.rc2
 platform: ruby
 authors:
 - Jimmy Dee
@@ -32,7 +32,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-13 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj