fastlane 2.150.0.rc3 → 2.150.0

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -113,7 +113,7 @@ module FastlaneCore
           else
             # `security` only works on Mac, fallback to `openssl`
             # via https://stackoverflow.com/a/14379814/252627
-            decoded = `openssl smime -inform der -verify -noverify -in #{path} 2> #{err}`
+            decoded = `openssl smime -inform der -verify -noverify -in #{path.shellescape} 2> #{err}`
           end
           UI.error("Failure to decode #{path}. Exit: #{$?.exitstatus}: #{File.read(err)}") if $?.exitstatus != 0
           decoded

data/produce/lib/produce/itunes_connect.rb

@@ -21,6 +21,13 @@ module Produce
         UI.success("App '#{Produce.config[:app_identifier]}' already exists (#{application.id}), nothing to do on App Store Connect")
         # Nothing to do here
       else
+        emails = Produce.config[:itc_users] || []
+        user_ids = []
+        unless emails.empty?
+          UI.message("Verifying users exist before creating app...")
+          user_ids = find_user_ids(emails: emails)
+        end
+
         UI.success("Creating new app '#{Produce.config[:app_name]}' on App Store Connect")
 
         platforms = Produce.config[:platforms] || [Produce.config[:platform]]
@@ -29,7 +36,6 @@ module Produce
           Spaceship::ConnectAPI::Platform.map(platform)
         end
 
-        # Produce.config[:company_name]
         # Produce.config[:itc_users]
         application = Spaceship::ConnectAPI::App.create(
           name: Produce.config[:app_name],
@@ -37,7 +43,8 @@ module Produce
           sku: Produce.config[:sku].to_s,
           primary_locale: language,
           bundle_id: app_identifier,
-          platforms: platforms
+          platforms: platforms,
+          company_name: Produce.config[:company_name]
         )
 
         application = fetch_application
@@ -60,12 +67,32 @@ module Produce
           application.ensure_version!(Produce.config[:app_version], platform: platform) if Produce.config[:app_version]
         end
 
+        # Add users to app
+        unless user_ids.empty?
+          application.add_users(user_ids: user_ids)
+          UI.message("Successfuly added #{user_ids.size} #{user_ids.count == 1 ? 'user' : 'users'} to app")
+        end
+
         UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.id}")
       end
 
       return application.id
     end
 
+    def find_user_ids(emails: nil)
+      emails ||= []
+      users = Spaceship::ConnectAPI::User.all.select do |user|
+        emails.include?(user.email)
+      end
+
+      diff_emails = emails - users.map(&:email)
+      unless diff_emails.empty?
+        raise "Could not find users with emails of: #{diff_emails.join(',')}"
+      end
+
+      return users.map(&:id)
+    end
+
     private
 
     def platform

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/file_uploader.rb

@@ -2,10 +2,12 @@ require 'faraday' # HTTP Client
 require 'faraday-cookie_jar'
 require 'faraday_middleware'
 
+require 'spaceship/globals'
+
 module Spaceship
   class ConnectAPI
     module FileUploader
-      def self.upload(upload_operation, payload)
+      def self.upload(upload_operations, bytes)
         # {
         #   "method": "PUT",
         #   "url": "https://some-url-apple-gives-us",
@@ -19,17 +21,47 @@ module Spaceship
         #   ]
         # }
 
-        headers = {}
-        upload_operation["requestHeaders"].each do |hash|
-          headers[hash["name"]] = hash["value"]
+        upload_operations.each_with_index do |upload_operation, index|
+          headers = {}
+          upload_operation["requestHeaders"].each do |hash|
+            headers[hash["name"]] = hash["value"]
+          end
+
+          offset = upload_operation["offset"]
+          length = upload_operation["length"]
+
+          puts("Uploading file (part #{index + 1})...") if Spaceship::Globals.verbose?
+          with_retry do
+            client.send(
+              upload_operation["method"].downcase,
+              upload_operation["url"],
+              bytes[offset, length],
+              headers
+            )
+          end
         end
+        puts("Uploading complete!") if Spaceship::Globals.verbose?
+      end
 
-        client.send(
-          upload_operation["method"].downcase,
-          upload_operation["url"],
-          payload,
-          headers
-        )
+      def self.with_retry(tries = 5, &_block)
+        tries = 1 if Object.const_defined?("SpecHelper")
+        response = yield
+
+        tries -= 1
+
+        unless (200...300).cover?(response.status)
+          msg = "Received status of #{response.status}! Retrying after 3 seconds (remaining: #{tries})..."
+          raise msg
+        end
+
+        return response
+      rescue => error
+        puts(error) if Spaceship::Globals.verbose?
+        if tries.zero?
+          raise "Failed to upload file after retries... Received #{response.status}"
+        else
+          retry
+        end
       end
 
       def self.client

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

@@ -95,7 +95,7 @@ module Spaceship
           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

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
 
@@ -82,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
@@ -106,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
@@ -144,11 +168,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)
@@ -226,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,11 +11,15 @@ 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"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"
+        INVALID_BINARY = "INVALID_BINARY"
       end
 
       module AppStoreAgeRating

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

@@ -1,5 +1,8 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require 'spaceship/globals'
+
+require 'digest/md5'
 
 module Spaceship
   class ConnectAPI
@@ -34,39 +37,88 @@ module Spaceship
         return "appPreviews"
       end
 
+      def complete?
+        (asset_delivery_state || {})["state"] == "COMPLETE"
+      end
+
       #
       # API
       #
 
-      def self.create(app_preview_set_id: nil, path: nil)
+      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)
-        payload = File.binread(path)
+        bytes = File.binread(path)
 
         post_attributes = {
           fileSize: filesize,
           fileName: filename
         }
 
-        post_resp = Spaceship::ConnectAPI.post_app_preview(
+        # Create placeholder
+        preview = Spaceship::ConnectAPI.post_app_preview(
           app_preview_set_id: app_preview_set_id,
           attributes: post_attributes
         ).to_models.first
 
-        upload_operation = post_resp.upload_operations.first
-        Spaceship::ConnectAPI::FileUploader.upload(upload_operation, payload)
+        # Upload the file
+        upload_operations = preview.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_preview(
-          app_preview_id: post_resp.id,
-          attributes: patch_attributes
-        ).to_models.first
+        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)

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

@@ -63,8 +63,8 @@ module Spaceship
         return resp.to_models
       end
 
-      def upload_preview(path: nil)
-        return Spaceship::ConnectAPI::AppPreview.create(app_preview_set_id: id, path: path)
+      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

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)