snapshot 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be52a63e105fca678eab15efe749632ba3ca661f
-  data.tar.gz: 7ce985585dddbb6d1e309c2b780e0a2236bdfea3
+  metadata.gz: 6b36155d8934cfc7940851a53eae0e15e760dca0
+  data.tar.gz: 88fdec491ff05bcbb6d97de2951530e629a9f1f4
 SHA512:
-  metadata.gz: 09e128bad2e2b626c77d3df4f5103af3625a17094843b05aef541a097e58d905ea08a022712ae7b93e7f356a4221bccf0778149d08fbe99935272d8d626f7c84
-  data.tar.gz: aadbf5467434ead6d261cb704b5aa82412d81c3678ec939f31bbf1eae20c91930aa981a54b75383f58c77d4ba02311f2f3eb524210d6598ad3cc278ad03683db
+  metadata.gz: 20539bd5c66a1a1456f5f90f312f5fe51c7daaba79f6eabf97c8926ee770445f96235d30458d869b088e5a9d36c6f8712b0d59763d88071093d820e932db940b
+  data.tar.gz: d78ef35d43fdb4ebc08df2a2254f1624078d5bb634b9785d1393f12bebbb2e48a1fa5a4c90a56e0fc39a1a32ad56f3d6f51f774d250db308864ead96191dd676

data/lib/snapshot/runner.rb

@@ -9,6 +9,7 @@ module Snapshot
     # All the errors we experience while running snapshot
     attr_accessor :collected_errors
 
+    # rubocop:disable Metrics/AbcSize
     def work
       if File.exist?("./fastlane/snapshot.js") or File.exist?("./snapshot.js")
         UI.error "Found old snapshot configuration file 'snapshot.js'"
@@ -32,9 +33,9 @@ module Snapshot
       self.collected_errors = []
       results = {} # collect all the results for a nice table
       launch_arguments_set = config_launch_arguments
-      Snapshot.config[:devices].each do |device|
+      Snapshot.config[:devices].each_with_index do |device, device_index|
         launch_arguments_set.each do |launch_arguments|
-          Snapshot.config[:languages].each do |language|
+          Snapshot.config[:languages].each_with_index do |language, language_index|
             locale = nil
             if language.kind_of?(Array)
               locale = language[1]
@@ -42,6 +43,10 @@ module Snapshot
             end
             results[device] ||= {}
 
+            current_run = device_index * Snapshot.config[:languages].count + language_index + 1
+            number_of_runs = Snapshot.config[:languages].count * Snapshot.config[:devices].count
+            UI.message("snapshot run #{current_run} of #{number_of_runs}")
+
             results[device][language] = run_for_device_and_language(language, locale, device, launch_arguments)
           end
         end
@@ -59,6 +64,7 @@ module Snapshot
         FileUtils.rm_rf(TestCommandGenerator.derived_data_path)
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # This is its own method so that it can re-try if the tests fail randomly
     # @return true/false depending on if the tests succeded
@@ -192,19 +198,11 @@ module Snapshot
     end
     # rubocop:enable Metrics/AbcSize
 
-    def open_simulator_for_device(device)
+    def open_simulator_for_device(device_name)
       return unless ENV['FASTLANE_EXPLICIT_OPEN_SIMULATOR']
 
-      # As a second level of feature switching, see if we want to try the xcode-select variant
-      if ENV['FASTLANE_EXPLICIT_OPEN_SIMULATOR'] == '2'
-        simulator_path = File.join(FastlaneCore::Helper.xcode_path, 'Applications', 'Simulator.app')
-        UI.message("Explicitly opening simulator at #{simulator_path} for device: #{device}")
-      else
-        simulator_path = 'Simulator'
-        UI.message("Explicitly opening simulator for device: #{device}")
-      end
-
-      `open -a #{simulator_path} --args -CurrentDeviceUDID #{TestCommandGenerator.device_udid(device)}`
+      device = TestCommandGenerator.find_device(device_name)
+      FastlaneCore::Simulator.launch(device) if device
     end
 
     def uninstall_app(device_type)

data/lib/snapshot/test_command_generator.rb

@@ -64,21 +64,23 @@ module Snapshot
         ["| tee #{xcodebuild_log_path.shellescape} | xcpretty #{Snapshot.config[:xcpretty_args]}"]
       end
 
-      def device_udid(device)
-        # we now fetch the device's udid. Why? Because we might get this error message
+      def find_device(device_name)
+        # 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 }
         #
-
-        device_udid = nil
-        FastlaneCore::Simulator.all.each do |sim|
-          device_udid = sim.udid if sim.name.strip == device.strip and sim.ios_version == Snapshot.config[:ios_version]
+        FastlaneCore::Simulator.all.find do |sim|
+          sim.name.strip == device_name.strip && sim.ios_version == Snapshot.config[:ios_version]
         end
+      end
+
+      def device_udid(device_name)
+        device = find_device(device_name)
 
-        return device_udid
+        device ? device.udid : nil
       end
 
       def destination(device)

data/lib/snapshot/version.rb

@@ -1,4 +1,4 @@
 module Snapshot
-  VERSION = "1.13.0".freeze
+  VERSION = "1.13.1".freeze
   DESCRIPTION = "Automate taking localized screenshots of your iOS app on every device"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.43.3
+        version: 0.50.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.43.3
+        version: 0.50.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0