-
-
-
-
-
- |
-
-
-
-
-
- |
|
-
-
-
-
-
- |
-
-
-
-
-
- |
-
-
-
-
-
-
-Łukasz Grabowski
- |
-
-
-
+ |
+
+
-
+
|
-
-
-
+ |
+
+
-
+
|
-
-
-
+ |
+
+
-
+
|
-
-
-
+ |
+
+
-
+
|
-|
-
-
-
-
- |
-
-
-
+ |
+
+
-
+
|
@@ -117,25 +79,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
|
-
-
-
-
-Jimmy Dee
- |
|
+
+
+
+
+
+ |
+
+
+
+
+
+ |
-|
-
-
+ |
+
+
-
+
|
@@ -143,23 +111,23 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
|
-
-
-
+ |
+
+
-
+Łukasz Grabowski
|
-
-
-
+ |
+
+
-
+
|
-
-
-
+ |
+
+
-
+
|
@@ -169,23 +137,37 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
-
-
-
+ |
+
+
-
+
|
-
-
-
+ |
+
+
-
+
|
-
-
-
+ |
+
+
-
+
+ |
+
+
+
+
+
+ |
+
+
+|
+
+
+
+
|
@@ -193,13 +175,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
|
+
+
+
+
+
+ |
+
+
+
+
+Jimmy Dee
+ |
+
+
+
+
+
+ |
-|
-
-
+ |
+
+
-
+
|
diff --git a/ToolsAndDebugging.md b/ToolsAndDebugging.md
index 775eb80057f..c58066576c4 100644
--- a/ToolsAndDebugging.md
+++ b/ToolsAndDebugging.md
@@ -2,6 +2,12 @@
For detailed instructions on how to get started with contributing to _fastlane_, first check out [YourFirstPR.md][first-pr] and [Testing.md](Testing.md). This guide will focus on more advanced instructions on how to debug _fastlane_ and _spaceship_ issues and work on patches.
+## Experiment with the _fastlane_ internals
+
+Open a _fastlane_ console by running `fastlane console` inside or outside your project.
+
+This will allow you to invoke any of the _fastlane_ modules and classes and test their behavior.
+
## Debug using [pry](https://pry.github.io/)
Before you’re able to use [pry](https://pry.github.io/), make sure to have completed the [YourFirstPR.md][first-pr] setup part, as this will install all required development dependencies.
@@ -28,6 +34,10 @@ DEBUG=1 bundle exec rspec
You will then jump into an interactive debugger that allows you to print out variables, call methods and [much more](https://github.com/pry/pry/wiki).
To continue running the original script use `control` + `d`
+## Running fastlane within a IRB console
+
+You can open an IRB console by running `bin/console`
+
## Debugging and patching [_spaceship_](https://github.com/fastlane/fastlane/tree/master/spaceship) problems
### Introduction to _spaceship_
@@ -94,6 +104,10 @@ To run the newly created script, run
SPACESHIP_DEBUG=1 bundle exec rake debug
```
+### Running the spaceship playground
+
+You can open an interactive _spaceship_ session console by running `fastlane spaceship`
+
### Additional Information
See also the [Debugging _spaceship_](spaceship/docs/Debugging.md) documentation.
diff --git a/appveyor.yml b/appveyor.yml
index dc72a1e08d8..fe37ad94cb5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,6 +24,8 @@ init:
install:
- set PATH=C:\Ruby26-x64\bin;%PATH%
+ - FOR /F "usebackq delims==" %%A IN (`ruby .ci/compatible_gem_version`) DO gem update --system %%A
+ - FOR /F "usebackq delims==" %%A IN (`ruby .ci/bundler_version.rb`) DO gem install bundler -v %%A
- bundle install
# iconv
- appveyor DownloadFile
diff --git a/bin/console b/bin/console
new file mode 100755
index 00000000000..2fb641ed79b
--- /dev/null
+++ b/bin/console
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "fastlane"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+require "irb"
+IRB.start(__FILE__)
diff --git a/bin/match_file b/bin/match_file
new file mode 100755
index 00000000000..7ee7232c23f
--- /dev/null
+++ b/bin/match_file
@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+require 'match'
+
+# CLI to encrypt/decrypt files using fastlane match encryption layer
+
+def usage
+ puts("USAGE: [encrypt|decrypt] input_path [output_path]")
+ exit(-1)
+end
+
+if ARGV.count < 2 || ARGV.count > 3
+ usage
+end
+
+method_name = ARGV.shift
+unless ['encrypt', 'decrypt'].include?(method_name)
+ usage
+end
+
+input_file = ARGV.shift
+
+if ARGV.count > 0
+ output_file = ARGV.shift
+else
+ output_file = input_file
+end
+
+def ask_password(msg)
+ ask(msg) do |q|
+ q.whitespace = :chomp
+ q.echo = "*"
+ end
+end
+
+def ask_password_twice
+ password = ask_password("Enter the password: ")
+ return "" if password.empty? || password == "\u0003" # CTRL-C char
+ other = ask_password("Enter the password again: ")
+ if other == password
+ return password
+ else
+ return nil
+ end
+end
+
+# read the password
+password = nil
+loop do
+ password = ask_password_twice
+ break unless password.nil?
+end
+
+exit if password.empty?
+
+begin
+ Match::Encryption::MatchFileEncryption.new.send(method_name, file_path: input_file, password: password, output_path: output_file)
+rescue => e
+ puts("ERROR #{method_name}ing. [#{e}]. Check your password")
+ usage
+end
diff --git a/deliver/lib/deliver/download_screenshots.rb b/deliver/lib/deliver/download_screenshots.rb
index 70e6b919077..da198d3784b 100644
--- a/deliver/lib/deliver/download_screenshots.rb
+++ b/deliver/lib/deliver/download_screenshots.rb
@@ -1,5 +1,6 @@
require_relative 'module'
require 'spaceship'
+require 'open-uri'
module Deliver
class DownloadScreenshots
@@ -67,7 +68,7 @@ def self.download_screenshots(folder_path, localization)
end
path = File.join(containing_folder, file_name)
- File.binwrite(path, FastlaneCore::Helper.open_uri(url).read)
+ File.binwrite(path, URI.open(url).read)
end
end
end
diff --git a/deliver/lib/deliver/generate_summary.rb b/deliver/lib/deliver/generate_summary.rb
index 5088f0b456e..a1a7380dd53 100644
--- a/deliver/lib/deliver/generate_summary.rb
+++ b/deliver/lib/deliver/generate_summary.rb
@@ -6,7 +6,7 @@ module Deliver
class GenerateSummary
def run(options)
screenshots = UploadScreenshots.new.collect_screenshots(options)
- UploadMetadata.new.load_from_filesystem(options)
+ UploadMetadata.new(options).load_from_filesystem
HtmlGenerator.new.render(options, screenshots, '.')
end
end
diff --git a/deliver/lib/deliver/options.rb b/deliver/lib/deliver/options.rb
index 5ff0929d977..1659c24ecad 100644
--- a/deliver/lib/deliver/options.rb
+++ b/deliver/lib/deliver/options.rb
@@ -99,7 +99,7 @@ def self.available_options
optional: true,
default_value: "ios",
verify_block: proc do |value|
- UI.user_error!("The platform can only be ios, appletvos, or osx") unless %('ios', 'appletvos', 'osx').include?(value)
+ UI.user_error!("The platform can only be ios, appletvos, xros or osx") unless %('ios', 'appletvos', 'xros', 'osx').include?(value)
end),
# live version
@@ -162,6 +162,11 @@ def self.available_options
description: "Clear all previously uploaded screenshots before uploading the new ones",
type: Boolean,
default_value: false),
+ FastlaneCore::ConfigItem.new(key: :screenshot_processing_timeout,
+ env_name: "DELIVER_SCREENSHOT_PROCESSING_TIMEOUT",
+ description: "Timeout in seconds to wait before considering screenshot processing as failed, used to handle cases where uploads to the App Store are stuck in processing",
+ type: Integer,
+ default_value: 3600),
FastlaneCore::ConfigItem.new(key: :sync_screenshots,
env_name: "DELIVER_SYNC_SCREENSHOTS",
description: "Sync screenshots with local ones. This is currently beta option so set true to 'FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS' environment variable as well",
@@ -182,6 +187,15 @@ def self.available_options
description: "Rejects the previously submitted build if it's in a state where it's possible",
type: Boolean,
default_value: false),
+ FastlaneCore::ConfigItem.new(key: :version_check_wait_retry_limit,
+ env_name: "DELIVER_VERSION_CHECK_WAIT_RETRY_LIMIT",
+ description: "After submitting a new version, App Store Connect takes some time to recognize the new version and we must wait until it's available before attempting to upload metadata for it. There is a mechanism that will check if it's available and retry with an exponential backoff if it's not available yet. " \
+ "This option specifies how many times we should retry before giving up. Setting this to a value below 5 is not recommended and will likely cause failures. Increase this parameter when Apple servers seem to be degraded or slow",
+ type: Integer,
+ default_value: 7,
+ verify_block: proc do |value|
+ UI.user_error!("'#{value}' needs to be greater than 0") if value <= 0
+ end),
# release
FastlaneCore::ConfigItem.new(key: :automatic_release,
@@ -235,7 +249,7 @@ def self.available_options
end),
FastlaneCore::ConfigItem.new(key: :submission_information,
short_option: "-b",
- description: "Extra information for the submission (e.g. compliance specifications, IDFA settings)",
+ description: "Extra information for the submission (e.g. compliance specifications)",
type: Hash,
optional: true),
diff --git a/deliver/lib/deliver/runner.rb b/deliver/lib/deliver/runner.rb
index 6529aaffe94..1f8985160f5 100644
--- a/deliver/lib/deliver/runner.rb
+++ b/deliver/lib/deliver/runner.rb
@@ -135,21 +135,21 @@ def verify_version
# Upload all metadata, screenshots, pricing information, etc. to App Store Connect
def upload_metadata
- upload_metadata = UploadMetadata.new
+ upload_metadata = UploadMetadata.new(options)
upload_screenshots = UploadScreenshots.new
# First, collect all the things for the HTML Report
screenshots = upload_screenshots.collect_screenshots(options)
- upload_metadata.load_from_filesystem(options)
+ upload_metadata.load_from_filesystem
# Assign "default" values to all languages
- upload_metadata.assign_defaults(options)
+ upload_metadata.assign_defaults
# Validate
validate_html(screenshots)
# Commit
- upload_metadata.upload(options)
+ upload_metadata.upload
if options[:sync_screenshots]
sync_screenshots = SyncScreenshots.new(app: Deliver.cache[:app], platform: Spaceship::ConnectAPI::Platform.map(options[:platform]))
@@ -172,7 +172,7 @@ def verify_binary
transporter = transporter_for_selected_team
case platform
- when "ios", "appletvos"
+ when "ios", "appletvos", "xros"
package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(
app_id: Deliver.cache[:app].id,
ipa_path: ipa_path,
@@ -209,7 +209,7 @@ def upload_binary
transporter = transporter_for_selected_team
case platform
- when "ios", "appletvos"
+ when "ios", "appletvos", "xros"
package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(
app_id: Deliver.cache[:app].id,
ipa_path: ipa_path,
@@ -264,6 +264,7 @@ def submit_for_review
private
# If App Store Connect API token, use token.
+ # If api_key is specified and it is an Individual API Key, don't use token but use username.
# If itc_provider was explicitly specified, use it.
# If there are multiple teams, infer the provider from the selected team name.
# If there are fewer than two teams, don't infer the provider.
@@ -280,6 +281,14 @@ def transporter_for_selected_team
api_key
end
+ # Currently no kind of transporters accept an Individual API Key. Use username and app-specific password instead.
+ # See https://github.com/fastlane/fastlane/issues/22115
+ is_individual_key = !api_key.nil? && api_key[:issuer_id].nil?
+ if is_individual_key
+ api_key = nil
+ api_token = nil
+ end
+
unless api_token.nil?
api_token.refresh! if api_token.expired?
return FastlaneCore::ItunesTransporter.new(nil, nil, false, nil, api_token.text, altool_compatible_command: true, api_key: api_key)
diff --git a/deliver/lib/deliver/submit_for_review.rb b/deliver/lib/deliver/submit_for_review.rb
index b4d36503b8c..caa325ceb6b 100644
--- a/deliver/lib/deliver/submit_for_review.rb
+++ b/deliver/lib/deliver/submit_for_review.rb
@@ -20,7 +20,6 @@ def submit!(options)
build = select_build(options, app, version, platform)
update_export_compliance(options, app, build)
- update_idfa(options, app, version)
update_submission_information(options, app)
create_review_submission(options, app, version, platform)
@@ -51,11 +50,11 @@ def create_review_submission(options, app, version, platform)
10.times do
version_with_latest_info = Spaceship::ConnectAPI::AppStoreVersion.get(app_store_version_id: version.id)
- if version_with_latest_info.app_store_state == Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_REVIEW
+ if version_with_latest_info.app_version_state == Spaceship::ConnectAPI::AppStoreVersion::AppVersionState::READY_FOR_REVIEW
break
end
- UI.message("Waiting for the state of the version to become #{Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_REVIEW}...")
+ UI.message("Waiting for the state of the version to become #{Spaceship::ConnectAPI::AppStoreVersion::AppVersionState::READY_FOR_REVIEW}...")
sleep(15)
end
@@ -120,82 +119,6 @@ def update_export_compliance(options, app, build)
end
end
- def update_idfa(options, app, version)
- submission_information = options[:submission_information] || {}
- submission_information = submission_information.transform_keys(&:to_sym)
-
- uses_idfa = submission_information[:add_id_info_uses_idfa]
-
- idfa_declaration = begin
- version.fetch_idfa_declaration
- rescue
- nil
- end
-
- updated_idfa = false
-
- # Set IDFA on version
- unless uses_idfa.nil?
- UI.verbose("Updating app store version for IDFA status of '#{uses_idfa}'")
- version = version.update(attributes: {
- usesIdfa: uses_idfa
- })
- UI.verbose("Updated app store version for IDFA status of '#{version.uses_idfa}'")
- updated_idfa = true
- end
-
- # Error if uses_idfa not set
- if version.uses_idfa.nil?
- message = [
- "Use of Advertising Identifier (IDFA) is required to submit",
- "Add information to the :submission_information option...",
- " Docs: http://docs.fastlane.tools/actions/deliver/#compliance-and-idfa-settings",
- " Example: submission_information: { add_id_info_uses_idfa: false }",
- " Example: submission_information: {",
- " add_id_info_uses_idfa: true,",
- " add_id_info_serves_ads: false,",
- " add_id_info_tracks_install: true,",
- " add_id_info_tracks_action: true,",
- " add_id_info_limits_tracking: true",
- " }",
- " Example CLI:",
- " --submission_information \"{\\\"add_id_info_uses_idfa\\\": false}\""
- ].join("\n")
- UI.user_error!(message)
- end
-
- # Create, update, or delete IDFA declaration
- if uses_idfa == false
- if idfa_declaration
- UI.verbose("Deleting IDFA declaration")
- idfa_declaration.delete!
- updated_idfa = true
- UI.verbose("Deleted IDFA declaration")
- end
- elsif uses_idfa == true
- attributes = {
- honorsLimitedAdTracking: !!submission_information[:add_id_info_limits_tracking],
- servesAds: !!submission_information[:add_id_info_serves_ads],
- attributesAppInstallationToPreviousAd: !!submission_information[:add_id_info_tracks_install],
- attributesActionWithPreviousAd: !!submission_information[:add_id_info_tracks_action]
- }
-
- if idfa_declaration
- UI.verbose("Updating IDFA declaration")
- idfa_declaration.update(attributes: attributes)
- UI.verbose("Updated IDFA declaration")
- else
- UI.verbose("Creating IDFA declaration")
- version.create_idfa_declaration(attributes: attributes)
- UI.verbose("Created IDFA declaration")
- end
-
- updated_idfa = true
- end
-
- UI.success("Successfully updated IDFA declarations on App Store Connect") if updated_idfa
- end
-
def update_submission_information(options, app)
submission_information = options[:submission_information] || {}
submission_information = submission_information.transform_keys(&:to_sym)
diff --git a/deliver/lib/deliver/upload_metadata.rb b/deliver/lib/deliver/upload_metadata.rb
index 2447f2e37ec..8e9f523bed6 100644
--- a/deliver/lib/deliver/upload_metadata.rb
+++ b/deliver/lib/deliver/upload_metadata.rb
@@ -78,19 +78,25 @@ class UploadMetadata
require_relative 'loader'
+ attr_accessor :options
+
+ def initialize(options)
+ self.options = options
+ end
+
# Make sure to call `load_from_filesystem` before calling upload
- def upload(options)
+ def upload
return if options[:skip_metadata]
app = Deliver.cache[:app]
platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
- enabled_languages = detect_languages(options)
+ enabled_languages = detect_languages
- app_store_version_localizations = verify_available_version_languages!(options, app, enabled_languages) unless options[:edit_live]
+ app_store_version_localizations = verify_available_version_languages!(app, enabled_languages) unless options[:edit_live]
app_info = fetch_edit_app_info(app)
- app_info_localizations = verify_available_info_languages!(options, app, app_info, enabled_languages) unless options[:edit_live] || !updating_localized_app_info?(options, app, app_info)
+ app_info_localizations = verify_available_info_languages!(app, app_info, enabled_languages) unless options[:edit_live] || !updating_localized_app_info?(app, app_info)
if options[:edit_live]
# not all values are editable when using live_version
@@ -342,9 +348,9 @@ def upload(options)
end
end
- set_review_information(version, options)
- set_review_attachment_file(version, options)
- set_app_rating(app_info, options)
+ review_information(version)
+ review_attachment_file(version)
+ app_rating(app_info)
end
# rubocop:enable Metrics/PerceivedComplexity
@@ -360,12 +366,12 @@ def convert_ms_to_iso8601(time_in_ms)
end
# If the user is using the 'default' language, then assign values where they are needed
- def assign_defaults(options)
+ def assign_defaults
# Normalizes languages keys from symbols to strings
- normalize_language_keys(options)
+ normalize_language_keys
# Build a complete list of the required languages
- enabled_languages = detect_languages(options)
+ enabled_languages = detect_languages
# Get all languages used in existing settings
(LOCALISED_VERSION_VALUES.keys + LOCALISED_APP_VALUES.keys).each do |key|
@@ -402,7 +408,7 @@ def assign_defaults(options)
end
end
- def detect_languages(options)
+ def detect_languages
# Build a complete list of the required languages
enabled_languages = options[:languages] || []
@@ -427,40 +433,49 @@ def detect_languages(options)
.uniq
end
- def fetch_edit_app_store_version(app, platform, wait_time: 10)
- retry_if_nil("Cannot find edit app store version", wait_time: wait_time) do
+ def fetch_edit_app_store_version(app, platform)
+ retry_if_nil("Cannot find edit app store version") do
app.get_edit_app_store_version(platform: platform)
end
end
- def fetch_edit_app_info(app, wait_time: 10)
- retry_if_nil("Cannot find edit app info", wait_time: wait_time) do
+ def fetch_edit_app_info(app)
+ retry_if_nil("Cannot find edit app info") do
app.fetch_edit_app_info
end
end
- def fetch_live_app_info(app, wait_time: 10)
- retry_if_nil("Cannot find live app info", wait_time: wait_time) do
+ def fetch_live_app_info(app)
+ retry_if_nil("Cannot find live app info") do
app.fetch_live_app_info
end
end
- def retry_if_nil(message, tries: 5, wait_time: 10)
+ # Retries a block of code if the return value is nil, with an exponential backoff.
+ def retry_if_nil(message)
+ tries = options[:version_check_wait_retry_limit]
+ wait_time = 10
loop do
tries -= 1
value = yield
return value if value
- UI.message("#{message}... Retrying after #{wait_time} seconds (remaining: #{tries})")
- sleep(wait_time)
+ # Calculate sleep time to be the lesser of the exponential backoff or 5 minutes.
+ # This prevents problems with CI's console output timeouts (of usually 10 minutes), and also
+ # speeds up the retry time for the user, as waiting longer than 5 minutes is a too long wait for a retry.
+ sleep_time = [wait_time * 2, 5 * 60].min
+ UI.message("#{message}... Retrying after #{sleep_time} seconds (remaining: #{tries})")
+ Kernel.sleep(sleep_time)
return nil if tries.zero?
+
+ wait_time *= 2 # Double the wait time for the next iteration
end
end
# Checking if the metadata to update includes localised App Info
- def updating_localized_app_info?(options, app, app_info)
+ def updating_localized_app_info?(app, app_info)
app_info ||= fetch_live_app_info(app)
unless app_info
UI.important("Can't find edit or live App info. Skipping upload.")
@@ -499,7 +514,7 @@ def updating_localized_app_info?(options, app, app_info)
end
# Finding languages to enable
- def verify_available_info_languages!(options, app, app_info, languages)
+ def verify_available_info_languages!(app, app_info, languages)
unless app_info
UI.user_error!("Cannot update languages - could not find an editable 'App Info'. Verify that your app is in one of the editable states in App Store Connect")
return
@@ -531,7 +546,7 @@ def verify_available_info_languages!(options, app, app_info, languages)
end
# Finding languages to enable
- def verify_available_version_languages!(options, app, languages)
+ def verify_available_version_languages!(app, languages)
platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
version = fetch_edit_app_store_version(app, platform)
@@ -566,7 +581,7 @@ def verify_available_version_languages!(options, app, languages)
end
# Loads the metadata files and stores them into the options object
- def load_from_filesystem(options)
+ def load_from_filesystem
return if options[:skip_metadata]
# Load localised data
@@ -623,7 +638,7 @@ def load_from_filesystem(options)
private
# Normalizes languages keys from symbols to strings
- def normalize_language_keys(options)
+ def normalize_language_keys
(LOCALISED_VERSION_VALUES.keys + LOCALISED_APP_VALUES.keys).each do |key|
current = options[key]
next unless current && current.kind_of?(Hash)
@@ -636,7 +651,7 @@ def normalize_language_keys(options)
options
end
- def set_review_information(version, options)
+ def review_information(version)
info = options[:app_review_information]
return if info.nil? || info.empty?
@@ -669,7 +684,7 @@ def set_review_information(version, options)
end
end
- def set_review_attachment_file(version, options)
+ def review_attachment_file(version)
app_store_review_detail = version.fetch_app_store_review_detail
app_store_review_attachments = app_store_review_detail.app_store_review_attachments || []
@@ -687,7 +702,7 @@ def set_review_attachment_file(version, options)
end
end
- def set_app_rating(app_info, options)
+ def app_rating(app_info)
return unless options[:app_rating_config_path]
require 'json'
diff --git a/deliver/lib/deliver/upload_screenshots.rb b/deliver/lib/deliver/upload_screenshots.rb
index 9046ce6f152..575e6e81892 100644
--- a/deliver/lib/deliver/upload_screenshots.rb
+++ b/deliver/lib/deliver/upload_screenshots.rb
@@ -55,7 +55,7 @@ def upload(options, screenshots)
localizations = version.get_app_store_version_localizations
end
- upload_screenshots(localizations, screenshots_per_language)
+ upload_screenshots(localizations, screenshots_per_language, options[:screenshot_processing_timeout])
Helper.show_loading_indicator("Sorting screenshots uploaded...")
sort_screenshots(localizations)
@@ -109,7 +109,7 @@ def delete_screenshots(localizations, screenshots_per_language, tries: 5)
end
end
- def upload_screenshots(localizations, screenshots_per_language, tries: 5)
+ def upload_screenshots(localizations, screenshots_per_language, timeout_seconds, tries: 5)
tries -= 1
# Upload screenshots
@@ -158,15 +158,16 @@ def upload_screenshots(localizations, screenshots_per_language, tries: 5)
UI.verbose('Uploading jobs are completed')
Helper.show_loading_indicator("Waiting for all the screenshots to finish being processed...")
- states = wait_for_complete(iterator)
+ states = wait_for_complete(iterator, timeout_seconds)
Helper.hide_loading_indicator
- retry_upload_screenshots_if_needed(iterator, states, total_number_of_screenshots, tries, localizations, screenshots_per_language)
+ retry_upload_screenshots_if_needed(iterator, states, total_number_of_screenshots, tries, timeout_seconds, localizations, screenshots_per_language)
UI.message("Successfully uploaded all screenshots")
end
# Verify all screenshots have been processed
- def wait_for_complete(iterator)
+ def wait_for_complete(iterator, timeout_seconds)
+ start_time = Time.now
loop do
states = iterator.each_app_screenshot.map { |_, _, app_screenshot| app_screenshot }.each_with_object({}) do |app_screenshot, hash|
state = app_screenshot.asset_delivery_state['state']
@@ -177,16 +178,22 @@ def wait_for_complete(iterator)
is_processing = states.fetch('UPLOAD_COMPLETE', 0) > 0
return states unless is_processing
+ if Time.now - start_time > timeout_seconds
+ UI.important("Screenshot upload reached the timeout limit of #{timeout_seconds} seconds. We'll now retry uploading the screenshots that couldn't be uploaded in time.")
+ return states
+ end
+
UI.verbose("There are still incomplete screenshots - #{states}")
sleep(5)
end
end
# Verify all screenshots states on App Store Connect are okay
- def retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots, tries, localizations, screenshots_per_language)
+ def retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots, tries, timeout_seconds, localizations, screenshots_per_language)
is_failure = states.fetch("FAILED", 0) > 0
+ is_processing = states.fetch('UPLOAD_COMPLETE', 0) > 0
is_missing_screenshot = !screenshots_per_language.empty? && !verify_local_screenshots_are_uploaded(iterator, screenshots_per_language)
- return unless is_failure || is_missing_screenshot
+ return unless is_failure || is_missing_screenshot || is_processing
if tries.zero?
iterator.each_app_screenshot.select { |_, _, app_screenshot| app_screenshot.error? }.each do |localization, _, app_screenshot|
@@ -200,7 +207,7 @@ def retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots,
iterator.each_app_screenshot do |_, _, app_screenshot|
app_screenshot.delete! unless app_screenshot.complete?
end
- upload_screenshots(localizations, screenshots_per_language, tries: tries)
+ upload_screenshots(localizations, screenshots_per_language, timeout_seconds, tries: tries)
end
end
diff --git a/deliver/spec/runner_spec.rb b/deliver/spec/runner_spec.rb
index 7b620fdc382..617a8bcb273 100644
--- a/deliver/spec/runner_spec.rb
+++ b/deliver/spec/runner_spec.rb
@@ -30,7 +30,9 @@ def provider_ids
let(:runner) do
allow(Spaceship::ConnectAPI).to receive(:login).and_return(true)
allow(Spaceship::ConnectAPI).to receive(:select_team).and_return(true)
- allow(Spaceship::Tunes).to receive(:client).and_return(MockSession.new)
+ mock_session = MockSession.new
+ allow(Spaceship::Tunes).to receive(:client).and_return(mock_session)
+ allow(Spaceship::ConnectAPI).to receive_message_chain('client.tunes_client').and_return(mock_session)
allow_any_instance_of(Deliver::DetectValues).to receive(:run!) { |opt| opt }
Deliver::Runner.new(options)
end
@@ -46,6 +48,9 @@ def provider_ids
}
end
+ let(:fake_team_api_key_json_path) { File.absolute_path("./spaceship/spec/connect_api/fixtures/asc_key.json") }
+ let(:fake_individual_api_key_json_path) { File.absolute_path("./spaceship/spec/connect_api/fixtures/asc_individual_key.json") }
+
before do
allow(Deliver).to receive(:cache).and_return({
app: double('app', { id: 'YI8C2AS' })
@@ -82,6 +87,20 @@ def provider_ids
end
end
+ describe 'with an IPA file for visionOS' do
+ before do
+ options[:platform] = 'xros'
+ end
+
+ it 'uploads the IPA for the visionOS platform' do
+ expect_any_instance_of(FastlaneCore::IpaUploadPackageBuilder).to receive(:generate)
+ .with(app_id: 'YI8C2AS', ipa_path: 'ACME.ipa', package_path: '/tmp', platform: 'xros')
+ .and_return('path')
+ expect(transporter).to receive(:upload).with(package_path: 'path', asset_path: 'ACME.ipa', platform: 'xros').and_return(true)
+ runner.upload_binary
+ end
+ end
+
describe 'with a PKG file for macOS' do
before do
options[:platform] = 'osx'
@@ -97,6 +116,67 @@ def provider_ids
runner.upload_binary
end
end
+
+ describe 'with Team API Key' do
+ before do
+ options[:api_key] = JSON.load_file(fake_team_api_key_json_path, symbolize_names: true)
+ end
+
+ it 'initializes transporter with API key' do
+ token = instance_double(Spaceship::ConnectAPI::Token, {
+ text: 'API_TOKEN',
+ expired?: false
+ })
+ allow(Spaceship::ConnectAPI).to receive(:token).and_return(token)
+ allow(Spaceship::ConnectAPI).to receive(:token=)
+ expect_any_instance_of(FastlaneCore::IpaUploadPackageBuilder).to receive(:generate).and_return('path')
+ expect(FastlaneCore::ItunesTransporter).to receive(:new)
+ .with(
+ nil,
+ nil,
+ false,
+ nil,
+ 'API_TOKEN',
+ {
+ altool_compatible_command: true,
+ api_key: options[:api_key],
+ }
+ )
+ .and_return(transporter)
+ expect(transporter).to receive(:upload).with(package_path: 'path', asset_path: 'ACME.ipa', platform: 'ios').and_return(true)
+ runner.upload_binary
+ end
+ end
+
+ describe 'with Individual API Key' do
+ before do
+ options[:api_key] = JSON.load_file(fake_individual_api_key_json_path, symbolize_names: true)
+ end
+
+ it 'initializes transporter with username' do
+ token = instance_double(Spaceship::ConnectAPI::Token, {
+ text: 'API_TOKEN',
+ expired?: false
+ })
+ allow(Spaceship::ConnectAPI).to receive(:token).and_return(token)
+ allow(Spaceship::ConnectAPI).to receive(:token=)
+ expect_any_instance_of(FastlaneCore::IpaUploadPackageBuilder).to receive(:generate).and_return('path')
+ expect(FastlaneCore::ItunesTransporter).to receive(:new)
+ .with(
+ 'bill@acme.com',
+ nil,
+ false,
+ nil,
+ {
+ altool_compatible_command: true,
+ api_key: nil,
+ }
+ )
+ .and_return(transporter)
+ expect(transporter).to receive(:upload).and_return(true)
+ runner.upload_binary
+ end
+ end
end
describe :verify_binary do
@@ -129,6 +209,20 @@ def provider_ids
end
end
+ describe 'with an IPA file for visionOS' do
+ before do
+ options[:platform] = 'xros'
+ end
+
+ it 'verifies the IPA for the visionOS platform' do
+ expect_any_instance_of(FastlaneCore::IpaUploadPackageBuilder).to receive(:generate)
+ .with(app_id: 'YI8C2AS', ipa_path: 'ACME.ipa', package_path: '/tmp', platform: 'xros')
+ .and_return('path')
+ expect(transporter).to receive(:verify).with(asset_path: "ACME.ipa", package_path: 'path', platform: "xros").and_return(true)
+ runner.verify_binary
+ end
+ end
+
describe 'with a PKG file for macOS' do
before do
options[:platform] = 'osx'
@@ -144,5 +238,66 @@ def provider_ids
runner.verify_binary
end
end
+
+ describe 'with Team API Key' do
+ before do
+ options[:api_key] = JSON.load_file(fake_team_api_key_json_path, symbolize_names: true)
+ end
+
+ it 'initializes transporter with API Key' do
+ token = instance_double(Spaceship::ConnectAPI::Token, {
+ text: 'API_TOKEN',
+ expired?: false
+ })
+ allow(Spaceship::ConnectAPI).to receive(:token).and_return(token)
+ allow(Spaceship::ConnectAPI).to receive(:token=)
+ allow_any_instance_of(FastlaneCore::IpaUploadPackageBuilder).to receive(:generate).and_return('path')
+ expect(FastlaneCore::ItunesTransporter).to receive(:new)
+ .with(
+ nil,
+ nil,
+ false,
+ nil,
+ 'API_TOKEN',
+ {
+ altool_compatible_command: true,
+ api_key: options[:api_key],
+ }
+ )
+ .and_return(transporter)
+ expect(transporter).to receive(:verify).and_return(true)
+ runner.verify_binary
+ end
+ end
+
+ describe 'with Individual API Key' do
+ before do
+ options[:api_key] = JSON.load_file(fake_individual_api_key_json_path, symbolize_names: true)
+ end
+
+ it 'initializes transporter with username' do
+ token = instance_double(Spaceship::ConnectAPI::Token, {
+ text: 'API_TOKEN',
+ expired?: false
+ })
+ allow(Spaceship::ConnectAPI).to receive(:token).and_return(token)
+ allow(Spaceship::ConnectAPI).to receive(:token=)
+ allow_any_instance_of(FastlaneCore::IpaUploadPackageBuilder).to receive(:generate).and_return('path')
+ expect(FastlaneCore::ItunesTransporter).to receive(:new)
+ .with(
+ 'bill@acme.com',
+ nil,
+ false,
+ nil,
+ {
+ altool_compatible_command: true,
+ api_key: nil,
+ }
+ )
+ .and_return(transporter)
+ expect(transporter).to receive(:verify).and_return(true)
+ runner.verify_binary
+ end
+ end
end
end
diff --git a/deliver/spec/submit_for_review_spec.rb b/deliver/spec/submit_for_review_spec.rb
index fb960990094..ebaf4758f12 100644
--- a/deliver/spec/submit_for_review_spec.rb
+++ b/deliver/spec/submit_for_review_spec.rb
@@ -14,17 +14,16 @@
let(:ready_for_review_version) do
double('ready_for_review_version',
id: '1',
- app_store_state: "READY_FOR_REVIEW",
+ app_version_state: "READY_FOR_REVIEW",
version_string: "1.0.0")
end
let(:prepare_for_submission_version) do
double('prepare_for_submission_version',
id: '1',
- app_store_state: "PREPARE_FOR_SUBMISSION",
+ app_version_state: "PREPARE_FOR_SUBMISSION",
version_string: "1.0.0")
end
let(:selected_build) { double('selected_build') }
- let(:idfa_declaration) { double('idfa_declaration') }
let(:submission) do
double('submission',
@@ -66,26 +65,6 @@
review_submitter.submit!(options)
end.to raise_error("boom")
end
-
- it 'needs to set export_compliance_uses_encryption' do
- options = {
- platform: Spaceship::ConnectAPI::Platform::IOS
- }
-
- expect(app).to receive(:get_edit_app_store_version).and_return(edit_version)
- expect(review_submitter).to receive(:select_build).and_return(selected_build)
-
- expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
-
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(nil)
-
- expect(UI).to receive(:user_error!).with(/Use of Advertising Identifier \(IDFA\) is required to submit/).and_raise("boom")
-
- expect do
- review_submitter.submit!(options)
- end.to raise_error("boom")
- end
end
context 'submits successfully' do
@@ -101,9 +80,6 @@
expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(false)
-
expect(app).to receive(:get_in_progress_review_submission).and_return(submission)
expect do
@@ -121,9 +97,6 @@
expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(false)
-
expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
expect(app).to receive(:get_ready_review_submission).and_return(submission)
expect(submission).to receive(:items).and_return([])
@@ -146,9 +119,6 @@
expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(false)
-
expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
expect(app).to receive(:get_ready_review_submission).and_return(submission)
expect(submission).to receive(:items).and_return([double('some item')])
@@ -170,9 +140,6 @@
expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(false)
-
expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
expect(app).to receive(:get_ready_review_submission).and_return(submission)
expect(submission).to receive(:items).and_return([])
@@ -203,9 +170,6 @@
expect(selected_build).to receive(:update).with(attributes: { usesNonExemptEncryption: false }).and_return(selected_build)
expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(false)
-
expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
expect(app).to receive(:get_ready_review_submission).and_return(nil)
expect(app).to receive(:create_review_submission).and_return(submission)
@@ -232,9 +196,6 @@
expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:uses_idfa).and_return(false)
-
expect(app).to receive(:update).with(attributes: {
contentRightsDeclaration: "USES_THIRD_PARTY_CONTENT"
})
@@ -250,145 +211,6 @@
review_submitter.submit!(options)
end
end
-
- context 'IDFA' do
- it 'submission information with idfa false with no idfa' do
- options = {
- platform: Spaceship::ConnectAPI::Platform::IOS,
- submission_information: {
- add_id_info_uses_idfa: false
- }
- }
-
- expect(app).to receive(:get_edit_app_store_version).and_return(edit_version)
- expect(review_submitter).to receive(:select_build).and_return(selected_build)
-
- expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
-
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:update).with(attributes: { usesIdfa: false }).and_return(edit_version)
- expect(edit_version).to receive(:uses_idfa).and_return(false).exactly(2).times
-
- expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
- expect(app).to receive(:get_ready_review_submission).and_return(nil)
- expect(app).to receive(:create_review_submission).and_return(submission)
-
- expect(submission).to receive(:add_app_store_version_to_review_items).with(app_store_version_id: edit_version.id)
- expect(Spaceship::ConnectAPI::AppStoreVersion).to receive(:get).and_return(ready_for_review_version)
- expect(submission).to receive(:submit_for_review)
-
- review_submitter.submit!(options)
- end
-
- it 'submission information with idfa false with existing idfa' do
- options = {
- platform: Spaceship::ConnectAPI::Platform::IOS,
- submission_information: {
- add_id_info_uses_idfa: false
- }
- }
-
- expect(app).to receive(:get_edit_app_store_version).and_return(edit_version)
- expect(review_submitter).to receive(:select_build).and_return(selected_build)
-
- expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
-
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(idfa_declaration)
- expect(edit_version).to receive(:update).with(attributes: { usesIdfa: false }).and_return(edit_version)
- expect(edit_version).to receive(:uses_idfa).and_return(false).exactly(2).times
- expect(idfa_declaration).to receive(:delete!)
-
- expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
- expect(app).to receive(:get_ready_review_submission).and_return(nil)
- expect(app).to receive(:create_review_submission).and_return(submission)
-
- expect(submission).to receive(:add_app_store_version_to_review_items).with(app_store_version_id: edit_version.id)
- expect(Spaceship::ConnectAPI::AppStoreVersion).to receive(:get).and_return(ready_for_review_version)
- expect(submission).to receive(:submit_for_review)
-
- review_submitter.submit!(options)
- end
-
- it 'submission information with idfa true with no idfa' do
- options = {
- platform: Spaceship::ConnectAPI::Platform::IOS,
- submission_information: {
- add_id_info_uses_idfa: true,
-
- add_id_info_limits_tracking: true,
- add_id_info_serves_ads: true,
- add_id_info_tracks_install: true,
- add_id_info_tracks_action: true
- }
- }
-
- expect(app).to receive(:get_edit_app_store_version).and_return(edit_version)
- expect(review_submitter).to receive(:select_build).and_return(selected_build)
-
- expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
-
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(nil)
- expect(edit_version).to receive(:update).with(attributes: { usesIdfa: true }).and_return(edit_version)
- expect(edit_version).to receive(:uses_idfa).and_return(true).exactly(2).times
-
- expect(edit_version).to receive(:create_idfa_declaration).with(attributes: {
- honorsLimitedAdTracking: true,
- servesAds: true,
- attributesAppInstallationToPreviousAd: true,
- attributesActionWithPreviousAd: true
- })
-
- expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
- expect(app).to receive(:get_ready_review_submission).and_return(nil)
- expect(app).to receive(:create_review_submission).and_return(submission)
-
- expect(submission).to receive(:add_app_store_version_to_review_items).with(app_store_version_id: edit_version.id)
- expect(Spaceship::ConnectAPI::AppStoreVersion).to receive(:get).and_return(ready_for_review_version)
- expect(submission).to receive(:submit_for_review)
-
- review_submitter.submit!(options)
- end
-
- it 'submission information with idfa true with existing idfa' do
- options = {
- platform: Spaceship::ConnectAPI::Platform::IOS,
- submission_information: {
- add_id_info_uses_idfa: true,
-
- add_id_info_limits_tracking: true,
- add_id_info_serves_ads: true,
- add_id_info_tracks_install: true,
- add_id_info_tracks_action: true
- }
- }
-
- expect(app).to receive(:get_edit_app_store_version).and_return(edit_version)
- expect(review_submitter).to receive(:select_build).and_return(selected_build)
-
- expect(selected_build).to receive(:uses_non_exempt_encryption).and_return(false)
-
- expect(edit_version).to receive(:fetch_idfa_declaration).and_return(idfa_declaration)
- expect(edit_version).to receive(:update).with(attributes: { usesIdfa: true }).and_return(edit_version)
- expect(edit_version).to receive(:uses_idfa).and_return(true).exactly(2).times
-
- expect(idfa_declaration).to receive(:update).with(attributes: {
- honorsLimitedAdTracking: true,
- servesAds: true,
- attributesAppInstallationToPreviousAd: true,
- attributesActionWithPreviousAd: true
- })
-
- expect(app).to receive(:get_in_progress_review_submission).and_return(nil)
- expect(app).to receive(:get_ready_review_submission).and_return(nil)
- expect(app).to receive(:create_review_submission).and_return(submission)
-
- expect(submission).to receive(:add_app_store_version_to_review_items).with(app_store_version_id: edit_version.id)
- expect(Spaceship::ConnectAPI::AppStoreVersion).to receive(:get).and_return(ready_for_review_version)
- expect(submission).to receive(:submit_for_review)
-
- review_submitter.submit!(options)
- end
- end
end
end
end
diff --git a/deliver/spec/upload_metadata_spec.rb b/deliver/spec/upload_metadata_spec.rb
index a9183547eed..51a3dbb5f51 100644
--- a/deliver/spec/upload_metadata_spec.rb
+++ b/deliver/spec/upload_metadata_spec.rb
@@ -2,12 +2,12 @@
require 'tempfile'
describe Deliver::UploadMetadata do
- let(:uploader) { Deliver::UploadMetadata.new }
let(:tmpdir) { Dir.mktmpdir }
describe '#load_from_filesystem' do
context 'with review information' do
let(:options) { { metadata_path: tmpdir, app_review_information: app_review_information } }
+ let(:uploader) { Deliver::UploadMetadata.new(options) }
def create_metadata(path, text)
File.open(File.join(path), 'w') do |f|
@@ -33,7 +33,7 @@ def create_metadata(path, text)
context 'without app_review_information' do
let(:app_review_information) { nil }
it 'can load review information from file' do
- uploader.load_from_filesystem(options)
+ uploader.load_from_filesystem
expect(options[:app_review_information][:first_name]).to eql('Alice')
expect(options[:app_review_information][:last_name]).to eql('Smith')
expect(options[:app_review_information][:phone_number]).to eql('+819012345678')
@@ -47,7 +47,7 @@ def create_metadata(path, text)
context 'with app_review_information' do
let(:app_review_information) { { notes: 'This is a note from option' } }
it 'values will be masked by the in options' do
- uploader.load_from_filesystem(options)
+ uploader.load_from_filesystem
expect(options[:app_review_information][:first_name]).to eql('Alice')
expect(options[:app_review_information][:last_name]).to eql('Smith')
expect(options[:app_review_information][:phone_number]).to eql('+819012345678')
@@ -64,10 +64,11 @@ def create_metadata(path, text)
end
end
- describe "#set_review_information" do
+ describe "#review_information" do
let(:options) { { metadata_path: tmpdir, app_review_information: app_review_information } }
let(:version) { double("version") }
let(:app_store_review_detail) { double("app_store_review_detail") }
+ let(:uploader) { Deliver::UploadMetadata.new(options) }
context "with review_information" do
let(:app_review_information) do
@@ -81,8 +82,10 @@ def create_metadata(path, text)
end
it "skips review information with empty app_review_information" do
+ options[:app_review_information] = {}
+
expect(FastlaneCore::UI).not_to receive(:message).with("Uploading app review information to App Store Connect")
- uploader.send("set_review_information", version, { app_review_information: {} })
+ uploader.send("review_information", version)
end
it "successfully set review information" do
@@ -100,7 +103,7 @@ def create_metadata(path, text)
expect(FastlaneCore::UI).to receive(:message).with("Uploading app review information to App Store Connect")
- uploader.send("set_review_information", version, options)
+ uploader.send("review_information", version)
end
end
@@ -116,7 +119,7 @@ def create_metadata(path, text)
"demo_account_required" => true
})
- uploader.send("set_review_information", version, options)
+ uploader.send("review_information", version)
end
end
@@ -129,7 +132,7 @@ def create_metadata(path, text)
"demo_account_required" => false
})
- uploader.send("set_review_information", version, options)
+ uploader.send("review_information", version)
end
end
@@ -142,7 +145,7 @@ def create_metadata(path, text)
"demo_account_required" => false
})
- uploader.send("set_review_information", version, options)
+ uploader.send("review_information", version)
end
end
end
@@ -175,6 +178,10 @@ def create_metadata(path, text)
count: 0)
end
+ let(:options) { { version_check_wait_retry_limit: 5 } }
+
+ let(:uploader) { Deliver::UploadMetadata.new(options) }
+
let(:metadata_path) { Dir.mktmpdir }
context "fetch app edit" do
@@ -182,22 +189,24 @@ def create_metadata(path, text)
it "no retry" do
expect(app).to receive(:get_edit_app_store_version).and_return(version)
- edit_version = uploader.fetch_edit_app_store_version(app, 'IOS', wait_time: 0.1)
+ edit_version = uploader.fetch_edit_app_store_version(app, 'IOS')
expect(edit_version).to eq(version)
end
it "1 retry" do
+ expect(Kernel).to receive(:sleep).once.with(20)
expect(app).to receive(:get_edit_app_store_version).and_return(nil)
expect(app).to receive(:get_edit_app_store_version).and_return(version)
- edit_version = uploader.fetch_edit_app_store_version(app, 'IOS', wait_time: 0.1)
+ edit_version = uploader.fetch_edit_app_store_version(app, 'IOS')
expect(edit_version).to eq(version)
end
it "5 retry" do
+ expect(Kernel).to receive(:sleep).exactly(5).times
expect(app).to receive(:get_edit_app_store_version).and_return(nil).exactly(5).times
- edit_version = uploader.fetch_edit_app_store_version(app, 'IOS', wait_time: 0.1)
+ edit_version = uploader.fetch_edit_app_store_version(app, 'IOS')
expect(edit_version).to eq(nil)
end
end
@@ -206,34 +215,38 @@ def create_metadata(path, text)
it "no retry" do
expect(app).to receive(:fetch_edit_app_info).and_return(app_info)
- edit_app_info = uploader.fetch_edit_app_info(app, wait_time: 0.1)
+ edit_app_info = uploader.fetch_edit_app_info(app)
expect(edit_app_info).to eq(app_info)
end
it "1 retry" do
+ expect(Kernel).to receive(:sleep).once.with(20)
expect(app).to receive(:fetch_edit_app_info).and_return(nil)
expect(app).to receive(:fetch_edit_app_info).and_return(app_info)
- edit_app_info = uploader.fetch_edit_app_info(app, wait_time: 0.1)
+ edit_app_info = uploader.fetch_edit_app_info(app)
expect(edit_app_info).to eq(app_info)
end
it "5 retry" do
+ expect(Kernel).to receive(:sleep).exactly(5).times
expect(app).to receive(:fetch_edit_app_info).and_return(nil).exactly(5).times
- edit_app_info = uploader.fetch_edit_app_info(app, wait_time: 0.1)
+ edit_app_info = uploader.fetch_edit_app_info(app)
expect(edit_app_info).to eq(nil)
end
end
end
context "#upload" do
+ let(:options) { {} }
+
before do
allow(Deliver).to receive(:cache).and_return({ app: app })
- allow(uploader).to receive(:set_review_information)
- allow(uploader).to receive(:set_review_attachment_file)
- allow(uploader).to receive(:set_app_rating)
+ allow(uploader).to receive(:review_information)
+ allow(uploader).to receive(:review_attachment_file)
+ allow(uploader).to receive(:app_rating)
# Verify available languages
expect(app).to receive(:id).and_return(id)
@@ -254,12 +267,11 @@ def create_metadata(path, text)
context "normal metadata" do
it "saves metadata" do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- name: { "en-US" => "App name" },
- description: { "en-US" => "App description" }
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:name] = { "en-US" => "App name" }
+ options[:description] = { "en-US" => "App description" }
+ options[:version_check_wait_retry_limit] = 5
# Get number of versions (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -285,18 +297,17 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
end
context "with privacy_url" do
it 'saves privacy_url' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- privacy_url: { "en-US" => "https://fastlane.tools" },
- apple_tv_privacy_policy: { "en-US" => "https://fastlane.tools/tv" }
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:privacy_url] = { "en-US" => "https://fastlane.tools" }
+ options[:apple_tv_privacy_policy] = { "en-US" => "https://fastlane.tools/tv" }
+ options[:version_check_wait_retry_limit] = 5
# Get number of versions (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -310,17 +321,16 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
end
context "with auto_release_date" do
it 'with date' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- auto_release_date: 1_595_395_800_000
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:auto_release_date] = 1_595_395_800_000
+ options[:version_check_wait_retry_limit] = 5
# Get number of version (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -333,18 +343,17 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
end
context "with phased_release" do
it 'with true' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- phased_release: true,
- automatic_release: false
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:phased_release] = true
+ options[:automatic_release] = false
+ options[:version_check_wait_retry_limit] = 5
# Get number of version (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -365,15 +374,14 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
it 'with false' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- phased_release: false
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:phased_release] = false
+ options[:version_check_wait_retry_limit] = 5
# Get number of version (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -391,17 +399,16 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
end
context "with reset_ratings" do
- it 'with true' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- reset_ratings: true
- }
+ it 'with select reset_ratings' do
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:reset_ratings] = true
+ options[:version_check_wait_retry_limit] = 5
# Get number of version (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -418,15 +425,14 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
- it 'with false' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- reset_ratings: false
- }
+ it 'does not select reset_ratings' do
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:reset_ratings] = false
+ options[:version_check_wait_retry_limit] = 5
# Get number of version (used for if whats_new should be sent)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
@@ -444,18 +450,18 @@ def create_metadata(path, text)
# Update app info
expect(app_info).to receive(:update_categories).with(category_id_map: {})
- uploader.upload(options)
+ uploader.upload
end
end
context "with no editable app info" do
let(:live_app_info) { double('app_info') }
let(:app_info) { nil }
+
it 'no new app info provided by user' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:version_check_wait_retry_limit] = 5
# Get live app info
expect(app).to receive(:fetch_live_app_info).and_return(live_app_info)
@@ -464,15 +470,14 @@ def create_metadata(path, text)
expect(Spaceship::ConnectAPI).to receive(:get_app_store_versions).and_return(app_store_versions)
expect(version).to receive(:update).with(attributes: {})
- uploader.upload(options)
+ uploader.upload
end
it 'same app info as live version' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- name: { "en-US" => "App name" }
- }
+ options[:platform] = "ios"
+ options[:metadata_path] = metadata_path
+ options[:name] = { "en-US" => "App name" }
+ options[:version_check_wait_retry_limit] = 5
# Get live app info
expect(app).to receive(:fetch_live_app_info).and_return(live_app_info)
@@ -485,7 +490,7 @@ def create_metadata(path, text)
# Get app info localization in English (used to compare with data to upload)
expect(app_info_localization_en).to receive(:name).and_return('App name')
- uploader.upload(options)
+ uploader.upload
end
end
end
@@ -493,18 +498,20 @@ def create_metadata(path, text)
context "fail when not allowed to update" do
let(:live_app_info) { double('app_info') }
let(:app_info) { nil }
- it 'different app info than live version' do
- options = {
- platform: "ios",
- metadata_path: metadata_path,
- name: { "en-US" => "New app name" }
+ let(:options) {
+ {
+ platform: "ios",
+ metadata_path: metadata_path,
+ name: { "en-US" => "New app name" },
+ version_check_wait_retry_limit: 5,
}
-
+ }
+ it 'different app info than live version' do
allow(Deliver).to receive(:cache).and_return({ app: app })
- allow(uploader).to receive(:set_review_information)
- allow(uploader).to receive(:set_review_attachment_file)
- allow(uploader).to receive(:set_app_rating)
+ allow(uploader).to receive(:review_information)
+ allow(uploader).to receive(:review_attachment_file)
+ allow(uploader).to receive(:app_rating)
# Get app info
expect(uploader).to receive(:fetch_edit_app_info).and_return(app_info)
@@ -522,13 +529,14 @@ def create_metadata(path, text)
expect(FastlaneCore::UI).to receive(:user_error!).with("Cannot update languages - could not find an editable 'App Info'. Verify that your app is in one of the editable states in App Store Connect").and_call_original
# Get app info localization in English (used to compare with data to upload)
- expect { uploader.upload(options) }.to raise_error(FastlaneCore::Interface::FastlaneError)
+ expect { uploader.upload }.to raise_error(FastlaneCore::Interface::FastlaneError)
end
end
end
describe "#languages" do
let(:options) { { metadata_path: tmpdir } }
+ let(:uploader) { Deliver::UploadMetadata.new(options) }
def create_metadata(path, text)
File.open(File.join(path), 'w') do |f|
@@ -549,8 +557,8 @@ def create_filesystem_language(name)
create_filesystem_language('de-DE')
create_filesystem_language('el')
- uploader.load_from_filesystem(options)
- languages = uploader.detect_languages(options)
+ uploader.load_from_filesystem
+ languages = uploader.detect_languages
expect(languages.sort).to eql(['de-DE', 'el', 'en-US'])
end
@@ -561,8 +569,8 @@ def create_filesystem_language(name)
create_filesystem_language('default')
create_filesystem_language('en-US')
- uploader.load_from_filesystem(options)
- languages = uploader.detect_languages(options)
+ uploader.load_from_filesystem
+ languages = uploader.detect_languages
expect(languages.sort).to eql(['default', 'en-US'])
end
@@ -572,8 +580,8 @@ def create_filesystem_language(name)
it "languages are 'en-AU', 'en-CA', 'en-GB'" do
options[:languages] = ['en-AU', 'en-CA', 'en-GB']
- uploader.load_from_filesystem(options)
- languages = uploader.detect_languages(options)
+ uploader.load_from_filesystem
+ languages = uploader.detect_languages
expect(languages.sort).to eql(['en-AU', 'en-CA', 'en-GB'])
end
@@ -588,8 +596,8 @@ def create_filesystem_language(name)
'es-MX' => 'something else'
}
- uploader.load_from_filesystem(options)
- languages = uploader.detect_languages(options)
+ uploader.load_from_filesystem
+ languages = uploader.detect_languages
expect(languages.sort).to eql(['default', 'es-MX'])
end
@@ -606,8 +614,8 @@ def create_filesystem_language(name)
'something'
)
- uploader.load_from_filesystem(options)
- languages = uploader.detect_languages(options)
+ uploader.load_from_filesystem
+ languages = uploader.detect_languages
expect(languages.sort).to eql(['default', 'en-US'])
end
@@ -626,8 +634,8 @@ def create_filesystem_language(name)
create_filesystem_language('de-DE')
create_filesystem_language('el')
- uploader.load_from_filesystem(options)
- languages = uploader.detect_languages(options)
+ uploader.load_from_filesystem
+ languages = uploader.detect_languages
expect(languages.sort).to eql(['de-DE', 'default', 'el', 'en-AU', 'en-CA', 'en-GB', 'en-US', 'es-MX'])
end
@@ -646,8 +654,8 @@ def create_filesystem_language(name)
create_filesystem_language('de-DE')
create_filesystem_language('el')
- uploader.load_from_filesystem(options)
- uploader.assign_defaults(options)
+ uploader.load_from_filesystem
+ uploader.assign_defaults
expect(options[:release_notes]["en-US"]).to eql('something else')
expect(options[:release_notes]["es-MX"]).to eql('something else else')
diff --git a/deliver/spec/upload_screenshots_spec.rb b/deliver/spec/upload_screenshots_spec.rb
index bcdbfda144b..27e281d33f3 100644
--- a/deliver/spec/upload_screenshots_spec.rb
+++ b/deliver/spec/upload_screenshots_spec.rb
@@ -79,7 +79,7 @@
allow(described_class).to receive(:calculate_checksum).and_return('checksum')
expect(app_screenshot_set).to receive(:upload_screenshot).with(path: local_screenshot.path, wait_for_processing: false)
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
@@ -100,7 +100,7 @@
allow(FastlaneCore::Helper).to receive(:show_loading_indicator).and_return(true)
expect(app_screenshot_set).to receive(:upload_screenshot).with(path: local_screenshot.path, wait_for_processing: false)
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
end
@@ -122,7 +122,7 @@
allow(FastlaneCore::Helper).to receive(:show_loading_indicator).and_return(true)
expect(app_screenshot_set).to receive(:upload_screenshot).with(path: local_screenshot.path, wait_for_processing: false)
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
@@ -145,7 +145,7 @@
allow(FastlaneCore::Helper).to receive(:show_loading_indicator).and_return(true)
expect(app_screenshot_set).to_not(receive(:upload_screenshot))
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
@@ -166,7 +166,7 @@
allow(FastlaneCore::Helper).to receive(:show_loading_indicator).and_return(true)
expect(app_screenshot_set).to receive(:upload_screenshot).exactly(10).times
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
@@ -194,7 +194,7 @@
allow(FastlaneCore::Helper).to receive(:show_loading_indicator).and_return(true)
expect(app_screenshot_set).to_not(receive(:upload_screenshot))
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
@@ -224,7 +224,7 @@
allow(FastlaneCore::Helper).to receive(:show_loading_indicator).and_return(true)
expect(app_screenshot_set).to_not(receive(:upload_screenshot))
- subject.upload_screenshots([localization], screenshots_per_language)
+ subject.upload_screenshots([localization], screenshots_per_language, 3600)
end
end
end
@@ -242,8 +242,10 @@
get_app_screenshot_sets: [app_screenshot_set])
iterator = Deliver::AppScreenshotIterator.new([localization])
+ allow(Time).to receive(:now).and_return(0)
+
expect(::Kernel).to_not(receive(:sleep))
- expect(subject.wait_for_complete(iterator)).to eq('COMPLETE' => 1)
+ expect(subject.wait_for_complete(iterator, 3600)).to eq('COMPLETE' => 1)
end
end
@@ -258,9 +260,29 @@
get_app_screenshot_sets: [app_screenshot_set])
iterator = Deliver::AppScreenshotIterator.new([localization])
+ allow(Time).to receive(:now).and_return(0)
+
expect_any_instance_of(Object).to receive(:sleep).with(kind_of(Numeric)).once
expect(app_screenshot).to receive(:asset_delivery_state).and_return({ 'state' => 'UPLOAD_COMPLETE' }, { 'state' => 'COMPLETE' })
- expect(subject.wait_for_complete(iterator)).to eq('COMPLETE' => 1)
+ expect(subject.wait_for_complete(iterator, 3600)).to eq('COMPLETE' => 1)
+ end
+ end
+
+ context 'when timeout is exceeded' do
+ it 'should exit the loop and return the current states' do
+ app_screenshot = double('Spaceship::ConnectAPI::AppScreenshot', asset_delivery_state: { 'state' => 'UPLOAD_COMPLETE' })
+ app_screenshot_set = double('Spaceship::ConnectAPI::AppScreenshotSet',
+ screenshot_display_type: Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_55,
+ app_screenshots: [app_screenshot])
+ localization = double('Spaceship::ConnectAPI::AppStoreVersionLocalization',
+ locale: 'en-US',
+ get_app_screenshot_sets: [app_screenshot_set])
+ iterator = Deliver::AppScreenshotIterator.new([localization])
+ states = { 'UPLOAD_COMPLETE' => 1 }
+
+ allow(Time).to receive(:now).and_return(0, 3601)
+
+ expect(subject.wait_for_complete(iterator, 3600)).to eq(states)
end
end
end
@@ -279,7 +301,7 @@
states = { 'FAILD' => 0, 'COMPLETE' => 1 }
expect(subject).to_not(receive(:upload_screenshots))
- subject.retry_upload_screenshots_if_needed(iterator, states, 1, 1, [], {})
+ subject.retry_upload_screenshots_if_needed(iterator, states, 1, 1, 0, [], {})
end
end
@@ -297,7 +319,7 @@
expect(subject).to receive(:upload_screenshots).with(any_args)
expect(app_screenshot).to receive(:delete!)
- subject.retry_upload_screenshots_if_needed(iterator, states, 1, 1, [], {})
+ subject.retry_upload_screenshots_if_needed(iterator, states, 1, 1, 0, [], {})
end
end
@@ -314,7 +336,7 @@
states = { 'FAILED' => 1, 'COMPLETE' => 0 }
expect(subject).to receive(:upload_screenshots).with(any_args)
- subject.retry_upload_screenshots_if_needed(iterator, states, 999, 1, [], {})
+ subject.retry_upload_screenshots_if_needed(iterator, states, 999, 1, 0, [], {})
end
end
@@ -336,7 +358,7 @@
expect(subject).to_not(receive(:upload_screenshots).with(any_args))
expect(UI).to receive(:user_error!)
- subject.retry_upload_screenshots_if_needed(iterator, states, 1, 0, [], {})
+ subject.retry_upload_screenshots_if_needed(iterator, states, 1, 0, 0, [], {})
end
end
@@ -357,7 +379,30 @@
expect(subject).to_not(receive(:upload_screenshots).with(any_args))
expect(UI).to_not(receive(:user_error!))
- subject.retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots, 0, [], screenshots_per_language)
+ subject.retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots, 0, 0, [], screenshots_per_language)
+ end
+ end
+
+ context 'when screenshots are in UPLOAD_COMPLETE state' do
+ it 'should trigger retry logic' do
+ app_screenshot = double('Spaceship::ConnectAPI::AppScreenshot',
+ 'complete?' => false,
+ 'error?' => false,
+ file_name: '5.5_1.jpg',
+ error_messages: ['error_message'])
+ app_screenshot_set = double('Spaceship::ConnectAPI::AppScreenshotSet',
+ screenshot_display_type: Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_55,
+ app_screenshots: [app_screenshot])
+ localization = double('Spaceship::ConnectAPI::AppStoreVersionLocalization',
+ locale: 'en-US',
+ get_app_screenshot_sets: [app_screenshot_set])
+ localizations = [localization]
+ iterator = Deliver::AppScreenshotIterator.new(localizations)
+ states = { 'UPLOAD_COMPLETE' => 1 }
+
+ expect(subject).to receive(:upload_screenshots).with(any_args)
+ expect(app_screenshot).to receive(:delete!)
+ subject.retry_upload_screenshots_if_needed(iterator, states, 1, 1, 0, localizations, {})
end
end
end
diff --git a/fastlane.gemspec b/fastlane.gemspec
index 1a770ba5a20..2c33a24b36e 100644
--- a/fastlane.gemspec
+++ b/fastlane.gemspec
@@ -22,35 +22,35 @@ Gem::Specification.new do |spec|
spec.name = "fastlane"
spec.version = Fastlane::VERSION
# list of authors is regenerated and resorted on each release
- spec.authors = ["Matthew Ellis",
+ spec.authors = ["Satoshi Namai",
+ "Manu Wallner",
+ "Felix Krause",
+ "Kohki Miki",
+ "Max Ott",
+ "Jorge Revuelta H",
+ "Jérôme Lacoste",
+ "Aaron Brager",
+ "Olivier Halligon",
"Jimmy Dee",
+ "Manish Rathi",
+ "Iulian Onofrei",
"Stefan Natchev",
+ "Maksym Grebenets",
"Roger Oba",
- "Kohki Miki",
"Fumiya Nakamura",
+ "Matthew Ellis",
+ "Łukasz Grabowski",
+ "Danielle Tomlinson",
"Josh Holtz",
- "Iulian Onofrei",
+ "Daniel Jankowski",
"Andrew McBurney",
- "Maksym Grebenets",
- "Manu Wallner",
- "Jérôme Lacoste",
- "Felix Krause",
- "Łukasz Grabowski",
+ "Joshua Liebowitz",
"Jan Piotrowski",
- "Max Ott",
"Helmut Januschka",
- "Joshua Liebowitz",
- "Danielle Tomlinson",
- "Daniel Jankowski",
- "Olivier Halligon",
- "Satoshi Namai",
- "Luka Mirosevic",
- "Jorge Revuelta H",
- "Manish Rathi",
- "Aaron Brager"]
+ "Luka Mirosevic"]
spec.email = ["fastlane@krausefx.com"]
- spec.summary = Fastlane::DESCRIPTION
+ spec.summary = Fastlane::SUMMARY
spec.description = Fastlane::DESCRIPTION
spec.homepage = "https://fastlane.tools"
spec.license = "MIT"
@@ -75,7 +75,7 @@ Gem::Specification.new do |spec|
spec.add_dependency('babosa', '>= 1.0.3', '< 2.0.0') # library for creating human-friendly identifiers, aka "slugs"
spec.add_dependency('bundler', '>= 1.12.0', '< 3.0.0') # Used for fastlane plugins
spec.add_dependency('CFPropertyList', '>= 2.3', '< 4.0.0') # Needed to be able to read binary plist format
- spec.add_dependency('colored') # colored terminal output
+ spec.add_dependency('colored', '~> 1.2') # colored terminal output
spec.add_dependency('commander', '~> 4.6') # CLI parser
spec.add_dependency('dotenv', '>= 2.1.1', '< 3.0.0')
spec.add_dependency('emoji_regex', '>= 0.1', '< 4.0') # Used to scan for Emoji in the changelog
@@ -96,10 +96,10 @@ Gem::Specification.new do |spec|
spec.add_dependency('mini_magick', '>= 4.9.4', '< 5.0.0') # To open, edit and export PSD files
spec.add_dependency('multipart-post', '>= 2.0.0', '< 3.0.0') # Needed for uploading builds to appetize
spec.add_dependency('naturally', '~> 2.2') # Used to sort strings with numbers in a human-friendly way
- spec.add_dependency('optparse', '>= 0.1.1') # Used to parse options with Commander
+ spec.add_dependency('optparse', '>= 0.1.1', '< 1.0.0') # Used to parse options with Commander
spec.add_dependency('plist', '>= 3.1.0', '< 4.0.0') # Needed for set_build_number_repository and get_info_plist_value actions
spec.add_dependency('rubyzip', '>= 2.0.0', '< 3.0.0') # fix swift/ipa in gym
- spec.add_dependency('security', '= 0.1.3') # macOS Keychain manager, a dead project, no updates expected
+ spec.add_dependency('security', '= 0.1.5') # macOS Keychain manager, a dead project, no updates expected
spec.add_dependency('simctl', '~> 1.6.3') # Used for querying and interacting with iOS simulators
spec.add_dependency('terminal-notifier', '>= 2.0.0', '< 3.0.0') # macOS notifications
spec.add_dependency('terminal-table', '~> 3') # Actions documentation
@@ -107,6 +107,6 @@ Gem::Specification.new do |spec|
spec.add_dependency('tty-spinner', '>= 0.8.0', '< 1.0.0') # loading indicators
spec.add_dependency('word_wrap', '~> 1.0.0') # to add line breaks for tables with long strings
spec.add_dependency('xcodeproj', '>= 1.13.0', '< 2.0.0') # Modify Xcode projects
- spec.add_dependency('xcpretty-travis-formatter', '>= 0.0.3')
+ spec.add_dependency('xcpretty-travis-formatter', '>= 0.0.3', '< 2.0.0')
spec.add_dependency('xcpretty', '~> 0.3.0') # prettify xcodebuild output
end
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index d513195041f..33bd9b9dacf 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -102,15 +102,23 @@ end
desc "Increment the version number of this gem, after generating new Swift API"
lane :bump do |options|
- verify_env_variables
+ bump_type = options[:bump_type]
+ is_automated_bump = !bump_type.nil?
+
+ verify_env_variables(skip_ruby_gems: is_automated_bump)
ensure_git_branch(branch: "master")
ensure_git_status_clean
github_api_token = ENV["FL_GITHUB_RELEASE_API_TOKEN"]
- UI.user_error!("Please provide a GitHub API token using `FL_GITHUB_RELEASE_API_TOKEN`") if github_api_token.to_s.length == 0
+ github_api_bearer = ENV["FL_GITHUB_RELEASE_API_BEARER"]
+
+ if github_api_token.to_s.length == 0 && github_api_bearer.to_s.length == 0
+ UI.user_error!("Please provide a GitHub API token using `FL_GITHUB_RELEASE_API_TOKEN` or `FL_GITHUB_RELEASE_API_BEARER`")
+ end
paths_for_commit = []
version_file_path = "./fastlane/lib/fastlane/version.rb"
+ last_version_file_path = File.absolute_path("../CHANGELOG.latest.md")
# Verify everything is in a consistent state
latest_version = current_version
@@ -119,6 +127,9 @@ lane :bump do |options|
changelog_text = show_changelog
+ # Update CHANGELOG.lasest.md (which will be used to create the Release)
+ File.write(last_version_file_path, changelog_text)
+
bump_type ||= 'minor' if prompt(text: "New feature, method or API?", boolean: true)
bump_type ||= 'patch'
@@ -135,6 +146,9 @@ lane :bump do |options|
paths_for_commit += sh("cd .. && git status --porcelain fastlane/swift | sed s/^...//").each_line.to_a.map(&:strip)
paths_for_commit << "Gemfile.lock"
+ # Add CHANGELOG.latest
+ paths_for_commit << last_version_file_path
+
# Add version file path to change set
paths_for_commit << version_file_path
@@ -155,6 +169,7 @@ lane :bump do |options|
pr_body << "**Changes since release '#{latest_version}':**"
pr_body << changelog_text
pr_url = create_pull_request(
+ api_bearer: github_api_bearer,
api_token: github_api_token,
repo: slug,
title: commit_message,
@@ -171,7 +186,9 @@ lane :bump do |options|
end
# Revert to master branch
- sh("git checkout master")
+ unless is_automated_bump
+ sh("git checkout master")
+ end
end
desc "Generate the Swift api and test it"
@@ -321,6 +338,101 @@ lane :release do
slack_train
end
+desc "Creates a GitHub release with the gem as an asset"
+lane :create_github_release do |options|
+ # Git verification
+ #
+ ensure_git_status_clean
+ ensure_git_branch(branch: 'master')
+
+ # Verifying RubyGems version
+ #
+ version = local_version
+ old_version = current_version
+ if Gem::Version.new(version) <= Gem::Version.new(old_version)
+ UI.user_error!("Version number #{version} was already deployed")
+ end
+
+ github_username = ENV["RELEASE_GITHUB_USERNAME"] || "fastlane"
+ repo_name = "#{github_username}/fastlane"
+
+ # Preparing GitHub Release
+ #
+ github_release = get_github_release(url: repo_name, version: version, api_bearer: ENV['FASTLANE_RELEASE_API_BEARER'])
+ gem_path = if (github_release || {}).fetch('body', '').length == 0
+ # Validate repo and create gem
+ validate_repo
+ gem_version_path = File.absolute_path("../pkg/fastlane-#{version}.gem")
+
+ title = "Improvements"
+ description = File.read("../CHANGELOG.latest.md")
+
+ github_release = set_github_release(
+ repository_name: repo_name,
+ name: [version, title].join(" "),
+ tag_name: version,
+ description: description,
+ is_draft: false,
+ upload_assets: [gem_version_path],
+ api_bearer: ENV['FASTLANE_RELEASE_API_BEARER']
+ )
+
+ release_url = github_release['html_url']
+ message = [title, description, release_url].join("\n\n")
+ add_fastlane_git_tag(tag: "fastlane/#{version}", message: message)
+
+ UI.success("New GitHub release has been created: #{release_url}")
+
+ gem_version_path
+ else
+ UI.message("GitHub release has already been created")
+
+ sleep(50) # GitHub rate limits are annowing
+ download_github_release_gem(version: version)
+ end
+
+ sh "gem push --key github --host https://rubygems.pkg.github.com/#{github_username} #{gem_path}" unless options[:skip_github_packages]
+
+ sh "gem push #{gem_path}" unless options[:skip_rubygems]
+end
+
+lane :publish_rubygems_from_github_release do |options|
+
+end
+
+lane :publish_github_packages_from_github_release do |options|
+
+end
+
+lane :download_github_release_gem do |options|
+ require 'open-uri'
+
+ version = options[:version]
+
+ github_username = ENV["RELEASE_GITHUB_USERNAME"] || "fastlane"
+
+ github_release = get_github_release(url: "#{github_username}/fastlane", version: version, api_bearer: ENV['FASTLANE_RELEASE_API_BEARER'])
+ assets = (github_release || {}).fetch('assets', [])
+
+ gem_asset = assets.find { |a| a["name"].end_with?(".gem") }
+ gem_asset_url = gem_asset["browser_download_url"]
+
+ # Extract the file name from the URL
+ file_name = File.basename(URI.parse(gem_asset_url).path)
+
+ FileUtils.mkdir_p('../pkg')
+ file_path = File.join('../pkg', file_name)
+
+ # Download the file
+ URI.open(gem_asset_url) do |remote_file|
+ File.open(file_path, 'wb') do |local_file|
+ local_file.write(remote_file.read)
+ end
+ end
+
+ file_path
+end
+
lane :release_brew do
version = local_version
sh("cd .. && brew update && brew bump-formula-pr fastlane --force --url=https://github.com/fastlane/fastlane/archive/refs/tags/#{version}.tar.gz")
@@ -353,11 +465,18 @@ private_lane :github_changelog do |options|
body = JSON.parse(resp[:body])
commits = body["commits"].reverse
+ sleep_time = ENV['FL_CHANGELOG_SLEEP'].to_i
+
formatted = commits.map do |commit|
+ if sleep_time > 0
+ UI.message("Sleeping for #{sleep_time} second(s) to get changelog")
+ sleep(sleep_time)
+ end
+
# Default to commit message info
message = commit["commit"]["message"].lines.first.strip
name = commit["commit"]["author"]["name"]
- username = commit["author"]["login"]
+ username = commit["author"]&.[]("login")
# Get pull request associate with commit message
sha = commit["sha"]
@@ -563,10 +682,12 @@ end
desc "Ensure all the requirement environment variables are provided"
desc "this way the deployment script will fail early (and often)"
-private_lane :verify_env_variables do
+private_lane :verify_env_variables do |options|
ensure_env_vars(env_vars: ['GITHUB_USER_NAME', 'GITHUB_API_TOKEN'])
- UI.user_error!("You're not logged in RubyGems. Log in using `gem push` if using RubyGems < 2.7.0 or `gem signin` if using RubyGems >=2.7.0") unless File.file?(File.expand_path("~/.gem/credentials"))
+ unless options[:skip_ruby_gems]
+ UI.user_error!("You're not logged in RubyGems. Log in using `gem push` if using RubyGems < 2.7.0 or `gem signin` if using RubyGems >=2.7.0") unless File.file?(File.expand_path("~/.gem/credentials"))
+ end
end
desc "Get the local version number per version.rb"
@@ -590,6 +711,7 @@ private_lane :ensure_tool_name_formatting do
errors = []
Dir.chdir("..") do
Dir["**/*.md"].each do |path|
+ next if path == "CHANGELOG.latest.md"
helper = Helper::ToolNameFormattingHelper.new(path: path, is_documenting_invalid_examples: path == 'CONTRIBUTING.md')
errors += helper.find_tool_name_formatting_errors
end
diff --git a/fastlane/actions/plugin_scores.rb b/fastlane/actions/plugin_scores.rb
index 2ede01ad4f9..de337ee01de 100644
--- a/fastlane/actions/plugin_scores.rb
+++ b/fastlane/actions/plugin_scores.rb
@@ -19,12 +19,13 @@ def self.run(params)
end
def self.fetch_plugins(cache_path)
+ require 'open-uri'
page = 1
plugins = []
loop do
url = "https://rubygems.org/api/v1/search.json?query=fastlane-plugin-&page=#{page}"
puts("RubyGems API Request: #{url}")
- results = JSON.parse(FastlaneCore::Helper.open_uri(url).read)
+ results = JSON.parse(URI.open(url).read)
break if results.count == 0
plugins += results.collect do |current|
diff --git a/fastlane/helper/plugin_scores_helper.rb b/fastlane/helper/plugin_scores_helper.rb
index 3c9588348c3..756582d7665 100644
--- a/fastlane/helper/plugin_scores_helper.rb
+++ b/fastlane/helper/plugin_scores_helper.rb
@@ -52,7 +52,7 @@ def initialize(hash, cache_path)
self.homepage = hash["homepage_uri"] || hash["documentation_uri"]
self.raw_hash = hash
- has_github_page = self.homepage.to_s.include?("https://github.com") # Here we can add non GitHub support one day
+ has_github_page = self.homepage.to_s.start_with?("https://github.com") # Here we can add non GitHub support one day
self.data = {
has_homepage: self.homepage.to_s.length > 5,
diff --git a/fastlane/lib/fastlane/actions/app_store_build_number.rb b/fastlane/lib/fastlane/actions/app_store_build_number.rb
index df01a3c415d..586215e7815 100644
--- a/fastlane/lib/fastlane/actions/app_store_build_number.rb
+++ b/fastlane/lib/fastlane/actions/app_store_build_number.rb
@@ -186,7 +186,7 @@ def self.available_options
optional: true,
default_value: "ios",
verify_block: proc do |value|
- UI.user_error!("The platform can only be ios, appletvos, or osx") unless %('ios', 'appletvos', 'osx').include?(value)
+ UI.user_error!("The platform can only be ios, appletvos, xros or osx") unless %('ios', 'appletvos', 'xros', 'osx').include?(value)
end),
FastlaneCore::ConfigItem.new(key: :team_name,
short_option: "-e",
diff --git a/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb b/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb
index aaf0386ff7f..8e557f8cd86 100644
--- a/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb
+++ b/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb
@@ -56,7 +56,8 @@ def self.available_options
description: "The key ID"),
FastlaneCore::ConfigItem.new(key: :issuer_id,
env_name: "APP_STORE_CONNECT_API_KEY_ISSUER_ID",
- description: "The issuer ID"),
+ description: "The issuer ID. It can be nil if the key is individual API key",
+ optional: true),
FastlaneCore::ConfigItem.new(key: :key_filepath,
env_name: "APP_STORE_CONNECT_API_KEY_KEY_FILEPATH",
description: "The path to the key p8 file",
diff --git a/fastlane/lib/fastlane/actions/appetize.rb b/fastlane/lib/fastlane/actions/appetize.rb
index 58306c6ee6f..3d4235d3d51 100644
--- a/fastlane/lib/fastlane/actions/appetize.rb
+++ b/fastlane/lib/fastlane/actions/appetize.rb
@@ -50,6 +50,10 @@ def self.run(options)
response = http.request(req)
+ unless response.code.to_i.between?(200, 299)
+ UI.user_error!("Error uploading to Appetize.io: received HTTP #{response.code} with body #{response.body}")
+ end
+
parse_response(response) # this will raise an exception if something goes wrong
UI.message("App URL: #{Actions.lane_context[SharedValues::APPETIZE_APP_URL]}")
diff --git a/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb b/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb
index 6af9638312b..7a5d57e2e5a 100644
--- a/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb
+++ b/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb
@@ -37,9 +37,9 @@ def self.run(params)
Dir.chdir(params[:path]) do
if params[:commits_count]
- changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering, params[:date_format], params[:ancestry_path])
+ changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering, params[:date_format], params[:ancestry_path], params[:app_path])
else
- changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering, params[:date_format], params[:ancestry_path])
+ changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering, params[:date_format], params[:ancestry_path], params[:app_path])
end
changelog = changelog.gsub("\n\n", "\n") if changelog # as there are duplicate newlines
@@ -147,7 +147,11 @@ def self.available_options
verify_block: proc do |value|
matches_option = GIT_MERGE_COMMIT_FILTERING_OPTIONS.any? { |opt| opt.to_s == value }
UI.user_error!("Valid values for :merge_commit_filtering are #{GIT_MERGE_COMMIT_FILTERING_OPTIONS.map { |o| "'#{o}'" }.join(', ')}") unless matches_option
- end)
+ end),
+ FastlaneCore::ConfigItem.new(key: :app_path,
+ env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_APP_PATH',
+ description: "Scopes the changelog to a specific subdirectory of the repository",
+ optional: true)
]
end
diff --git a/fastlane/lib/fastlane/actions/docs/sync_code_signing.md b/fastlane/lib/fastlane/actions/docs/sync_code_signing.md
index 6915d962a5a..9d6fd540012 100644
--- a/fastlane/lib/fastlane/actions/docs/sync_code_signing.md
+++ b/fastlane/lib/fastlane/actions/docs/sync_code_signing.md
@@ -509,12 +509,16 @@ Please be careful when using this option and ensure the certificates and profile
### Manual Decrypt
-If you want to manually decrypt a file you can.
+If you want to manually decrypt or encrypt a file, you can use the companion script `match_file`:
```no-highlight
-openssl aes-256-cbc -k "