snapshot 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1cb159338beb8967f7503b11f5a681521b40fd
-  data.tar.gz: 37d155a06363fe901d234027b6407b3a18eda291
+  metadata.gz: 240336d6be66f93dcf5fb8f86d0b22c02b8cf430
+  data.tar.gz: c3474a9d370b0d30621dadb856aed9aea93db090
 SHA512:
-  metadata.gz: ccee926d0e221f8499e2fd7ea0b7a966fc8fd5386927f7ba08125495b7e0ff3e464e2222882f7dde62fe4ee468c6d558804eb4d2505d23e1369000d6b915d0c2
-  data.tar.gz: fc7df18a95b939451ecea39cffaf7805f8403b0e0807b0425cc50381edafd2e90fc88b48ed15952d12fad4da759038219e8228b68b225970396cd84bfeededeb
+  metadata.gz: c08cc643de417f35674cc2ebf621afb8df57454556b0f0346e8895b8743347a16b31df40a0448f3682eb9f7fc82d705213346f0f352b6bd7605f11ff92851446
+  data.tar.gz: a4c00fc15adb4707dad1bcca1e1f6cab5a5f63f8be2ff82286e1ad37cb7388fd0a0f5974c3756be77bc37c945ee160a7da2dc684a77c83d02dbf31e396e0d74c

data/README.md

@@ -245,7 +245,8 @@ devices([
 languages([
   "en-US",
   "de-DE",
-  "es-ES"
+  "es-ES",
+  ["pt", "pt_BR"] # Portuguese with Brazilian locale
 ])
 
 launch_arguments("-username Felix")
@@ -362,6 +363,8 @@ If you want to add frames around the screenshots and even put a title on top, ch
 ALL_LANGUAGES = ["da", "de-DE", "el", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi", "fr-CA", "fr-FR", "id", "it", "ja", "ko", "ms", "nl", "no", "pt-BR", "pt-PT", "ru", "sv", "th", "tr", "vi", "zh-Hans", "zh-Hant"]
 ```
 
+To get more information about language and locale codes please read [Internationalization and Localization Guide](https://developer.apple.com/library/ios/documentation/MacOSX/Conceptual/BPInternational/LanguageandLocaleIDs/LanguageandLocaleIDs.html).
+
 ## Use a clean status bar
 You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/SimulatorStatusMagic) to clean up the status bar.
 

data/lib/assets/SnapfileTemplate

@@ -13,7 +13,8 @@
 languages([
   "en-US",
   "de-DE",
-  "it-IT"
+  "it-IT",
+  ["pt", "pt_BR"] # Portuguese with Brazilian locale
 ])
 
 # Arguments to pass to the app on launch. See https://github.com/fastlane/snapshot#launch-arguments

data/lib/assets/SnapshotHelper.swift

@@ -29,6 +29,7 @@ class Snapshot: NSObject {
 
     class func setupSnapshot(app: XCUIApplication) {
         setLanguage(app)
+        setLocale(app)
         setLaunchArguments(app)
     }
 
@@ -36,18 +37,31 @@ class Snapshot: NSObject {
         let path = "/tmp/language.txt"
 
         do {
-            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"]
+            deviceLanguage = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
+            app.launchArguments += ["-AppleLanguages", "(\(deviceLanguage))"]
         } catch {
             print("Couldn't detect/set language...")
         }
     }
 
+    class func setLocale(app: XCUIApplication) {
+        let path = "tmp/locale.txt"
+
+        do {
+            locale = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
+        } catch {
+            print("Couldn't detect/set locale...")
+        }
+        if locale.isEmpty {
+            locale = NSLocale(localeIdentifier: deviceLanguage).localeIdentifier
+        }
+        app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
+    }
+
     class func setLaunchArguments(app: XCUIApplication) {
         let path = "/tmp/snapshot-launch_arguments.txt"
 
-        app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES"]
+        app.launchArguments += ["-FASTLANE_SNAPSHOT", "YES", "-ui_testing"]
 
         do {
             let launchArguments = try NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding) as String
@@ -91,4 +105,4 @@ extension XCUIElement {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [[1.0]]
+// SnapshotHelperVersion [1.1]

data/lib/snapshot.rb

@@ -12,6 +12,7 @@ require 'snapshot/collector'
 require 'snapshot/options'
 require 'snapshot/update'
 require 'snapshot/fixes/simulator_zoom_fix'
+require 'snapshot/fixes/hardware_keyboard_fix'
 
 require 'fastlane_core'
 

data/lib/snapshot/fixes/hardware_keyboard_fix.rb

@@ -0,0 +1,16 @@
+module Snapshot
+  module Fixes
+    # Having "Connect Hardware Keyboard" enabled causes issues with entering text in secure textfields
+    # Fixes https://github.com/fastlane/snapshot/issues/433
+
+    class HardwareKeyboardFix
+      def self.patch
+        Snapshot.kill_simulator # First we need to kill the simulator
+
+        UI.verbose "Patching simulator to work with secure text fields"
+
+        Helper.backticks("defaults write com.apple.iphonesimulator ConnectHardwareKeyboard 0", print: $verbose)
+      end
+    end
+  end
+end

data/lib/snapshot/fixes/simulator_zoom_fix.rb

@@ -7,8 +7,7 @@ module Snapshot
 
     class SimulatorZoomFix
       def self.patch
-        # First we need to kill the simulator
-        Snapshot.kill_simulator
+        Snapshot.kill_simulator # First we need to kill the simulator
 
         UI.message "Patching '#{config_path}' to scale simulator to 100%"
 
@@ -16,9 +15,7 @@ module Snapshot
           simulator_name = simulator.name.tr("\s", "-")
           key = "SimulatorWindowLastScale-com.apple.CoreSimulator.SimDeviceType.#{simulator_name}"
 
-          command = "defaults write '#{config_path}' '#{key}' '1.0'"
-          puts command.yellow if $debug
-          `#{command}`
+          Helper.backticks("defaults write '#{config_path}' '#{key}' '1.0'", print: $verbose)
         end
       end
 

data/lib/snapshot/runner.rb

@@ -35,9 +35,14 @@ module Snapshot
       Snapshot.config[:devices].each do |device|
         launch_arguments_set.each do |launch_arguments|
           Snapshot.config[:languages].each do |language|
+            locale = nil
+            if language.kind_of?(Array)
+              locale = language[1]
+              language = language[0]
+            end
             results[device] ||= {}
 
-            results[device][language] = run_for_device_and_language(language, device, launch_arguments)
+            results[device][language] = run_for_device_and_language(language, locale, device, launch_arguments)
           end
         end
       end
@@ -55,14 +60,14 @@ module Snapshot
 
     # 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
-    def run_for_device_and_language(language, device, launch_arguments, retries = 0)
-      return launch(language, device, launch_arguments)
+    def run_for_device_and_language(language, locale, device, launch_arguments, retries = 0)
+      return launch(language, locale, device, launch_arguments)
     rescue => ex
       UI.error ex.to_s # show the reason for failure to the user, but still maybe retry
 
       if retries < Snapshot.config[:number_of_retries]
         UI.important "Tests failed, re-trying #{retries + 1} out of #{Snapshot.config[:number_of_retries] + 1} times"
-        run_for_device_and_language(language, device, launch_arguments, retries + 1)
+        run_for_device_and_language(language, locale, device, launch_arguments, retries + 1)
       else
         UI.error "Backtrace:\n\t#{ex.backtrace.join("\n\t")}" if $verbose
         self.collected_errors << ex
@@ -104,16 +109,18 @@ module Snapshot
     end
 
     # Returns true if it succeded
-    def launch(language, device_type, launch_arguments)
+    def launch(language, locale, device_type, launch_arguments)
       screenshots_path = TestCommandGenerator.derived_data_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)
+      File.write("/tmp/locale.txt", locale || "")
       File.write("/tmp/snapshot-launch_arguments.txt", launch_arguments.last)
 
       Fixes::SimulatorZoomFix.patch
+      Fixes::HardwareKeyboardFix.patch
 
       Snapshot.kill_simulator # because of https://github.com/fastlane/snapshot/issues/337
       `xcrun simctl shutdown booted &> /dev/null`
@@ -130,7 +137,11 @@ module Snapshot
 
       command = TestCommandGenerator.generate(device_type: device_type)
 
-      UI.header("#{device_type} - #{language}")
+      if locale
+        UI.header("#{device_type} - #{language} (#{locale})")
+      else
+        UI.header("#{device_type} - #{language}")
+      end
 
       prefix_hash = [
         {
@@ -154,7 +165,7 @@ module Snapshot
 
                                                 self.number_of_retries_due_to_failing_simulator += 1
                                                 if self.number_of_retries_due_to_failing_simulator < 20
-                                                  launch(language, device_type, launch_arguments)
+                                                  launch(language, locale, device_type, launch_arguments)
                                                 else
                                                   # It's important to raise an error, as we don't want to collect the screenshots
                                                   UI.crash!("Too many errors... no more retries...")
@@ -215,7 +226,7 @@ module Snapshot
       helper_files.each do |path|
         content = File.read(path)
 
-        if content.include?("start.pressForDuration(0, thenDragToCoordinate: finish)")
+        unless content.include?("SnapshotHelperVersion [1.1]")
           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/version.rb

@@ -1,4 +1,4 @@
 module Snapshot
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
   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.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -217,6 +217,7 @@ files:
 - lib/snapshot/detect_values.rb
 - lib/snapshot/error_handler.rb
 - lib/snapshot/fixes/README.md
+- lib/snapshot/fixes/hardware_keyboard_fix.rb
 - lib/snapshot/fixes/simulator_zoom_fix.rb
 - lib/snapshot/latest_ios_version.rb
 - lib/snapshot/options.rb
@@ -250,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Automate taking localized screenshots of your iOS app on every device