fastlane 2.121.0.beta.20190418200030 → 2.121.0.beta.20190419200010

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5921bda2deb026e45486f304d713b971c53d5f1
-  data.tar.gz: 326352516919d952d0bb569d12f5b59a7e5af4eb
+  metadata.gz: edd3f9b8c80196c22a0a1762980b3cfbc0e4045b
+  data.tar.gz: 628831a51625a69a33984133a42ee34f906ebdd8
 SHA512:
-  metadata.gz: e0dff05c7cb386c762725559fc13f8692497754a87964b61af02849c431877aaa485ac668902a850556c40dea2ba319bfb2286bbd0172489cd5f824974f6c757
-  data.tar.gz: 7cff8a299efbce1eea540fdd09fa2f2b0c8b422e5c01375d98ba232d62e72df5b8873c3bee0d8585c9f291c93b34cf1965a996d2e3eb6bc66dee3842a7ae248c
+  metadata.gz: cf720bdcb105744e8fe67b42fcba0fe8606b26e160b8e97ca64b7e9dba31ddcb37c210b9fac25d2162ab9a6a24d3e4a15cd6e8514bdd942136102180bd5ffee8
+  data.tar.gz: b86ece9302ceedc4c38f2e3663f4676394f8eb8d072ea0b4b575212e2108dc7cf82798c91867645bfd009b888f058e27cd7bf1eaebb5d70f95ed3be6cb44d1e8

data/cert/lib/cert/runner.rb

@@ -153,7 +153,7 @@ module Cert
       # Create a new certificate signing request
       csr, pkey = Spaceship.certificate.create_certificate_signing_request
 
-      # Use the signing request to create a new distribution certificate
+      # Use the signing request to create a new (development|distribution) certificate
       begin
         certificate = certificate_type.create!(csr: csr)
       rescue => ex

data/deliver/lib/deliver/app_screenshot.rb

