snapshot 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240336d6be66f93dcf5fb8f86d0b22c02b8cf430
-  data.tar.gz: c3474a9d370b0d30621dadb856aed9aea93db090
+  metadata.gz: 1f423c7b8038df57343f37a6d205c3d7df858612
+  data.tar.gz: 10ff5a81421f1a3bad034c590297c812e69e7277
 SHA512:
-  metadata.gz: c08cc643de417f35674cc2ebf621afb8df57454556b0f0346e8895b8743347a16b31df40a0448f3682eb9f7fc82d705213346f0f352b6bd7605f11ff92851446
-  data.tar.gz: a4c00fc15adb4707dad1bcca1e1f6cab5a5f63f8be2ff82286e1ad37cb7388fd0a0f5974c3756be77bc37c945ee160a7da2dc684a77c83d02dbf31e396e0d74c
+  metadata.gz: 7cc9ad37a6ff4e4fdf627866821784474fc471f2bfb8769805aee42d8540fe892aa71b0d690052a535631dd87b1d7e8554a5aebb95a9a931ed49d109da8f681a
+  data.tar.gz: 1c436151af68dfe77df868b95460ad6ad35c27821100a440aea6c72ffceb520e2502676b61a54f509dfa25f91accf5c4625989f97a424e398e2fef6aae1c180a

data/README.md

@@ -286,7 +286,7 @@ to update your `SnapshotHelper.swift` files. In case you modified your `Snapshot
 
 ## Launch Arguments
 
-You can provide additional arguments to your app on launch. These strings will be available in your code through `NSProcessInfo.processInfo().arguments`. Alternatively use user-default syntax (`-key value`) and they will be available as key-value pairs in `NSUserDefaults.standardUserDefaults()`.
+You can provide additional arguments to your app on launch. These strings will be available in your app (eg. not in the testing target) through `NSProcessInfo.processInfo().arguments`. Alternatively use user-default syntax (`-key value`) and they will be available as key-value pairs in `NSUserDefaults.standardUserDefaults()`.
 
 `snapshot` includes `-FASTLANE_SNAPSHOT YES`, which will set a temporary user default for the key `FASTLANE_SNAPSHOT`, you may use this to detect when the app is run by `snapshot`.
 

data/bin/snapshot

@@ -65,8 +65,8 @@ class SnapshotApplication
       c.option '-i', '--ios String', String, 'The comma separated list of iOS Versions you want to use'
 
       c.action do |args, options|
-        versions = [Snapshot::LatestIosVersion.version]
-        versions = options.ios.split(',') if options.ios
+        options.default ios_version: Snapshot::LatestIosVersion.version
+        versions = options.ios_version.split(',') if options.ios_version
         require 'snapshot/reset_simulators'
 
         Snapshot::ResetSimulators.clear_everything!(versions)

data/lib/assets/SnapshotHelper.swift

@@ -34,10 +34,15 @@ class Snapshot: NSObject {
     }
 
     class func setLanguage(app: XCUIApplication) {
-        let path = "/tmp/language.txt"
+        guard let prefix = pathPrefix() else {
+            return
+        }
+
+        let path = prefix.stringByAppendingPathComponent("language.txt")
 
         do {
-            deviceLanguage = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
+            let trimCharacterSet = NSCharacterSet.whitespaceAndNewlineCharacterSet()
+            deviceLanguage = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding).stringByTrimmingCharactersInSet(trimCharacterSet) as String
             app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))"]
         } catch {
             print("Couldn't detect/set language...")
@@ -45,10 +50,15 @@ class Snapshot: NSObject {
     }
 
     class func setLocale(app: XCUIApplication) {
-        let path = "tmp/locale.txt"
+        guard let prefix = pathPrefix() else {
+            return
+        }
+
+        let path = prefix.stringByAppendingPathComponent("locale.txt")
 
         do {
-            locale = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
+            let trimCharacterSet = NSCharacterSet.whitespaceAndNewlineCharacterSet()
+            locale = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding).stringByTrimmingCharactersInSet(trimCharacterSet) as String
         } catch {
             print("Couldn't detect/set locale...")
         }
@@ -59,8 +69,11 @@ class Snapshot: NSObject {
     }
 
     class func setLaunchArguments(app: XCUIApplication) {
-        let path = "/tmp/snapshot-launch_arguments.txt"
+        guard let prefix = pathPrefix() else {
+            return
+        }
 
+        let path = prefix.stringByAppendingPathComponent("snapshot-launch_arguments.txt")
         app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES", "-ui_testing"]
 
         do {
@@ -95,6 +108,14 @@ class Snapshot: NSObject {
             print("Waiting for loading indicator to disappear...")
         }
     }
+
+    class func pathPrefix() -> NSString? {
+        if let path = NSProcessInfo().environment["SIMULATOR_HOST_HOME"] as NSString? {
+            return path.stringByAppendingPathComponent("Library/Caches/tools.fastlane")
+        }
+        print("Couldn't find Snapshot configuration files at ~/Library/Caches/tools.fastlane")
+        return nil
+    }
 }
 
 extension XCUIElement {
@@ -105,4 +126,4 @@ extension XCUIElement {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.1]
+// SnapshotHelperVersion [1.2]

data/lib/snapshot/options.rb

@@ -6,7 +6,7 @@ module Snapshot
     def self.available_options
       output_directory = (File.directory?("fastlane") ? "fastlane/screenshots" : "screenshots")
 
-      @@options ||= [
+      @options ||= [
         FastlaneCore::ConfigItem.new(key: :workspace,
                                      short_option: "-w",
                                      env_name: "SNAPSHOT_WORKSPACE",

data/lib/snapshot/page.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>KrauseFx/snapshot</title>
+    <title>fastlane/snapshot</title>
     <meta charset="UTF-8">
     <style type="text/css">
       * {

data/lib/snapshot/runner.rb

@@ -115,9 +115,11 @@ module Snapshot
       FileUtils.rm_rf(screenshots_path) if Snapshot.config[:clean]
       FileUtils.mkdir_p(screenshots_path)
 
-      File.write("/tmp/language.txt", language)
-      File.write("/tmp/locale.txt", locale || "")
-      File.write("/tmp/snapshot-launch_arguments.txt", launch_arguments.last)
+      prefix = File.join(Dir.home, "Library/Caches/tools.fastlane")
+      FileUtils.mkdir_p(prefix)
+      File.write(File.join(prefix, "language.txt"), language)
+      File.write(File.join(prefix, "locale.txt"), locale || "")
+      File.write(File.join(prefix, "snapshot-launch_arguments.txt"), launch_arguments.last)
 
       Fixes::SimulatorZoomFix.patch
       Fixes::HardwareKeyboardFix.patch
@@ -220,13 +222,25 @@ module Snapshot
       end
     end
 
+    def version_of_bundled_helper
+      runner_dir = File.dirname(__FILE__)
+      bundled_helper = File.read File.expand_path('../assets/SnapshotHelper.swift', runner_dir)
+      current_version = bundled_helper.match(/\n.*SnapshotHelperVersion \[.+\]/)[0]
+
+      ## Something like "// SnapshotHelperVersion [1.2]", but be relaxed about whitespace
+      current_version.gsub(%r{^//\w*}, '').strip
+    end
+
     # rubocop:disable Style/Next
     def verify_helper_is_current
+      current_version = version_of_bundled_helper
+      UI.verbose "Checking that helper files contain #{current_version}"
+
       helper_files = Update.find_helper
       helper_files.each do |path|
         content = File.read(path)
 
-        unless content.include?("SnapshotHelperVersion [1.1]")
+        unless content.include?(current_version)
           UI.error "Your '#{path}' is outdated, please run `snapshot update`"
           UI.error "to update your Helper file"
           UI.user_error!("Please update your Snapshot Helper file")

data/lib/snapshot/test_command_generator.rb

@@ -88,7 +88,7 @@ module Snapshot
       end
 
       def derived_data_path
-        "/tmp/snapshot_derived/"
+        Snapshot.cache[:derived_data_path] ||= Dir.mktmpdir("snapshot_derived")
       end
     end
   end

data/lib/snapshot/version.rb

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

data/lib/snapshot.rb

@@ -25,9 +25,12 @@ module Snapshot
 
     attr_accessor :project
 
+    attr_accessor :cache
+
     def config=(value)
       @config = value
       DetectValues.set_additional_default_values
+      @cache = {}
     end
 
     def snapfile_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage