fastlane 2.54.0.beta.20170822010003 → 2.54.0

data/snapshot/lib/snapshot/test_command_generator.rb

@@ -1,133 +1,65 @@
+require 'snapshot/test_command_generator_base'
+
 module Snapshot
   # Responsible for building the fully working xcodebuild command
-  class TestCommandGenerator
+  # Xcode 9 introduced the ability to run tests in parallel on multiple simulators
+  # This TestCommandGenerator constructs the appropriate `xcodebuild` command
+  # to be used for executing simultaneous tests
+  class TestCommandGenerator < TestCommandGeneratorBase
     class << self
-      def generate(device_type: nil, language: nil, locale: nil)
+      def generate(devices: nil, language: nil, locale: nil, log_path: nil)
         parts = prefix
         parts << "xcodebuild"
         parts += options
-        parts += destination(device_type)
+        parts += destination(devices)
         parts += build_settings
         parts += actions
         parts += suffix
-        parts += pipe(device_type, language, locale)
-
-        parts
-      end
-
-      def prefix
-        ["set -o pipefail &&"]
-      end
-
-      # Path to the project or workspace as parameter
-      # This will also include the scheme (if given)
-      # @return [Array] The array with all the components to join
-      def project_path_array
-        proj = Snapshot.project.xcodebuild_parameters
-        return proj if proj.count > 0
-        UI.user_error!("No project/workspace found")
-      end
-
-      def options
-        config = Snapshot.config
-
-        options = []
-        options += project_path_array
-        options << "-sdk '#{config[:sdk]}'" if config[:sdk]
-        options << "-derivedDataPath '#{derived_data_path}'"
-        options << config[:xcargs] if config[:xcargs]
-        options
-      end
-
-      def build_settings
-        config = Snapshot.config
-
-        build_settings = []
-        build_settings << "FASTLANE_SNAPSHOT=YES"
-        build_settings << "TEST_TARGET_NAME=#{config[:test_target_name].shellescape}" if config[:test_target_name]
-
-        build_settings
-      end
-
-      def actions
-        actions = []
-        actions << :clean if Snapshot.config[:clean]
-        actions << :build # https://github.com/fastlane/snapshot/issues/246
-        actions << :test
+        parts += pipe(language: language, locale: locale, log_path: log_path)
 
-        actions
+        return parts
       end
 
-      def suffix
-        []
+      def pipe(language: nil, locale: nil, log_path: nil)
+        tee_command = ['tee']
+        tee_command << '-a' if log_path && File.exist?(log_path)
+        tee_command << log_path.shellescape if log_path
+        return ["| #{tee_command.join(' ')} | xcpretty #{Snapshot.config[:xcpretty_args]}"]
       end
 
-      def pipe(device_type, language, locale)
-        log_path = xcodebuild_log_path(device_type: device_type, language: language, locale: locale)
-        ["| tee #{log_path.shellescape} | xcpretty #{Snapshot.config[:xcpretty_args]}"]
-      end
-
-      def find_device(device_name, os_version = Snapshot.config[:ios_version])
-        # We might get this error message
-        # > The requested device could not be found because multiple devices matched the request.
-        #
-        # This happens when you have multiple simulators for a given device type / iOS combination
-        #   { platform:iOS Simulator, id:1685B071-AFB2-4DC1-BE29-8370BA4A6EBD, OS:9.0, name:iPhone 5 }
-        #   { platform:iOS Simulator, id:A141F23B-96B3-491A-8949-813B376C28A7, OS:9.0, name:iPhone 5 }
-        #
-        simulators = FastlaneCore::DeviceManager.simulators
-        # Sort devices with matching names by OS version, largest first, so that we can
-        # pick the device with the newest OS in case an exact OS match is not available
-        name_matches = simulators.find_all { |sim| sim.name.strip == device_name.strip }
-                                 .sort_by { |sim| Gem::Version.new(sim.os_version) }
-                                 .reverse
-        name_matches.find { |sim| sim.os_version == os_version } || name_matches.first
-      end
-
-      def device_udid(device_name, os_version = Snapshot.config[:ios_version])
-        device = find_device(device_name, os_version)
-
-        device ? device.udid : nil
-      end
-
-      def destination(device_name)
+      def destination(devices)
+        unless verify_devices_share_os(devices)
+          UI.user_error!('All devices provided to snapshot should run the same operating system')
+        end
         # on Mac we will always run on host machine, so should specify only platform
