fastlane 2.9.0 → 2.10.0

data/sigh/lib/sigh/runner.rb

@@ -61,7 +61,7 @@ module Sigh
     # Fetches a profile matching the user's search requirements
     def fetch_profiles
       UI.message "Fetching profiles..."
-      results = profile_type.find_by_bundle_id(Sigh.config[:app_identifier])
+      results = profile_type.find_by_bundle_id(Sigh.config[:app_identifier], mac: Sigh.config[:platform].to_s == 'macos')
       results = results.find_all do |current_profile|
         if current_profile.valid? || Sigh.config[:force]
           true
@@ -136,15 +136,35 @@ module Sigh
       profile
     end
 
+    def certificates_for_profile_and_platform
+      case Sigh.config[:platform].to_s
+      when 'ios'
+        if profile_type == Spaceship.provisioning_profile.Development
+          certificates = Spaceship.certificate.development.all
+        elsif profile_type == Spaceship.provisioning_profile.InHouse
+          certificates = Spaceship.certificate.in_house.all
+        else
+          certificates = Spaceship.certificate.production.all # Ad hoc or App Store
+        end
+
+      when 'macos'
+        if profile_type == Spaceship.provisioning_profile.Development
+          certificates = Spaceship.certificate.mac_development.all
+        elsif profile_type == Spaceship.provisioning_profile.AppStore
+          certificates = Spaceship.certificate.mac_app_distribution.all
+        elsif profile_type == Spaceship.provisioning_profile.Direct
+          certificates = Spaceship.certificate.developer_id_application.all
+        else
+          certificates = Spaceship.certificate.mac_app_distribution.all
+        end
+      end
+
+      certificates
+    end
+
     # Certificate to use based on the current distribution mode
     def certificate_to_use
-      if profile_type == Spaceship.provisioning_profile.Development
-        certificates = Spaceship.certificate.development.all
-      elsif profile_type == Spaceship.provisioning_profile.InHouse
-        certificates = Spaceship.certificate.in_house.all
-      else
-        certificates = Spaceship.certificate.production.all # Ad hoc or App Store
-      end
+      certificates = certificates_for_profile_and_platform
 
       # Filter them
       certificates = certificates.find_all do |c|
@@ -211,7 +231,7 @@ module Sigh
 
     # Makes sure the current App ID exists. If not, it will show an appropriate error message
     def ensure_app_exists!
