fastlane 2.126.0.beta.20190623200100 → 2.126.0

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.125.2
+// Generated with fastlane 2.126.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.125.2
+// Generated with fastlane 2.126.0

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.125.2
+// Generated with fastlane 2.126.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.125.2
+// Generated with fastlane 2.126.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -51,6 +51,7 @@ protocol ScanfileProtocol: class {
   var slackOnlyOnFailure: Bool { get }
   var destination: String? { get }
   var customReportFileName: String? { get }
+  var xcodebuildCommand: String { get }
   var failBuild: Bool { get }
 }
 
@@ -107,9 +108,10 @@ extension ScanfileProtocol {
   var slackOnlyOnFailure: Bool { return false }
   var destination: String? { return nil }
   var customReportFileName: String? { return nil }
+  var xcodebuildCommand: String { return "env NSUnbufferedIO=YES xcodebuild" }
   var failBuild: Bool { return true }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.10]
+// FastlaneRunnerAPIVersion [0.9.11]

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.125.2
+// Generated with fastlane 2.126.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.125.2
+// Generated with fastlane 2.126.0

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -47,12 +47,12 @@ module FastlaneCore
         watched_app_version = remove_version_leading_zeros(version: watched_app_version)
         watched_build_version = remove_version_leading_zeros(version: watched_build_version)
 
-        build_deliveries = Spaceship::ConnectAPI::TestFlight::BuildDelivery.all(app_id: app_id, version: watched_app_version, build_number: watched_build_version)
+        build_deliveries = Spaceship::ConnectAPI::BuildDelivery.all(app_id: app_id, version: watched_app_version, build_number: watched_build_version)
         build_delivery = build_deliveries.first
 
         # Get processed builds when no longer in build deliveries
         if build_delivery.nil?
-          matched_builds = Spaceship::ConnectAPI::TestFlight::Build.all(
+          matched_builds = Spaceship::ConnectAPI::Build.all(
             app_id: app_id,
             version: watched_app_version,
             build_number: watched_build_version,

data/pilot/lib/pilot/build_manager.rb

@@ -100,14 +100,14 @@ module Pilot
       end
 
       # Get latest uploaded build if no build specified
-      build ||= Spaceship::ConnectAPI::TestFlight::Build.all(app_id: app.id, sort: "-uploadedDate", limit: 1).first
+      build ||= Spaceship::ConnectAPI::Build.all(app_id: app.id, sort: "-uploadedDate", limit: 1).first
 
       # Verify the build has all the includes that we need
       # and fetch a new build if not
       if build && (!build.app || !build.build_beta_detail || !build.pre_release_version)
         UI.important("Build did include information for app, build beta detail and pre release version")
         UI.important("Fetching a new build with all the information needed")
-        build = Spaceship::ConnectAPI::TestFlight::Build.get(build_id: build.id)
+        build = Spaceship::ConnectAPI::Build.get(build_id: build.id)
       end
 
       # Error out if no build
@@ -328,8 +328,7 @@ module Pilot
         uses_non_exempt_encryption = options[:uses_non_exempt_encryption]
         attributes = { usesNonExemptEncryption: uses_non_exempt_encryption }
 
-        client = Spaceship::ConnectAPI::TestFlight.client
-        client.patch_builds(build_id: uploaded_build.id, attributes: attributes)
+        Spaceship::ConnectAPI.patch_builds(build_id: uploaded_build.id, attributes: attributes)
 
         UI.important("Export compliance has been set to '#{uses_non_exempt_encryption}'. Need to wait for build to finishing processing again...")
         UI.important("Set 'ITSAppUsesNonExemptEncryption' in the 'Info.plist' to skip this step and speed up the submission")
@@ -350,8 +349,7 @@ module Pilot
       attributes[:demoAccountRequired] = info[:demo_account_required] if info.key?(:demo_account_required)
       attributes[:notes] = info[:notes] if info.key?(:notes)
 
-      client = Spaceship::ConnectAPI::TestFlight.client
-      client.patch_beta_app_review_detail(app_id: build.app.id, attributes: attributes)
+      Spaceship::ConnectAPI.patch_beta_app_review_detail(app_id: build.app.id, attributes: attributes)
     end
 
     def update_localized_app_review(build, info_by_lang, default_info: nil)
@@ -392,12 +390,11 @@ module Pilot
       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::TestFlight.client
       if localization
-        client.patch_beta_app_localizations(localization_id: localization.id, attributes: attributes)
+        Spaceship::ConnectAPI.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)
+        Spaceship::ConnectAPI.post_beta_app_localizations(app_id: app.id, attributes: attributes)
       end
     end
 
@@ -435,12 +432,11 @@ module Pilot
       attributes = {}
       attributes[:whatsNew] = self.class.sanitize_changelog(info[:whats_new]) if info.key?(:whats_new)
 
-      client = Spaceship::ConnectAPI::TestFlight.client
       if localization
-        client.patch_beta_build_localizations(localization_id: localization.id, attributes: attributes)
+        Spaceship::ConnectAPI.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)
+        Spaceship::ConnectAPI.post_beta_build_localizations(build_id: build.id, attributes: attributes)
       end
     end
 
