fastlane 2.153.1 → 2.155.3

data/snapshot/lib/snapshot/options.rb

@@ -116,6 +116,11 @@ module Snapshot
                                      description: "Enabling this option will automatically erase the simulator before running the application",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :headless,
+                                     env_name: 'SNAPSHOT_HEADLESS',
+                                     description: "Enabling this option will prevent displaying the simulator window",
+                                     default_value: true,
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :override_status_bar,
                                      env_name: 'SNAPSHOT_OVERRIDE_STATUS_BAR',
                                      description: "Enabling this option wil automatically override the status bar to show 9:41 AM, full battery, and full reception",
@@ -273,6 +278,11 @@ module Snapshot
                                      env_name: "SNAPSHOT_DISABLE_XCPRETTY",
                                      description: "Disable xcpretty formatting of build",
                                      type: Boolean,
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :suppress_xcode_output,
+                                     env_name: "SNAPSHOT_SUPPRESS_XCODE_OUTPUT",
+                                     description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
+                                     type: Boolean,
                                      optional: true)
       ]
     end

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -7,6 +7,7 @@ module Snapshot
     attr_accessor :add_videos
     attr_accessor :clean
     attr_accessor :erase_simulator
+    attr_accessor :headless
     attr_accessor :localize_simulator
     attr_accessor :dark_mode
     attr_accessor :reinstall_app
@@ -34,6 +35,7 @@ module Snapshot
       @add_videos = snapshot_config[:add_videos]
       @clean = snapshot_config[:clean]
       @erase_simulator = snapshot_config[:erase_simulator]
+      @headless = snapshot_config[:headless]
       @localize_simulator = snapshot_config[:localize_simulator]
       @dark_mode = snapshot_config[:dark_mode]
       @reinstall_app = snapshot_config[:reinstall_app]

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -76,6 +76,11 @@ module Snapshot
           disable_slide_to_type(type)
         end
       end
+
+      unless launcher_config.headless
+        simulator_path = File.join(Helper.xcode_path, 'Applications', 'Simulator.app')
+        Helper.backticks("open -a #{simulator_path} -g", print: FastlaneCore::Globals.verbose?)
+      end
     end
 
     # pass an array of device types

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -33,8 +33,9 @@ module Snapshot
 
         xcpretty = "xcpretty #{Snapshot.config[:xcpretty_args]}"
         xcpretty << "--no-color" if Helper.colors_disabled?
-
-        return pipe << "| #{xcpretty}"
+        pipe << "| #{xcpretty}"
+        pipe << "> /dev/null" if Snapshot.config[:suppress_xcode_output]
+        return pipe
       end
 
       def destination(devices)

data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb

@@ -24,7 +24,10 @@ module Snapshot
 
       def pipe(device_type, language, locale)
         log_path = xcodebuild_log_path(device_type: device_type, language: language, locale: locale)
-        return ["| tee #{log_path.shellescape} | xcpretty #{Snapshot.config[:xcpretty_args]}"]
+        pipe = ["| tee #{log_path.shellescape}"]
+        pipe << "| xcpretty #{Snapshot.config[:xcpretty_args]}"
+        pipe << "> /dev/null" if Snapshot.config[:suppress_xcode_output]
+        return pipe
       end
 
       def destination(device_name)

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

@@ -129,7 +129,6 @@ module Spaceship
         tries = 1 if Object.const_defined?("SpecHelper")
         response = yield
 
-        tries -= 1
         status = response.status if response
 
         if [500, 504].include?(status)
@@ -139,6 +138,7 @@ module Spaceship
 
         return response
       rescue => error
+        tries -= 1
         puts(error) if Spaceship::Globals.verbose?
         if tries.zero?
           return response
@@ -164,6 +164,8 @@ module Spaceship
 
         raise UnexpectedResponse, "Temporary App Store Connect error: #{response.body}" if response.body['statusCode'] == 'ERROR'
 
+        store_csrf_tokens(response)
+
         return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
       end
 

data/spaceship/lib/spaceship/connect_api/model.rb

@@ -152,7 +152,7 @@ module Spaceship
               id == included_data["id"] && type == included_data["type"]
             end
 
-            inflate_model(relationship_data, included)
+            inflate_model(relationship_data, included) if relationship_data
           end
 
           # Map a hash or an array of data

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -10,6 +10,7 @@ module Spaceship
       attr_accessor :bundle_id
       attr_accessor :sku
       attr_accessor :primary_locale
+      attr_accessor :is_opted_in_to_distribute_ios_app_on_mac_app_store
       attr_accessor :removed
       attr_accessor :is_aag
       attr_accessor :available_in_new_territories
@@ -26,6 +27,7 @@ module Spaceship
         "bundleId" => "bundle_id",
         "sku" => "sku",
         "primaryLocale" => "primary_locale",
+        "isOptedInToDistributeIosAppOnMacAppStore" => "is_opted_in_to_distribute_ios_app_on_mac_app_store",
         "removed" => "removed",
         "isAAG" => "is_aag",
         "availableInNewTerritories" => "available_in_new_territories",
@@ -186,14 +188,14 @@ module Spaceship
 
         # Get the latest version
         return get_app_store_versions(filter: filter, includes: includes)
-               .sort_by { |v| Gem::Version.new(v.version_string) }
+               .sort_by { |v| Date.parse(v.created_date) }
                .last
       end
 
       def get_live_app_store_version(platform: nil, includes: nil)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
-          appStoreState: [Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE].join(","),
+          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE,
           platform: platform
         }
         return get_app_store_versions(filter: filter, includes: includes).first
@@ -219,6 +221,24 @@ module Spaceship
                .last
       end
 
+      def get_in_review_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
+          platform: platform
+        }
+        return get_app_store_versions(filter: filter, includes: includes).first
+      end
+
+      def get_pending_release_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
+          platform: platform
+        }
+        return get_app_store_versions(filter: filter, includes: includes).first
+      end
+
       def get_app_store_versions(filter: {}, includes: nil, limit: nil, sort: nil)
         resps = Spaceship::ConnectAPI.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)

data/spaceship/lib/spaceship/connect_api/models/bundle_id.rb

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative './bundle_id_capability'
 module Spaceship
   class ConnectAPI
     class BundleId
@@ -20,15 +21,20 @@ module Spaceship
         "bundleIdCapabilities" => 'bundle_id_capabilities'
       })
 
-      module Platform
-        IOS = "IOS"
-        MAC_OS = "MAC_OS"
-      end
-
       def self.type
         return "bundleIds"
       end
 
+      #
+      # Helpers
+      #
+
+      def supports_catalyst?
+        return bundle_id_capabilities.any? do |capability|
+          capability.is_type?(Spaceship::ConnectAPI::BundleIdCapability::Type::MARZIPAN)
+        end
+      end
+
       #
       # API
       #
@@ -38,6 +44,12 @@ module Spaceship
         return resps.flat_map(&:to_models)
       end
 
+      def self.find(identifier, includes: nil)
+        return all(filter: { identifier: identifier }, includes: includes).find do |app|
+          app.identifier == identifier
+        end
+      end
+
       def self.get(bundle_id_id: nil, includes: nil)
         return Spaceship::ConnectAPI.get_bundle_id(bundle_id_id: bundle_id_id, includes: includes).first
       end

data/spaceship/lib/spaceship/connect_api/models/bundle_id_capability.rb

@@ -4,23 +4,57 @@ module Spaceship
     class BundleIdCapability
       include Spaceship::ConnectAPI::Model
 
-      attr_accessor :capabilityType
-      attr_accessor :bundleIdCapabilitiesSettingOption
+      attr_accessor :capability_type
+      attr_accessor :settings
 
       attr_mapping({
-        "capabilityType" => "capabilityType",
-        "settings" => "email"
+        "capabilityType" => "capability_type",
+        "settings" => "settings"
       })
 
-      module Platform
-        IOS = "IOS"
-        MAC_OS = "MAC_OS"
+      module Type
+        ICLOUD = "ICLOUD"
+        IN_APP_PURCHASE = "IN_APP_PURCHASE"
+        GAME_CENTER = "GAME_CENTER"
+        PUSH_NOTIFICATIONS = "PUSH_NOTIFICATIONS"
+        WALLET = "WALLET"
+        INTER_APP_AUDIO = "INTER_APP_AUDIO"
+        MAPS = "MAPS"
+        ASSOCIATED_DOMAINS = "ASSOCIATED_DOMAINS"
+        PERSONAL_VPN = "PERSONAL_VPN"
+        APP_GROUPS = "APP_GROUPS"
+        HEALTHKIT = "HEALTHKIT"
+        HOMEKIT = "HOMEKIT"
+        WIRELESS_ACCESSORY_CONFIGURATION = "WIRELESS_ACCESSORY_CONFIGURATION"
+        APPLE_PAY = "APPLE_PAY"
+        DATA_PROTECTION = "DATA_PROTECTION"
+        SIRIKIT = "SIRIKIT"
+        NETWORK_EXTENSIONS = "NETWORK_EXTENSIONS"
+        MULTIPATH = "MULTIPATH"
+        HOT_SPOT = "HOT_SPOT"
+        NFC_TAG_READING = "NFC_TAG_READING"
+        CLASSKIT = "CLASSKIT"
+        AUTOFILL_CREDENTIAL_PROVIDER = "AUTOFILL_CREDENTIAL_PROVIDER"
+        ACCESS_WIFI_INFORMATION = "ACCESS_WIFI_INFORMATION"
+
+        # Undocumented as of 2020-06-09
+        MARZIPAN = "MARZIPAN" # Catalyst
       end
 
       def self.type
         return "bundleIdCapabilities"
       end
 
+      #
+      # Helpers
+      #
+
+      def is_type?(type)
+        # JWT session returns type under "capability_type" attribute
+        # Web session returns type under "id" attribute but with "P7GJR49W72_" prefixed
+        return capability_type == type || id.end_with?(type)
+      end
+
       #
       # API
       #

data/spaceship/lib/spaceship/connect_api/models/profile.rb

@@ -13,6 +13,9 @@ module Spaceship
       attr_accessor :profile_type
       attr_accessor :expiration_date
 
+      attr_accessor :bundle_id
+      attr_accessor :certificates
+
       attr_mapping({
         "name" => "name",
         "platform" => "platform",
@@ -21,7 +24,10 @@ module Spaceship
         "createdDate" => "created_date",
         "profileState" => "profile_state",
         "profileType" => "profile_type",
-        "expirationDate" => "expiration_date"
+        "expirationDate" => "expiration_date",
+
+        "bundleId" => "bundle_id",
+        "certificates" => "certificates"
       })
 
       module ProfileState
@@ -41,12 +47,19 @@ module Spaceship
         TVOS_APP_STORE = "TVOS_APP_STORE"
         TVOS_APP_ADHOC = "TVOS_APP_ADHOC"
         TVOS_APP_INHOUSE = "TVOS_APP_INHOUSE"
+        MAC_CATALYST_APP_DEVELOPMENT = "MAC_CATALYST_APP_DEVELOPMENT"
+        MAC_CATALYST_APP_STORE = "MAC_CATALYST_APP_STORE"
+        MAC_CATALYST_APP_DIRECT = "MAC_CATALYST_APP_DIRECT"
       end
 
       def self.type
         return "profiles"
       end
 
+      def valid?
+        return profile_state == ProfileState::ACTIVE
+      end
+
       #
       # API
       #
@@ -55,6 +68,24 @@ module Spaceship
         resps = Spaceship::ConnectAPI.get_profiles(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
+
+      def self.create(name: nil, profile_type: nil, bundle_id_id: nil, certificate_ids: nil, device_ids: nil, template_name: nil)
+        resp = Spaceship::ConnectAPI.post_profiles(
+          bundle_id_id: bundle_id_id,
+          certificates: certificate_ids,
+          devices: device_ids,
+          attributes: {
+            name: name,
+            profileType: profile_type,
+            templateName: template_name
+          }
+        )
+        return resp.to_models.first
+      end
+
+      def delete!
+        return Spaceship::ConnectAPI.delete_profile(profile_id: id)
+      end
     end
   end
 end

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

@@ -33,14 +33,30 @@ module Spaceship
         #
 
         def get(url_or_path, params = nil)
-          # The App Store Connect API is only available in a web session through a
-          # a proxy server where GET requests are actually sent as a POST
-          return get_as_post(url_or_path, params) if web_session?
+          # The Provisioning App Store Connect API needs to be proxied through a
+          # POST request if using web session
+          return proxy_get(url_or_path, params) if web_session?
 
           super(url_or_path, params)
         end
 
-        def get_as_post(url_or_path, params = nil)
+        def post(url_or_path, body)
+          # The Provisioning App Store Connect API needs teamId added to the body of
+          # each post if using web session
+          return proxy_post(url_or_path, body) if web_session?
+
+          super(url_or_path, body)
+        end
+
+        def delete(url_or_path, params = nil)
+          # The Provisioning App Store Connect API needs to be proxied through a
+          # POST request if using web session
+          return proxy_delete(url_or_path, params) if web_session?
+
+          super(url_or_path, params)
+        end
+
+        def proxy_get(url_or_path, params = nil)
           encoded_params = Faraday::NestedParamsEncoder.encode(params)
           body = { "urlEncodedQueryParams" => encoded_params, "teamId" => team_id }
 
@@ -53,6 +69,32 @@ module Spaceship
           end
           handle_response(response)
         end
+
+        def proxy_post(url_or_path, body)
+          body[:data][:attributes][:teamId] = team_id
+
+          response = request(:post) do |req|
+            req.url(url_or_path)
+            req.body = body.to_json
+            req.headers['Content-Type'] = 'application/vnd.api+json'
+            req.headers['X-Requested-With'] = 'XMLHttpRequest'
+          end
+          handle_response(response)
+        end
+
+        def proxy_delete(url_or_path, params = nil)
+          encoded_params = Faraday::NestedParamsEncoder.encode(params)
+          body = { "urlEncodedQueryParams" => encoded_params, "teamId" => team_id }
+
+          response = request(:post) do |req|
+            req.url(url_or_path)
+            req.body = body.to_json
+            req.headers['Content-Type'] = 'application/vnd.api+json'
+            req.headers['X-HTTP-Method-Override'] = 'DELETE'
+            req.headers['X-Requested-With'] = 'XMLHttpRequest'
+          end
+          handle_response(response)
+        end
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/provisioning/provisioning.rb

@@ -43,6 +43,47 @@ module Spaceship
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
         Client.instance.get("profiles", params)
       end
+
+      def post_profiles(bundle_id_id: nil, certificates: nil, devices: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            type: "profiles",
+            relationships: {
+              bundleId: {
+                data: {
+                  type: "bundleIds",
+                  id: bundle_id_id
+                }
+              },
+              certificates: {
+                data: certificates.map do |certificate|
+                  {
+                    type: "certificates",
+                    id: certificate
+                  }
+                end
+              },
+              devices: {
+                data: (devices || []).map do |device|
+                  {
+                    type: "devices",
+                    id: device
+                  }
+                end
+              }
+            }
+          }
+        }
+
+        Client.instance.post("profiles", body)
+      end
+
+      def delete_profile(profile_id: nil)
+        raise "Profile id is nil" if profile_id.nil?
+
+        Client.instance.delete("profiles/#{profile_id}")
+      end
     end
   end
 end