fastlane 2.136.0 → 2.141.0

data/pilot/lib/pilot/options.rb

@@ -132,7 +132,9 @@ module Pilot
         FastlaneCore::ConfigItem.new(key: :skip_waiting_for_build_processing,
                                      short_option: "-z",
                                      env_name: "PILOT_SKIP_WAITING_FOR_BUILD_PROCESSING",
-                                     description: "Don't wait for the build to process. If set to true, the changelog won't be set, `distribute_external` option won't work and no build will be distributed to testers. (You might want to use this option if you are using this action on CI and have to pay for 'minutes used' on your CI plan)",
+                                     description: "If set to true, the `distribute_external` option won't work and no build will be distributed to testers. " \
+                                      "(You might want to use this option if you are using this action on CI and have to pay for 'minutes used' on your CI plan). " \
+                                      "If set to `true` and a changelog is provided, it will partially wait for the build to appear on AppStore Connect so the changelog can be set, and skip the remaining processing steps",
                                      is_string: false,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :update_build_info_on_upload,

data/scan/lib/scan/detect_values.rb

@@ -108,7 +108,7 @@ module Scan
     def self.detect_simulator(devices, requested_os_type, deployment_target_key, default_device_name, simulator_type_descriptor)
       require 'set'
 
-      deployment_target_version = Scan.project.build_settings(key: deployment_target_key) || '0'
+      deployment_target_version = get_deployment_target_version(deployment_target_key)
 
       simulators = filter_simulators(
         FastlaneCore::DeviceManager.simulators(requested_os_type).tap do |array|
@@ -215,5 +215,10 @@ module Scan
         Scan.config[:destination] = min_xcode8? ? ["platform=macOS"] : ["platform=OS X"]
       end
     end
+
+    # get deployment target version
+    def self.get_deployment_target_version(deployment_target_key)
+      Scan.config[:deployment_target_version] || Scan.project.build_settings(key: deployment_target_key) || '0'
+    end
   end
 end

data/scan/lib/scan/manager.rb

@@ -4,8 +4,13 @@ require_relative 'runner'
 
 module Scan
   class Manager
+    attr_accessor :plist_files_before
+
     def work(options)
-      Scan.config = options
+      Scan.config = options # we set this here to auto-detect missing values, which we need later on
+      unless options[:derived_data_path].to_s.empty?
+        self.plist_files_before = test_summary_filenames(Scan.config[:derived_data_path])
+      end
 
       # Also print out the path to the used Xcode installation
       # We go 2 folders up, to not show "Contents/Developer/"
@@ -17,5 +22,17 @@ module Scan
 
       return Runner.new.run
     end
+
+    def test_summary_filenames(derived_data_path)
+      files = []
+
+      # Xcode < 10
+      files += Dir["#{derived_data_path}/**/Logs/Test/*TestSummaries.plist"]
+
+      # Xcode 10
+      files += Dir["#{derived_data_path}/**/Logs/Test/*.xcresult/TestSummaries.plist"]
+
+      return files
+    end
   end
 end

data/scan/lib/scan/options.rb

@@ -81,6 +81,11 @@ module Scan
                                      description: "Enabling this option will automatically erase the simulator before running the application",
                                      default_value: false,
                                      type: Boolean),
+        FastlaneCore::ConfigItem.new(key: :disable_slide_to_type,
+                                     env_name: 'SCAN_DISABLE_SLIDE_TO_TYPE',
+                                     description: "Enabling this option will disable the simulator from showing the 'Slide to type' prompt",
+                                     default_value: true,
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :prelaunch_simulator,
                                      env_name: 'SCAN_PRELAUNCH_SIMULATOR',
                                      description: "Enabling this option will launch the first simulator prior to calling any xcodebuild command",
@@ -311,6 +316,18 @@ module Scan
                                        UI.user_error!("File not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
                                      end),
 
+        # build settings
+        FastlaneCore::ConfigItem.new(key: :app_name,
+                                    env_name: "SCAN_APP_NAME",
+                                    optional: true,
+                                    description: "App name to use in slack message and logfile name",
+                                    is_string: true),
+        FastlaneCore::ConfigItem.new(key: :deployment_target_version,
+                                    env_name: "SCAN_DEPLOYMENT_TARGET_VERSION",
+                                    optional: true,
+                                    description: "Target version of the app being build or tested. Used to filter out simulator version",
+                                    is_string: true),
+
         # slack
         FastlaneCore::ConfigItem.new(key: :slack_url,
                                      short_option: "-i",
@@ -381,7 +398,12 @@ module Scan
                                     description: "Allows for override of the default `xcodebuild` command",
                                     type: String,
                                     optional: true,
-                                    default_value: "env NSUnbufferedIO=YES xcodebuild")
+                                    default_value: "env NSUnbufferedIO=YES xcodebuild"),
+        FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
+                                    env_name: "SCAN_CLONED_SOURCE_PACKAGES_PATH",
+                                    description: "Sets a custom path for Swift Package Manager dependencies",
+                                    type: String,
+                                    optional: true)
 
       ]
     end

data/scan/lib/scan/runner.rb

@@ -31,6 +31,12 @@ module Scan
         end
       end
 
+      if Scan.config[:disable_slide_to_type]
+        Scan.devices.each do |device|
+          FastlaneCore::Simulator.disable_slide_to_type(udid: device.udid)
+        end
+      end
+
       # We call this method, to be sure that all other simulators are killed
       # And a correct one is freshly launched. Switching between multiple simulator
       # in case the user specified multiple targets works with no issues

data/scan/lib/scan/slack_poster.rb

@@ -44,7 +44,7 @@ module Scan
       end
 
       Fastlane::Actions::SlackAction.run({
-        message: "#{Scan.project.app_name} Tests:\n#{Scan.config[:slack_message]}",
+        message: "#{Scan.config[:app_name] || Scan.project.app_name} Tests:\n#{Scan.config[:slack_message]}",
         channel: channel,
         slack_url: Scan.config[:slack_url].to_s,
         success: results[:build_errors].to_i == 0 && results[:failures].to_i == 0,

data/scan/lib/scan/test_command_generator.rb

@@ -120,7 +120,7 @@ module Scan
 
     # Store the raw file
     def xcodebuild_log_path
-      file_name = "#{Scan.project.app_name}-#{Scan.config[:scheme]}.log"
+      file_name = "#{Scan.config[:app_name] || Scan.project.app_name}-#{Scan.config[:scheme]}.log"
       containing = File.expand_path(Scan.config[:buildlog_path])
       FileUtils.mkdir_p(containing)
 

data/screengrab/lib/screengrab/options.rb

@@ -141,16 +141,7 @@ module Screengrab
         FastlaneCore::ConfigItem.new(key: :adb_host,
                                      env_name: 'SCREENGRAB_ADB_HOST',
                                      description: "Configure the host used by adb to connect, allows running on remote devices farm",
-                                     optional: true),
-        FastlaneCore::ConfigItem.new(key: :clean_status_bar,
-                                     env_name: 'SCREENGRAB_CLEAN_STATUS_BAR',
-                                     description: "Enabling this option will clean the status bar",
-                                     default_value: false,
-                                     type: Boolean),
-        FastlaneCore::ConfigItem.new(key: :clean_status_bar_config,
-                                     description: "Specifies the configuration for the clean status bar",
-                                     default_value: {},
-                                     type: Hash)
+                                     optional: true)
       ]
     end
   end

data/screengrab/lib/screengrab/runner.rb

@@ -1,5 +1,6 @@
 require 'fastlane_core/print_table'
 require 'fastlane_core/command_executor'
+require 'fastlane/helper/adb_helper'
 require_relative 'reports_generator'
 require_relative 'module'
 
@@ -84,35 +85,26 @@ module Screengrab
     end
 
     def select_device
-      devices = run_adb_command("devices -l", print_all: true, print_command: true).split("\n")
-      # the first output by adb devices is "List of devices attached" so remove that and any adb startup output
-      devices.reject! do |device|
-        [
-          'server is out of date',    # The adb server is out of date and must be restarted
-          'unauthorized',             # The device has not yet accepted ADB control
-          'offline',                  # The device is offline, skip it
-          '* daemon',                 # Messages printed when the daemon is starting up
-          'List of devices attached', # Header of table for data we want
-          "doesn't match this client" # Message printed when there is an ADB client/server version mismatch
-        ].any? { |status| device.include?(status) }
-      end
+      adb = Fastlane::Helper::AdbHelper.new(adb_host: @config[:adb_host])
+      devices = adb.load_all_devices
 
       UI.user_error!('There are no connected and authorized devices or emulators') if devices.empty?
 
-      devices.select! { |d| d.include?(@config[:specific_device]) } if @config[:specific_device]
+      specific_device = @config[:specific_device]
+      if specific_device
+        devices.select! do |d|
+          d.serial.include?(specific_device)
+        end
+      end
 
