scan 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fa3eb576fcee514a38f281dfe851fa5263fa764
-  data.tar.gz: 64e1862711e7b2add328d938706b0d92655554d9
+  metadata.gz: fd24b832b988c2eb8af64873b97f1aafcfe192f7
+  data.tar.gz: b2f274327a88c3ed46323c4f4eb093d2d99a6ce7
 SHA512:
-  metadata.gz: 625c97a63e9920277284005a3c74fe72749aead9e3100eb9c186f8c63a08852108d7071395dcb23279b00a94f698870dc6dfcefe7099154b4d9aee0b88540cdd
-  data.tar.gz: 9158dafa5f916f779d23acc7113c31f82a8c4d59a3e5872593c4536a354ef2b7a2adfc4d3248fec64c7345e80bd7b320960762eb90b75a63c902a9c34211a2b8
+  metadata.gz: 6d4ae3770b16d96aa13dcba825f567201e87b9ee04f48612a2d4312e66898c904d0ba8f041b7618386261ef233774cdb949cffece8dc5e7e03fbf1e5bfd6a950
+  data.tar.gz: e1d38725fb574a9c7052295219e3e0ddb12a269af384b48e3b72521b77b2e618c0de05882746e8b17a7377709f04fdbf71c254ce71f0497ce0605a1bed24695d

data/lib/scan/detect_values.rb

@@ -20,8 +20,8 @@ module Scan
 
       Scan.project.select_scheme
 
-      default_device_ios if Scan.project.ios?
-      default_device_tvos if Scan.project.tvos?
+      detect_simulator_ios if Scan.project.ios?
+      detect_simulator_tvos if Scan.project.tvos?
       detect_destination
 
       default_derived_data
@@ -39,103 +39,123 @@ module Scan
       Scan.config[:derived_data_path] = default_path
     end
 
-    def self.filter_simulators(simulators, deployment_target)
-      # Filter out any simulators that are not the same major and minor version of our deployment target
+    def self.filter_simulators(simulators, operator = :greater_than_or_equal, deployment_target)
       deployment_target_version = Gem::Version.new(deployment_target)
       simulators.select do |s|
-        sim_version = Gem::Version.new(s.ios_version)
-        (sim_version >= deployment_target_version)
-      end
-    end
-
-    def self.default_device_ios
-      devices = Scan.config[:devices] || Array(Scan.config[:device]) # important to use Array(nil) for when the value is nil
-      found_devices = []
-      xcode_target = Scan.project.build_settings(key: "IPHONEOS_DEPLOYMENT_TARGET")
-
-      if devices.any?
-        # Optionally, we only do this if the user specified a custom device or an array of devices
-        devices.each do |device|
-          lookup_device = device.to_s.strip
-          has_version = lookup_device.include?(xcode_target) || lookup_device.include?('(')
-          lookup_device = lookup_device.tr('()', '') # Remove parenthesis
-          # Default to Xcode target version if no device version is specified.
-          lookup_device = lookup_device + " " + xcode_target unless has_version
-
-          found = FastlaneCore::Simulator.all.detect do |d|
-            (d.name + " " + d.ios_version).include? lookup_device
-          end
-
-          if found
-            found_devices.push(found)
-          else
-            UI.error("Ignoring '#{device}', couldn't find matching simulator")
-          end
-        end
-
-        if found_devices.any?
-          Scan.devices = found_devices
-          return
+        sim_version = Gem::Version.new(s.os_version)
+        if operator == :greater_than_or_equal
+          sim_version >= deployment_target_version
+        elsif operator == :equal
+          sim_version == deployment_target_version
         else
-          UI.error("Couldn't find any matching simulators for '#{devices}' - falling back to default simulator")
+          false # this will show an error message in the detect_simulator method
         end
       end
+    end
 
-      sims = FastlaneCore::Simulator.all
-      sims = filter_simulators(sims, xcode_target)
+    def self.regular_expression_for_split_on_whitespace_followed_by_parenthesized_version
+      # %r{
+      #   \s # a whitespace character
+      #   (?= # followed by -- using lookahead
+      #   \( # open parenthesis
+      #   [\d\.]+ # our version -- one or more digits or full stops
+      #   \) # close parenthesis
+      #   $ # end of line
+      #   ) # end of lookahead
+      # }
+      /\s(?=\([\d\.]+\)$)/
+    end
 
-      # An iPhone 5s is reasonable small and useful for tests
-      found = sims.detect { |d| d.name == "iPhone 5s" }
-      found ||= sims.first # anything is better than nothing
+    def self.detect_simulator_ios
+      # An iPhone 5s is a reasonably small and useful default for tests
+      detect_simulator('iOS', 'IPHONEOS_DEPLOYMENT_TARGET', 'iPhone 5s', nil)
+    end
 
-      if found
-        Scan.devices = [found]
-      else
-        UI.user_error!("No simulators found on local machine")
-      end
+    def self.detect_simulator_tvos
+      detect_simulator('tvOS', 'TVOS_DEPLOYMENT_TARGET', 'Apple TV 1080p', 'TV')
     end
 
-    def self.default_device_tvos
+    def self.detect_simulator(requested_os_type, deployment_target_key, default_device_name, simulator_type_descriptor)
+      require 'set'
       devices = Scan.config[:devices] || Array(Scan.config[:device]) # important to use Array(nil) for when the value is nil
-      found_devices = []
 
-      if devices.any?
-        # Optionally, we only do this if the user specified a custom device or an array of devices
-        devices.each do |device|
-          lookup_device = device.to_s.strip.tr('()', '') # Remove parenthesis
+      deployment_target_version = Scan.project.build_settings(key: deployment_target_key)
 
-          found = FastlaneCore::SimulatorTV.all.detect do |d|
-            (d.name + " " + d.os_version).include? lookup_device
+      simulators = filter_simulators(
+        FastlaneCore::DeviceManager.simulators(requested_os_type).tap do |array|
+          if array.empty?
+            UI.user_error!(['No', simulator_type_descriptor, 'simulators found on local machine'].reject(&:nil?).join(' '))
           end
+        end,
+        :greater_than_or_equal,
+        deployment_target_version
+      ).tap do |sims|
+        if sims.empty?
+          UI.error("No simulators found that are greater than or equal to the version of deployment target (#{deployment_target_version})")
+        end
+      end
 
-          if found
-            found_devices.push(found)
-          else
-            UI.error("Ignoring '#{device}', couldn't find matching simulator")
+      # At this point we have all simulators for the given deployment target (or higher)
+
+      # We create 2 lambdas, which we iterate over later on
+      # If the first lambda `matches` found a simulator to use
+      # we'll never call the second one
+
+      matches = lambda do
+        set_of_simulators = devices.inject(
+          Set.new # of simulators
+        ) do |set, device_string|
+          pieces = device_string.split(regular_expression_for_split_on_whitespace_followed_by_parenthesized_version)
+
+          selector = ->(sim) { pieces.count > 0 && sim.name == pieces.first }
+
+          set + (
+            if pieces.count == 0
+              [] # empty array
+            elsif pieces.count == 1
+              simulators
+                .select(&selector)
+                .reverse # more efficient, because `simctl` prints higher versions first
+                .sort_by! { |sim| Gem::Version.new(sim.os_version) }
+                .pop(1)
+            else # pieces.count == 2 -- mathematically, because of the 'end of line' part of our regular expression
+              version = pieces[1].tr('()', '')
+              potential_emptiness_error = lambda do |sims|
+                UI.error("No simulators found that are equal to the version " \
+                "of specifier (#{version}) and greater than or equal to the version " \
+                "of deployment target (#{deployment_target_version})") if sims.empty?
+              end
+              filter_simulators(simulators, :equal, version).tap(&potential_emptiness_error).select(&selector)
+            end
+          ).tap do |array|
+            UI.error("Ignoring '#{device_string}', couldn’t find matching simulator") if array.empty?
           end
         end
 
-        if found_devices.any?
-          Scan.devices = found_devices
-          return
-        else
-          UI.error("Couldn't find any matching simulators for '#{devices}' - falling back to default simulator")
-        end
+        set_of_simulators.to_a
       end
 
-      sims = FastlaneCore::SimulatorTV.all
-      xcode_target = Scan.project.build_settings(key: "TVOS_DEPLOYMENT_TARGET")
-      sims = filter_simulators(sims, xcode_target)
+      default = lambda do
+        UI.error("Couldn't find any matching simulators for '#{devices}' - falling back to default simulator")
 
-      # Apple TV 1080p is useful for tests
-      found = sims.detect { |d| d.name == "Apple TV 1080p" }
-      found ||= sims.first # anything is better than nothing
+        result = Array(
+          simulators
+            .select { |sim| sim.name == default_device_name }
+            .reverse # more efficient, because `simctl` prints higher versions first
+            .sort_by! { |sim| Gem::Version.new(sim.os_version) }
+            .last || simulators.first
+        )
 
-      if found
-        Scan.devices = [found]
-      else
-        UI.user_error!("No TV simulators found on the local machine")
+        UI.error("Found simulator \"#{result.first.name} (#{result.first.os_version})\"") if result.first
+
+        result
       end
+
+      # grab the first unempty evaluated array
+      Scan.devices = [matches, default].lazy.map { |x|
+        arr = x.call
+        arr unless arr.empty?
+      }.reject(&:nil?).first
     end
 
     def self.min_xcode8?

data/lib/scan/version.rb

@@ -1,4 +1,4 @@
 module Scan
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
   DESCRIPTION = "The easiest way to run tests of your iOS and Mac app"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scan
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The easiest way to run tests of your iOS and Mac app