@@ -450,8 +446,7 @@ module Pilot
       attributes = {}
       attributes[:autoNotifyEnabled] = info[:auto_notify_enabled] if info.key?(:auto_notify_enabled)
 
-      client = Spaceship::ConnectAPI::TestFlight.client
-      client.patch_build_beta_details(build_beta_details_id: build_beta_detail.id, attributes: attributes)
+      Spaceship::ConnectAPI.patch_build_beta_details(build_beta_details_id: build_beta_detail.id, attributes: attributes)
     end
   end
   # rubocop:enable Metrics/ClassLength

data/pilot/lib/pilot/manager.rb

@@ -29,7 +29,7 @@ module Pilot
     def app
       @app_id ||= fetch_app_id
 
-      @app ||= Spaceship::ConnectAPI::TestFlight::App.get(app_id: @app_id)
+      @app ||= Spaceship::ConnectAPI::App.get(app_id: @app_id)
       unless @app
         UI.user_error!("Could not find app with #{(config[:apple_id] || config[:app_identifier])}")
       end
@@ -48,7 +48,7 @@ module Pilot
       config[:app_identifier] = fetch_app_identifier
 
       if config[:app_identifier]
-        @app ||= Spaceship::ConnectAPI::TestFlight::App.find(config[:app_identifier])
+        @app ||= Spaceship::ConnectAPI::App.find(config[:app_identifier])
         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.id
       end

data/pilot/lib/pilot/tester_exporter.rb

@@ -15,7 +15,7 @@ module Pilot
       if app
         testers = app.get_beta_testers(includes: "apps,betaTesterMetrics,betaGroups")
       else
-        testers = Spaceship::ConnectAPI::TestFlight::BetaTester.all(includes: "apps,betaTesterMetrics,betaGroups")
+        testers = Spaceship::ConnectAPI::BetaTester.all(includes: "apps,betaTesterMetrics,betaGroups")
       end
 
       file = config[:testers_file_path]
@@ -41,13 +41,13 @@ module Pilot
 
     def find_app(apple_id: nil, app_identifier: nil)
       if app_identifier
-        app = Spaceship::ConnectAPI::TestFlight::App.find(app_identifier)
+        app = Spaceship::ConnectAPI::App.find(app_identifier)
         UI.user_error!("Could not find an app by #{app_identifier}") unless app
         return app
       end
 
       if apple_id
-        app = Spaceship::ConnectAPI::TestFlight::App.get(app_id: apple_id)
+        app = Spaceship::ConnectAPI::App.get(app_id: apple_id)
         UI.user_error!("Could not find an app by #{apple_id}") unless app
         return app
       end

data/pilot/lib/pilot/tester_manager.rb

@@ -83,13 +83,13 @@ module Pilot
 
     def find_app(apple_id: nil, app_identifier: nil)
       if app_identifier
-        app = Spaceship::ConnectAPI::TestFlight::App.find(app_identifier)
+        app = Spaceship::ConnectAPI::App.find(app_identifier)
         UI.user_error!("Could not find an app by #{app_identifier}") unless app
         return app
       end
 
       if apple_id
-        app = Spaceship::ConnectAPI::TestFlight::App.get(app_id: apple_id)
+        app = Spaceship::ConnectAPI::App.get(app_id: apple_id)
         UI.user_error!("Could not find an app by #{apple_id}") unless app
         return app
       end

data/scan/lib/scan/options.rb

@@ -375,7 +375,13 @@ module Scan
                                      deprecated: "Use `--output_files` instead",
                                      conflicting_options: [:output_files],
                                      optional: true,
-                                     is_string: true)
+                                     is_string: true),
+        FastlaneCore::ConfigItem.new(key: :xcodebuild_command,
+                                    env_name: "GYM_XCODE_BUILD_COMMAND",
+                                    description: "Allows for override of the default `xcodebuild` command",
+                                    type: String,
+                                    optional: true,
+                                    default_value: "env NSUnbufferedIO=YES xcodebuild")
 
       ]
     end

data/scan/lib/scan/test_command_generator.rb

@@ -5,7 +5,7 @@ module Scan
   class TestCommandGenerator
     def generate
       parts = prefix
-      parts << "env NSUnbufferedIO=YES xcodebuild"
+      parts << Scan.config[:xcodebuild_command]
       parts += options
       parts += actions
       parts += suffix

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -175,12 +175,18 @@ open class Snapshot: NSObject {
 
             let window = app.windows.firstMatch
             let screenshot = window.screenshot()
-            guard let simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
-            let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
+            guard var simulator = ProcessInfo().environment["SIMULATOR_DEVICE_NAME"], let screenshotsDir = screenshotsDirectory else { return }
+            
             do {
+                // The simulator name contains "Clone X of " inside the screenshot file when running parallelized UI Tests on concurrent devices
+                let regex = try NSRegularExpression(pattern: "Clone [0-1]+ of ")
+                let range = NSMakeRange(0, simulator.count)
+                simulator = regex.stringByReplacingMatches(in: simulator, range: range, withTemplate: "")
+
+                let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
                 try screenshot.pngRepresentation.write(to: path)
             } catch let error {
-                NSLog("Problem writing screenshot: \(name) to \(path)")
+                NSLog("Problem writing screenshot: \(name) to \(screenshotsDir)/\(simulator)-\(name).png")
                 NSLog(error.localizedDescription)
             }
         #endif
@@ -295,4 +301,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.16]
+// SnapshotHelperVersion [1.17]

data/spaceship/lib/spaceship/connect_api.rb

@@ -2,4 +2,46 @@ require 'spaceship/connect_api/model'
 require 'spaceship/connect_api/response'
 require 'spaceship/connect_api/token'
 
+require 'spaceship/connect_api/provisioning/provisioning'
 require 'spaceship/connect_api/testflight/testflight'
+require 'spaceship/connect_api/users/users'
+
+require 'spaceship/connect_api/models/bundle_id_capability'
+require 'spaceship/connect_api/models/bundle_id'
+require 'spaceship/connect_api/models/certificate'
+require 'spaceship/connect_api/models/device'
+require 'spaceship/connect_api/models/profile'
+
+require 'spaceship/connect_api/models/user'
+
+require 'spaceship/connect_api/models/app'
+require 'spaceship/connect_api/models/beta_app_localization'
+require 'spaceship/connect_api/models/beta_build_localization'
+require 'spaceship/connect_api/models/beta_build_metric'
+require 'spaceship/connect_api/models/beta_app_review_detail'
+require 'spaceship/connect_api/models/beta_app_review_submission'
+require 'spaceship/connect_api/models/beta_group'
+require 'spaceship/connect_api/models/beta_tester'
+require 'spaceship/connect_api/models/beta_tester_metric'
+require 'spaceship/connect_api/models/build'
+require 'spaceship/connect_api/models/build_delivery'
+require 'spaceship/connect_api/models/build_beta_detail'
+require 'spaceship/connect_api/models/pre_release_version'
+
+module Spaceship
+  class ConnectAPI
+    extend Spaceship::ConnectAPI::Provisioning
+    extend Spaceship::ConnectAPI::TestFlight
+    extend Spaceship::ConnectAPI::Users
+
+    @token = nil
+
+    class << self
+      attr_writer(:token)
+    end
+
+    class << self
+      attr_reader :token
+    end
+  end
+end

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

@@ -0,0 +1,178 @@
+require_relative '../client'
+require_relative './response'
+
+module Spaceship
+  class ConnectAPI
+    class Client < Spaceship::Client
+      attr_accessor :token
+
+      #####################################################
+      # @!group Client Init
+      #####################################################
+
+      # 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)
+        else
+          options = {
+            request: {
+              timeout:       (ENV["SPACESHIP_TIMEOUT"] || 300).to_i,
+              open_timeout:  (ENV["SPACESHIP_TIMEOUT"] || 300).to_i
+            }
+          }
+          @token = token
+          @current_team_id = current_team_id
+
+          hostname = "https://api.appstoreconnect.apple.com/v1/"
+
+          @client = Faraday.new(hostname, options) do |c|
+            c.response(:json, content_type: /\bjson$/)
+            c.response(:xml, content_type: /\bxml$/)
+            c.response(:plist, content_type: /\bplist$/)
+            c.use(FaradayMiddleware::RelsMiddleware)
+            c.adapter(Faraday.default_adapter)
+            c.headers["Authorization"] = "Bearer #{token.text}"
+
+            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
+
+      def self.hostname
+        return nil
+      end
+
+      #
+      # Helpers
+      #
+
+      def web_session?
+        return @token.nil?
+      end
+
+      def build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
+        params = {}
+
+        filter = filter.delete_if { |k, v| v.nil? } if filter
+
+        params[:filter] = filter if filter && !filter.empty?
+        params[:include] = includes if includes
+        params[:limit] = limit if limit
+        params[:sort] = sort if sort
+        params[:cursor] = cursor if cursor
+
+        return params
+      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'
+        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'
+        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'
+        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
+        end
+        handle_response(response)
+      end
+
+      protected
+
+      def handle_response(response)
+        if (200...300).cover?(response.status) && (response.body.nil? || response.body.empty?)
+          return
+        end
+
+        raise InternalServerError, "Server error got #{response.status}" if (500...600).cover?(response.status)
+
+        unless response.body.kind_of?(Hash)
+          raise UnexpectedResponse, response.body
+        end
+
+        raise UnexpectedResponse, response.body['error'] if response.body['error']
+
+        raise UnexpectedResponse, handle_errors(response) if response.body['errors']
+
+        raise UnexpectedResponse, "Temporary App Store Connect error: #{response.body}" if response.body['statusCode'] == 'ERROR'
+
+        return Spaceship::ConnectAPI::Response.new(body: response.body, status: response.status, client: self)
+      end
+
+      def handle_errors(response)
+        # Example error format
+        # {
+        #   "errors" : [ {
+        #     "id" : "ce8c391e-f858-411b-a14b-5aa26e0915f2",
+        #     "status" : "400",
+        #     "code" : "PARAMETER_ERROR.INVALID",
+        #     "title" : "A parameter has an invalid value",
+        #     "detail" : "'uploadedDate3' is not a valid field name",
+        #     "source" : {
+        #       "parameter" : "sort"
+        #     }
+        #   } ]
+        # }
+
+        return response.body['errors'].map do |error|
+          "#{error['title']} - #{error['detail']}"
+        end.join(" ")
+      end
+
+      private
+
+      def local_variable_get(binding, name)
+        if binding.respond_to?(:local_variable_get)
+          binding.local_variable_get(name)
+        else
+          binding.eval(name.to_s)
+        end
+      end
+
+      def provider_id
+        return team_id if self.provider.nil?
+        self.provider.provider_id
+      end
+    end
+  end
+  # rubocop:enable Metrics/ClassLength
+end