snapshot 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59deac73604573be71f7e26bf7ae7b1b1280de3
-  data.tar.gz: d0229d10b68b030f8ce312f5ba9a206cdb474398
+  metadata.gz: 32db1081d69cbad7c990081eb4c4f99a85363077
+  data.tar.gz: 0b11785e5ed0fbb90c1bfbef0f43631d84e8fa39
 SHA512:
-  metadata.gz: b8459b0158b3bc211e5a7cb4bf0cedccfc27bc70be68f158d1287a678992f0f21748a16018f5e0ac2f716dfcb8f59d922e42e13144e24803258fec1024732370
-  data.tar.gz: 2d26cc64242a0be27bf655744ed0da88fdeda607931cecf347525ba43eaece052473b81f52ba558b1e18399a2a5d1b7e76eec1186cdc2546e1ccda6598a6a05e
+  metadata.gz: f0e22d665e9898bcbd52b8ef87e869e94ae4ba177578707f8bbc85c29e2faf5f0abea21cfdf2bee005dc464d37286dab1eb88bd11e48246643bd46583ab589ea
+  data.tar.gz: cf8379a5515e44c4db7ac5690fd74023bc70649df9f24db9b135c208633066de82fb10b928b157ea3f45ecdc88fd090e6e69cf3f7d3f9bbf6ab78117535ca948

data/README.md

@@ -261,7 +261,7 @@ The easiest solution would be to just render the UIWindow into a file. That's no
 
 When you run unit tests in Xcode, the reporter generates a plist file, documenting all events that occured during the tests ([More Information](http://michele.io/test-logs-in-xcode)). Additionally, Xcode generates screenshots before, during and after each of these events. There is no way to manually trigger a screenshot event. The screenshots and the plist files are stored in the DerivedData directory, which `snapshot` stores in a temporary folder.
 
-When the user calls `snapshot(...)` in the UI Tests (Swift or Objective C) the script actually does a rotation to `.Invalid` which doesn't have any effect on the actual app, but is enough to trigger a screenshot. It has no effect to the application and is not something you would do in your tests. The goal was to find *some* event that a user would never trigger, so that we know it's from `snapshot`.
+When the user calls `snapshot(...)` in the UI Tests (Swift or Objective C) the script actually does a rotation to `.Unknown` which doesn't have any effect on the actual app, but is enough to trigger a screenshot. It has no effect to the application and is not something you would do in your tests. The goal was to find *some* event that a user would never trigger, so that we know it's from `snapshot`.
 
 `snapshot` then iterates through all test events and check where we did this weird rotation. Once `snapshot` has all events triggered by `snapshot` it collects a ordered list of all the file names of the actual screenshots of the application. 
 

data/lib/assets/SnapshotHelper.swift

@@ -11,50 +11,43 @@ import XCTest
 
 var deviceLanguage = ""
 
-func setLanguage(app: XCUIApplication)
-{
+func setLanguage(app: XCUIApplication) {
     Snapshot.setLanguage(app)
 }
 
-func snapshot(name: String, waitForLoadingIndicator: Bool = false)
-{
+func snapshot(name: String, waitForLoadingIndicator: Bool = false) {
     Snapshot.snapshot(name, waitForLoadingIndicator: waitForLoadingIndicator)
 }
 
-
-
-@objc class Snapshot: NSObject
-{
-    class func setLanguage(app: XCUIApplication)
-    {
+class Snapshot: NSObject {
+    
+    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))
-            app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))", "-AppleLocale", "\"\(locale)\"","-ui_testing"]
+            app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))", "-AppleLocale", "\"\(locale)\"", "-ui_testing"]
         } catch {
             print("Couldn't detect/set language...")
         }
     }
     
-    class func snapshot(name: String, waitForLoadingIndicator: Bool = false)
-    {
-        if (waitForLoadingIndicator)
-        {
+    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()
-    {
+    class func waitForLoadingIndicatorToDisappear() {
         let query = XCUIApplication().statusBars.childrenMatchingType(.Other).elementBoundByIndex(1).childrenMatchingType(.Other)
         
-        while (query.count > 4) {
+        while query.count > 4 {
             sleep(1)
             print("Number of Elements in Status Bar: \(query.count)... waiting for status bar to disappear")
         }

data/lib/snapshot/collector.rb

@@ -60,7 +60,6 @@ module Snapshot
 
       to_store = [] # contains the names of all the attachments we want to use
       activities.each do |activity|
-        # We do care about this, all "Long press Target" events mean screenshots
         attachment_entry = activity
         to_store << attachment_entry["Attachments"].last["FileName"]
       end

data/lib/snapshot/fixes/simulator_zoom_fix.rb

@@ -13,7 +13,7 @@ module Snapshot
         Helper.log.debug "Patching '#{config_path}' to scale simulator to 100%"
 
         FastlaneCore::Simulator.all.each do |simulator|
-          simulator_name = simulator.name.tr(" ", "-")
+          simulator_name = simulator.name.tr("\s", "-")
           key = "SimulatorWindowLastScale-com.apple.CoreSimulator.SimDeviceType.#{simulator_name}"
 
           command = "defaults write '#{config_path}' '#{key}' '1.0'"

data/lib/snapshot/reports_generator.rb

@@ -52,10 +52,12 @@ module Snapshot
       # The order IS important, since those names are used to check for include?
       # and the iPhone 6 is inlucded in the iPhone 6 Plus
       {
-        'iPhone6Plus' => "iPhone 6 Plus",
-        'iPhone6' => "iPhone 6",
-        'iPhone5' => "iPhone 5",
-        'iPhone4' => "iPhone 4",
+        'iPhone6sPlus' => "5.5-Inch",
+        'iPhone6Plus' => "5.5-Inch",
+        'iPhone6s' => "4.7-Inch",
+        'iPhone6' => "4.7-Inch",
+        'iPhone5' => "4-Inch",
+        'iPhone4' => "3.5-Inch",
         'iPadPro' => "iPad Pro",
         'iPad' => "iPad",
         'Mac' => "Mac"

data/lib/snapshot/runner.rb

@@ -41,11 +41,15 @@ module Snapshot
 
       # Generate HTML report
       ReportsGenerator.new.generate
+
+      # Clear the Derived Data
+      FileUtils.rm_rf(TestCommandGenerator.derived_data_path)
     end
 
     def launch(language, device_type)
       screenshots_path = TestCommandGenerator.derived_data_path
-      FileUtils.rm_rf(screenshots_path)
+      FileUtils.rm_rf(File.join(screenshots_path, "Logs"))
+      FileUtils.rm_rf(screenshots_path) if Snapshot.config[:clean]
       FileUtils.mkdir_p(screenshots_path)
 
       File.write("/tmp/language.txt", language)

data/lib/snapshot/version.rb

@@ -1,4 +1,4 @@
 module Snapshot
-  VERSION = "1.2.1"
+  VERSION = "1.2.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.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Automate taking localized screenshots of your iOS app on every device