scan 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc2fe474c347a129830537ffce88fe76b0a2d4c
-  data.tar.gz: 135a4581ccad9231202c43f4338dcb5fbea1eb82
+  metadata.gz: 3e80ce377dfea30070cc638147cb93688e8c3fd3
+  data.tar.gz: 59750c70db3b139fcb532a8840e6f5c342a363d2
 SHA512:
-  metadata.gz: 819d84e29eb6c03e34edec3514f5a5bf8aa2b9e0f38e3a5bff2e6a1d4075b1178aef94f2c11e798cbb50e2f17b79b58a3c94adaad6491c2dd5b6647bde93494b
-  data.tar.gz: bcf9bfe6456c0f8d8ed50d48760ab60aacf12e4e0e02dd88e15e63af85a722952007db9bd561bbbd560445c35b010f16a4778d7789c23d4d1c41c51174a0b1cc
+  metadata.gz: 200af6ecf87403148f386fb1f4ffdc72eef3728c18f3041c49bf24f14d52db24e7effa7b120120f39c17f66c04784bf6e46608d3de6d55841f8022da99057bde
+  data.tar.gz: 8ef71b1679533343d44c1dafacdaa38154dca06121faf67c8f5aff8680410b743acad96735dddad32339c722d5b23c3afa1b990e812d150800146590a72a8722

data/lib/scan.rb

@@ -20,7 +20,7 @@ module Scan
 
     attr_accessor :cache
 
-    attr_accessor :device
+    attr_accessor :devices
 
     def config=(value)
       @config = value

data/lib/scan/detect_values.rb

@@ -37,20 +37,30 @@ module Scan
     end
 
     def self.default_device_ios
-      config = Scan.config
-
-      if config[:device] # make sure it actually exists
-        device = config[:device].to_s.strip.tr('()', '') # Remove parenthesis
-
-        found = FastlaneCore::Simulator.all.find do |d|
-          (d.name + " " + d.ios_version).include? device
+      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
+
+          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
-          Scan.device = found
+        if found_devices.any?
+          Scan.devices = found_devices
           return
         else
-          UI.error("Couldn't find simulator '#{config[:device]}' - falling back to default simulator")
+          UI.error("Couldn't find any matching simulators for '#{devices}' - falling back to default simulator")
         end
       end
 
@@ -62,26 +72,38 @@ module Scan
       found = sims.detect { |d| d.name == "iPhone 5s" }
       found ||= sims.first # anything is better than nothing
 
-      Scan.device = found
-
-      UI.user_error!("No simulators found") unless Scan.device
+      if found
+        Scan.devices = [found]
+      else
+        UI.user_error!("No simulators found on local machine")
+      end
     end
 
     def self.default_device_tvos
-      config = Scan.config
-
-      if config[:device] # make sure it actually exists
-        device = config[:device].to_s.strip.tr('()', '') # Remove parenthesis
-
-        found = FastlaneCore::SimulatorTV.all.find do |d|
-          (d.name + " " + d.tvos_version).include? device
+      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
+
+          found = FastlaneCore::SimulatorTV.all.detect do |d|
+            (d.name + " " + d.tvos_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
-          Scan.device = found
+        if found_devices.any?
+          Scan.devices = found_devices
           return
         else
-          UI.error("Couldn't find simulator '#{config[:device]}' - falling back to default simulator")
+          UI.error("Couldn't find any matching simulators for '#{devices}' - falling back to default simulator")
         end
       end
 
@@ -93,12 +115,14 @@ module Scan
       found = sims.detect { |d| d.name == "Apple TV 1080p" }
       found ||= sims.first # anything is better than nothing
 
-      Scan.device = found
-
-      UI.user_error!("No simulators found") unless Scan.device
+      if found
+        Scan.devices = [found]
+      else
+        UI.user_error!("No TV simulators found on the local machine")
+      end
     end
 
-    # Is it an iOS device or a Mac?
+    # Is it an iOS, a tvOS or a MacOS device?
     def self.detect_destination
       if Scan.config[:destination]
         UI.important("It's not recommended to set the `destination` value directly")
@@ -110,11 +134,11 @@ module Scan
 
       # building up the destination now
       if Scan.project.ios?
-        Scan.config[:destination] = "platform=iOS Simulator,id=#{Scan.device.udid}"
+        Scan.config[:destination] = Scan.devices.map { |d| "platform=iOS Simulator,id=#{d.udid}" }
       elsif Scan.project.tvos?
-        Scan.config[:destination] = "platform=tvOS Simulator,id=#{Scan.device.udid}"
+        Scan.config[:destination] = Scan.devices.map { |d| "platform=tvOS Simulator,id=#{d.udid}" }
       else
-        Scan.config[:destination] = "platform=OS X"
+        Scan.config[:destination] = ["platform=OS X"]
       end
     end
   end

data/lib/scan/options.rb

@@ -34,7 +34,21 @@ module Scan
                                      optional: true,
                                      is_string: true,
                                      env_name: "SCAN_DEVICE",
-                                     description: "The name of the simulator type you want to run tests on"),
+                                     description: "The name of the simulator type you want to run tests on (e.g. 'iPhone 6')",
+                                     conflicting_options: [:devices],
+                                     conflict_block: proc do |value|
+                                       UI.user_error!("You can't use 'device' and 'devices' options in one run")
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :devices,
+                                     optional: true,
+                                     is_string: false,
+                                     env_name: "SCAN_DEVICES",
+                                     type: Array,
+                                     description: "Array of devices to run the tests on (e.g. ['iPhone 6', 'iPad Air'])",
+                                     conflicting_options: [:device],
+                                     conflict_block: proc do |value|
+                                       UI.user_error!("You can't use 'device' and 'devices' options in one run")
+                                     end),
         FastlaneCore::ConfigItem.new(key: :scheme,
                                      short_option: "-s",
                                      optional: true,
@@ -50,6 +64,10 @@ module Scan
                                      description: "Should generate code coverage (Xcode 7 only)?",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :address_sanitizer,
+                                     description: "Should turn on the address sanitizer?",
+                                     is_string: false,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_build,
                                      description: "Should skip debug build before test build?",
                                      short_option: "-r",
@@ -72,7 +90,7 @@ module Scan
         FastlaneCore::ConfigItem.new(key: :output_types,
                                      short_option: "-f",
                                      env_name: "SCAN_OUTPUT_TYPES",
-                                     description: "Comma seperated list of the output types (e.g. html, junit)",
+                                     description: "Comma separated list of the output types (e.g. html, junit)",
                                      default_value: "html,junit"),
         FastlaneCore::ConfigItem.new(key: :buildlog_path,
                                      short_option: "-l",
@@ -115,6 +133,7 @@ module Scan
                                      short_option: "-d",
                                      env_name: "SCAN_DESTINATION",
                                      description: "Use only if you're a pro, use the other options instead",
+                                     is_string: false,
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :xcargs,
                                      short_option: "-x",

data/lib/scan/runner.rb

@@ -10,7 +10,12 @@ module Scan
     end
 
     def test_app
-      open_simulator_for_device(Scan.device)
+      # We call this method, to be sure that all other simulators are killed
+      # And a correct one is freshly launched. Switching between multiple simulator
+      # in case the user specified multiple targets works with no issues
+      # This way it's okay to just call it for the first simulator we're using for
+      # the first test run
+      open_simulator_for_device(Scan.devices.first)
 
       command = TestCommandGenerator.generate
       prefix_hash = [

data/lib/scan/test_command_generator.rb

@@ -33,10 +33,11 @@ module Scan
         options += project_path_array
         options << "-configuration '#{config[:configuration]}'" if config[:configuration]
         options << "-sdk '#{config[:sdk]}'" if config[:sdk]
-        options << "-destination '#{config[:destination]}'" # generated in `detect_values`
+        options << destination # generated in `detect_values`
         options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
         options << "-enableCodeCoverage YES" if config[:code_coverage]
+        options << "-enableAddressSanitizer YES" if config[:address_sanitizer]
         options << "-xcconfig '#{config[:xcconfig]}'" if config[:xcconfig]
         options << config[:xcargs] if config[:xcargs]
 
@@ -94,6 +95,14 @@ module Scan
         return File.join(containing, file_name)
       end
 
+      # Generate destination parameters
+      def destination
+        unless Scan.cache[:destination]
+          Scan.cache[:destination] = [*Scan.config[:destination]].map { |dst| "-destination '#{dst}'" }.join(' ')
+        end
+        Scan.cache[:destination]
+      end
+
       # The path to set the Derived Data to
       def build_path
         unless Scan.cache[:build_path]

data/lib/scan/version.rb

@@ -1,4 +1,4 @@
 module Scan
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
   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.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-23 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.4.0
 signing_key: 
 specification_version: 4
 summary: The easiest way to run tests of your iOS and Mac app