-      UI.user_error!("No connected devices matched your criteria: #{@config[:specific_device]}") if devices.empty?
+      UI.user_error!("No connected devices matched your criteria: #{specific_device}") if devices.empty?
 
       if devices.length > 1
         UI.important("Multiple connected devices, selecting the first one")
         UI.important("To specify which connected device to use, use the -s (specific_device) config option")
       end
 
-      # grab the serial number. the lines of output can look like these:
-      # 00c22d4d84aec525       device usb:2148663295X product:bullhead model:Nexus_5X device:bullhead
-      # 192.168.1.100:5555       device usb:2148663295X product:bullhead model:Nexus_5X device:genymotion
-      # emulator-5554       device usb:2148663295X product:bullhead model:Nexus_5X device:emulator
-      devices[0].match(/^\S+/)[0]
+      devices.first.serial
     end
 
     def select_app_apk(discovered_apk_paths)
@@ -395,6 +387,11 @@ module Screengrab
     def enable_clean_status_bar(device_serial, app_apk_path)
       return unless device_api_version(device_serial) >= 23
 
+      unless @android_env.aapt_path
+        UI.error("The `aapt` command could not be found, so status bar could not be cleaned. Make sure android_home is configured for screengrab or ANDROID_HOME is set in the environment")
+        return
+      end
+
       # Check if the app wants to use the clean status bar feature
       badging_dump = @executor.execute(command: "#{@android_env.aapt_path} dump badging #{app_apk_path}",
                                        print_all: true, print_command: true)

data/snapshot/lib/snapshot/options.rb

@@ -221,7 +221,18 @@ module Snapshot
                                      env_name: "SNAPSHOT_EXECUTE_CONCURRENT_SIMULATORS",
                                      description: "Take snapshots on multiple simulators concurrently. Note: This option is only applicable when running against Xcode 9",
                                      default_value: true,
-                                     is_string: false)
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :disable_slide_to_type,
+                                     env_name: "SNAPSHOT_DISABLE_SLIDE_TO_TYPE",
+                                     description: "Disable the simulator from showing the 'Slide to type' prompt",
+                                     default_value: false,
+                                     optional: true,
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
+                                     env_name: "SNAPSHOT_CLONED_SOURCE_PACKAGES_PATH",
+                                     description: "Sets a custom path for Swift Package Manager dependencies",
+                                     type: String,
+                                     optional: true)
       ]
     end
   end

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -11,6 +11,7 @@ module Snapshot
     attr_accessor :dark_mode
     attr_accessor :reinstall_app
     attr_accessor :app_identifier
+    attr_accessor :disable_slide_to_type
 
     # xcode 8
     attr_accessor :number_of_retries
@@ -41,6 +42,7 @@ module Snapshot
       @output_simulator_logs = snapshot_config[:output_simulator_logs]
       @output_directory = snapshot_config[:output_directory]
       @concurrent_simulators = snapshot_config[:concurrent_simulators]
+      @disable_slide_to_type = snapshot_config[:disable_slide_to_type]
 
       launch_arguments = Array(snapshot_config[:launch_arguments])
       # if more than 1 set of arguments, use a tuple with an index

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -67,6 +67,9 @@ module Snapshot
           # no need to reinstall if device has been erased
           uninstall_app(type)
         end
+        if launcher_config.disable_slide_to_type
+          disable_slide_to_type(type)
+        end
       end
     end
 
@@ -139,6 +142,14 @@ module Snapshot
       end
     end
 
+    def disable_slide_to_type(device_type)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+      if device_udid
+        UI.message("Disabling slide to type on #{device_type}")
+        FastlaneCore::Simulator.disable_slide_to_type(udid: device_udid)
+      end
+    end
+
     def copy_simulator_logs(device_names, language, locale, launch_arguments)
       return unless launcher_config.output_simulator_logs
 

data/spaceship/lib/spaceship/client.rb

@@ -563,10 +563,15 @@ module Spaceship
     #####################################################
 
     def load_session_from_file
-      if File.exist?(persistent_cookie_path)
-        puts("Loading session from '#{persistent_cookie_path}'") if Spaceship::Globals.verbose?
-        @cookie.load(persistent_cookie_path)
-        return true
+      begin
+        if File.exist?(persistent_cookie_path)
+          puts("Loading session from '#{persistent_cookie_path}'") if Spaceship::Globals.verbose?
+          @cookie.load(persistent_cookie_path)
+          return true
+        end
+      rescue => ex
+        puts(ex.to_s)
+        puts("Continuing with normal login.")
       end
       return false
     end

data/spaceship/lib/spaceship/connect_api.rb

@@ -20,7 +20,9 @@ require 'spaceship/connect_api/models/beta_build_localization'
 require 'spaceship/connect_api/models/beta_build_metric'
 require 'spaceship/connect_api/models/beta_app_review_detail'
 require 'spaceship/connect_api/models/beta_app_review_submission'
+require 'spaceship/connect_api/models/beta_feedback'
 require 'spaceship/connect_api/models/beta_group'
+require 'spaceship/connect_api/models/beta_screenshot'
 require 'spaceship/connect_api/models/beta_tester'
 require 'spaceship/connect_api/models/beta_tester_metric'
 require 'spaceship/connect_api/models/build'

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -45,6 +45,17 @@ module Spaceship
         return Spaceship::ConnectAPI.get_app(app_id: app_id, includes: includes).first
       end
 
+      #
+      # Beta Feedback
+
+      def get_beta_feedback(filter: {}, includes: "tester,build,screenshots", limit: nil, sort: nil)
+        filter ||= {}
+        filter["build.app"] = id
+
+        resps = Spaceship::ConnectAPI.get_beta_feedback(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
       #
       # Beta Testers
       #

data/spaceship/lib/spaceship/connect_api/models/beta_feedback.rb

@@ -0,0 +1,75 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class BetaFeedback
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :timestamp
+      attr_accessor :comment
+      attr_accessor :email_address
+      attr_accessor :device_model
+      attr_accessor :os_version
+      attr_accessor :bookmarked
+      attr_accessor :locale
+      attr_accessor :carrier
+      attr_accessor :timezone
+      attr_accessor :architecture
+      attr_accessor :connection_status
+      attr_accessor :paired_apple_watch
+      attr_accessor :app_up_time_millis
+      attr_accessor :available_disk_bytes
+      attr_accessor :total_disk_bytes
+      attr_accessor :network_type
+      attr_accessor :battery_percentage
+      attr_accessor :screen_width
+      attr_accessor :screen_height
+
+      attr_accessor :build
+      attr_accessor :tester
+      attr_accessor :screenshots
+
+      attr_mapping({
+        "timestamp" => "timestamp",
+        "comment" => "comment",
+        "emailAddress" => "email_address",
+        "contactEmail" => "contact_email",
+        "deviceModel" => "device_model",
+        "osVersion" => "os_version",
+        "bookmarked" => "bookmarked",
+        "locale" => "locale",
+        "carrier" => "carrier",
+        "timezone" => "timezone",
+        "architecture" => "architecture",
+        "connectionStatus" => "connection_status",
+        "pairedAppleWatch" => "paired_apple_watch",
+        "appUpTimeMillis" => "app_up_time_millis",
+        "availableDiskBytes" => "available_disk_bytes",
+        "totalDiskBytes" => "total_disk_bytes",
+        "networkType" => "network_type",
+        "batteryPercentage" => "battery_percentage",
+        "screenWidth" => "screen_width",
+        "screenHeight" => "screen_height",
+
+        "build" => "build",
+        "tester" => "tester",
+        "screenshots" => "screenshots"
+      })
+
+      def self.type
+        return "betaFeedbacks"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(filter: {}, includes: "tester,build,screenshots", limit: nil, sort: nil)
+        return Spaceship::ConnectAPI.get_beta_feedback(filter: filter, includes: includes, limit: limit, sort: sort)
+      end
+
+      def delete!
+        return Spaceship::ConnectAPI.delete_beta_feedback(feedback_id: self.id)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/beta_screenshot.rb

@@ -0,0 +1,18 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class BetaScreenshot
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :image_assets
+
+      attr_mapping({
+        "imageAssets" => "image_assets"
+      })
+
+      def self.type
+        return "betaScreenshots"
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/build.rb

@@ -78,6 +78,11 @@ module Spaceship
         return processing_state != ProcessingState::PROCESSING
       end
 
+      def ready_for_internal_testing?
+        raise "No build_beta_detail included" unless build_beta_detail
+        return build_beta_detail.ready_for_internal_testing?
+      end
+
       def ready_for_beta_submission?
         raise "No build_beta_detail included" unless build_beta_detail
         return build_beta_detail.ready_for_beta_submission?