fastlane 2.198.0 → 2.201.0.rc1

data/supply/lib/supply/options.rb

@@ -217,6 +217,14 @@ module Supply
                                      verify_block: proc do |value|
                                        UI.user_error!("'rollout' is no longer a valid track name - please use 'production' instead") if value.casecmp('rollout').zero?
                                      end),
+        FastlaneCore::ConfigItem.new(key: :track_promote_release_status,
+                                     env_name: "SUPPLY_TRACK_PROMOTE_RELEASE_STATUS",
+                                     optional: true,
+                                     description: "Promoted track release status (used when promoting a track) - valid values are #{Supply::ReleaseStatus::ALL.join(', ')}",
+                                     default_value: Supply::ReleaseStatus::COMPLETED,
+                                     verify_block: proc do |value|
+                                                     UI.user_error!("Value must be one of '#{Supply::RELEASE_STATUS}'") unless Supply::ReleaseStatus::ALL.include?(value)
+                                                   end),
         FastlaneCore::ConfigItem.new(key: :validate_only,
                                      env_name: "SUPPLY_VALIDATE_ONLY",
                                      optional: true,

data/supply/lib/supply/uploader.rb

@@ -164,6 +164,10 @@ module Supply
         UI.user_error!(%(Cannot specify rollout percentage when the release status is set to 'draft'))
       end
 
+      if Supply.config[:track_promote_release_status] == Supply::ReleaseStatus::DRAFT && Supply.config[:rollout]
+        UI.user_error!(%(Cannot specify rollout percentage when the track promote release status is set to 'draft'))
+      end
+
       unless Supply.config[:version_codes_to_retain].nil?
         Supply.config[:version_codes_to_retain] = Supply.config[:version_codes_to_retain].map(&:to_i)
       end
@@ -182,7 +186,7 @@ module Supply
         end
       else
         releases = releases.select do |release|
-          release.status == Supply::ReleaseStatus::COMPLETED
+          release.status == Supply.config[:release_status]
         end
       end
 
@@ -200,7 +204,7 @@ module Supply
         release.status = Supply::ReleaseStatus::IN_PROGRESS
         release.user_fraction = rollout
       else
-        release.status = Supply::ReleaseStatus::COMPLETED
+        release.status = Supply.config[:track_promote_release_status]
         release.user_fraction = nil
       end
 

data/trainer/lib/assets/junit.xml.erb

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<% number_of_tests = 0 %>
+<% number_of_failures = 0 %>
+<% @results.each { |a| number_of_tests += a[:number_of_tests] } %>
+<% @results.each { |a| number_of_failures += a[:number_of_failures] } %>
+
+<testsuites tests="<%= number_of_tests %>" failures="<%= number_of_failures %>">
+  <% @results.each do |testsuite| %>
+    <testsuite name=<%= (testsuite[:target_name].nil? ? testsuite[:test_name] : testsuite[:target_name]).encode(:xml => :attr) %> tests="<%= testsuite[:number_of_tests] %>" failures="<%= testsuite[:number_of_failures] %>" time="<%= testsuite[:duration] %>">
+      <% testsuite[:tests].each do |test| %>
+        <testcase classname=<%= test[:test_group].encode(:xml => :attr) %> name=<%= test[:name].encode(:xml => :attr) %> time="<%= test[:duration] %>">
+          <% (test[:failures] || []).each do |failure| %>
+            <failure message=<%= failure[:failure_message].encode(:xml => :attr) %>>
+            </failure>
+          <% end %>
+        </testcase>
+      <% end %>
+    </testsuite>
+  <% end %>
+</testsuites>

data/trainer/lib/trainer/commands_generator.rb

@@ -0,0 +1,51 @@
+require 'commander'
+
+require 'fastlane_core/configuration/configuration'
+require 'fastlane_core/ui/help_formatter'
+
+require_relative 'options'
+require_relative 'test_parser'
+
+require_relative 'module'
+
+HighLine.track_eof = false
+
+module Trainer
+  class CommandsGenerator
+    include Commander::Methods
+
+    def self.start
+      self.new.run
+    end
+
+    def run
+      program :version, Fastlane::VERSION
+      program :description, Trainer::DESCRIPTION
+      program :help, 'Author', 'Felix Krause <trainer@krausefx.com>'
+      program :help, 'Website', 'https://fastlane.tools'
+      program :help, 'GitHub', 'https://github.com/KrauseFx/trainer'
+      program :help_formatter, :compact
+
+      global_option('--verbose', 'Shows a more verbose output') { $verbose = true }
+
+      always_trace!
+
+      FastlaneCore::CommanderGenerator.new.generate(Trainer::Options.available_options)
+
+      command :run do |c|
+        c.syntax = 'trainer'
+        c.description = Trainer::DESCRIPTION
+
+        c.action do |args, options|
+          options = FastlaneCore::Configuration.create(Trainer::Options.available_options, options.__hash__)
+          FastlaneCore::PrintTable.print_values(config: options, title: "Summary for trainer #{Fastlane::VERSION}") if $verbose
+          Trainer::TestParser.auto_convert(options)
+        end
+      end
+
+      default_command(:run)
+
+      run!
+    end
+  end
+end

data/trainer/lib/trainer/junit_generator.rb

@@ -0,0 +1,31 @@
+require_relative 'module'
+
+module Trainer
+  class JunitGenerator
+    attr_accessor :results
+
+    def initialize(results)
+      self.results = results
+    end
+
+    def generate
+      # JUnit file documentation: http://llg.cubic.org/docs/junit/
+      # And http://nelsonwells.net/2012/09/how-jenkins-ci-parses-and-displays-junit-output/
+      # And http://windyroad.com.au/dl/Open%20Source/JUnit.xsd
+
+      lib_path = Trainer::ROOT
+      xml_path = File.join(lib_path, "lib/assets/junit.xml.erb")
+      xml = ERB.new(File.read(xml_path), nil, '<>').result(binding) # http://www.rrn.dk/rubys-erb-templating-system
+
+      xml = xml.gsub('system_', 'system-').delete("\e") # Jenkins can not parse 'ESC' symbol
+
+      # We have to manuall clear empty lines
+      # They may contain white spaces
+      clean_xml = []
+      xml.each_line do |row|
+        clean_xml << row.delete("\n") if row.strip.to_s.length > 0
+      end
+      return clean_xml.join("\n")
+    end
+  end
+end

data/trainer/lib/trainer/module.rb

@@ -0,0 +1,10 @@
+require 'fastlane_core/helper'
+require 'fastlane/boolean'
+
+module Trainer
+  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
+  Boolean = Fastlane::Boolean
+  ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
+  DESCRIPTION = "Convert xcodebuild plist and xcresult files to JUnit reports"
+end

data/trainer/lib/trainer/options.rb

@@ -0,0 +1,55 @@
+require 'fastlane_core/configuration/config_item'
+
+require_relative 'module'
+
+module Trainer
+  class Options
+    def self.available_options
+      @options ||= [
+        FastlaneCore::ConfigItem.new(key: :path,
+                                     short_option: "-p",
+                                     env_name: "TRAINER_PATH",
+                                     default_value: ".",
+                                     description: "Path to the directory that should be converted",
+                                     verify_block: proc do |value|
+                                       v = File.expand_path(value.to_s)
+                                       if v.end_with?(".plist")
+                                         UI.user_error!("Can't find file at path #{v}") unless File.exist?(v)
+                                       else
+                                         UI.user_error!("Path '#{v}' is not a directory or can't be found") unless File.directory?(v)
+                                       end
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :extension,
+                                     short_option: "-e",
+                                     env_name: "TRAINER_EXTENSION",
+                                     default_value: ".xml",
+                                     description: "The extension for the newly created file. Usually .xml or .junit",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("extension must contain a `.`") unless value.include?(".")
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :output_directory,
+                                     short_option: "-o",
+                                     env_name: "TRAINER_OUTPUT_DIRECTORY",
+                                     default_value: nil,
+                                     optional: true,
+                                     description: "Directoy in which the xml files should be written to. Same directory as source by default"),
+        FastlaneCore::ConfigItem.new(key: :fail_build,
+                                     env_name: "TRAINER_FAIL_BUILD",
+                                     description: "Should this step stop the build if the tests fail? Set this to false if you're handling this with a test reporter",
+                                     is_string: false,
+                                     default_value: true),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_naming,
+                                     short_option: "-x",
+                                     env_name: "TRAINER_XCPRETTY_NAMING",
+                                     description: "Produces class name and test name identical to xcpretty naming in junit file",
+                                     is_string: false,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :silent,
+                                     env_name: "TRAINER_SILENT",
+                                     description: "Silences all output",
+                                     is_string: false,
+                                     default_value: false)
+      ]
+    end
+  end
+end

data/trainer/lib/trainer/test_parser.rb

@@ -0,0 +1,335 @@
+require 'plist'
+
+require 'fastlane_core/print_table'
+
+require_relative 'junit_generator'
+require_relative 'xcresult'
+require_relative 'module'
+
+module Trainer
+  class TestParser
+    attr_accessor :data
+
+    attr_accessor :file_content
+
+    attr_accessor :raw_json
+
+    attr_accessor :number_of_tests
+    attr_accessor :number_of_failures
+    attr_accessor :number_of_tests_excluding_retries
+    attr_accessor :number_of_failures_excluding_retries
+    attr_accessor :number_of_retries
+
+    # Returns a hash with the path being the key, and the value
+    # defining if the tests were successful
+    def self.auto_convert(config)
+      unless config[:silent]
+        FastlaneCore::PrintTable.print_values(config: config,
+                                               title: "Summary for trainer #{Fastlane::VERSION}")
+      end
+
+      containing_dir = config[:path]
+      # Xcode < 10
+      files = Dir["#{containing_dir}/**/Logs/Test/*TestSummaries.plist"]
+      files += Dir["#{containing_dir}/Test/*TestSummaries.plist"]
+      files += Dir["#{containing_dir}/*TestSummaries.plist"]
+      # Xcode 10
+      files += Dir["#{containing_dir}/**/Logs/Test/*.xcresult/TestSummaries.plist"]
+      files += Dir["#{containing_dir}/Test/*.xcresult/TestSummaries.plist"]
+      files += Dir["#{containing_dir}/*.xcresult/TestSummaries.plist"]
+      files += Dir[containing_dir] if containing_dir.end_with?(".plist") # if it's the exact path to a plist file
+      # Xcode 11
+      files += Dir["#{containing_dir}/**/Logs/Test/*.xcresult"]
+      files += Dir["#{containing_dir}/Test/*.xcresult"]
+      files += Dir["#{containing_dir}/*.xcresult"]
+      files << containing_dir if File.extname(containing_dir) == ".xcresult"
+
+      if files.empty?
+        UI.user_error!("No test result files found in directory '#{containing_dir}', make sure the file name ends with 'TestSummaries.plist' or '.xcresult'")
+      end
+
+      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])
+          else
+            to_path = path.gsub(".plist", config[:extension])
+          end
+        end
+
+        tp = Trainer::TestParser.new(path, config)
+        File.write(to_path, tp.to_junit)
+        UI.success("Successfully generated '#{to_path}'") unless config[:silent]
+
+        return_hash[to_path] = {
+          successful: tp.tests_successful?,
+          number_of_tests: tp.number_of_tests,
+          number_of_failures: tp.number_of_failures,
+          number_of_tests_excluding_retries: tp.number_of_tests_excluding_retries,
+          number_of_failures_excluding_retries: tp.number_of_failures_excluding_retries,
+          number_of_retries: tp.number_of_retries
+        }
+      end
+      return_hash
+    end
+
+    def initialize(path, config = {})
+      path = File.expand_path(path)
+      UI.user_error!("File not found at path '#{path}'") unless File.exist?(path)
+
+      if File.directory?(path) && path.end_with?(".xcresult")
+        parse_xcresult(path)
+      else
+        self.file_content = File.read(path)
+        self.raw_json = Plist.parse_xml(self.file_content)
+
+        return if self.raw_json["FormatVersion"].to_s.length.zero? # maybe that's a useless plist file
+
+        ensure_file_valid!
+        parse_content(config[:xcpretty_naming])
+      end
+
+      self.number_of_tests = 0
+      self.number_of_failures = 0
+      self.number_of_tests_excluding_retries = 0
+      self.number_of_failures_excluding_retries = 0
+      self.number_of_retries = 0
+      self.data.each do |thing|
+        self.number_of_tests += thing[:number_of_tests].to_i
+        self.number_of_failures += thing[:number_of_failures].to_i
+        self.number_of_tests_excluding_retries += thing[:number_of_tests_excluding_retries].to_i
+        self.number_of_failures_excluding_retries += thing[:number_of_failures_excluding_retries].to_i
+        self.number_of_retries += thing[:number_of_retries].to_i
+      end
+    end
+
+    # Returns the JUnit report as String
+    def to_junit
+      JunitGenerator.new(self.data).generate
+    end
+
+    # @return [Bool] were all tests successful? Is false if at least one test failed
+    def tests_successful?
+      self.data.collect { |a| a[:number_of_failures] }.all?(&:zero?)
+    end
+
+    private
+
+    def ensure_file_valid!
+      format_version = self.raw_json["FormatVersion"]
+      supported_versions = ["1.1", "1.2"]
+      UI.user_error!("Format version '#{format_version}' is not supported, must be #{supported_versions.join(', ')}") unless supported_versions.include?(format_version)
+    end
+
+    # Converts the raw plist test structure into something that's easier to enumerate
+    def unfold_tests(data)
+      # `data` looks like this
+      # => [{"Subtests"=>
+      #  [{"Subtests"=>
+      #     [{"Subtests"=>
+      #        [{"Duration"=>0.4,
+      #          "TestIdentifier"=>"Unit/testExample()",
+      #          "TestName"=>"testExample()",
+      #          "TestObjectClass"=>"IDESchemeActionTestSummary",
+      #          "TestStatus"=>"Success",
+      #          "TestSummaryGUID"=>"4A24BFED-03E6-4FBE-BC5E-2D80023C06B4"},
+      #         {"FailureSummaries"=>
+      #           [{"FileName"=>"/Users/krausefx/Developer/themoji/Unit/Unit.swift",
+      #             "LineNumber"=>34,
+      #             "Message"=>"XCTAssertTrue failed - ",
+      #             "PerformanceFailure"=>false}],
+      #          "TestIdentifier"=>"Unit/testExample2()",
+
+      tests = []
+      data.each do |current_hash|
+        if current_hash["Subtests"]
+          tests += unfold_tests(current_hash["Subtests"])
+        end
+        if current_hash["TestStatus"]
+          tests << current_hash
+        end
+      end
+      return tests
+    end
+
+    # Returns the test group and test name from the passed summary and test
+    # Pass xcpretty_naming = true to get the test naming aligned with xcpretty
+    def test_group_and_name(testable_summary, test, xcpretty_naming)
+      if xcpretty_naming
+        group = testable_summary["TargetName"] + "." + test["TestIdentifier"].split("/")[0..-2].join(".")
+        name = test["TestName"][0..-3]
+      else
+        group = test["TestIdentifier"].split("/")[0..-2].join(".")
+        name = test["TestName"]
+      end
+      return group, name
+    end
+
+    def execute_cmd(cmd)
+      output = `#{cmd}`
+      raise "Failed to execute - #{cmd}" unless $?.success?
+      return output
+    end
+
+    def parse_xcresult(path)
+      require 'shellwords'
+      path = Shellwords.escape(path)
+
+      # Executes xcresulttool to get JSON format of the result bundle object
+      result_bundle_object_raw = execute_cmd("xcrun xcresulttool get --format json --path #{path}")
+      result_bundle_object = JSON.parse(result_bundle_object_raw)
+
+      # Parses JSON into ActionsInvocationRecord to find a list of all ids for ActionTestPlanRunSummaries
+      actions_invocation_record = Trainer::XCResult::ActionsInvocationRecord.new(result_bundle_object)
+      test_refs = actions_invocation_record.actions.map do |action|
+        action.action_result.tests_ref
+      end.compact
+      ids = test_refs.map(&:id)
+
+      # Maps ids into ActionTestPlanRunSummaries by executing xcresulttool to get JSON
+      # containing specific information for each test summary,
+      summaries = ids.map do |id|
+        raw = execute_cmd("xcrun xcresulttool get --format json --path #{path} --id #{id}")
+        json = JSON.parse(raw)
+        Trainer::XCResult::ActionTestPlanRunSummaries.new(json)
+      end
+
+      # Converts the ActionTestPlanRunSummaries to data for junit generator
+      failures = actions_invocation_record.issues.test_failure_summaries || []
+      summaries_to_data(summaries, failures)
+    end
+
+    def summaries_to_data(summaries, failures)
+      # Gets flat list of all ActionTestableSummary
+      all_summaries = summaries.map(&:summaries).flatten
+      testable_summaries = all_summaries.map(&:testable_summaries).flatten
+
+      # Maps ActionTestableSummary to rows for junit generator
+      rows = testable_summaries.map do |testable_summary|
+        all_tests = testable_summary.all_tests.flatten
+
+        # Used by store number of passes and failures by identifier
+        # This is used when Xcode 13 (and up) retries tests
+        # The identifier is duplicated until test succeeds or max count is reachd
+        tests_by_identifier = {}
+
+        test_rows = all_tests.map do |test|
+          identifier = "#{test.parent.name}.#{test.name}"
+          test_row = {
+            identifier: identifier,
+            name: test.name,
+            duration: test.duration,
+            status: test.test_status,
+            test_group: test.parent.name,
+
+            # These don't map to anything but keeping empty strings
+            guid: ""
+          }
+
+          info = tests_by_identifier[identifier] || {}
+          info[:failure_count] ||= 0
+          info[:success_count] ||= 0
+
+          retry_count = info[:retry_count]
+          if retry_count.nil?
+            retry_count = 0
+          else
+            retry_count += 1
+          end
+          info[:retry_count] = retry_count
+
+          # Set failure message if failure found
+          failure = test.find_failure(failures)
+          if failure
+            test_row[:failures] = [{
+              file_name: "",
+              line_number: 0,
+              message: "",
+              performance_failure: {},
+              failure_message: failure.failure_message
+            }]
+
+            info[:failure_count] += 1
+          else
+            info[:success_count] = 1
+          end
+
+          tests_by_identifier[identifier] = info
+
+          test_row
+        end
+
+        row = {
+          project_path: testable_summary.project_relative_path,
+          target_name: testable_summary.target_name,
+          test_name: testable_summary.name,
+          duration: all_tests.map(&:duration).inject(:+),
+          tests: test_rows
+        }
+
+        row[:number_of_tests] = row[:tests].count
+        row[:number_of_failures] = row[:tests].find_all { |a| (a[:failures] || []).count > 0 }.count
+
+        # Used for seeing if any tests continued to fail after all of the Xcode 13 (and up) retries have finished
+        unique_tests = tests_by_identifier.values || []
+        row[:number_of_tests_excluding_retries] = unique_tests.count
+        row[:number_of_failures_excluding_retries] = unique_tests.find_all { |a| a[:success_count] == 0 }.count
+        row[:number_of_retries] = unique_tests.map { |a| a[:retry_count] }.inject(:+)
+
+        row
+      end
+
+      self.data = rows
+    end
+
+    # Convert the Hashes and Arrays in something more useful
+    def parse_content(xcpretty_naming)
+      self.data = self.raw_json["TestableSummaries"].collect do |testable_summary|
+        summary_row = {
+          project_path: testable_summary["ProjectPath"],
+          target_name: testable_summary["TargetName"],
+          test_name: testable_summary["TestName"],
+          duration: testable_summary["Tests"].map { |current_test| current_test["Duration"] }.inject(:+),
+          tests: unfold_tests(testable_summary["Tests"]).collect do |current_test|
+            test_group, test_name = test_group_and_name(testable_summary, current_test, xcpretty_naming)
+            current_row = {
+              identifier: current_test["TestIdentifier"],
+                 test_group: test_group,
+                 name: test_name,
+              object_class: current_test["TestObjectClass"],
+              status: current_test["TestStatus"],
+              guid: current_test["TestSummaryGUID"],
+              duration: current_test["Duration"]
+            }
+            if current_test["FailureSummaries"]
+              current_row[:failures] = current_test["FailureSummaries"].collect do |current_failure|
+                {
+                  file_name: current_failure['FileName'],
+                  line_number: current_failure['LineNumber'],
+                  message: current_failure['Message'],
+                  performance_failure: current_failure['PerformanceFailure'],
+                  failure_message: "#{current_failure['Message']} (#{current_failure['FileName']}:#{current_failure['LineNumber']})"
+                }
+              end
+            end
+            current_row
+          end
+        }
+        summary_row[:number_of_tests] = summary_row[:tests].count
+        summary_row[:number_of_failures] = summary_row[:tests].find_all { |a| (a[:failures] || []).count > 0 }.count
+        summary_row
+      end
+    end
+  end
+end