fastlane 2.151.2 → 2.155.0

data/snapshot/lib/snapshot/options.rb

@@ -116,6 +116,11 @@ module Snapshot
                                      description: "Enabling this option will automatically erase the simulator before running the application",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :headless,
+                                     env_name: 'SNAPSHOT_HEADLESS',
+                                     description: "Enabling this option will prevent displaying the simulator window",
+                                     default_value: true,
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :override_status_bar,
                                      env_name: 'SNAPSHOT_OVERRIDE_STATUS_BAR',
                                      description: "Enabling this option wil automatically override the status bar to show 9:41 AM, full battery, and full reception",
@@ -273,6 +278,11 @@ module Snapshot
                                      env_name: "SNAPSHOT_DISABLE_XCPRETTY",
                                      description: "Disable xcpretty formatting of build",
                                      type: Boolean,
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :suppress_xcode_output,
+                                     env_name: "SNAPSHOT_SUPPRESS_XCODE_OUTPUT",
+                                     description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
+                                     type: Boolean,
                                      optional: true)
       ]
     end

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

@@ -7,6 +7,7 @@ module Snapshot
     attr_accessor :add_videos
     attr_accessor :clean
     attr_accessor :erase_simulator
+    attr_accessor :headless
     attr_accessor :localize_simulator
     attr_accessor :dark_mode
     attr_accessor :reinstall_app
@@ -34,6 +35,7 @@ module Snapshot
       @add_videos = snapshot_config[:add_videos]
       @clean = snapshot_config[:clean]
       @erase_simulator = snapshot_config[:erase_simulator]
+      @headless = snapshot_config[:headless]
       @localize_simulator = snapshot_config[:localize_simulator]
       @dark_mode = snapshot_config[:dark_mode]
       @reinstall_app = snapshot_config[:reinstall_app]

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

@@ -76,6 +76,11 @@ module Snapshot
           disable_slide_to_type(type)
         end
       end
+
+      unless launcher_config.headless
+        simulator_path = File.join(Helper.xcode_path, 'Applications', 'Simulator.app')
+        Helper.backticks("open -a #{simulator_path} -g", print: FastlaneCore::Globals.verbose?)
+      end
     end
 
     # pass an array of device types

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -33,8 +33,9 @@ module Snapshot
 
         xcpretty = "xcpretty #{Snapshot.config[:xcpretty_args]}"
         xcpretty << "--no-color" if Helper.colors_disabled?
-
-        return pipe << "| #{xcpretty}"
+        pipe << "| #{xcpretty}"
+        pipe << "> /dev/null" if Snapshot.config[:suppress_xcode_output]
+        return pipe
       end
 
       def destination(devices)

data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb

@@ -24,7 +24,10 @@ module Snapshot
 
       def pipe(device_type, language, locale)
         log_path = xcodebuild_log_path(device_type: device_type, language: language, locale: locale)
-        return ["| tee #{log_path.shellescape} | xcpretty #{Snapshot.config[:xcpretty_args]}"]
+        pipe = ["| tee #{log_path.shellescape}"]
+        pipe << "| xcpretty #{Snapshot.config[:xcpretty_args]}"
+        pipe << "> /dev/null" if Snapshot.config[:suppress_xcode_output]
+        return pipe
       end
 
       def destination(device_name)

data/spaceship/lib/spaceship/connect_api.rb

@@ -42,6 +42,7 @@ require 'spaceship/connect_api/models/app_price'
 require 'spaceship/connect_api/models/app_price_tier'
 require 'spaceship/connect_api/models/app_store_review_attachment'
 require 'spaceship/connect_api/models/app_store_review_detail'
+require 'spaceship/connect_api/models/app_store_version_release_request'
 require 'spaceship/connect_api/models/app_store_version_submission'
 require 'spaceship/connect_api/models/app_screenshot_set'
 require 'spaceship/connect_api/models/app_screenshot'

data/spaceship/lib/spaceship/connect_api/client.rb

@@ -88,8 +88,8 @@ module Spaceship
         handle_response(response)
       end
 
-      def post(url_or_path, body)
-        response = with_asc_retry do
+      def post(url_or_path, body, tries: 5)
+        response = with_asc_retry(tries) do
           request(:post) do |req|
             req.url(url_or_path)
             req.body = body.to_json
@@ -129,7 +129,6 @@ module Spaceship
         tries = 1 if Object.const_defined?("SpecHelper")
         response = yield
 
-        tries -= 1
         status = response.status if response
 
         if [500, 504].include?(status)
@@ -139,6 +138,7 @@ module Spaceship
 
         return response
       rescue => error
+        tries -= 1
         puts(error) if Spaceship::Globals.verbose?
         if tries.zero?
           return response
@@ -164,6 +164,8 @@ module Spaceship
 
         raise UnexpectedResponse, "Temporary App Store Connect error: #{response.body}" if response.body['statusCode'] == 'ERROR'
 
+        store_csrf_tokens(response)
+
         return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
       end
 

data/spaceship/lib/spaceship/connect_api/model.rb

@@ -8,6 +8,7 @@ module Spaceship
       end
 
       attr_accessor :id
+      attr_accessor :reverse_attr_map
 
       def initialize(id, attributes)
         self.id = id
@@ -29,6 +30,7 @@ module Spaceship
       # Creates alias for :minOsVersion to :min_os_version
       #
       def attr_mapping(attr_map)
+        self.reverse_attr_map ||= attr_map.invert.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v; }
         attr_map.each do |key, value|
           # Actual
           reader = value.to_sym
@@ -50,6 +52,18 @@ module Spaceship
         end
       end
 
+      def reverse_attr_mapping(attributes)
+        return nil if attributes.nil?
+
+        # allows for getting map from either an instance or class execution
+        map = self.reverse_attr_map || self.class.reverse_attr_map
+
+        attributes.each_with_object({}) do |(k, v), memo|
+          key = map[k.to_sym] || k.to_sym
+          memo[key] = v
+        end
+      end
+
       def to_json(*options)
         instance_variables.map do |var|
           [var.to_s[1..-1], instance_variable_get(var)]
@@ -138,7 +152,7 @@ module Spaceship
               id == included_data["id"] && type == included_data["type"]
             end
 
-            inflate_model(relationship_data, included)
+            inflate_model(relationship_data, included) if relationship_data
           end
 
           # Map a hash or an array of data

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

@@ -106,6 +106,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_age_rating_declaration(age_rating_declaration_id: id, attributes: attributes)
       end
     end

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

@@ -10,11 +10,11 @@ module Spaceship
       attr_accessor :bundle_id
       attr_accessor :sku
       attr_accessor :primary_locale
+      attr_accessor :is_opted_in_to_distribute_ios_app_on_mac_app_store
       attr_accessor :removed
       attr_accessor :is_aag
-
+      attr_accessor :available_in_new_territories
       attr_accessor :content_rights_declaration
-
       attr_accessor :app_store_versions
 
       module ContentRightsDeclaration
@@ -27,8 +27,10 @@ module Spaceship
         "bundleId" => "bundle_id",
         "sku" => "sku",
         "primaryLocale" => "primary_locale",
+        "isOptedInToDistributeIosAppOnMacAppStore" => "is_opted_in_to_distribute_ios_app_on_mac_app_store",
         "removed" => "removed",
         "isAAG" => "is_aag",
+        "availableInNewTerritories" => "available_in_new_territories",
 
         "contentRightsDeclaration" => "content_rights_declaration",
 
@@ -71,6 +73,7 @@ module Spaceship
       end
 
       def update(attributes: nil, app_price_tier_id: nil, territory_ids: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app(app_id: id, attributes: attributes, app_price_tier_id: app_price_tier_id, territory_ids: territory_ids)
       end
 
@@ -78,6 +81,21 @@ module Spaceship
       # App Info
       #
 
+      def fetch_live_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
+        states = [
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::READY_FOR_SALE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_DEVELOPER_RELEASE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PROCESSING_FOR_APP_STORE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW
+        ]
+
+        filter = { app: id }
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        return resp.to_models.select do |model|
+          states.include?(model.app_store_state)
+        end.first
+      end
+
       def fetch_edit_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
@@ -95,6 +113,16 @@ module Spaceship
         end.first
       end
 
+      #
+      # Available Territories
+      #
+
+      def fetch_available_territories(filter: {}, includes: nil, limit: nil, sort: nil)
+        filter ||= {}
+        resps = Spaceship::ConnectAPI.get_available_territories(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
       #
       # App Pricing
       #
@@ -152,10 +180,22 @@ module Spaceship
         end
       end
 
+      def get_latest_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          platform: platform
+        }
+
+        # Get the latest version
+        return get_app_store_versions(filter: filter, includes: includes)
+               .sort_by { |v| Date.parse(v.created_date) }
+               .last
+      end
+
       def get_live_app_store_version(platform: nil, includes: nil)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
-          appStoreState: [Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE].join(","),
+          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE,
           platform: platform
         }
         return get_app_store_versions(filter: filter, includes: includes).first
@@ -181,6 +221,24 @@ module Spaceship
                .last
       end
 
+      def get_in_review_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
+          platform: platform
+        }
+        return get_app_store_versions(filter: filter, includes: includes).first
+      end
+
+      def get_pending_release_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
+          platform: platform
+        }
+        return get_app_store_versions(filter: filter, includes: includes).first
+      end
+
       def get_app_store_versions(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)

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

@@ -27,6 +27,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_info_localization(app_info_localization_id: id, attributes: attributes)
       end
 

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

@@ -119,6 +119,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_preview(app_preview_id: id, attributes: attributes).first
       end
 

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

@@ -1,5 +1,6 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require_relative './app_screenshot_set'
 require 'spaceship/globals'
 
 require 'digest/md5'
@@ -9,6 +10,7 @@ module Spaceship
     class AppScreenshot
       include Spaceship::ConnectAPI::Model
 
+      attr_accessor :file_size
       attr_accessor :file_name
       attr_accessor :source_file_checksum
       attr_accessor :image_asset
@@ -19,6 +21,7 @@ module Spaceship
       attr_accessor :uploaded
 
       attr_mapping({
+        "fileSize" => "file_size",
         "fileName" => "file_name",
         "sourceFileChecksum" => "source_file_checksum",
         "imageAsset" => "image_asset",
@@ -33,6 +36,10 @@ module Spaceship
         return "appScreenshots"
       end
 
+      def awaiting_upload?
+        (asset_delivery_state || {})["state"] == "AWAITING_UPLOAD"
+      end
+
       def complete?
         (asset_delivery_state || {})["state"] == "COMPLETE"
       end
@@ -84,11 +91,43 @@ module Spaceship
           fileName: filename
         }
 
-        # Create placeholder
-        screenshot = Spaceship::ConnectAPI.post_app_screenshot(
-          app_screenshot_set_id: app_screenshot_set_id,
-          attributes: post_attributes
-        ).first
+        # Create placeholder to upload screenshot
+        begin
+          screenshot = Spaceship::ConnectAPI.post_app_screenshot(
+            app_screenshot_set_id: app_screenshot_set_id,
+            attributes: post_attributes
+          ).first
+        rescue => error
+          # Sometimes creating a screenshot with the web session App Store Connect API
+          # will result in a false failure. The response will return a 503 but the database
+          # insert will eventually go through.
+          #
+          # When this is observed, we will poll until we find the matchin screenshot that
+          # is awaiting for upload and file size
+          #
+          # https://github.com/fastlane/fastlane/pull/16842
+          time = Time.now.to_i
+
+          timeout_minutes = (ENV["SPACESHIP_SCREENSHOT_UPLOAD_TIMEOUT"] || 20).to_i
+
+          loop do
+            puts("Waiting for screenshot to appear before uploading...")
+            sleep(30)
+
+            screenshots = Spaceship::ConnectAPI::AppScreenshotSet
+                          .get(app_screenshot_set_id: app_screenshot_set_id)
+                          .app_screenshots
+
+            screenshot = screenshots.find do |s|
+              s.awaiting_upload? && s.file_size == filesize
+            end
+
+            break if screenshot
+
+            time_diff = Time.now.to_i - time
+            raise error if time_diff >= (60 * timeout_minutes)
+          end
+        end
 
         # Upload the file
         upload_operations = screenshot.upload_operations

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

@@ -39,6 +39,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app_store_review_detail(app_store_review_detail_id: id, attributes: attributes)
       end
 

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

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative './app_store_review_detail'
 require_relative './app_store_version_localization'
 
 module Spaceship
@@ -85,6 +86,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app_store_version(app_store_version_id: id, attributes: attributes).first
       end
 
@@ -118,6 +120,7 @@ module Spaceship
       #
 
       def create_app_store_review_detail(attributes: nil)
+        attributes = Spaceship::ConnectAPI::AppStoreReviewDetail.reverse_attr_mapping(attributes)
         resp = Spaceship::ConnectAPI.post_app_store_review_detail(app_store_version_id: id, attributes: attributes)
         return resp.to_models.first
       end
@@ -155,6 +158,15 @@ module Spaceship
         return resp.to_models.first
       end
 
+      #
+      # App Store Version Release Requests
+      #
+
+      def create_app_store_version_release_request
+        resp = Spaceship::ConnectAPI.post_app_store_version_release_request(app_store_version_id: id)
+        return resp.to_models.first
+      end
+
       #
       # Build
       #

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

@@ -45,6 +45,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_store_version_localization(app_store_version_localization_id: id, attributes: attributes)
       end
 

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

@@ -0,0 +1,12 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppStoreVersionReleaseRequest
+      include Spaceship::ConnectAPI::Model
+
+      def self.type
+        return "appStoreVersionReleaseRequests"
+      end
+    end
+  end
+end