-        return ["-destination 'platform=macOS'"] if device_name =~ /^Mac/
+        return ["-destination 'platform=macOS'"] if devices.first.to_s =~ /^Mac/
+
+        os = devices.first.to_s =~ /^Apple TV/ ? "tvOS" : "iOS"
 
-        os = device_name =~ /^Apple TV/ ? "tvOS" : "iOS"
         os_version = Snapshot.config[:ios_version] || Snapshot::LatestOsVersion.version(os)
 
-        device = find_device(device_name, os_version)
-        if device.nil?
-          UI.user_error!("No device found named '#{device_name}' for version '#{os_version}'")
-          return
-        elsif device.os_version != os_version
-          UI.important("Using device named '#{device_name}' with version '#{device.os_version}' because no match was found for version '#{os_version}'")
+        destinations = devices.map do |d|
+          device = find_device(d, os_version)
+          UI.user_error!("No device found named '#{d}' for version '#{os_version}'") if device.nil?
+          "-destination 'platform=#{os} Simulator,name=#{device.name},OS=#{os_version}'"
         end
-        value = "platform=#{os} Simulator,id=#{device.udid},OS=#{os_version}"
 
-        return ["-destination '#{value}'"]
+        return [destinations.join(' ')]
       end
 
-      def xcodebuild_log_path(device_type: nil, language: nil, locale: nil)
-        name_components = [Snapshot.project.app_name, Snapshot.config[:scheme]]
-
-        if Snapshot.config[:namespace_log_files]
-          name_components << device_type if device_type
-          name_components << language if language
-          name_components << locale if locale
+      def verify_devices_share_os(devices)
+        # Check each device to see if it is an iOS device
+        all_ios = devices.map do |device|
+          device = device.downcase
+          device.start_with?('iphone', 'ipad')
         end
-
-        file_name = "#{name_components.join('-')}.log"
-
-        containing = File.expand_path(Snapshot.config[:buildlog_path])
-        FileUtils.mkdir_p(containing)
-
-        return File.join(containing, file_name)
-      end
-
-      def derived_data_path
-        Snapshot.cache[:derived_data_path] ||= (Snapshot.config[:derived_data_path] || Dir.mktmpdir("snapshot_derived"))
+        # Return true if all devices are iOS devices
+        return true unless all_ios.include?(false)
+        # There should only be more than 1 device type if
+        # it is iOS, therefore, if there is more than 1
+        # device in the array, and they are not all iOS
+        # as checked above, that would imply that this is a mixed bag
+        return devices.count == 1
       end
     end
   end

data/snapshot/lib/snapshot/test_command_generator_base.rb

@@ -0,0 +1,94 @@
+module Snapshot
+  class TestCommandGeneratorBase
+    class << self
+      def prefix
+        ["set -o pipefail &&"]
+      end
+
+      # Path to the project or workspace as parameter
+      # This will also include the scheme (if given)
+      # @return [Array] The array with all the components to join
+      def project_path_array
+        proj = Snapshot.project.xcodebuild_parameters
+        return proj if proj.count > 0
+        UI.user_error!("No project/workspace found")
+      end
+
+      def options
+        config = Snapshot.config
+        options = []
+        options += project_path_array
+        options << "-sdk '#{config[:sdk]}'" if config[:sdk]
+        options << "-derivedDataPath '#{derived_data_path}'"
+        options << config[:xcargs] if config[:xcargs]
+        return options
+      end
+
+      def build_settings
+        config = Snapshot.config
+
+        build_settings = []
+        build_settings << "FASTLANE_SNAPSHOT=YES"
+        build_settings << "TEST_TARGET_NAME=#{config[:test_target_name].shellescape}" if config[:test_target_name]
+
+        return build_settings
+      end
+
+      def actions
+        actions = []
+        actions << :clean if Snapshot.config[:clean]
+        actions << :build # https://github.com/fastlane/snapshot/issues/246
+        actions << :test
+
+        return actions
+      end
+
+      def suffix
+        return []
+      end
+
+      def find_device(device_name, os_version = Snapshot.config[:ios_version])
+        # We might get this error message
+        # > The requested device could not be found because multiple devices matched the request.
+        #
+        # This happens when you have multiple simulators for a given device type / iOS combination
+        #   { platform:iOS Simulator, id:1685B071-AFB2-4DC1-BE29-8370BA4A6EBD, OS:9.0, name:iPhone 5 }
+        #   { platform:iOS Simulator, id:A141F23B-96B3-491A-8949-813B376C28A7, OS:9.0, name:iPhone 5 }
+        #
+        simulators = FastlaneCore::DeviceManager.simulators
+        # Sort devices with matching names by OS version, largest first, so that we can
+        # pick the device with the newest OS in case an exact OS match is not available
+        name_matches = simulators.find_all { |sim| sim.name.strip == device_name.strip }
+                                 .sort_by { |sim| Gem::Version.new(sim.os_version) }
+                                 .reverse
+        return name_matches.find { |sim| sim.os_version == os_version } || name_matches.first
+      end
+
+      def device_udid(device_name, os_version = Snapshot.config[:ios_version])
+        device = find_device(device_name, os_version)
+
+        return device ? device.udid : nil
+      end
+
+      def derived_data_path
+        Snapshot.cache[:derived_data_path] ||= (Snapshot.config[:derived_data_path] || Dir.mktmpdir("snapshot_derived"))
+      end
+
+      def initialize
+        not_implemented(__method__)
+      end
+
+      def pipe(device_type, language, locale)
+        not_implemented(__method__)
+      end
+
+      def destination(device_name)
+        not_implemented(__method__)
+      end
+
+      def xcodebuild_log_path(device_type: nil, language: nil, locale: nil)
+        not_implemented(__method__)
+      end
+    end
+  end
+end

data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb

@@ -0,0 +1,65 @@
+require 'snapshot/test_command_generator_base'
+
+module Snapshot
+  # Responsible for building the fully working xcodebuild command
+  # This TestCommandGenerator supports Xcode 8's `xcodebuild` requirements
+  # It is its own object, as the logic differs for how we want to handle
+  # creating `xcodebuild` commands for Xcode 9 (see test_command_generator.rb)
+  class TestCommandGeneratorXcode8 < TestCommandGeneratorBase
+    class << self
+      def generate(device_type: nil, language: nil, locale: nil)
+        parts = prefix
+        parts << "xcodebuild"
+        parts += options
+        parts += destination(device_type)
+        parts += build_settings
+        parts += actions
+        parts += suffix
+        parts += pipe(device_type, language, locale)
+
+        return parts
+      end
+
+      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]}"]
+      end
+
+      def destination(device_name)
+        # on Mac we will always run on host machine, so should specify only platform
+        return ["-destination 'platform=macOS'"] if device_name =~ /^Mac/
+
+        # if device_name is nil, use the config and get all devices
+        os = device_name =~ /^Apple TV/ ? "tvOS" : "iOS"
+        os_version = Snapshot.config[:ios_version] || Snapshot::LatestOsVersion.version(os)
+
+        device = find_device(device_name, os_version)
+        if device.nil?
+          UI.user_error!("No device found named '#{device_name}' for version '#{os_version}'")
+        elsif device.os_version != os_version
+          UI.important("Using device named '#{device_name}' with version '#{device.os_version}' because no match was found for version '#{os_version}'")
+        end
+        value = "platform=#{os} Simulator,id=#{device.udid},OS=#{os_version}"
+
+        return ["-destination '#{value}'"]
+      end
+
+      def xcodebuild_log_path(device_type: nil, language: nil, locale: nil)
+        name_components = [Snapshot.project.app_name, Snapshot.config[:scheme]]
+
+        if Snapshot.config[:namespace_log_files]
+          name_components << device_type if device_type
+          name_components << language if language
+          name_components << locale if locale
+        end
+
+        file_name = "#{name_components.join('-')}.log"
+
+        containing = File.expand_path(Snapshot.config[:buildlog_path])
+        FileUtils.mkdir_p(containing)
+
+        return File.join(containing, file_name)
+      end
+    end
+  end
+end

data/snapshot/lib/snapshot/update.rb

@@ -3,11 +3,12 @@ module Snapshot
   class Update
     # @return [Array] A list of helper files (usually just one)
     def self.find_helper
-      Dir["./**/SnapshotHelper.swift"]
+      Dir["./**/SnapshotHelper.swift"] + Dir["./**/SnapshotHelperXcode8.swift"]
     end
 
     def update
       paths = self.class.find_helper
+      UI.user_error!("Couldn't find any SnapshotHelper files in current directory") if paths.count == 0
 
       UI.message "Found the following SnapshotHelper:"
       paths.each { |p| UI.message "\t#{p}" }
@@ -20,7 +21,8 @@ module Snapshot
 
       paths.each do |path|
         UI.message "Updating '#{path}'..."
-        File.write(path, File.read("#{Snapshot::ROOT}/lib/assets/SnapshotHelper.swift"))
+        input_path = Snapshot::Runner.path_to_helper_file_from_gem
+        File.write(path, File.read(input_path))
       end
 
       UI.success "Successfully updated helper files"

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

@@ -316,9 +316,12 @@ module Spaceship
         #   profiles matching the bundle identifier
         #   Returns [] if no profiles were found
         #   This may also contain invalid or expired profiles
-        def find_by_bundle_id(bundle_id, mac: false)
+        def find_by_bundle_id(bundle_id: nil, mac: false, sub_platform: nil)
+          raise "Missing required parameter 'bundle_id'" if bundle_id.to_s.empty?
+          raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? and sub_platform != 'tvOS'
+          find_tvos_profiles = sub_platform == 'tvOS'
           all(mac: mac).find_all do |profile|
-            profile.app.bundle_id == bundle_id
+            profile.app.bundle_id == bundle_id && profile.tvos? == find_tvos_profiles
           end
         end
       end

data/spaceship/lib/spaceship/test_flight/client.rb

@@ -112,6 +112,14 @@ module Spaceship::TestFlight
       handle_response(response)
     end
 
+    def search_for_tester_in_app(app_id: nil, text: nil)
+      assert_required_params(__method__, binding)
+      text = CGI.escape(text)
+      url = "providers/#{team_id}/apps/#{app_id}/testers?order=asc&search=#{text}&sort=status"
+      response = request(:get, url)
+      handle_response(response)
+    end
+
     def resend_invite_to_external_tester(app_id: nil, tester_id: nil)
       assert_required_params(__method__, binding)
       url = "/testflight/v1/invites/#{app_id}/resend?testerId=#{tester_id}"

data/spaceship/lib/spaceship/test_flight/tester.rb

@@ -20,11 +20,27 @@ module Spaceship::TestFlight
       client.testers_for_app(app_id: app_id).map { |data| self.new(data) }
     end
 
