fastlane 2.98.0 → 2.99.0

data/fastlane_core/lib/fastlane_core/module.rb

@@ -12,14 +12,11 @@ module FastlaneCore
   # Specifically, in AnalyticsSession.finalize_session
   # Learn more at https://docs.fastlane.tools/#metrics
   def self.session
-    return nil
-    # https://github.com/fastlane/fastlane/issues/11913
-    # @session ||= AnalyticsSession.new
+    @session ||= AnalyticsSession.new
   end
 
   def self.reset_session
-    # https://github.com/fastlane/fastlane/issues/11913
-    # @session = nil
+    @session = nil
   end
 
   # A directory that's being used to user-wide fastlane configs

data/fastlane_core/lib/fastlane_core/ui/errors/fastlane_error.rb

@@ -20,7 +20,6 @@ end
 
 class Exception
   def fastlane_should_report_metrics?
-    # https://github.com/fastlane/fastlane/issues/11913
     return false
   end
 end

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -68,9 +68,8 @@ module Commander
           FastlaneCore::UI.user_error!("fastlane requires a minimum version of Xcode #{Fastlane::MINIMUM_XCODE_RELEASE}, please upgrade and make sure to use `sudo xcode-select -s /Applications/Xcode.app`")
         end
 
-        # https://github.com/fastlane/fastlane/issues/11913
-        # action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(@program[:name], args: ARGV)
-        # FastlaneCore.session.action_launched(launch_context: action_launch_context)
+        action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(@program[:name], args: ARGV)
+        FastlaneCore.session.action_launched(launch_context: action_launch_context)
 
         return_value = run_active_command
 
@@ -128,9 +127,8 @@ module Commander
         rescue_connection_failed_error(e)
       rescue => e # high chance this is actually FastlaneCore::Interface::FastlaneCrash, but can be anything else
         rescue_unknown_error(e)
-        # https://github.com/fastlane/fastlane/issues/11913
-        # ensure
-        #   FastlaneCore.session.finalize_session
+      ensure
+        FastlaneCore.session.finalize_session
       end
     end
 
@@ -173,7 +171,7 @@ module Commander
     end
 
     def handle_tls_error!(e)
-      # Apple has upgraded its iTunes Connect servers to require TLS 1.2, but
+      # Apple has upgraded its App Store Connect servers to require TLS 1.2, but
       # system Ruby 2.0 does not support it. We want to suggest that users upgrade
       # their Ruby version
       suggest_ruby_reinstall(e)

data/gym/lib/gym/detect_values.rb

@@ -26,6 +26,8 @@ module Gym
         end
       end
 
+      ensure_export_options_is_hash
+
       detect_scheme
       detect_platform # we can only do that *after* we have the scheme
       detect_selected_provisioning_profiles # we can only do that *after* we have the platform
@@ -144,5 +146,26 @@ module Gym
         Gym.config[:toolchain] = "com.apple.dt.toolchain.Swift_2_3"
       end
     end
+
+    def self.ensure_export_options_is_hash
+      return if Gym.config[:export_options].nil? || Gym.config[:export_options].kind_of?(Hash)
+
+      # Reads options from file
+      plist_file_path = Gym.config[:export_options]
+      UI.user_error!("Couldn't find plist file at path #{File.expand_path(plist_file_path)}") unless File.exist?(plist_file_path)
+      hash = Plist.parse_xml(plist_file_path)
+      UI.user_error!("Couldn't read provided plist at path #{File.expand_path(plist_file_path)}") if hash.nil?
+      # Convert keys to symbols
+      Gym.config[:export_options] = keys_to_symbols(hash)
+    end
+
+    def self.keys_to_symbols(hash)
+      # Convert keys to symbols
+      hash = hash.each_with_object({}) do |(k, v), memo|
+        memo[k.b.to_s.to_sym] = v
+        memo
+      end
+      hash
+    end
   end
 end

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -124,30 +124,10 @@ module Gym
         hash
       end
 
-      def keys_to_symbols(hash)
-        # Convert keys to symbols
-        hash = hash.each_with_object({}) do |(k, v), memo|
-          memo[k.b.to_s.to_sym] = v
-          memo
-        end
-        hash
-      end
-
       def read_export_options
         # Reads export options
         if Gym.config[:export_options]
-          if Gym.config[:export_options].kind_of?(Hash)
-            # Reads options from hash
-            hash = normalize_export_options(Gym.config[:export_options])
-          else
-            # Reads options from file
-            plist_file_path = Gym.config[:export_options]
-            UI.user_error!("Couldn't find plist file at path #{File.expand_path(plist_file_path)}") unless File.exist?(plist_file_path)
-            hash = Plist.parse_xml(plist_file_path)
-            UI.user_error!("Couldn't read provided plist at path #{File.expand_path(plist_file_path)}") if hash.nil?
-            # Convert keys to symbols
-            hash = keys_to_symbols(hash)
-          end
+          hash = normalize_export_options(Gym.config[:export_options])
 
           # Saves configuration for later use
           Gym.config[:export_method] ||= hash[:method] || DEFAULT_EXPORT_METHOD

data/match/lib/match/spaceship_ensure.rb

@@ -2,7 +2,7 @@ require 'spaceship'
 require_relative 'module'
 
 module Match
-  # Ensures the certificate and profiles are also available on iTunes Connect
+  # Ensures the certificate and profiles are also available on App Store Connect
   class SpaceshipEnsure
     def initialize(user, team_id, team_name)
       # We'll try to manually fetch the password

data/pilot/lib/pilot/build_manager.rb

@@ -41,7 +41,7 @@ module Pilot
         UI.user_error!("Error uploading ipa file, for more information see above")
       end
 
-      UI.success("Successfully uploaded the new binary to iTunes Connect")
+      UI.success("Successfully uploaded the new binary to App Store Connect")
 
       if config[:skip_waiting_for_build_processing]
         UI.important("Skip waiting for build processing")
@@ -182,7 +182,7 @@ module Pilot
         begin
           uploaded_build.submit_for_testflight_review!
         rescue => ex
-          # iTunes Connect currently may 504 on this request even though it manages to get the build in
+          # App Store Connect currently may 504 on this request even though it manages to get the build in
           # the approved state, this is a temporary workaround.
           raise ex unless ex.to_s.include?("504")
           UI.message("Submitting the build for review timed out, trying to recover.")

data/pilot/lib/pilot/manager.rb

@@ -19,7 +19,7 @@ module Pilot
     def login
       config[:username] ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
-      UI.message("Login to iTunes Connect (#{config[:username]})")
+      UI.message("Login to App Store Connect (#{config[:username]})")
       Spaceship::Tunes.login(config[:username])
       Spaceship::Tunes.select_team
       UI.message("Login successful")
@@ -48,7 +48,7 @@ module Pilot
 
       if config[:app_identifier]
         @app ||= Spaceship::Tunes::Application.find(config[:app_identifier])
-        UI.user_error!("Couldn't find app '#{config[:app_identifier]}' on the account of '#{config[:username]}' on iTunes Connect") unless @app
+        UI.user_error!("Couldn't find app '#{config[:app_identifier]}' on the account of '#{config[:username]}' on App Store Connect") unless @app
         app_id ||= @app.apple_id
       end
 

data/pilot/lib/pilot/options.rb

@@ -83,7 +83,7 @@ module Pilot
         FastlaneCore::ConfigItem.new(key: :apple_id,
                                      short_option: "-p",
                                      env_name: "PILOT_APPLE_ID",
-                                     description: "The unique App ID provided by iTunes Connect",
+                                     description: "The unique App ID provided by App Store Connect",
                                      optional: true,
                                      code_gen_sensitive: true,
                                      default_value: ENV["TESTFLIGHT_APPLE_ID"],
@@ -130,7 +130,7 @@ module Pilot
         FastlaneCore::ConfigItem.new(key: :wait_processing_interval,
                                      short_option: "-k",
                                      env_name: "PILOT_WAIT_PROCESSING_INTERVAL",
-                                     description: "Interval in seconds to wait for iTunes Connect processing",
+                                     description: "Interval in seconds to wait for App Store Connect processing",
                                      default_value: 30,
                                      type: Integer,
                                      verify_block: proc do |value|
@@ -139,7 +139,7 @@ module Pilot
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-q",
                                      env_name: "PILOT_TEAM_ID",
-                                     description: "The ID of your iTunes Connect team if you're in multiple teams",
+                                     description: "The ID of your App Store Connect team if you're in multiple teams",
                                      optional: true,
                                      is_string: false, # as we also allow integers, which we convert to strings anyway
                                      code_gen_sensitive: true,
@@ -151,7 +151,7 @@ module Pilot
         FastlaneCore::ConfigItem.new(key: :team_name,
                                      short_option: "-r",
                                      env_name: "PILOT_TEAM_NAME",
-                                     description: "The name of your iTunes Connect team if you're in multiple teams",
+                                     description: "The name of your App Store Connect team if you're in multiple teams",
                                      optional: true,
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_name),

data/precheck/lib/precheck/options.rb

@@ -41,7 +41,7 @@ module Precheck
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-b",
                                      env_name: "PRECHECK_TEAM_ID",
-                                     description: "The ID of your iTunes Connect team if you're in multiple teams",
+                                     description: "The ID of your App Store Connect team if you're in multiple teams",
                                      optional: true,
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
@@ -52,7 +52,7 @@ module Precheck
         FastlaneCore::ConfigItem.new(key: :team_name,
                                      short_option: "-l",
                                      env_name: "PRECHECK_TEAM_NAME",
-                                     description: "The name of your iTunes Connect team if you're in multiple teams",
+                                     description: "The name of your App Store Connect team if you're in multiple teams",
                                      optional: true,
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_name),

data/produce/lib/produce/commands_generator.rb

@@ -29,7 +29,7 @@ module Produce
 
       command :create do |c|
         c.syntax = 'fastlane produce create'
-        c.description = 'Creates a new app on iTunes Connect and the Apple Developer Portal'
+        c.description = 'Creates a new app on App Store Connect and the Apple Developer Portal'
 
         FastlaneCore::CommanderGenerator.new.generate(Produce::Options.available_options, command: c)
 

data/produce/lib/produce/developer_center.rb

@@ -62,7 +62,7 @@ module Produce
         if app.name != Produce.config[:app_name]
           UI.important("Your app name includes non-ASCII characters, which are not supported by the Apple Developer Portal.")
           UI.important("To fix this a unique (internal) name '#{app.name}' has been created for you. Your app's real name '#{Produce.config[:app_name]}'")
-          UI.important("will still show up correctly on iTunes Connect and the App Store.")
+          UI.important("will still show up correctly on App Store Connect and the App Store.")
         end
 
         UI.message("Created app #{app.app_id}")

data/produce/lib/produce/itunes_connect.rb

@@ -18,10 +18,10 @@ module Produce
     def create_new_app
       application = fetch_application
       if application
-        UI.success("[iTC] App '#{Produce.config[:app_identifier]}' already exists (#{application.apple_id}), nothing to do on iTunes Connect")
+        UI.success("[iTC] App '#{Produce.config[:app_identifier]}' already exists (#{application.apple_id}), nothing to do on App Store Connect")
         # Nothing to do here
       else
-        UI.success("Creating new app '#{Produce.config[:app_name]}' on iTunes Connect")
+        UI.success("Creating new app '#{Produce.config[:app_name]}' on App Store Connect")
 
         Produce.config[:bundle_identifier_suffix] = '' unless wildcard_bundle?
         generated_app = Spaceship::Tunes::Application.create!(name: Produce.config[:app_name],
@@ -39,11 +39,11 @@ module Produce
         counter = 0
         while application.nil?
           counter += 1
-          UI.crash!("Couldn't find newly created app on iTunes Connect - please check the website for more information") if counter == 200
+          UI.crash!("Couldn't find newly created app on App Store Connect - please check the website for more information") if counter == 200
 
-          # Since 2016-08-10 iTunes Connect takes some time to actually list the newly created application
+          # Since 2016-08-10 App Store Connect takes some time to actually list the newly created application
           # We have no choice but to poll to see if the newly created app is already available
-          UI.message("Waiting for the newly created application to be available on iTunes Connect...")
+          UI.message("Waiting for the newly created application to be available on App Store Connect...")
           sleep(15)
           application = fetch_application
         end
@@ -53,7 +53,7 @@ module Produce
         UI.message("Ensuring version number")
         application.ensure_version!(Produce.config[:app_version], platform: Produce.config[:platform]) if Produce.config[:app_version]
 
-        UI.success("Successfully created new app '#{Produce.config[:app_name]}' on iTunes Connect with ID #{application.apple_id}")
+        UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.apple_id}")
       end
 
       return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: Produce.config[:platform] == "osx").apple_id

data/produce/lib/produce/options.rb

@@ -70,7 +70,7 @@ module Produce
         FastlaneCore::ConfigItem.new(key: :skip_itc,
                                      short_option: "-i",
                                      env_name: "PRODUCE_SKIP_ITC",
-                                     description: "Skip the creation of the app on iTunes Connect",
+                                     description: "Skip the creation of the app on App Store Connect",
                                      is_string: false,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :itc_users,
@@ -78,7 +78,7 @@ module Produce
                                      env_name: "ITC_USERS",
                                      optional: true,
                                      type: Array,
-                                     description: "Array of iTunes Connect users. If provided, you can limit access to this newly created app for users with the App Manager, Developer, Marketer or Sales roles",
+                                     description: "Array of App Store Connect users. If provided, you can limit access to this newly created app for users with the App Manager, Developer, Marketer or Sales roles",
                                      is_string: false),
         # Deprecating this in favor of a rename from "enabled_features" to "enable_services"
         FastlaneCore::ConfigItem.new(key: :enabled_features,
@@ -140,7 +140,7 @@ module Produce
         FastlaneCore::ConfigItem.new(key: :itc_team_id,
                                      short_option: "-k",
                                      env_name: "PRODUCE_ITC_TEAM_ID",
-                                     description: "The ID of your iTunes Connect team if you're in multiple teams",
+                                     description: "The ID of your App Store Connect team if you're in multiple teams",
                                      optional: true,
                                      is_string: false, # as we also allow integers, which we convert to strings anyway
                                      code_gen_sensitive: true,
@@ -152,7 +152,7 @@ module Produce
         FastlaneCore::ConfigItem.new(key: :itc_team_name,
                                      short_option: "-p",
                                      env_name: "PRODUCE_ITC_TEAM_NAME",
-                                     description: "The name of your iTunes Connect team if you're in multiple teams",
+                                     description: "The name of your App Store Connect team if you're in multiple teams",
                                      optional: true,
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_name),

data/scan/lib/scan/test_command_generator.rb

@@ -84,8 +84,12 @@ module Scan
       end
 
       formatter = []
-      if Scan.config[:formatter]
-        formatter << "-f `#{Scan.config[:formatter]}`"
+      if (custom_formatter = Scan.config[:formatter])
+        if custom_formatter.end_with?(".rb")
+          formatter << "-f '#{custom_formatter}'"
+        else
+          formatter << "-f `#{custom_formatter}`"
+        end
       elsif FastlaneCore::Env.truthy?("TRAVIS")
         formatter << "-f `xcpretty-travis-formatter`"
         UI.success("Automatically switched to Travis formatter")

data/screengrab/lib/screengrab/runner.rb

@@ -178,13 +178,13 @@ module Screengrab
 
     def install_apks(device_serial, app_apk_path, tests_apk_path)
       UI.message('Installing app APK')
-      apk_install_output = run_adb_command("adb -s #{device_serial} install -r #{app_apk_path.shellescape}",
+      apk_install_output = run_adb_command("adb -s #{device_serial} install -t -r #{app_apk_path.shellescape}",
                                            print_all: true,
                                            print_command: true)
       UI.user_error!("App APK could not be installed") if apk_install_output.include?("Failure [")
 
       UI.message('Installing tests APK')
-      apk_install_output = run_adb_command("adb -s #{device_serial} install -r #{tests_apk_path.shellescape}",
+      apk_install_output = run_adb_command("adb -s #{device_serial} install -t -r #{tests_apk_path.shellescape}",
                                            print_all: true,
                                            print_command: true)
       UI.user_error!("Tests APK could not be installed") if apk_install_output.include?("Failure [")

data/sigh/lib/sigh/runner.rb

@@ -176,6 +176,11 @@ module Sigh
           certificates = Spaceship.certificate.development.all
         elsif profile_type == Spaceship.provisioning_profile.InHouse
           certificates = Spaceship.certificate.in_house.all
+        # handles case where the desired certificate type is adhoc but the account is an enterprise account
+        # the apple dev portal api has a weird quirk in it where if you query for distribution certificates
+        # for enterprise accounts, you get nothing back even if they exist.
+        elsif profile_type == Spaceship.provisioning_profile.AdHoc && Spaceship.client && Spaceship.client.in_house?
+          certificates = Spaceship.certificate.in_house.all
         else
           certificates = Spaceship.certificate.production.all # Ad hoc or App Store
         end
@@ -283,7 +288,7 @@ module Sigh
       UI.message("fastlane produce -u #{config[:username]} -a #{config[:app_identifier]} --skip_itc".yellow)
       UI.message("")
       UI.message("You will be asked for any missing information, like the full name of your app")
-      UI.message("If the app should also be created on iTunes Connect, remove the " + "--skip_itc".yellow + " from the command above")
+      UI.message("If the app should also be created on App Store Connect, remove the " + "--skip_itc".yellow + " from the command above")
       UI.message("==========================================".yellow)
       UI.message("")
     end

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -3,7 +3,6 @@
 //  Example
 //
 //  Created by Felix Krause on 10/8/15.
-//  Copyright © 2015 Felix Krause. All rights reserved.
 //
 
 // -----------------------------------------------------

data/snapshot/lib/assets/SnapshotHelperXcode8.swift

@@ -3,7 +3,6 @@
 //  Example
 //
 //  Created by Felix Krause on 10/8/15.
-//  Copyright © 2015 Felix Krause. All rights reserved.
 //
 
 // -----------------------------------------------------

data/spaceship/README.md

@@ -33,7 +33,7 @@
 [![Twitter: @FastlaneTools](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/LICENSE)
 
-_spaceship_ exposes both the Apple Developer Center and the iTunes Connect API. This fast and powerful API powers parts of fastlane, and can be leveraged for more advanced fastlane features. Scripting your Developer Center workflow has never been easier!
+_spaceship_ exposes both the Apple Developer Center and the App Store Connect API. This fast and powerful API powers parts of fastlane, and can be leveraged for more advanced fastlane features. Scripting your Developer Center workflow has never been easier!
 
 Get in contact with the creators on Twitter: [@FastlaneTools](https://twitter.com/fastlanetools)
 
@@ -107,7 +107,7 @@ This requires you to install `pry` using `sudo gem install pry`. `pry` is not in
 
 ##### Open [DeveloperPortal.md](docs/DeveloperPortal.md) for code samples
 
-## iTunes Connect API
+## App Store Connect API
 
 ##### Open [iTunesConnect.md](docs/iTunesConnect.md) for code samples
 
@@ -135,7 +135,7 @@ Copy everything from `---\n` to your CI server and provide it as environment var
 
 #### Transporter
 
-If you want to upload builds to TestFlight/iTunes Connect from your CI, you have to generate an application specific password:
+If you want to upload builds to TestFlight/App Store Connect from your CI, you have to generate an application specific password:
 
 1. Visit [appleid.apple.com/account/manage](https://appleid.apple.com/account/manage)
 1. Generate a new application specific password

data/spaceship/lib/spaceship.rb

@@ -8,7 +8,7 @@ require_relative 'spaceship/launcher'
 require_relative 'spaceship/portal/portal'
 require_relative 'spaceship/portal/spaceship'
 
-# iTunes Connect
+# App Store Connect
 require_relative 'spaceship/tunes/tunes'
 require_relative 'spaceship/tunes/spaceship'
 require_relative 'spaceship/test_flight'

data/spaceship/lib/spaceship/client.rb

@@ -371,7 +371,7 @@ module Spaceship
       end
     end
 
-    # This method is used for both the Apple Dev Portal and iTunes Connect
+    # This method is used for both the Apple Dev Portal and App Store Connect
     # This will also handle 2 step verification
     def send_shared_login_request(user, password)
       # Check if we have a cached/valid session here
@@ -394,7 +394,7 @@ module Spaceship
           # As this will raise an exception if the old session has expired
           # If the old session is still valid, we don't have to do anything else in this method
           # that's why we return true
-          return true if fetch_olympus_session.count > 0
+          return true if fetch_olympus_session
         rescue
           # If the `fetch_olympus_session` method raises an exception
           # we'll land here, and therefore continue doing a full login process
@@ -471,7 +471,7 @@ module Spaceship
           # Looking for status of 412 might be enough but might be safer to keep looking only at what is being reported
           raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. Please manually log into https://appleid.apple.com (or https://itunesconnect.apple.com) to acknowledge the statement."
         elsif (response['Set-Cookie'] || "").include?("itctx")
-          raise "Looks like your Apple ID is not enabled for iTunes Connect, make sure to be able to login online"
+          raise "Looks like your Apple ID is not enabled for App Store Connect, make sure to be able to login online"
         else
           info = [response.body, response['Set-Cookie']]
           raise Tunes::Error.new, info.join("\n")
@@ -491,8 +491,13 @@ module Spaceship
         end
 
         provider = body["provider"]
-        self.provider = Spaceship::Provider.new(provider_hash: provider) unless provider.nil?
+        if provider
+          self.provider = Spaceship::Provider.new(provider_hash: provider)
+          return true
+        end
       end
+
+      return false
     end
 
     def itc_service_key
@@ -513,7 +518,7 @@ module Spaceship
       return @service_key
     rescue => ex
       puts(ex.to_s)
-      raise AppleTimeoutError.new, "Could not receive latest API key from iTunes Connect, this might be a server issue."
+      raise AppleTimeoutError.new, "Could not receive latest API key from App Store Connect, this might be a server issue."
     end
 
     #####################################################
@@ -614,7 +619,7 @@ module Spaceship
     end
 
     def detect_most_common_errors_and_raise_exceptions(body)
-      # Check if the failure is due to missing permissions (iTunes Connect)
+      # Check if the failure is due to missing permissions (App Store Connect)
       if body["messages"] && body["messages"]["error"].include?("Forbidden")
         raise_insuffient_permission_error!
       elsif body["messages"] && body["messages"]["error"].include?("insufficient privileges")
@@ -622,7 +627,7 @@ module Spaceship
         # With the default location the error would say that `parse_response` is the caller
         raise_insuffient_permission_error!(caller_location: 3)
       elsif body.to_s.include?("Internal Server Error - Read")
-        raise InternalServerError, "Received an internal server error from iTunes Connect / Developer Portal, please try again later"
+        raise InternalServerError, "Received an internal server error from App Store Connect / Developer Portal, please try again later"
       elsif (body["resultString"] || "").include?("Program License Agreement")
         raise ProgramLicenseAgreementUpdated, "#{body['userString']} Please manually log into your Apple Developer account to review and accept the updated agreement."
       end