@@ -178,25 +178,30 @@ module Deliver
     def self.device_messages
       return {
         ScreenSize::IOS_65_MESSAGES => [
-          [1242, 2688]
+          [1242, 2688],
+          [2688, 1242]
         ],
         ScreenSize::IOS_61_MESSAGES => [
-          [828, 1792]
+          [828, 1792],
+          [1792, 828]
         ],
         ScreenSize::IOS_58_MESSAGES => [
-          [1125, 2436]
+          [1125, 2436],
+          [2436, 1125]
         ],
         ScreenSize::IOS_55_MESSAGES => [
-          [1080, 1920],
-          [1242, 2208]
+          [1242, 2208],
+          [2208, 1242]
         ],
         ScreenSize::IOS_47_MESSAGES => [
-          [750, 1334]
+          [750, 1334],
+          [1334, 750]
         ],
         ScreenSize::IOS_40_MESSAGES => [
-          [640, 1136],
           [640, 1096],
-          [1136, 600] # landscape status bar is smaller
+          [640, 1136],
+          [1136, 600],
+          [1136, 640]
         ],
         ScreenSize::IOS_IPAD_MESSAGES => [
           [1024, 748],
@@ -212,7 +217,7 @@ module Deliver
           [1668, 2224],
           [2224, 1668]
         ],
-        ScreenSize::IOS_IPAD_11 => [
+        ScreenSize::IOS_IPAD_11_MESSAGES => [
           [1668, 2388],
           [2388, 1668]
         ],
@@ -227,30 +232,36 @@ module Deliver
     def self.devices
       return {
         ScreenSize::IOS_65 => [
-          [1242, 2688]
+          [1242, 2688],
+          [2688, 1242]
         ],
         ScreenSize::IOS_61 => [
-          [828, 1792]
+          [828, 1792],
+          [1792, 828]
         ],
         ScreenSize::IOS_58 => [
-          [1125, 2436]
+          [1125, 2436],
+          [2436, 1125]
         ],
         ScreenSize::IOS_55 => [
-          [1080, 1920],
-          [1242, 2208]
+          [1242, 2208],
+          [2208, 1242]
         ],
         ScreenSize::IOS_47 => [
-          [750, 1334]
+          [750, 1334],
+          [1334, 750]
         ],
         ScreenSize::IOS_40 => [
-          [640, 1136],
           [640, 1096],
-          [1136, 600] # landscape without status bar
+          [640, 1136],
+          [1136, 600],
+          [1136, 640]
         ],
         ScreenSize::IOS_35 => [
-          [640, 960],
           [640, 920],
-          [960, 600] # landscape without status bar
+          [640, 960],
+          [960, 600],
+          [960, 640]
         ],
         ScreenSize::IOS_IPAD => [ # 9.7 inch
           [1024, 748],
@@ -298,28 +309,12 @@ module Deliver
 
       UI.user_error!("Could not find or parse file at path '#{path}'") if size.nil? || size.count == 0
 
-      # Walk up two directories and test if we need to handle a platform that doesn't support landscape
-      path_component = Pathname.new(path).each_filename.to_a[-3]
-      if path_component.eql?("appleTV")
-        skip_landscape = true
-      end
-
       # iMessage screenshots have same resolution as app screenshots so we need to distinguish them
+      path_component = Pathname.new(path).each_filename.to_a[-3]
       devices = path_component.eql?("iMessage") ? self.device_messages : self.devices
 
-      devices.each do |device_type, array|
-        array.each do |resolution|
-          if skip_landscape
-            if size[0] == (resolution[0]) && size[1] == (resolution[1]) # portrait
-              return device_type
-            end
-          else
-            if (size[0] == (resolution[0]) && size[1] == (resolution[1])) || # portrait
-               (size[1] == (resolution[0]) && size[0] == (resolution[1])) # landscape
-              return device_type
-            end
-          end
-        end
+      devices.each do |screen_size, resolutions|
+        return screen_size if resolutions.include?(size)
       end
 
       UI.user_error!("Unsupported screen size #{size} for path '#{path}'")

data/fastlane/lib/fastlane/actions/app_store_build_number.rb

@@ -21,7 +21,7 @@ module Fastlane
       def self.get_build_number(params)
         UI.message("Login to App Store Connect (#{params[:username]})")
         Spaceship::Tunes.login(params[:username])
-        Spaceship::Tunes.select_team
+        Spaceship::Tunes.select_team(team_id: params[:team_id], team_name: params[:team_name])
         UI.message("Login successful")
 
         app = Spaceship::Tunes::Application.find(params[:app_identifier])

data/fastlane/lib/fastlane/actions/latest_testflight_build_number.rb

@@ -79,10 +79,7 @@ module Fastlane
                                        is_string: false, # as we also allow integers, which we convert to strings anyway
                                        code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
-                                       default_value_dynamic: true,
-                                       verify_block: proc do |value|
-                                         ENV["FASTLANE_ITC_TEAM_ID"] = value.to_s
-                                       end),
+                                       default_value_dynamic: true),
           FastlaneCore::ConfigItem.new(key: :team_name,
                                        short_option: "-e",
                                        env_name: "LATEST_TESTFLIGHT_BUILD_NUMBER_TEAM_NAME",
@@ -90,10 +87,7 @@ module Fastlane
                                        optional: true,
                                        code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_name),
-                                       default_value_dynamic: true,
-                                       verify_block: proc do |value|
-                                         ENV["FASTLANE_ITC_TEAM_NAME"] = value.to_s
-                                       end)
+                                       default_value_dynamic: true)
         ]
       end
 

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.121.0.beta.20190418200030'.freeze
+  VERSION = '2.121.0.beta.20190419200010'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -18,13 +18,15 @@ module Spaceship
         Spaceship::Tunes.login(@username)
         puts("Successfully logged in to App Store Connect".green)
         puts("")
-      rescue
+      rescue => ex
         puts("Could not login to App Store Connect".red)
         puts("Please check your credentials and try again.".yellow)
         puts("This could be an issue with App Store Connect,".yellow)
         puts("Please try unsetting the FASTLANE_SESSION environment variable".yellow)
         puts("(if it is set) and re-run `fastlane spaceauth`".yellow)
-        raise "Problem connecting to App Store Connect"
+        puts("")
+        puts("Execption type: #{ex.class}")
+        raise ex
       end
 
       itc_cookie_content = Spaceship::Tunes.client.store_cookie
@@ -44,7 +46,7 @@ module Spaceship
 
       # We remove all the un-needed cookies
       cookies.select! do |cookie|
-        cookie.name.start_with?("myacinfo") || cookie.name == 'dqsid'
+        cookie.name.start_with?("myacinfo") || cookie.name == "dqsid" || cookie.name.start_with?("DES")
       end
 
       yaml = cookies.to_yaml.gsub("\n", "\\n")

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -123,14 +123,33 @@ module Spaceship
       code_length = security_code["length"]
 
       puts("")
-      puts("(Input `sms` to escape this prompt and select a trusted phone number to send the code as a text message)")
-      code_type = 'trusteddevice'
-      code = ask("Please enter the #{code_length} digit code:")
-      body = { "securityCode" => { "code" => code.to_s } }.to_json
+      env_2fa_sms_default_phone_number = ENV["SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER"]
 
-      if code == 'sms'
+      if env_2fa_sms_default_phone_number
+        raise Tunes::Error.new, "Environment variable SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER is set, but empty." if env_2fa_sms_default_phone_number.empty?
+
+        puts("Environment variable `SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER` is set, automatically requesting 2FA token via SMS to that number")
+        puts("SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER = #{env_2fa_sms_default_phone_number}")
+        puts("")
+        phone_number = env_2fa_sms_default_phone_number
+        phone_id = phone_id_from_number(response.body["trustedPhoneNumbers"], phone_number)
         code_type = 'phone'
-        body = request_two_factor_code_from_phone(response.body["trustedPhoneNumbers"], code_length)
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length)
+      else
+        puts("(Input `sms` to escape this prompt and select a trusted phone number to send the code as a text message)")
+        puts("")
+        puts("(You can also set the environment variable `SPACESHIP_2FA_SMS_DEFAULT_PHONE_NUMBER` to automate this)")
+        puts("(Read more at: https://github.com/fastlane/fastlane/blob/master/spaceship/docs/Authentication.md#auto-select-sms-via-spaceship-2fa-sms-default-phone-number)")
+        puts("")
+        code_type = 'trusteddevice'
+        code = ask_for_2fa_code("Please enter the #{code_length} digit code:")
+        body = { "securityCode" => { "code" => code.to_s } }.to_json
+
+        # User exited by entering `sms` and wants to choose phone number for SMS
+        if code == 'sms'
+          code_type = 'phone'
+          body = request_two_factor_code_from_phone_choose(response.body["trustedPhoneNumbers"], code_length)
+        end
       end
 
       puts("Requesting session...")
@@ -172,23 +191,68 @@ module Spaceship
       return true
     end
 
-    def get_id_for_number(phone_numbers, result)
+    # extracted into its own method for testing
+    def ask_for_2fa_code(text)
+      ask(text)
+    end
+
+    def phone_id_from_number(phone_numbers, phone_number)
+      characters_to_remove_from_phone_numbers = ' \-()"'
+
+      # start with e.g. +49 162 1234585 or +1-123-456-7866
+      phone_number = phone_number.tr(characters_to_remove_from_phone_numbers, '')
+      # cleaned: +491621234585 or +11234567866
+
+      phone_numbers.each do |phone|
+        # rubocop:disable Style/AsciiComments
+        # start with: +49 •••• •••••85 or +1 (•••) •••-••66
+        number_with_dialcode_masked = phone['numberWithDialCode'].tr(characters_to_remove_from_phone_numbers, '')
+        # cleaned: +49•••••••••85 or +1••••••••66
+        # rubocop:enable Style/AsciiComments
+
+        maskings_count = number_with_dialcode_masked.count('•') # => 9 or 8
+        pattern = /^([0-9+]{2,4})([•]{#{maskings_count}})([0-9]{2})$/
+        replacement = "\\1([0-9]{#{maskings_count - 1},#{maskings_count}})\\3"
+        number_with_dialcode_regex_part = number_with_dialcode_masked.gsub(pattern, replacement)
+        # => +49([0-9]{8,9})85 or +1([0-9]{7,8})66
+
+        backslash = '\\'
+        number_with_dialcode_regex_part = backslash + number_with_dialcode_regex_part
+        number_with_dialcode_regex = /^#{number_with_dialcode_regex_part}$/
+        # => /^\+49([0-9]{8})85$/ or /^\+1([0-9]{7,8})66$/
+
+        return phone['id'] if phone_number =~ number_with_dialcode_regex
+        # +491621234585 matches /^\+49([0-9]{8})85$/
+      end
+
+      # Handle case of phone_number not existing in phone_numbers because ENV var is wrong or matcher is broken
+      raise Tunes::Error.new, %(
+Could not find a matching phone number to #{phone_number} in #{phone_numbers}.
+Make sure your environment variable is set to the correct phone number.
+If it is, please open an issue at https://github.com/fastlane/fastlane/issues/new and include this output so we can fix our matcher. Thanks.
+)
+    end
+
+    def phone_id_from_masked_number(phone_numbers, masked_number)
       phone_numbers.each do |phone|
-        phone_id = phone['id']
-        return phone_id if phone['numberWithDialCode'] == result
+        return phone['id'] if phone['numberWithDialCode'] == masked_number
       end
     end
 
-    def request_two_factor_code_from_phone(phone_numbers, code_length)
+    def request_two_factor_code_from_phone_choose(phone_numbers, code_length)
       puts("Please select a trusted phone number to send code to:")
 
       available = phone_numbers.collect do |current|
         current['numberWithDialCode']
       end
-      result = choose(*available)
+      chosen = choose(*available)
+      phone_id = phone_id_from_masked_number(phone_numbers, chosen)
 
-      phone_id = get_id_for_number(phone_numbers, result)
+      request_two_factor_code_from_phone(phone_id, chosen, code_length)
+    end
 
+    # this is used in two places: after choosing a phone number and when a phone number is set via ENV var
+    def request_two_factor_code_from_phone(phone_id, phone_number, code_length)
       # Request code
       r = request(:put) do |req|
         req.url("https://idmsa.apple.com/appleauth/auth/verify/phone")
@@ -201,10 +265,11 @@ module Spaceship
       # since this might be from the Dev Portal, but for 2 step
       Spaceship::TunesClient.new.handle_itc_response(r.body)
 
-      puts("Successfully requested text message")
+      puts("Successfully requested text message to #{phone_number}")
+
+      code = ask_for_2fa_code("Please enter the #{code_length} digit code you received at #{phone_number}:")
 
-      code = ask("Please enter the #{code_length} digit code you received at #{result}:")
-      { "securityCode" => { "code" => code.to_s }, "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
+      return { "securityCode" => { "code" => code.to_s }, "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
     end
 
     def store_session

data/spaceship/lib/spaceship.rb

@@ -13,6 +13,7 @@ require_relative 'spaceship/tunes/tunes'
 require_relative 'spaceship/tunes/spaceship'
 require_relative 'spaceship/test_flight'
 require_relative 'spaceship/connect_api'
+require_relative 'spaceship/spaceauth_runner'
 
 require_relative 'spaceship/module'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.121.0.beta.20190418200030
+  version: 2.121.0.beta.20190419200010
 platform: ruby
 authors:
 - Kohki Miki
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1688,24 +1688,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- spaceship/lib
+- match/lib
+- precheck/lib
+- pem/lib
+- deliver/lib
+- fastlane_core/lib
 - snapshot/lib
+- cert/lib
 - fastlane/lib
-- credentials_manager/lib
-- frameit/lib
-- supply/lib
 - produce/lib
-- pem/lib
-- cert/lib
-- deliver/lib
+- supply/lib
 - screengrab/lib
-- pilot/lib
 - sigh/lib
-- precheck/lib
-- gym/lib
-- match/lib
-- fastlane_core/lib
 - scan/lib
+- spaceship/lib
+- credentials_manager/lib
+- pilot/lib
+- gym/lib
+- frameit/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="