-      return if Spaceship::App.find(Sigh.config[:app_identifier])
+      return if Spaceship::App.find(Sigh.config[:app_identifier], mac: Sigh.config[:platform].to_s == 'macos')
       print_produce_command(Sigh.config)
       UI.user_error!("Could not find App with App Identifier '#{Sigh.config[:app_identifier]}'")
     end

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -129,6 +129,10 @@ open class Snapshot: NSObject {
 
 extension XCUIElement {
     var isLoadingIndicator: Bool {
+        let whiteListedLoaders = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
+        if whiteListedLoaders.contains(self.identifier) {
+            return false
+        }
         return self.frame.size == CGSize(width: 10, height: 20)
     }
 }

data/snapshot/lib/assets/SnapshotHelper2-3.swift

@@ -131,6 +131,10 @@ public class Snapshot: NSObject {
 
 extension XCUIElement {
     var isLoadingIndicator: Bool {
+        let whiteListedLoaders = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"]
+        if whiteListedLoaders.contains(self.identifier) {
+            return false
+        }
         return self.frame.size == CGSize(width: 10, height: 20)
     }
 }

data/snapshot/lib/snapshot/dependency_checker.rb

@@ -43,7 +43,7 @@ module Snapshot
 
     def self.check_simctl
       unless `xcrun simctl`.include? "openurl"
-        UI.user_error!("Could not find `xcrun simctl`. Make sure you have the latest version of Xcode and Mac OS installed.")
+        UI.user_error!("Could not find `xcrun simctl`. Make sure you have the latest version of Xcode and macOS installed.")
       end
     end
   end

data/snapshot/lib/snapshot/options.rb

@@ -63,6 +63,12 @@ module Snapshot
                                      env_name: "SNAPSHOT_OUTPUT_DIRECTORY",
                                      description: "The directory where to store the screenshots",
                                      default_value: output_directory),
+        FastlaneCore::ConfigItem.new(key: :output_simulator_logs,
+                                     env_name: "SNAPSHOT_OUTPUT_SIMULATOR_LOGS",
+                                     description: "If the logs generated by the app (e.g. using NSLog, perror, etc.) in the Simulator should be written to the output_directory",
+                                     type: TrueClass,
+                                     default_value: false,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :ios_version,
                                      description: "By default, the latest version should be used automatically. If you want to change it, do it here",
                                      short_option: "-i",

data/snapshot/lib/snapshot/runner.rb

@@ -62,6 +62,10 @@ module Snapshot
       # Generate HTML report
       ReportsGenerator.new.generate
 
+      if Snapshot.config[:output_simulator_logs]
+        output_simulator_logs
+      end
+
       # Clear the Derived Data
       unless Snapshot.config[:derived_data_path]
         FileUtils.rm_rf(TestCommandGenerator.derived_data_path)
@@ -96,6 +100,17 @@ module Snapshot
       end
     end
 
+    def output_simulator_logs
+      Snapshot.config[:devices].each do |device_name|
+        device = TestCommandGenerator.find_device(device_name)
+        sim_device_logfilepath_source = File.expand_path("~/Library/Logs/CoreSimulator/#{device.udid}/system.log")
+        next unless File.exist?(sim_device_logfilepath_source)
+
+        sim_device_logfilepath_dest = File.join(Snapshot.config[:output_directory], "#{device.name}_#{device.os_type}_#{device.os_version}_system.log")
+        FileUtils.cp(sim_device_logfilepath_source, sim_device_logfilepath_dest)
+      end
+    end
+
     def print_results(results)
       return if results.count == 0
 

data/spaceship/lib/spaceship/client.rb

@@ -368,7 +368,7 @@ module Spaceship
 
     def with_retry(tries = 5, &_block)
       return yield
-    rescue Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, AppleTimeoutError, Errno::EPIPE => ex # New Faraday version: Faraday::TimeoutError => ex
+    rescue Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, AppleTimeoutError => ex # New Faraday version: Faraday::TimeoutError => ex
       tries -= 1
       unless tries.zero?
         logger.warn("Timeout received: '#{ex.message}'. Retrying after 3 seconds (remaining: #{tries})...")

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -283,6 +283,7 @@ module Spaceship
         # @return (Certificate): The newly created certificate
         def create!(csr: nil, bundle_id: nil)
           type = CERTIFICATE_TYPE_IDS.key(self)
+          mac = MAC_CERTIFICATE_TYPE_IDS.include? type
 
           # look up the app_id by the bundle_id
           if bundle_id
@@ -295,7 +296,7 @@ module Spaceship
           csr = OpenSSL::X509::Request.new(csr) if csr.kind_of?(String)
 
           # if this succeeds, we need to save the .cer and the private key in keychain access or wherever they go in linux
-          response = client.create_certificate!(type, csr.to_pem, app_id)
+          response = client.create_certificate!(type, csr.to_pem, app_id, mac)
           # munge the response to make it work for the factory
           response['certificateTypeDisplayId'] = response['certificateType']['certificateTypeDisplayId']
           self.new(response)

data/spaceship/lib/spaceship/portal/device.rb

@@ -100,10 +100,12 @@ module Spaceship
           all.select { |device| device.device_type != "tvOS" }
         end
 
-        # @return (Array) Returns all devices that can be used for iOS profiles (all devices except TVs)
+        # @return (Array) Returns all devices matching the provided profile_type
         def all_for_profile_type(profile_type)
           if profile_type.include? "tvOS"
             Spaceship::Device.all_apple_tvs
+          elsif profile_type.include? "Mac"
+            Spaceship::Device.all_macs
           else
             Spaceship::Device.all_ios_profile_devices
           end

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -315,10 +315,10 @@ module Spaceship
       end
     end
 
-    def create_certificate!(type, csr, app_id = nil)
+    def create_certificate!(type, csr, app_id = nil, mac = false)
       ensure_csrf(Spaceship::Certificate)
 
-      r = request(:post, 'account/ios/certificate/submitCertificateRequest.action', {
+      r = request(:post, "account/#{platform_slug(mac)}/certificate/submitCertificateRequest.action", {
         teamId: team_id,
         type: type,
         csrContent: csr,

data/spaceship/lib/spaceship/portal/provisioning_profile.rb

@@ -249,13 +249,15 @@ module Spaceship
         # @return (Array) Returns all profiles registered for this account
         #  If you're calling this from a subclass (like AdHoc), this will
         #  only return the profiles that are of this type
-        def all(mac: false)
+        # @param mac (Bool) (optional): Pass true to get all Mac provisioning profiles
+        # @param xcode (Bool) (optional): Pass true to include Xcode managed provisioning profiles
+        def all(mac: false, xcode: false)
           profiles = client.provisioning_profiles(mac: mac).map do |profile|
             self.factory(profile)
           end
 
           # filter out the profiles managed by xcode
-          profiles.delete_if(&:managed_by_xcode?)
+          profiles.delete_if(&:managed_by_xcode?) unless xcode
 
           return profiles if self == ProvisioningProfile
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Felix Krause
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier