fastlane 2.150.0.rc2 → 2.150.0.rc7

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

@@ -1,5 +1,8 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require 'spaceship/globals'
+
+require 'digest/md5'
 
 module Spaceship
   class ConnectAPI
@@ -15,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",
@@ -60,33 +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
+        # Create placeholder
+        screenshot = Spaceship::ConnectAPI.post_app_screenshot(
+          app_screenshot_set_id: app_screenshot_set_id,
+          attributes: post_attributes
+        ).first
 
-        upload_operation = post_resp.upload_operations.first
-        Spaceship::ConnectAPI::FileUploader.upload(upload_operation, payload)
+        # 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)

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,8 @@ 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
     end
   end

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

@@ -19,13 +19,19 @@ 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"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"
+        INVALID_BINARY = "INVALID_BINARY"
       end
 
       module ReleaseType
@@ -46,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
       #

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, territory_ids: nil, available_in_new_territories: true)
+      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,15 +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,
-              availableInNewTerritories: !!available_in_new_territories
-            },
+            attributes: app_attributes,
             relationships: relationships
           },
           included: included
@@ -189,6 +191,11 @@ module Spaceship
       # appPreview
       #
 
+      def get_app_preview(app_preview_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("appPreviews/#{app_preview_id}", params)
+      end
+
       def post_app_preview(app_preview_set_id: nil, attributes: {})
         body = {
           data: {
@@ -339,6 +346,11 @@ module Spaceship
       # appScreenshots
       #
 
+      def get_app_screenshot(app_screenshot_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("appScreenshots/#{app_screenshot_id}", params)
+      end
+
       def post_app_screenshot(app_screenshot_set_id: nil, attributes: {})
         body = {
           data: {
@@ -379,9 +391,9 @@ module Spaceship
       # appInfos
       #
 
-      def get_app_infos(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def get_app_infos(filter: {}, includes: nil, limit: nil, sort: nil)
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("apps/#{app_id}/appInfos", params)
+        Client.instance.get("appInfos", params)
       end
 
       def patch_app_info(app_info_id: nil, attributes: {})

data/spaceship/lib/spaceship/connect_api/users/users.rb

@@ -11,6 +11,19 @@ module Spaceship
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
         Client.instance.get("users", params)
       end
+
+      def add_user_visible_apps(user_id: nil, app_ids: nil)
+        body = {
+          data: app_ids.map do |app_id|
+            {
+              type: "apps",
+              id: app_id
+            }
+          end
+        }
+
+        Client.instance.post("users/#{user_id}/relationships/visibleApps", body)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.150.0.rc2
+  version: 2.150.0.rc7
 platform: ruby
 authors:
 - Manu Wallner
@@ -26,10 +26,10 @@ authors:
 - Aaron Brager
 - Josh Holtz
 - Joshua Liebowitz
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1013,6 +1013,9 @@ files:
 - fastlane/lib/fastlane.rb
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
+- fastlane/lib/fastlane/actions/.hockey.rb.swp
+- fastlane/lib/fastlane/actions/.slack.rb.swp
+- fastlane/lib/fastlane/actions/.update_project_provisioning.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1349,6 +1352,7 @@ files:
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+- fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.xcworkspace/xcuserdata/josh.xcuserdatad/UserInterfaceState.xcuserstate
 - fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/xcshareddata/xcschemes/FastlaneRunner.xcscheme
 - fastlane/swift/FastlaneSwiftRunner/README.txt
 - fastlane/swift/Gymfile.swift
@@ -1505,6 +1509,7 @@ files:
 - pem/lib/pem/options.rb
 - pilot/README.md
 - pilot/lib/pilot.rb
+- pilot/lib/pilot/.manager.rb.swp
 - pilot/lib/pilot/build_manager.rb
 - pilot/lib/pilot/commands_generator.rb
 - pilot/lib/pilot/features.rb
@@ -1632,12 +1637,12 @@ files:
 - spaceship/lib/assets/languageMapping.json
 - spaceship/lib/assets/languageMappingReadable.json
 - spaceship/lib/spaceship.rb
-- spaceship/lib/spaceship/.DS_Store
 - spaceship/lib/spaceship/babosa_fix.rb
 - spaceship/lib/spaceship/base.rb
 - spaceship/lib/spaceship/client.rb
 - spaceship/lib/spaceship/commands_generator.rb
 - spaceship/lib/spaceship/connect_api.rb
+- spaceship/lib/spaceship/connect_api/.DS_Store
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/file_uploader.rb
 - spaceship/lib/spaceship/connect_api/model.rb
@@ -1809,7 +1814,7 @@ licenses:
 - MIT
 metadata:
   docs_url: https://docs.fastlane.tools
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - credentials_manager/lib
@@ -1841,8 +1846,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps