snapshot 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3ce6c9d6f26b06837afca256da0a7b30a2d27c
-  data.tar.gz: 7a206b57ce9f47942511be89a86fbaee968aca3c
+  metadata.gz: 96f6aa6d5034a51c6bd41f7c1ba31796b19daa55
+  data.tar.gz: 2ffaec44d9ca48065f8dada8142b8f324740be5a
 SHA512:
-  metadata.gz: 985c1e44237b8afa4abb5553c1820a7b8c5429133771d41683d82caa8013cb3580879f06e4759e7238e5849a6a61a8f1e3df256479af306448b52006d01e73b4
-  data.tar.gz: b6866944c914b6d4fe80cfd558e6d2cf264cbda799f712f221510d8cd91597c1ba1c3ef65066c5e5ca7ae5a0749595da68c52103a36dc4840cad9eb0b5779a64
+  metadata.gz: a06cc5ff23182185afa183e4928fb4b0b041ec4943157e21424cbc69d40b92a8fbce0e7c23d97d5c07d1c37c9c72ac242949892619a71d6527e7552d3f1fa02c
+  data.tar.gz: 777220ead255052ff6d08eb231d0efdbefaf8d0dbd8b041bee9b4425128ccf49224279e72ce5db86866f95130f5e3ce4c0f2ec8cb159612a02e812ae7381f7e4

data/README.md

@@ -17,7 +17,8 @@
   <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
   <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
   <a href="https://github.com/fastlane/gym">gym</a> &bull;
-  <a href="https://github.com/fastlane/scan">scan</a>
+  <a href="https://github.com/fastlane/scan">scan</a> &bull;
+  <a href="https://github.com/fastlane/match">match</a>
 </p>
 -------
 
@@ -333,6 +334,7 @@ Also, feel free to duplicate radar [23062925](https://openradar.appspot.com/rada
 - [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers 
 - [`gym`](https://github.com/fastlane/gym): Building your iOS apps has never been easier
 - [`scan`](https://github.com/fastlane/scan): The easiest way to run tests of your iOS and Mac app
+- [`match`](https://github.com/fastlane/match): Easily sync your certificates and profiles across your team using git
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 

data/lib/assets/SnapshotHelper.swift

@@ -17,8 +17,7 @@ func setLanguage(app: XCUIApplication) {
 }
 
 func setupSnapshot(app: XCUIApplication) {
-    Snapshot.setLanguage(app)
-    Snapshot.setLaunchArguments(app)
+    Snapshot.setupSnapshot(app)
 }
 
 func snapshot(name: String, waitForLoadingIndicator: Bool = false) {
@@ -26,10 +25,15 @@ func snapshot(name: String, waitForLoadingIndicator: Bool = false) {
 }
 
 class Snapshot: NSObject {
-    
+
+    class func setupSnapshot(app: XCUIApplication) {
+        setLanguage(app)
+        setLaunchArguments(app)
+    }
+
     class func setLanguage(app: XCUIApplication) {
         let path = "/tmp/language.txt"
-        
+
         do {
             let locale = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
             deviceLanguage = locale.substringToIndex(locale.startIndex.advancedBy(2, limit:locale.endIndex))
@@ -38,12 +42,12 @@ class Snapshot: NSObject {
             print("Couldn't detect/set language...")
         }
     }
-    
+
     class func setLaunchArguments(app: XCUIApplication) {
         let path = "/tmp/snapshot-launch_arguments.txt"
-        
+
         app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES"]
-        
+
         do {
             let launchArguments = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
             let regex = try NSRegularExpression(pattern: "(\\\".+?\\\"|\\S+)", options: [])
@@ -56,18 +60,18 @@ class Snapshot: NSObject {
             print("Couldn't detect/set launch_arguments...")
         }
     }
-    
+
     class func snapshot(name: String, waitForLoadingIndicator: Bool = false) {
         if waitForLoadingIndicator {
             waitForLoadingIndicatorToDisappear()
         }
-        
+
         print("snapshot: \(name)") // more information about this, check out https://github.com/krausefx/snapshot
-        
+
         sleep(1) // Waiting for the animation to be finished (kind of)
         XCUIDevice.sharedDevice().orientation = .Unknown
     }
-    
+
     class func waitForLoadingIndicatorToDisappear() {
         let query = XCUIApplication().statusBars.childrenMatchingType(.Other).elementBoundByIndex(1).childrenMatchingType(.Other)
         

data/lib/snapshot/reset_simulators.rb

@@ -9,23 +9,16 @@ module Snapshot
       sure = agree("Are you sure? All your simulators will be DELETED and new ones will be created! (y/n)".red, true) unless sure
       raise "User cancelled action" unless sure
 
-      all_devices = `xcrun simctl list devices`
-      # == Devices ==
-      # -- iOS 9.0 --
-      #   iPhone 4s (32246EBC-33B0-47F9-B7BB-5C23C550DF29) (Shutdown)
-      #   iPhone 5 (4B56C101-6B95-43D1-9485-3FBA0E127FFA) (Shutdown)
-      #   iPhone 5s (6379C204-E82A-4FBD-8A22-6A01C7791D62) (Shutdown)
-      # -- Unavailable: com.apple.CoreSimulator.SimRuntime.iOS-8-4 --
-      #   iPhone 4s (FE9D6F85-1C51-4FE6-8597-FCAB5286B869) (Shutdown) (unavailable, runtime profile not found)
-
-      all_devices.split("\n").each do |line|
-        parsed = line.match(/\s+([\w\s]+)\s\(([\w\-]+)\)/) || []
-        next unless parsed.length == 3 # we don't care about those headers
-        _, name, id = parsed.to_a
+      devices.each do |device|
+        _, name, id = device
         puts "Removing device #{name} (#{id})"
         `xcrun simctl delete #{id}`
       end
 
+      all_runtimes = `xcrun simctl list runtimes`.lines.map { |s| s.slice(/(.*?) \(/, 1) }.compact
+      tv_versions = filter_runtimes(all_runtimes, 'tvOS')
+      watch_versions = filter_runtimes(all_runtimes, 'watchOS')
+
       all_device_types = `xcrun simctl list devicetypes`.scan(/(.*)\s\((.*)\)/)
       # == Device Types ==
       # iPhone 4s (com.apple.CoreSimulator.SimDeviceType.iPhone-4s)
@@ -33,14 +26,53 @@ module Snapshot
       # iPhone 5s (com.apple.CoreSimulator.SimDeviceType.iPhone-5s)
       # iPhone 6 (com.apple.CoreSimulator.SimDeviceType.iPhone-6)
       all_device_types.each do |device_type|
-        next if device_type.join(' ').include?("Watch") # we don't want to deal with the Watch right now
-        next if device_type.join(' ').include?("TV") # we don't want to deal with TV right now
-
-        ios_versions.each do |ios_version|
-          puts "Creating #{device_type} for iOS version #{ios_version}"
-          `xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{ios_version}`
+        if device_type.join(' ').include?("Watch")
+          create(device_type, watch_versions, 'watchOS')
+        elsif device_type.join(' ').include?("TV")
+          create(device_type, tv_versions, 'tvOS')
+        else
+          create(device_type, ios_versions)
         end
       end
+
+      phones = []
+      watches = []
+      devices.each do |device|
+        _, name, id = device
+        phones << id if name.start_with?('iPhone 6')
+        watches << id if name.end_with?('mm')
+      end
+
+      puts "Creating device pair of #{phones.last} and #{watches.last}"
+      `xcrun simctl pair #{watches.last} #{phones.last}`
+    end
+
+    def self.create(device_type, os_versions, os_name = 'iOS')
+      os_versions.each do |os_version|
+        puts "Creating #{device_type} for #{os_name} version #{os_version}"
+        `xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{os_version}`
+      end
+    end
+
+    def self.filter_runtimes(all_runtimes, os = 'iOS')
+      all_runtimes.select { |r| r[/^#{os}/] }.map { |r| r.split(' ')[1] }
+    end
+
+    def self.devices
+      all_devices = `xcrun simctl list devices`
+      # == Devices ==
+      # -- iOS 9.0 --
+      #   iPhone 4s (32246EBC-33B0-47F9-B7BB-5C23C550DF29) (Shutdown)
+      #   iPhone 5 (4B56C101-6B95-43D1-9485-3FBA0E127FFA) (Shutdown)
+      #   iPhone 5s (6379C204-E82A-4FBD-8A22-6A01C7791D62) (Shutdown)
+      # -- Unavailable: com.apple.CoreSimulator.SimRuntime.iOS-8-4 --
+      #   iPhone 4s (FE9D6F85-1C51-4FE6-8597-FCAB5286B869) (Shutdown) (unavailable, runtime profile not found)
+
+      result = all_devices.lines.map do |line|
+        (line.match(/\s+([\w\s]+)\s\(([\w\-]+)\)/) || []).to_a
+      end
+
+      result.select { |parsed| parsed.length == 3 } # we don't care about those headers
     end
   end
 end

data/lib/snapshot/version.rb

@@ -1,4 +1,4 @@
 module Snapshot
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
   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.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage