fastlane 2.150.0.rc1 → 2.150.0.rc6

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

@@ -91,10 +91,14 @@ module Spaceship
 
       def self.map_value_from_itc(key, value)
         if ["gamblingAndContests", "unrestrictedWebAccess"].include?(key)
-          return LEGACY_BOOLEAN_VALUE_ITC_MAP[value]
+          new_value = LEGACY_BOOLEAN_VALUE_ITC_MAP[value]
+          return value if new_value.nil?
+          return new_value
         else
-          return LEGACY_RATING_VALUE_ITC_MAP[value]
+          return LEGACY_RATING_VALUE_ITC_MAP[value] || value
         end
+
+        return value
       end
 
       #

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

@@ -54,16 +54,24 @@ module Spaceship
         end
       end
 
-      def self.create(name: nil, version_string: nil, sku: nil, primary_locale: nil, bundle_id: nil, platforms: nil)
-        Spaceship::ConnectAPI.post_app(name: name, version_string: version_string, sku: sku, primary_locale: primary_locale, bundle_id: bundle_id, platforms: platforms)
+      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,
+          company_name: company_name
+        )
       end
 
       def self.get(app_id: nil, includes: "appStoreVersions")
         return Spaceship::ConnectAPI.get_app(app_id: app_id, includes: includes).first
       end
 
-      def update(attributes: nil)
-        return Spaceship::ConnectAPI.patch_app(app_id: id, attributes: attributes)
+      def update(attributes: nil, app_price_tier_id: nil, territory_ids: nil)
+        return Spaceship::ConnectAPI.patch_app(app_id: id, attributes: attributes, app_price_tier_id: app_price_tier_id, territory_ids: territory_ids)
       end
 
       #
@@ -75,10 +83,13 @@ module Spaceship
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::DEVELOPER_REJECTED,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::REJECTED,
-          Spaceship::ConnectAPI::AppInfo::AppStoreState::METADATA_REJECTED
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::METADATA_REJECTED,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::WAITING_FOR_REVIEW,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::INVALID_BINARY
         ]
 
-        resp = Spaceship::ConnectAPI.get_app_infos(app_id: id)
+        filter = { app: id }
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -95,11 +106,6 @@ module Spaceship
         return resp.to_models
       end
 
-      def update_app_price_tier(app_price_tier_id: nil)
-        resp = Spaceship::ConnectAPI.patch_app_app_prices(app_id: id, app_price_tier_id: app_price_tier_id)
-        return resp.first
-      end
-
       #
       # App Store Versions
       #
@@ -142,11 +148,17 @@ module Spaceship
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PREPARE_FOR_SUBMISSION,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::DEVELOPER_REJECTED,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::REJECTED,
-            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::METADATA_REJECTED
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::METADATA_REJECTED,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::INVALID_BINARY
           ].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)
@@ -224,6 +236,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

@@ -16,6 +16,7 @@ module Spaceship
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"
+        INVALID_BINARY = "INVALID_BINARY"
       end
 
       module AppStoreAgeRating
@@ -38,19 +39,11 @@ module Spaceship
       #
 
       def update(filter: {}, includes: nil, limit: nil, sort: nil)
-        Spaceship::ConnectAPI.patch_app_info(app_info_id: id)
+        Spaceship::ConnectAPI.patch_app_info(app_info_id: id).first
       end
 
-      def update_categories(primary_category_id: nil, secondary_category_id: nil, primary_subcategory_one_id: nil, primary_subcategory_two_id: nil, secondary_subcategory_one_id: nil, secondary_subcategory_two_id: nil)
-        Spaceship::ConnectAPI.patch_app_info_categories(
-          app_info_id: id,
-          primary_category_id: primary_category_id,
-          secondary_category_id: secondary_category_id,
-          primary_subcategory_one_id: primary_subcategory_one_id,
-          primary_subcategory_two_id: primary_subcategory_two_id,
-          secondary_subcategory_one_id: secondary_subcategory_one_id,
-          secondary_subcategory_two_id: secondary_subcategory_two_id
-        )
+      def update_categories(category_id_map: nil)
+        Spaceship::ConnectAPI.patch_app_info_categories(app_info_id: id, category_id_map: category_id_map).first
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)

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

@@ -0,0 +1,129 @@
+require_relative '../model'
+require_relative '../file_uploader'
+require 'spaceship/globals'
+
+require 'digest/md5'
+
+module Spaceship
+  class ConnectAPI
+    class AppPreview
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :file_size
+      attr_accessor :file_name
+      attr_accessor :source_file_checksum
+      attr_accessor :preview_frame_time_code
+      attr_accessor :mime_type
+      attr_accessor :video_url
+      attr_accessor :preview_image
+      attr_accessor :upload_operations
+      attr_accessor :asset_deliver_state
+      attr_accessor :upload
+
+      attr_mapping({
+        "fileSize" => "file_size",
+        "fileName" => "file_name",
+        "sourceFileChecksum" => "source_file_checksum",
+        "previewFrameTimeCode" => "preview_frame_time_code",
+        "mimeType" => "mime_type",
+        "videoUrl" => "video_url",
+        "previewImage" => "preview_image",
+        "uploadOperations" => "upload_operations",
+        "assetDeliveryState" => "asset_delivery_state",
+        "uploaded" => "uploaded"
+      })
+
+      def self.type
+        return "appPreviews"
+      end
+
+      def complete?
+        (asset_delivery_state || {})["state"] == "COMPLETE"
+      end
+
+      #
+      # API
+      #
+
+      def self.get(app_preview_id: nil)
+        Spaceship::ConnectAPI.get_app_preview(app_preview_id: app_preview_id).first
+      end
+
+      # Creates an AppPreview in an AppPreviewSet
+      # Setting the optional frame_time_code will force polling until video is done processing
+      # @param app_preview_set_id The AppPreviewSet id
+      # @param path The path of the file
+      # @param frame_time_code The time code for the preview still frame (ex: "00:00:07:01")
+      def self.create(app_preview_set_id: nil, path: nil, frame_time_code: nil)
+        require 'faraday'
+
+        filename = File.basename(path)
+        filesize = File.size(path)
+        bytes = File.binread(path)
+
+        post_attributes = {
+          fileSize: filesize,
+          fileName: filename
+        }
+
+        # Create placeholder
+        preview = Spaceship::ConnectAPI.post_app_preview(
+          app_preview_set_id: app_preview_set_id,
+          attributes: post_attributes
+        ).to_models.first
+
+        # Upload the file
+        upload_operations = preview.upload_operations
+        Spaceship::ConnectAPI::FileUploader.upload(upload_operations, bytes)
+
+        # Update file uploading complete
+        patch_attributes = {
+          uploaded: true,
+          sourceFileChecksum: Digest::MD5.hexdigest(bytes)
+        }
+
+        begin
+          preview = Spaceship::ConnectAPI.patch_app_preview(
+            app_preview_id: preview.id,
+            attributes: patch_attributes
+          ).to_models.first
+        rescue => error
+          puts("Failed to patch app preview. Update may have gone through so verifying") if Spaceship::Globals.verbose?
+
+          preview = Spaceship::ConnectAPI::AppPreview.get(app_preview_id: preview.id)
+          raise error unless preview.complete?
+        end
+
+        # Poll for video processing completion to set still frame time
+        unless frame_time_code.nil?
+          loop do
+            unless preview.video_url.nil?
+              puts("Preview processing complete!") if Spaceship::Globals.verbose?
+              preview = preview.update(attributes: {
+                previewFrameTimeCode: frame_time_code
+              })
+              puts("Updated preview frame time code!") if Spaceship::Globals.verbose?
+              break
+            end
+
+            sleep_time = 30
+            puts("Waiting #{sleep_time} seconds before checking status of processing...") if Spaceship::Globals.verbose?
+            sleep(sleep_time)
+
+            preview = Spaceship::ConnectAPI::AppPreview.get(app_preview_id: preview.id)
+          end
+        end
+
+        preview
+      end
+
+      def update(attributes: nil)
+        Spaceship::ConnectAPI.patch_app_preview(app_preview_id: id, attributes: attributes)
+      end
+
+      def delete!(filter: {}, includes: nil, limit: nil, sort: nil)
+        Spaceship::ConnectAPI.delete_app_preview(app_preview_id: id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+require_relative '../model'
+require_relative './app_preview'
+
+module Spaceship
+  class ConnectAPI
+    class AppPreviewSet
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :preview_type
+
+      attr_accessor :app_previews
+
+      module PreviewType
+        IPHONE_35 = "IPHONE_35"
+        IPHONE_40 = "IPHONE_40"
+        IPHONE_47 = "IPHONE_47"
+        IPHONE_55 = "IPHONE_55"
+        IPHONE_58 = "IPHONE_58"
+        IPHONE_65 = "IPHONE_65"
+
+        IPAD_97 = "IPAD_97"
+        IPAD_105 = "IPAD_105"
+        IPAD_PRO_3GEN_11 = "IPAD_PRO_3GEN_11"
+        IPAD_PRO_129 = "IPAD_PRO_129"
+        IPAD_PRO_3GEN_129 = "IPAD_PRO_3GEN_129"
+
+        DESKTOP = "DESKTOP"
+
+        ALL = [
+          IPHONE_35,
+          IPHONE_40,
+          IPHONE_47,
+          IPHONE_55,
+          IPHONE_58,
+          IPHONE_65,
+
+          IPAD_97,
+          IPAD_105,
+          IPAD_PRO_3GEN_11,
+          IPAD_PRO_129,
+          IPAD_PRO_3GEN_129,
+
+          DESKTOP
+        ]
+      end
+
+      attr_mapping({
+        "previewType" => "preview_type",
+
+        "appPreviews" => "app_previews"
+      })
+
+      def self.type
+        return "appPreviewSets"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
+        resp = Spaceship::ConnectAPI.get_app_preview_sets(filter: filter, includes: includes, limit: limit, sort: sort)
+        return resp.to_models
+      end
+
+      def upload_preview(path: nil, frame_time_code: nil)
+        return Spaceship::ConnectAPI::AppPreview.create(app_preview_set_id: id, path: path, frame_time_code: frame_time_code)
+      end
+    end
+  end
+end

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

@@ -1,4 +1,7 @@
 require_relative '../model'
+require_relative '../file_uploader'
+require 'digest/md5'
+
 module Spaceship
   class ConnectAPI
     class AppReviewAttachment
@@ -31,46 +34,33 @@ module Spaceship
 
         filename = File.basename(path)
         filesize = File.size(path)
-        payload = File.binread(path)
+        bytes = File.binread(path)
 
         post_attributes = {
           fileSize: filesize,
           fileName: filename
         }
 
-        post_resp = Spaceship::ConnectAPI.post_app_review_attachment(app_store_review_detail_id: app_store_review_detail_id, attributes: post_attributes).to_models.first
-
-        # {
-        #   "method": "PUT",
-        #   "url": "https://some-url-apple-gives-us",
-        #   "length": 57365,
-        #   "offset": 0,
-        #   "requestHeaders": [
-        #     {
-        #       "name": "Content-Type",
-        #       "value": "image/png"
-        #     }
-        #   ]
-        # }
-        upload_operation = post_resp.upload_operations.first
-
-        headers = {}
-        upload_operation["requestHeaders"].each do |hash|
-          headers[hash["name"]] = hash["value"]
-        end
+        # Create placeholder
+        attachment = Spaceship::ConnectAPI.post_app_review_attachment(
+          app_store_review_detail_id: app_store_review_detail_id,
+          attributes: post_attributes
+        ).to_models.first
 
-        Faraday.put(
-          upload_operation["url"],
-          payload,
-          headers
-        )
+        # Upload the file
+        upload_operations = attachment.upload_operations
+        Spaceship::ConnectAPI::FileUploader.upload(upload_operations, bytes)
 
+        # Update file uploading complete
         patch_attributes = {
           uploaded: true,
-          sourceFileChecksum: "checksum-holder"
+          sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
-        Spaceship::ConnectAPI.patch_app_review_attachment(app_review_attachment_id: post_resp.id, attributes: patch_attributes).to_models.first
+        Spaceship::ConnectAPI.patch_app_review_attachment(
+          app_review_attachment_id: attachment.id,
+          attributes: patch_attributes
+        ).to_models.first
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)

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

@@ -1,4 +1,9 @@
 require_relative '../model'
+require_relative '../file_uploader'
+require 'spaceship/globals'
+
+require 'digest/md5'
+
 module Spaceship
   class ConnectAPI
     class AppScreenshot
@@ -13,36 +18,6 @@ module Spaceship
       attr_accessor :asset_delivery_state
       attr_accessor :uploaded
 
-      # "fileSize": 92542,
-      #   "fileName": "ftl_3241d62418767c0aa9b889b020c4f8db_45455763d4aaf7b18ee0045bc787f3de.png",
-      #   "sourceFileChecksum": "c237fd7852ed8f9285d16d9a28d2ec25",
-      #   "imageAsset": {
-      #     "templateUrl": "https://is4-ssl.mzstatic.com/image/thumb/Purple113/v4/61/18/68/61186886-b234-5bd0-1f4a-563124f18511/pr_source.png/{w}x{h}bb.{f}",
-      #     "width": 2048,
-      #     "height": 2732
-      #   },
-      #   "assetToken": "Purple113/v4/61/18/68/61186886-b234-5bd0-1f4a-563124f18511/pr_source.png",
-      #   "assetType": "SortedJ99ScreenShot",
-      #   "uploadOperations": null,
-      #   "assetDeliveryState": {
-      #     "errors": [],
-      #     "warnings": null,
-      #     "state": "COMPLETE"
-      #   },
-      #   "uploaded": null
-
-      # "assetDeliveryState": {
-      #   "errors": [],
-      #   "warnings": null,
-      #   "state": "AWAITING_UPLOAD"
-      # },
-
-      # "assetDeliveryState": {
-      #   "errors": [],
-      #   "warnings": null,
-      #   "state": "UPLOAD_COMPLETE"
-      # },
-
       attr_mapping({
         "fileName" => "file_name",
         "sourceFileChecksum" => "source_file_checksum",
@@ -58,55 +33,109 @@ module Spaceship
         return "appScreenshots"
       end
 
+      def complete?
+        (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)
         filesize = File.size(path)
-        payload = File.binread(path)
+        bytes = File.binread(path)
 
         post_attributes = {
           fileSize: filesize,
           fileName: filename
         }
 
-        post_resp = Spaceship::ConnectAPI.post_app_screenshot(app_screenshot_set_id: app_screenshot_set_id, attributes: post_attributes).to_models.first
-
-        # {
-        #   "method": "PUT",
-        #   "url": "https://some-url-apple-gives-us",
-        #   "length": 57365,
-        #   "offset": 0,
-        #   "requestHeaders": [
-        #     {
-        #       "name": "Content-Type",
-        #       "value": "image/png"
-        #     }
-        #   ]
-        # }
-        upload_operation = post_resp.upload_operations.first
-
-        headers = {}
-        upload_operation["requestHeaders"].each do |hash|
-          headers[hash["name"]] = hash["value"]
-        end
+        # Create placeholder
+        screenshot = Spaceship::ConnectAPI.post_app_screenshot(
+          app_screenshot_set_id: app_screenshot_set_id,
+          attributes: post_attributes
+        ).first
 
-        Faraday.put(
-          upload_operation["url"],
-          payload,
-          headers
-        )
+        # Upload the file
+        upload_operations = screenshot.upload_operations
+        Spaceship::ConnectAPI::FileUploader.upload(upload_operations, bytes)
 
+        # Update file uploading complete
         patch_attributes = {
           uploaded: true,
-          sourceFileChecksum: "checksum-holder"
+          sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
-        Spaceship::ConnectAPI.patch_app_screenshot(app_screenshot_id: post_resp.id, attributes: patch_attributes).to_models.first
+        # 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,
+            attributes: patch_attributes
+          ).first
+        rescue => error
+          puts("Failed to patch app screenshot. Update may have gone through so verifying") if Spaceship::Globals.verbose?
+
+          screenshot = Spaceship::ConnectAPI.get_app_screenshot(app_screenshot_id: screenshot.id).first
+          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
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)