-    # @return (Spaceship::TestFlight::Tester) Returns the tester matching the parameter
-    #   as either the Tester id or email
-    # @param email (String) (required): Value used to filter the tester, case insensitive
+    # *DEPRECATED: Use `Spaceship::TestFlight::Tester.search` method instead*
     def self.find(app_id: nil, email: nil)
-      self.all(app_id: app_id).find { |tester| tester.email == email }
+      testers = self.search(app_id: app_id, text: email, is_email_exact_match: true)
+      return testers.first
+    end
+
+    # @return (Spaceship::TestFlight::Tester) Returns the testers matching the parameter.
+    # ITC searchs all fields, and is full text. The search results are the union of all words in the search text
+    # @param text (String) (required): Value used to filter the tester, case insensitive
+    def self.search(app_id: nil, text: nil, is_email_exact_match: false)
+      text = text.strip
+      testers_matching_text = client.search_for_tester_in_app(app_id: app_id, text: text).map { |data| self.new(data) }
+      testers_matching_text ||= []
+      if is_email_exact_match
+        text = text.downcase
+        testers_matching_text = testers_matching_text.select do |tester|
+          tester.email.downcase == text
+        end
+      end
+
+      return testers_matching_text
     end
 
     def self.create_app_level_tester(app_id: nil, first_name: nil, last_name: nil, email: nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.54.0.beta.20170822010003
+  version: 2.54.0
 platform: ruby
 authors:
 - Felix Krause
@@ -1125,6 +1125,7 @@ files:
 - fastlane_core/lib/fastlane_core/provisioning_profile.rb
 - fastlane_core/lib/fastlane_core/string_filters.rb
 - fastlane_core/lib/fastlane_core/swag.rb
+- fastlane_core/lib/fastlane_core/test_parser.rb
 - fastlane_core/lib/fastlane_core/tool_collector.rb
 - fastlane_core/lib/fastlane_core/ui/disable_colors.rb
 - fastlane_core/lib/fastlane_core/ui/errors/fastlane_common_error.rb
@@ -1277,6 +1278,7 @@ files:
 - snapshot/README.md
 - snapshot/lib/assets/SnapfileTemplate
 - snapshot/lib/assets/SnapshotHelper.swift
+- snapshot/lib/assets/SnapshotHelperXcode8.swift
 - snapshot/lib/snapshot.rb
 - snapshot/lib/snapshot/collector.rb
 - snapshot/lib/snapshot/commands_generator.rb
@@ -1295,7 +1297,13 @@ files:
 - snapshot/lib/snapshot/screenshot_flatten.rb
 - snapshot/lib/snapshot/screenshot_rotate.rb
 - snapshot/lib/snapshot/setup.rb
+- snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb
+- snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb
+- snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb
+- snapshot/lib/snapshot/simulator_launchers/simulator_launcher_xcode_8.rb
 - snapshot/lib/snapshot/test_command_generator.rb
+- snapshot/lib/snapshot/test_command_generator_base.rb
+- snapshot/lib/snapshot/test_command_generator_xcode_8.rb
 - snapshot/lib/snapshot/update.rb
 - spaceship/README.md
 - spaceship/lib/assets/languageMapping.json
@@ -1407,24 +1415,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- spaceship/lib
-- scan/lib
-- sigh/lib
-- snapshot/lib
-- screengrab/lib
-- fastlane/lib
 - cert/lib
-- pem/lib
-- gym/lib
-- produce/lib
+- credentials_manager/lib
 - deliver/lib
-- supply/lib
-- match/lib
+- fastlane/lib
+- fastlane_core/lib
 - frameit/lib
-- credentials_manager/lib
+- gym/lib
+- match/lib
+- pem/lib
 - pilot/lib
 - precheck/lib
-- fastlane_core/lib
+- produce/lib
+- scan/lib
+- screengrab/lib
+- sigh/lib
+- snapshot/lib
+- spaceship/lib
+- supply/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1432,14 +1440,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps
 test_files: []
+has_rdoc: