fastlane 2.150.0.rc4 → 2.150.1

data/spaceship/lib/spaceship/connect_api.rb

@@ -40,7 +40,7 @@ require 'spaceship/connect_api/models/app_preview_set'
 require 'spaceship/connect_api/models/app_preview'
 require 'spaceship/connect_api/models/app_price'
 require 'spaceship/connect_api/models/app_price_tier'
-require 'spaceship/connect_api/models/app_review_attachment'
+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_submission'
 require 'spaceship/connect_api/models/app_screenshot_set'

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

@@ -133,7 +133,7 @@ module Spaceship
         tries -= 1
         status = response.status if response
 
-        if [504].include?(status)
+        if [500, 504].include?(status)
           msg = "Timeout received! Retrying after 3 seconds (remaining: #{tries})..."
           raise msg
         end

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

@@ -54,14 +54,15 @@ module Spaceship
         end
       end
 
-      def self.create(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil)
+      def self.create(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil, company_name: nil)
         Spaceship::ConnectAPI.post_app(
           name: name,
           version_string: version_string,
           sku: sku,
           primary_locale: primary_locale,
           bundle_id: bundle_id,
-          platforms: platforms
+          platforms: platforms,
+          company_name: company_name
         )
       end
 
@@ -109,6 +110,26 @@ module Spaceship
       # App Store Versions
       #
 
+      def reject_version_if_possible!
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW
+          ].join(","),
+          platform: platform
+        }
+
+        # Get the latest version
+        version = get_app_store_versions(filter: filter, includes: "appStoreVersionSubmission")
+                  .sort_by { |v| Gem::Version.new(v.version_string) }
+                  .last
+
+        return false if version.nil?
+        return version.reject!
+      end
+
       # Will make sure the current edit_version matches the given version number
       # This will either create a new version or change the version number
       # from an existing version
@@ -153,7 +174,11 @@ module Spaceship
           ].join(","),
           platform: platform
         }
-        return get_app_store_versions(filter: filter, includes: includes).first
+
+        # Get the latest version
+        return get_app_store_versions(filter: filter, includes: includes)
+               .sort_by { |v| Gem::Version.new(v.version_string) }
+               .last
       end
 
       def get_app_store_versions(filter: {}, includes: nil, limit: nil, sort: nil)
@@ -231,6 +256,16 @@ module Spaceship
         ).all_pages
         return resps.flat_map(&:to_models).first
       end
+
+      #
+      # Users
+      #
+
+      def add_users(user_ids: nil)
+        user_ids.each do |user_id|
+          Spaceship::ConnectAPI.add_user_visible_apps(user_id: user_id, app_ids: [id])
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,9 @@ module Spaceship
 
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
+        PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
+        PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
         REJECTED = "REJECTED"
@@ -60,7 +63,8 @@ module Spaceship
       end
 
       def get_app_info_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
-        return Spaceship::ConnectAPI.get_app_info_localizations(app_info_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
+        resp = Spaceship::ConnectAPI.get_app_info_localizations(app_info_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
+        return resp.to_models
       end
     end
   end

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

@@ -37,12 +37,42 @@ module Spaceship
         (asset_delivery_state || {})["state"] == "COMPLETE"
       end
 
+      def error?
+        (asset_delivery_state || {})["state"] == "FAILED"
+      end
+
+      def error_messages
+        errors = (asset_delivery_state || {})["errors"]
+        (errors || []).map do |error|
+          [error["code"], error["description"]].compact.join(" - ")
+        end
+      end
+
+      # This does not download the source image (exact image that was uploaded)
+      # This downloads a modified version.
+      # This image won't have the same checksums as source_file_checksum.
+      #
+      # There is an open radar for allowing downloading of source file.
+      # https://openradar.appspot.com/radar?id=4980344105205760
+      def image_asset_url(width: nil, height: nil, type: "png")
+        return nil if image_asset.nil?
+
+        template_url = image_asset["templateUrl"]
+        width ||= image_asset["width"]
+        height ||= image_asset["height"]
+
+        return template_url
+               .gsub("{w}", width.to_s)
+               .gsub("{h}", height.to_s)
+               .gsub("{f}", type)
+      end
+
       #
       # API
       #
       #
 
-      def self.create(app_screenshot_set_id: nil, path: nil)
+      def self.create(app_screenshot_set_id: nil, path: nil, wait_for_processing: true)
         require 'faraday'
 
         filename = File.basename(path)
@@ -70,6 +100,9 @@ module Spaceship
           sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
+        # Patch screenshot that file upload is complete
+        # Catch error if patch retries due to 504. Origal patch
+        # may go through by return response as 504.
         begin
           screenshot = Spaceship::ConnectAPI.patch_app_screenshot(
             app_screenshot_id: screenshot.id,
@@ -82,6 +115,26 @@ module Spaceship
           raise error unless screenshot.complete?
         end
 
+        # Wait for processing
+        if wait_for_processing
+          loop do
+            if screenshot.complete?
+              puts("Screenshot processing complete!") if Spaceship::Globals.verbose?
+              break
+            elsif screenshot.error?
+              messages = ["Error processing screenshot '#{screenshot.file_name}'"] + screenshot.error_messages
+              raise messages.join(". ")
+            end
+
+            # Poll every 2 seconds
+            sleep_time = 2
+            puts("Waiting #{sleep_time} seconds before checking status of processing...") if Spaceship::Globals.verbose?
+            sleep(sleep_time)
+
+            screenshot = Spaceship::ConnectAPI.get_app_screenshot(app_screenshot_id: screenshot.id).first
+          end
+        end
+
         return screenshot
       end
 

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

@@ -39,8 +39,24 @@ module Spaceship
         APP_WATCH_SERIES_3 = "APP_WATCH_SERIES_3"
         APP_WATCH_SERIES_4 = "APP_WATCH_SERIES_4"
 
+        APP_APPLE_TV = "APP_APPLE_TV"
+
         APP_DESKTOP = "APP_DESKTOP"
 
+        ALL_IMESSAGE = [
+          IMESSAGE_APP_IPHONE_40,
+          IMESSAGE_APP_IPHONE_47,
+          IMESSAGE_APP_IPHONE_55,
+          IMESSAGE_APP_IPHONE_58,
+          IMESSAGE_APP_IPHONE_65,
+
+          IMESSAGE_APP_IPAD_97,
+          IMESSAGE_APP_IPAD_105,
+          IMESSAGE_APP_IPAD_PRO_129,
+          IMESSAGE_APP_IPAD_PRO_3GEN_11,
+          IMESSAGE_APP_IPAD_PRO_3GEN_129
+        ]
+
         ALL = [
           APP_IPHONE_35,
           APP_IPHONE_40,
@@ -84,6 +100,14 @@ module Spaceship
         return "appScreenshotSets"
       end
 
+      def apple_tv?
+        DisplayType::APP_APPLE_TV == screenshot_display_type
+      end
+
+      def imessage?
+        DisplayType::ALL_IMESSAGE.include?(screenshot_display_type)
+      end
+
       #
       # API
       #
@@ -93,8 +117,14 @@ module Spaceship
         return resp.to_models
       end
 
-      def upload_screenshot(path: nil)
-        return Spaceship::ConnectAPI::AppScreenshot.create(app_screenshot_set_id: id, path: path)
+      def upload_screenshot(path: nil, wait_for_processing: true)
+        return Spaceship::ConnectAPI::AppScreenshot.create(app_screenshot_set_id: id, path: path, wait_for_processing: wait_for_processing)
+      end
+
+      def reorder_screenshots(app_screenshot_ids: nil)
+        Spaceship::ConnectAPI.patch_app_screenshot_set_screenshots(app_screenshot_set_id: id, app_screenshot_ids: app_screenshot_ids)
+
+        return Spaceship::ConnectAPI.get_app_screenshot_set(app_screenshot_set_id: id, includes: "appScreenshots").first
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/{app_review_attachment.rb → app_store_review_attachment.rb}

@@ -4,7 +4,7 @@ require 'digest/md5'
 
 module Spaceship
   class ConnectAPI
-    class AppReviewAttachment
+    class AppStoreReviewAttachment
       include Spaceship::ConnectAPI::Model
 
       attr_accessor :file_name
@@ -22,7 +22,7 @@ module Spaceship
       })
 
       def self.type
-        return "appReviewAttachments"
+        return "appStoreReviewAttachments"
       end
 
       #
@@ -42,7 +42,7 @@ module Spaceship
         }
 
         # Create placeholder
-        attachment = Spaceship::ConnectAPI.post_app_review_attachment(
+        attachment = Spaceship::ConnectAPI.post_app_store_review_attachment(
           app_store_review_detail_id: app_store_review_detail_id,
           attributes: post_attributes
         ).to_models.first
@@ -57,14 +57,14 @@ module Spaceship
           sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
-        Spaceship::ConnectAPI.patch_app_review_attachment(
-          app_review_attachment_id: attachment.id,
+        Spaceship::ConnectAPI.patch_app_store_review_attachment(
+          app_store_review_attachment_id: attachment.id,
           attributes: patch_attributes
         ).to_models.first
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)
-        Spaceship::ConnectAPI.delete_app_review_attachment(app_review_attachment_id: id)
+        Spaceship::ConnectAPI.delete_app_store_review_attachment(app_store_review_attachment_id: id)
       end
     end
   end

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

@@ -1,5 +1,5 @@
 require_relative '../model'
-require_relative './app_review_attachment'
+require_relative './app_store_review_attachment'
 
 module Spaceship
   class ConnectAPI
@@ -15,6 +15,8 @@ module Spaceship
       attr_accessor :demo_account_required
       attr_accessor :notes
 
+      attr_accessor :app_store_review_attachments
+
       attr_mapping({
         "contactFirstName" => "contact_first_name",
         "contactLastName" => "contact_last_name",
@@ -23,7 +25,9 @@ module Spaceship
         "demoAccountName" => "demo_account_name",
         "demoAccountPassword" => "demo_account_password",
         "demoAccountRequired" => "demo_account_required",
-        "notes" => "notes"
+        "notes" => "notes",
+
+        "appStoreReviewAttachments" => "app_store_review_attachments"
       })
 
       def self.type
@@ -34,17 +38,12 @@ module Spaceship
       # API
       #
 
-      def fetch_app_review_attachments
-        resp = Spaceship::ConnectAPI.get_app_review_attachments(app_store_review_detail_id: id)
-        return resp.to_models
-      end
-
       def update(attributes: nil)
         return Spaceship::ConnectAPI.patch_app_store_review_detail(app_store_review_detail_id: id, attributes: attributes)
       end
 
       def upload_attachment(path: nil)
-        return Spaceship::ConnectAPI::AppReviewAttachment.create(app_store_review_detail_id: id, path: path)
+        return Spaceship::ConnectAPI::AppStoreReviewAttachment.create(app_store_review_detail_id: id, path: path)
       end
     end
   end

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

@@ -19,8 +19,13 @@ module Spaceship
       attr_accessor :downloadable
       attr_accessor :created_date
 
+      attr_accessor :app_store_version_submission
+
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
+        PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
+        PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
         REJECTED = "REJECTED"
@@ -47,13 +52,26 @@ module Spaceship
         "usesIdfa" =>  "uses_idfa",
         "isWatchOnly" =>  "is_watch_only",
         "downloadable" =>  "downloadable",
-        "createdDate" =>  "created_date"
+        "createdDate" =>  "created_date",
+
+        "appStoreVersionSubmission" => "app_store_version_submission"
       })
 
       def self.type
         return "appStoreVersions"
       end
 
+      def can_reject?
+        raise "No app_store_version_submission included" unless app_store_version_submission
+        return app_store_version_submission.can_reject
+      end
+
+      def reject!
+        return false unless can_reject?
+        app_store_version_submission.delete!
+        return true
+      end
+
       #
       # API
       #
@@ -104,8 +122,8 @@ module Spaceship
         return resp.to_models.first
       end
 
-      def fetch_app_store_review_detail
-        resp = Spaceship::ConnectAPI.get_app_store_review_detail(app_store_version_id: id)
+      def fetch_app_store_review_detail(includes: "appStoreReviewAttachments")
+        resp = Spaceship::ConnectAPI.get_app_store_review_detail(app_store_version_id: id, includes: includes)
         return resp.to_models.first
       end
 

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

@@ -39,7 +39,8 @@ module Spaceship
       #
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        return Spaceship::ConnectAPI.get_users(filter: filter, includes: includes)
+        resps = Spaceship::ConnectAPI.get_users(filter: filter, includes: includes).all_pages
+        return resps.flat_map(&:to_models)
       end
 
       def self.find(email: nil, includes: nil)

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -28,7 +28,7 @@ module Spaceship
       # app
       #
 
-      def post_app(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil)
+      def post_app(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil, company_name: nil)
         included = []
         included << {
           type: "appInfos",
@@ -103,14 +103,17 @@ module Spaceship
           }
         }
 
+        app_attributes = {
+          sku: sku,
+          primaryLocale: primary_locale,
+          bundleId: bundle_id
+        }
+        app_attributes[:companyName] = company_name if company_name
+
         body = {
           data: {
             type: "apps",
-            attributes: {
-              sku: sku,
-              primaryLocale: primary_locale,
-              bundleId: bundle_id
-            },
+            attributes: app_attributes,
             relationships: relationships
           },
           included: included
@@ -270,15 +273,10 @@ module Spaceship
       # appReviewAttachments
       #
 
-      def get_app_review_attachments(app_store_review_detail_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
-        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("appStoreReviewDetails/#{app_store_review_detail_id}/appReviewAttachments", params)
-      end
-
-      def post_app_review_attachment(app_store_review_detail_id: nil, attributes: {})
+      def post_app_store_review_attachment(app_store_review_detail_id: nil, attributes: {})
         body = {
           data: {
-            type: "appReviewAttachments",
+            type: "appStoreReviewAttachments",
             attributes: attributes,
             relationships: {
               appStoreReviewDetail: {
@@ -291,24 +289,24 @@ module Spaceship
           }
         }
 
-        Client.instance.post("appReviewAttachments", body)
+        Client.instance.post("appStoreReviewAttachments", body)
       end
 
-      def patch_app_review_attachment(app_review_attachment_id: nil, attributes: {})
+      def patch_app_store_review_attachment(app_store_review_attachment_id: nil, attributes: {})
         body = {
           data: {
-            type: "appReviewAttachments",
-            id: app_review_attachment_id,
+            type: "appStoreReviewAttachments",
+            id: app_store_review_attachment_id,
             attributes: attributes
           }
         }
 
-        Client.instance.patch("appReviewAttachments/#{app_review_attachment_id}", body)
+        Client.instance.patch("appStoreReviewAttachments/#{app_store_review_attachment_id}", body)
       end
 
-      def delete_app_review_attachment(app_review_attachment_id: nil)
+      def delete_app_store_review_attachment(app_store_review_attachment_id: nil)
         params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
-        Client.instance.delete("appReviewAttachments/#{app_review_attachment_id}", params)
+        Client.instance.delete("appStoreReviewAttachments/#{app_store_review_attachment_id}", params)
       end
 
       #
@@ -320,6 +318,11 @@ module Spaceship
         Client.instance.get("appScreenshotSets", params)
       end
 
+      def get_app_screenshot_set(app_screenshot_set_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("appScreenshotSets/#{app_screenshot_set_id}", params)
+      end
+
       def post_app_screenshot_set(app_store_version_localization_id: nil, attributes: {})
         body = {
           data: {
@@ -339,6 +342,21 @@ module Spaceship
         Client.instance.post("appScreenshotSets", body)
       end
 
+      def patch_app_screenshot_set_screenshots(app_screenshot_set_id: nil, app_screenshot_ids: nil)
+        app_screenshot_ids ||= []
+
+        body = {
+          data: app_screenshot_ids.map do |app_screenshot_id|
+            {
+              type: "appScreenshots",
+              id: app_screenshot_id
+            }
+          end
+        }
+
+        Client.instance.patch("appScreenshotSets/#{app_screenshot_set_id}/relationships/appScreenshots", body)
+      end
+
       #
       # appScreenshots
       #