fastlane 2.150.0.rc1 → 2.150.0.rc6

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -239,64 +239,101 @@ module FastlaneCore
   # escaping problems in its accompanying shell script.
   class JavaTransporterExecutor < TransporterExecutor
     def build_upload_command(username, password, source = "/tmp", provider_short_name = "")
-      [
-        Helper.transporter_java_executable_path.shellescape,
-        "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
-        '-XX:NewSize=2m',
-        '-Xms32m',
-        '-Xmx1024m',
-        '-Xms1024m',
-        '-Djava.awt.headless=true',
-        '-Dsun.net.http.retryPost=false',
-        java_code_option,
-        '-m upload',
-        "-u #{username.shellescape}",
-        "-p #{password.shellescape}",
-        "-f #{source.shellescape}",
-        additional_upload_parameters, # that's here, because the user might overwrite the -t option
-        '-k 100000',
-        ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
-        '2>&1' # cause stderr to be written to stdout
-      ].compact.join(' ') # compact gets rid of the possibly nil ENV value
+      if Helper.mac? && Helper.xcode_at_least?(11)
+        [
+          'xcrun iTMSTransporter',
+          '-m upload',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-f #{source.shellescape}",
+          additional_upload_parameters, # that's here, because the user might overwrite the -t option
+          '-k 100000',
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ') # compact gets rid of the possibly nil ENV value
+      else
+        [
+          Helper.transporter_java_executable_path.shellescape,
+          "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
+          '-XX:NewSize=2m',
+          '-Xms32m',
+          '-Xmx1024m',
+          '-Xms1024m',
+          '-Djava.awt.headless=true',
+          '-Dsun.net.http.retryPost=false',
+          java_code_option,
+          '-m upload',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-f #{source.shellescape}",
+          additional_upload_parameters, # that's here, because the user might overwrite the -t option
+          '-k 100000',
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ') # compact gets rid of the possibly nil ENV value
+      end
     end
 
     def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "")
-      [
-        Helper.transporter_java_executable_path.shellescape,
-        "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
-        '-XX:NewSize=2m',
-        '-Xms32m',
-        '-Xmx1024m',
-        '-Xms1024m',
-        '-Djava.awt.headless=true',
-        '-Dsun.net.http.retryPost=false',
-        java_code_option,
-        '-m lookupMetadata',
-        "-u #{username.shellescape}",
-        "-p #{password.shellescape}",
-        "-apple_id #{apple_id.shellescape}",
-        "-destination #{destination.shellescape}",
-        ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
-        '2>&1' # cause stderr to be written to stdout
-      ].compact.join(' ')
+      if Helper.mac? && Helper.xcode_at_least?(11)
+        [
+          'xcrun iTMSTransporter',
+          '-m lookupMetadata',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-apple_id #{apple_id.shellescape}",
+          "-destination #{destination.shellescape}",
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      else
+        [
+          Helper.transporter_java_executable_path.shellescape,
+          "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
+          '-XX:NewSize=2m',
+          '-Xms32m',
+          '-Xmx1024m',
+          '-Xms1024m',
+          '-Djava.awt.headless=true',
+          '-Dsun.net.http.retryPost=false',
+          java_code_option,
+          '-m lookupMetadata',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-apple_id #{apple_id.shellescape}",
+          "-destination #{destination.shellescape}",
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      end
     end
 
     def build_provider_ids_command(username, password)
-      [
-        Helper.transporter_java_executable_path.shellescape,
-        "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
-        '-XX:NewSize=2m',
-        '-Xms32m',
-        '-Xmx1024m',
-        '-Xms1024m',
-        '-Djava.awt.headless=true',
-        '-Dsun.net.http.retryPost=false',
-        java_code_option,
-        '-m provider',
-        "-u #{username.shellescape}",
-        "-p #{password.shellescape}",
-        '2>&1' # cause stderr to be written to stdout
-      ].compact.join(' ')
+      if Helper.mac? && Helper.xcode_at_least?(11)
+        [
+          'xcrun iTMSTransporter',
+          '-m provider',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      else
+        [
+          Helper.transporter_java_executable_path.shellescape,
+          "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
+          '-XX:NewSize=2m',
+          '-Xms32m',
+          '-Xmx1024m',
+          '-Xms1024m',
+          '-Djava.awt.headless=true',
+          '-Dsun.net.http.retryPost=false',
+          java_code_option,
+          '-m provider',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      end
     end
 
     def java_code_option

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
@@ -85,13 +112,24 @@ module Produce
     end
 
     # Makes sure to get the value for the language
-    # Instead of using the user's value `UK English` spaceship should send
-    # `English_UK` to the server
+    # Instead of using the user's value `UK English` spaceship should send `en-UK`
     def language
       @language = Produce.config[:language]
 
       unless FastlaneCore::Languages::ALL_LANGUAGES.include?(@language)
-        UI.user_error!("Please enter one of available languages: #{FastlaneCore::Languages::ALL_LANGUAGES}")
+        mapped_language = Spaceship::Tunes::LanguageConverter.from_standard_to_itc_locale(@language)
+        if mapped_language.to_s.empty?
+          message = [
+            "Sending language name is deprecated. Could not map '#{@language}' to a locale.",
+            "Please enter one of available languages: #{FastlaneCore::Languages::ALL_LANGUAGES}"
+          ].join("\n")
+          UI.user_error!(message)
+        end
+
+        UI.deprecated("Sending language name is deprecated. '#{@language}' has been mapped to '#{mapped_language}'.")
+        UI.deprecated("Please enter one of available languages: #{FastlaneCore::Languages::ALL_LANGUAGES}")
+
+        @language = mapped_language
       end
 
       return @language

data/spaceship/lib/spaceship/client.rb

@@ -194,15 +194,16 @@ module Spaceship
       self.new(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id)
     end
 
-    def initialize(cookie: nil, current_team_id: nil)
+    def initialize(cookie: nil, current_team_id: nil, timeout: nil)
       options = {
        request: {
-          timeout:       (ENV["SPACESHIP_TIMEOUT"] || 300).to_i,
-          open_timeout:  (ENV["SPACESHIP_TIMEOUT"] || 300).to_i
+          timeout:       (ENV["SPACESHIP_TIMEOUT"] || timeout || 300).to_i,
+          open_timeout:  (ENV["SPACESHIP_TIMEOUT"] || timeout || 300).to_i
         }
       }
       @current_team_id = current_team_id
       @cookie = cookie || HTTP::CookieJar.new
+
       @client = Faraday.new(self.class.hostname, options) do |c|
         c.response(:json, content_type: /\bjson$/)
         c.response(:xml, content_type: /\bxml$/)

data/spaceship/lib/spaceship/connect_api.rb

@@ -1,6 +1,7 @@
 require 'spaceship/connect_api/model'
 require 'spaceship/connect_api/response'
 require 'spaceship/connect_api/token'
+require 'spaceship/connect_api/file_uploader'
 
 require 'spaceship/connect_api/provisioning/provisioning'
 require 'spaceship/connect_api/testflight/testflight'
@@ -35,6 +36,8 @@ require 'spaceship/connect_api/models/age_rating_declaration'
 require 'spaceship/connect_api/models/app_category'
 require 'spaceship/connect_api/models/app_info'
 require 'spaceship/connect_api/models/app_info_localization'
+require 'spaceship/connect_api/models/app_preview_set'
+require 'spaceship/connect_api/models/app_preview'
 require 'spaceship/connect_api/models/app_price'
 require 'spaceship/connect_api/models/app_price_tier'
 require 'spaceship/connect_api/models/app_review_attachment'
@@ -47,6 +50,7 @@ require 'spaceship/connect_api/models/app_store_version_phased_release'
 require 'spaceship/connect_api/models/app_store_version'
 require 'spaceship/connect_api/models/idfa_declaration'
 require 'spaceship/connect_api/models/reset_ratings_request'
+require 'spaceship/connect_api/models/territory'
 
 module Spaceship
   class ConnectAPI
@@ -84,7 +88,7 @@ module Spaceship
         case platform.to_sym
         when :appletvos, :tvos
           return Spaceship::ConnectAPI::Platform::TV_OS
-        when :osx, :macos
+        when :osx, :macos, :mac
           return Spaceship::ConnectAPI::Platform::MAC_OS
         when :ios
           return Spaceship::ConnectAPI::Platform::IOS

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

@@ -13,7 +13,7 @@ module Spaceship
       # Instantiates a client with cookie session or a JWT token.
       def initialize(cookie: nil, current_team_id: nil, token: nil)
         if token.nil?
-          super(cookie: cookie, current_team_id: current_team_id)
+          super(cookie: cookie, current_team_id: current_team_id, timeout: 1200)
         else
           options = {
             request: {
@@ -78,46 +78,76 @@ module Spaceship
       end
 
       def get(url_or_path, params = nil)
-        response = request(:get) do |req|
-          req.url(url_or_path)
-          req.options.params_encoder = Faraday::NestedParamsEncoder
-          req.params = params if params
-          req.headers['Content-Type'] = 'application/json'
+        response = with_asc_retry do
+          request(:get) do |req|
+            req.url(url_or_path)
+            req.options.params_encoder = Faraday::NestedParamsEncoder
+            req.params = params if params
+            req.headers['Content-Type'] = 'application/json'
+          end
         end
         handle_response(response)
       end
 
       def post(url_or_path, body)
-        response = request(:post) do |req|
-          req.url(url_or_path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
+        response = with_asc_retry do
+          request(:post) do |req|
+            req.url(url_or_path)
+            req.body = body.to_json
+            req.headers['Content-Type'] = 'application/json'
+          end
         end
         handle_response(response)
       end
 
       def patch(url_or_path, body)
-        response = request(:patch) do |req|
-          req.url(url_or_path)
-          req.body = body.to_json
-          req.headers['Content-Type'] = 'application/json'
+        response = with_asc_retry do
+          request(:patch) do |req|
+            req.url(url_or_path)
+            req.body = body.to_json
+            req.headers['Content-Type'] = 'application/json'
+          end
         end
         handle_response(response)
       end
 
       def delete(url_or_path, params = nil, body = nil)
-        response = request(:delete) do |req|
-          req.url(url_or_path)
-          req.options.params_encoder = Faraday::NestedParamsEncoder if params
-          req.params = params if params
-          req.body = body.to_json if body
-          req.headers['Content-Type'] = 'application/json' if body
+        response = with_asc_retry do
+          request(:delete) do |req|
+            req.url(url_or_path)
+            req.options.params_encoder = Faraday::NestedParamsEncoder if params
+            req.params = params if params
+            req.body = body.to_json if body
+            req.headers['Content-Type'] = 'application/json' if body
+          end
         end
         handle_response(response)
       end
 
       protected
 
+      def with_asc_retry(tries = 5, &_block)
+        tries = 1 if Object.const_defined?("SpecHelper")
+        response = yield
+
+        tries -= 1
+        status = response.status if response
+
+        if [500, 504].include?(status)
+          msg = "Timeout received! Retrying after 3 seconds (remaining: #{tries})..."
+          raise msg
+        end
+
+        return response
+      rescue => error
+        puts(error) if Spaceship::Globals.verbose?
+        if tries.zero?
+          return response
+        else
+          retry
+        end
+      end
+
       def handle_response(response)
         if (200...300).cover?(response.status) && (response.body.nil? || response.body.empty?)
           return

data/spaceship/lib/spaceship/connect_api/file_uploader.rb

@@ -0,0 +1,98 @@
+require 'faraday' # HTTP Client
+require 'faraday-cookie_jar'
+require 'faraday_middleware'
+
+require 'spaceship/globals'
+
+module Spaceship
+  class ConnectAPI
+    module FileUploader
+      def self.upload(upload_operations, bytes)
+        # {
+        #   "method": "PUT",
+        #   "url": "https://some-url-apple-gives-us",
+        #   "length": 57365,
+        #   "offset": 0,
+        #   "requestHeaders": [
+        #     {
+        #       "name": "Content-Type",
+        #       "value": "image/png"
+        #     }
+        #   ]
+        # }
+
+        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
+
+      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
+        options = {
+          request: {
+              timeout: (ENV["SPACESHIP_TIMEOUT"] || 300).to_i,
+              open_timeout: (ENV["SPACESHIP_TIMEOUT"] || 300).to_i
+            }
+        }
+
+        @client ||= Faraday.new(options) do |c|
+          c.response(:json, content_type: /\bjson$/)
+          c.response(:xml, content_type: /\bxml$/)
+          c.response(:plist, content_type: /\bplist$/)
+          c.adapter(Faraday.default_adapter)
+
+          if ENV['SPACESHIP_DEBUG']
+            # for debugging only
+            # This enables tracking of networking requests using Charles Web Proxy
+            c.proxy = "https://127.0.0.1:8888"
+            c.ssl[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
+          elsif ENV["SPACESHIP_PROXY"]
+            c.proxy = ENV["SPACESHIP_PROXY"]
+            c.ssl[:verify_mode] = OpenSSL::SSL::VERIFY_NONE if ENV["SPACESHIP_PROXY_SSL_VERIFY_NONE"]
+          end
+
+          if ENV["DEBUG"]
+            puts("To run spaceship through a local proxy, use SPACESHIP_DEBUG")
+          end
+        end
+      end
+    end
+  end
+end