fastlane 2.117.0.beta.20190228200006 → 2.117.0

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.116.1
+// Generated with fastlane 2.117.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.116.1
+// Generated with fastlane 2.117.0

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.116.1
+// Generated with fastlane 2.117.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.116.1
+// Generated with fastlane 2.117.0

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.116.1
+// Generated with fastlane 2.117.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.116.1
+// Generated with fastlane 2.117.0

data/pilot/lib/pilot/build_manager.rb

@@ -72,28 +72,13 @@ module Pilot
         UI.user_error!("No build to distribute!")
       end
 
-      if should_update_app_test_information?(options)
-        app_test_info = Spaceship::TestFlight::AppTestInfo.find(app_id: build.app_id)
-        app_test_info.test_info.feedback_email = options[:beta_app_feedback_email] if options[:beta_app_feedback_email]
-        app_test_info.test_info.description = options[:beta_app_description] if options[:beta_app_description]
-        begin
-          app_test_info.save_for_app!(app_id: build.app_id)
-          UI.success("Successfully set the beta_app_feedback_email and/or beta_app_description")
-        rescue => ex
-          UI.user_error!("Could not set beta_app_feedback_email and/or beta_app_description: #{ex}")
-        end
-      end
-
-      if should_update_build_information?(options)
-        begin
-          build.update_build_information!(whats_new: options[:changelog])
-          UI.success("Successfully set the changelog for build")
-        rescue => ex
-          UI.user_error!("Could not set changelog: #{ex}")
-        end
-      end
-
-      build.auto_notify_enabled = config[:notify_external_testers]
+      # Update beta app meta info
+      # 1. Demo account required
+      # 2. App info
+      # 3. Localized app  info
+      # 4. Localized build info
+      # 5. Auto notify enabled with config[:notify_external_testers]
+      update_beta_app_meta(options, build)
 
       return if config[:skip_submission]
       if options[:reject_build_waiting_for_review]
@@ -129,6 +114,44 @@ module Pilot
       ))
     end
 
+    def update_beta_app_meta(options, build)
+      # Setting account required wth AppStore Connect API
+      update_review_detail(build.app_id, { demo_account_required: options[:demo_account_required] })
+
+      if should_update_beta_app_review_info(options)
+        update_review_detail(build.app_id, options[:beta_app_review_info])
+      end
+
+      if should_update_localized_app_information?(options)
+        update_localized_app_review(build.app_id, options[:localized_app_info])
+      elsif should_update_app_test_information?(options)
+        default_info = {}
+        default_info[:feedback_email] = options[:beta_app_feedback_email] if options[:beta_app_feedback_email]
+        default_info[:description] = options[:beta_app_description] if options[:beta_app_description]
+        begin
+          update_localized_app_review(build.app_id, {}, default_info: default_info)
+          UI.success("Successfully set the beta_app_feedback_email and/or beta_app_description")
+        rescue => ex
+          UI.user_error!("Could not set beta_app_feedback_email and/or beta_app_description: #{ex}")
+        end
+      end
+
+      if should_update_localized_build_information?(options)
+        update_localized_build_review(build, options[:localized_build_info])
+      elsif should_update_build_information?(options)
+        begin
+          update_localized_build_review(build, {}, default_info: { whats_new: options[:changelog] })
+          UI.success("Successfully set the changelog for build")
+        rescue => ex
+          UI.user_error!("Could not set changelog: #{ex}")
+        end
+      end
+
+      update_build_beta_details(build, {
+        auto_notify_enabled: options[:notify_external_testers]
+      })
+    end
+
     def self.truncate_changelog(changelog)
       max_changelog_length = 4000
       if changelog && changelog.length > max_changelog_length
@@ -163,6 +186,10 @@ module Pilot
       return row
     end
 
+    def should_update_beta_app_review_info(options)
+      !options[:beta_app_review_info].nil?
+    end
+
     def should_update_build_information?(options)
       options[:changelog].to_s.length > 0
     end
@@ -171,6 +198,14 @@ module Pilot
       options[:beta_app_description].to_s.length > 0 || options[:beta_app_feedback_email].to_s.length > 0
     end
 
+    def should_update_localized_app_information?(options)
+      !options[:localized_app_info].nil?
+    end
+
+    def should_update_localized_build_information?(options)
+      !options[:localized_build_info].nil?
+    end
+
     def distribute_build(uploaded_build, options)
       UI.message("Distributing new build to testers: #{uploaded_build.train_version} - #{uploaded_build.build_version}")
 
@@ -178,7 +213,6 @@ module Pilot
       uploaded_build.export_compliance.encryption_updated = false
 
       if options[:groups] || options[:distribute_external]
-        uploaded_build.beta_review_info.demo_account_required = options[:demo_account_required] # this needs to be set for iTC to continue
         begin
           uploaded_build.submit_for_testflight_review!
         rescue => ex
@@ -216,5 +250,134 @@ module Pilot
 
       true
     end
+
+    def update_review_detail(app_id, info)
+      info = info.collect { |k, v| [k.to_sym, v] }.to_h
+
+      attributes = {}
+      attributes[:contactEmail] = info[:contact_email] if info.key?(:contact_email)
+      attributes[:contactFirstName] = info[:contact_first_name] if info.key?(:contact_first_name)
+      attributes[:contactLastName] = info[:contact_last_name] if info.key?(:contact_last_name)
+      attributes[:contactPhone] = info[:contact_phone] if info.key?(:contact_phone)
+      attributes[:demoAccountName] = info[:demo_account_name] if info.key?(:demo_account_name)
+      attributes[:demoAccountPassword] = info[:demo_account_password] if info.key?(:demo_account_password)
+      attributes[:demoAccountRequired] = info[:demo_account_required] if info.key?(:demo_account_required)
+      attributes[:notes] = info[:notes] if info.key?(:notes)
+
+      client = Spaceship::ConnectAPI::Base.client
+      client.patch_beta_app_review_detail(app_id: app_id, attributes: attributes)
+    end
+
+    def update_localized_app_review(app_id, info_by_lang, default_info: nil)
+      info_by_lang = info_by_lang.collect { |k, v| [k.to_sym, v] }.to_h
+
+      if default_info
+        info_by_lang.delete(:default)
+      else
+        default_info = info_by_lang.delete(:default)
+      end
+
+      # Initialize hash of lang codes
+      langs_localization_ids = {}
+
+      # Validate locales exist
+      client = Spaceship::ConnectAPI::Base.client
+      localizations = client.get_beta_app_localizations(filter: { app: app_id })
+      localizations.each do |localization|
+        localization_id = localization["id"]
+        attributes = localization["attributes"]
+        locale = attributes["locale"]
+
+        langs_localization_ids[locale.to_sym] = localization_id
+      end
+
+      # Create or update localized app review info
+      langs_localization_ids.each do |lang_code, localization_id|
+        info = info_by_lang[lang_code]
+
+        info = default_info unless info
+        update_localized_app_review_for_lang(app_id, localization_id, lang_code, info) if info
+      end
+    end
+
+    def update_localized_app_review_for_lang(app_id, localization_id, locale, info)
+      attributes = {}
+      attributes[:feedbackEmail] = info[:feedback_email] if info.key?(:feedback_email)
+      attributes[:marketingUrl] = info[:marketing_url] if info.key?(:marketing_url)
+      attributes[:privacyPolicyUrl] = info[:privacy_policy_url] if info.key?(:privacy_policy_url)
+      attributes[:tvOsPrivacyPolicy] = info[:tv_os_privacy_policy_url] if info.key?(:tv_os_privacy_policy_url)
+      attributes[:description] = info[:description] if info.key?(:description)
+
+      client = Spaceship::ConnectAPI::Base.client
+      if localization_id
+        client.patch_beta_app_localizations(localization_id: localization_id, attributes: attributes)
+      else
+        attributes[:locale] = locale if locale
+        client.post_beta_app_localizations(app_id: app_id, attributes: attributes)
+      end
+    end
+
+    def update_localized_build_review(build, info_by_lang, default_info: nil)
+      resp = Spaceship::ConnectAPI::Base.client.get_builds(filter: { expired: false, processingState: "PROCESSING,VALID", version: build.build_version })
+      build_id = resp.first["id"]
+
+      info_by_lang = info_by_lang.collect { |k, v| [k.to_sym, v] }.to_h
+
+      if default_info
+        info_by_lang.delete(:default)
+      else
+        default_info = info_by_lang.delete(:default)
+      end
+
+      # Initialize hash of lang codes
+      langs_localization_ids = {}
+
+      # Validate locales exist
+      client = Spaceship::ConnectAPI::Base.client
+      localizations = client.get_beta_build_localizations(filter: { build: build_id })
+      localizations.each do |localization|
+        localization_id = localization["id"]
+        attributes = localization["attributes"]
+        locale = attributes["locale"]
+
+        langs_localization_ids[locale.to_sym] = localization_id
+      end
+
+      # Create or update localized app review info
+      langs_localization_ids.each do |lang_code, localization_id|
+        info = info_by_lang[lang_code]
+
+        info = default_info unless info
+        update_localized_build_review_for_lang(build_id, localization_id, lang_code, info) if info
+      end
+    end
+
+    def update_localized_build_review_for_lang(build_id, localization_id, locale, info)
+      attributes = {}
+      attributes[:whatsNew] = info[:whats_new] if info.key?(:whats_new)
+
+      client = Spaceship::ConnectAPI::Base.client
+      if localization_id
+        client.patch_beta_build_localizations(localization_id: localization_id, attributes: attributes)
+      else
+        attributes[:locale] = locale if locale
+        client.post_beta_build_localizations(build_id: build_id, attributes: attributes)
+      end
+    end
+
+    def update_build_beta_details(build, info)
+      client = Spaceship::ConnectAPI::Base.client
+
+      resp = client.get_builds(filter: { expired: false, processingState: "PROCESSING,VALID", version: build.build_version })
+      build_id = resp.first["id"]
+
+      resp = client.get_build_beta_details(filter: { build: build_id })
+      build_beta_details_id = resp.first["id"]
+
+      attributes = {}
+      attributes[:autoNotifyEnabled] = info[:auto_notify_enabled] if info.key?(:auto_notify_enabled)
+
+      client.patch_build_beta_details(build_beta_details_id: build_beta_details_id, attributes: attributes)
+    end
   end
 end

data/pilot/lib/pilot/manager.rb

@@ -21,7 +21,7 @@ module Pilot
 
       UI.message("Login to App Store Connect (#{config[:username]})")
       Spaceship::Tunes.login(config[:username])
-      Spaceship::Tunes.select_team
+      Spaceship::Tunes.select_team(team_id: config[:team_id], team_name: config[:team_name])
       UI.message("Login successful")
     end
 

data/pilot/lib/pilot/module.rb

@@ -1,8 +1,10 @@
 require 'fastlane_core/helper'
+require 'fastlane/boolean'
 
 module Pilot
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
   UI = FastlaneCore::UI
+  Boolean = Fastlane::Boolean
   ROOT = Pathname.new(File.expand_path('../../..', __FILE__))
 
   DESCRIPTION = "The best way to manage your TestFlight testers and builds from your terminal"

data/pilot/lib/pilot/options.rb

@@ -10,6 +10,7 @@ module Pilot
       user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
       [
+        # app upload info
         FastlaneCore::ConfigItem.new(key: :username,
                                      short_option: "-u",
                                      env_name: "PILOT_USERNAME",
@@ -34,6 +35,14 @@ module Pilot
                                      verify_block: proc do |value|
                                        UI.user_error!("The platform can only be ios, appletvos, or osx") unless ['ios', 'appletvos', 'osx'].include?(value)
                                      end),
+        FastlaneCore::ConfigItem.new(key: :apple_id,
+                                     short_option: "-p",
+                                     env_name: "PILOT_APPLE_ID",
+                                     description: "The unique App ID provided by App Store Connect",
+                                     optional: true,
+                                     code_gen_sensitive: true,
+                                     default_value: ENV["TESTFLIGHT_APPLE_ID"],
+                                     default_value_dynamic: true),
         FastlaneCore::ConfigItem.new(key: :ipa,
                                      short_option: "-i",
                                      optional: true,
@@ -47,11 +56,35 @@ module Pilot
                                        UI.user_error!("Could not find ipa file at path '#{value}'") unless File.exist?(value)
                                        UI.user_error!("'#{value}' doesn't seem to be an ipa file") unless value.end_with?(".ipa")
                                      end),
-        FastlaneCore::ConfigItem.new(key: :changelog,
-                                     short_option: "-w",
+
+        # app review info
+        FastlaneCore::ConfigItem.new(key: :demo_account_required,
+                                     type: Boolean,
+                                     env_name: "DEMO_ACCOUNT_REQUIRED",
+                                     description: "Do you need a demo account when Apple does review?",
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :beta_app_review_info,
+                                     type: Hash,
+                                     env_name: "PILOT_BETA_APP_REVIEW_INFO",
+                                     description: "Beta app review information for contact info and demo account",
                                      optional: true,
-                                     env_name: "PILOT_CHANGELOG",
-                                     description: "Provide the 'What to Test' text when uploading a new build. `skip_waiting_for_build_processing: false` is required to set the changelog"),
+                                     verify_block: proc do |values|
+                                       valid_keys = %w(contact_email contact_first_name contact_last_name contact_phone demo_account_required demo_account_name demo_account_password notes)
+                                       values.keys.each { |value| UI.user_error!("Invalid key '#{value}'") unless valid_keys.include?(value.to_s) }
+                                     end),
+
+        # app detail
+        FastlaneCore::ConfigItem.new(key: :localized_app_info,
+                                     type: Hash,
+                                     env_name: "PILOT_LOCALIZED_APP_INFO",
+                                     description: "Localized beta app test info for description, feedback email, marketing url, and privacy policy",
+                                     optional: true,
+                                     verify_block: proc do |lang_values|
+                                       valid_keys = %w(feedback_email marketing_url privacy_policy_url tv_os_privacy_policy_url description)
+                                       lang_values.values.each do |values|
+                                         values.keys.each { |value| UI.user_error!("Invalid key '#{value}'") unless valid_keys.include?(value.to_s) }
+                                       end
+                                     end),
         FastlaneCore::ConfigItem.new(key: :beta_app_description,
                                      short_option: "-d",
                                      optional: true,
@@ -62,6 +95,24 @@ module Pilot
                                      optional: true,
                                      env_name: "PILOT_BETA_APP_FEEDBACK",
                                      description: "Provide the beta app email when uploading a new build"),
+
+        # build review info
+        FastlaneCore::ConfigItem.new(key: :localized_build_info,
+                                     type: Hash,
+                                     env_name: "PILOT_LOCALIZED_BUILD_INFO",
+                                     description: "Localized beta app test info for what's new",
+                                     optional: true,
+                                     verify_block: proc do |lang_values|
+                                       valid_keys = %w(whats_new)
+                                       lang_values.values.each do |values|
+                                         values.keys.each { |value| UI.user_error!("Invalid key '#{value}'") unless valid_keys.include?(value.to_s) }
+                                       end
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :changelog,
+                                     short_option: "-w",
+                                     optional: true,
+                                     env_name: "PILOT_CHANGELOG",
+                                     description: "Provide the 'What to Test' text when uploading a new build. `skip_waiting_for_build_processing: false` is required to set the changelog"),
         FastlaneCore::ConfigItem.new(key: :skip_submission,
                                      short_option: "-s",
                                      env_name: "PILOT_SKIP_SUBMISSION",
@@ -81,14 +132,8 @@ module Pilot
                                      description: "Update build info immediately after validation. This is deprecated and will be removed in a future release. App Store Connect no longer supports setting build info until after build processing has completed, which is when build info is updated by default",
                                      is_string: false,
                                      default_value: false),
-        FastlaneCore::ConfigItem.new(key: :apple_id,
-                                     short_option: "-p",
-                                     env_name: "PILOT_APPLE_ID",
-                                     description: "The unique App ID provided by App Store Connect",
-                                     optional: true,
-                                     code_gen_sensitive: true,
-                                     default_value: ENV["TESTFLIGHT_APPLE_ID"],
-                                     default_value_dynamic: true),
+
+        # distribution
         FastlaneCore::ConfigItem.new(key: :distribute_external,
                                      is_string: false,
                                      env_name: "PILOT_DISTRIBUTE_EXTERNAL",
@@ -99,11 +144,8 @@ module Pilot
                                     env_name: "PILOT_NOTIFY_EXTERNAL_TESTERS",
                                     description: "Should notify external testers?",
                                     default_value: true),
-        FastlaneCore::ConfigItem.new(key: :demo_account_required,
-                                     is_string: false,
-                                     env_name: "DEMO_ACCOUNT_REQUIRED",
-                                     description: "Do you need a demo account when Apple does review?",
-                                     default_value: false),
+
+        # testers
         FastlaneCore::ConfigItem.new(key: :first_name,
                                      short_option: "-f",
                                      env_name: "PILOT_TESTER_FIRST_NAME",
@@ -128,15 +170,17 @@ module Pilot
                                      description: "Path to a CSV file of testers",
                                      default_value: "./testers.csv",
                                      optional: true),
-        FastlaneCore::ConfigItem.new(key: :wait_processing_interval,
-                                     short_option: "-k",
-                                     env_name: "PILOT_WAIT_PROCESSING_INTERVAL",
-                                     description: "Interval in seconds to wait for App Store Connect processing",
-                                     default_value: 30,
-                                     type: Integer,
+        FastlaneCore::ConfigItem.new(key: :groups,
+                                     short_option: "-g",
+                                     env_name: "PILOT_GROUPS",
+                                     description: "Associate tester to one group or more by group name / group id. E.g. `-g \"Team 1\",\"Team 2\"`",
+                                     optional: true,
+                                     type: Array,
                                      verify_block: proc do |value|
-                                       UI.user_error!("Please enter a valid positive number of seconds") unless value.to_i > 0
+                                       UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)
                                      end),
+
+        # app store connect teams
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-q",
                                      env_name: "PILOT_TEAM_ID",
@@ -177,14 +221,16 @@ module Pilot
                                      description: "The provider short name to be used with the iTMSTransporter to identify your team. To get provider short name run `pathToXcode.app/Contents/Applications/Application\\ Loader.app/Contents/itms/bin/iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column",
                                      optional: true),
         # rubocop:enable Metrics/LineLength
-        FastlaneCore::ConfigItem.new(key: :groups,
-                                     short_option: "-g",
-                                     env_name: "PILOT_GROUPS",
-                                     description: "Associate tester to one group or more by group name / group id. E.g. `-g \"Team 1\",\"Team 2\"`",
-                                     optional: true,
-                                     type: Array,
+
+        # waiting and uploaded build
+        FastlaneCore::ConfigItem.new(key: :wait_processing_interval,
+                                     short_option: "-k",
+                                     env_name: "PILOT_WAIT_PROCESSING_INTERVAL",
+                                     description: "Interval in seconds to wait for App Store Connect processing",
+                                     default_value: 30,
+                                     type: Integer,
                                      verify_block: proc do |value|
-                                       UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)
+                                       UI.user_error!("Please enter a valid positive number of seconds") unless value.to_i > 0
                                      end),
         FastlaneCore::ConfigItem.new(key: :wait_for_uploaded_build,
                                      env_name: "PILOT_WAIT_FOR_UPLOADED_BUILD",