snapshot 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5403d3a85b61bd0cd8036fd1fdb3c75dba4c64a7
-  data.tar.gz: 504b5e471e8188c7b89fa4da81c2739e17045909
+  metadata.gz: f66739b39604b0850729cdbc3ec8b7c285b8dc0d
+  data.tar.gz: a724757422b90bd6b7c438d2550322d0c19422fc
 SHA512:
-  metadata.gz: 7993f66ee0575507b64de582d8cb7df939386643a821a186b20a9ea16046a63cb00f52639f19b107919633a91029d3c789f9b84b4fb3948a101cd85c3c475302
-  data.tar.gz: 4ddfccd5e70643ed187f1f6fd67cb7d4bb54b231382e985ff0efba85935516cb16a2ab4471dc2d437b1f7fffac675db5d80deb86399fb08f75662d35de1516aa
+  metadata.gz: 6ea43999e4268e07952c39b1788e35ff0609d150d10e6ef71eda5b556aea4368f51270039caf0928d596f532b1a575fa298a168744688e8252b6039aa9887f5c
+  data.tar.gz: 87eb051ee9eee593b5e264426c7caa810bc3077cc7909a92f245b53f65a8741701dea62037bfbb7a15addff8d556cd146d1b22b4b93e2481985c3cfda35a141c

data/README.md

@@ -81,7 +81,7 @@ Please check out the [MigrationGuide to 1.0](/snapshot/MigrationGuide.md) :+1:
 
 -------
 
-<h5 align="center"><code>snapshot</code> is part of <a href="https://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
+<h5 align="center"><code>snapshot</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate building and releasing your iOS and Android apps.</h5>
 
 # Features
 - Create hundreds of screenshots in multiple languages on all simulators
@@ -329,7 +329,7 @@ When the user calls `snapshot(...)` in the UI Tests (Swift or Objective C) the s
 
 In the test output, the Swift `snapshot` function will print out something like this
 
-  snapshot: [some random text here]
+> snapshot: [some random text here]
 
 `snapshot` finds all these entries using a regex. The number of `snapshot` outputs in the terminal and the number of `snapshot` events in the plist file should be the same. Knowing that, `snapshot` automatically matches these 2 lists to identify the name of each of these screenshots. They are then copied over to the output directory and separated by language and device.
 
@@ -346,7 +346,7 @@ Also, feel free to duplicate radar [23062925](https://openradar.appspot.com/rada
 
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
-- [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
+- [`fastlane`](https://fastlane.tools): The easiest way to automate building and releasing your iOS and Android apps
 - [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
 - [`frameit`](https://github.com/fastlane/fastlane/tree/master/frameit): Quickly put your screenshots into the right device frames
 - [`PEM`](https://github.com/fastlane/fastlane/tree/master/pem): Automatically generate and renew your push notification profiles

data/lib/assets/SnapshotHelper.swift

@@ -25,9 +25,9 @@ func snapshot(name: String, waitForLoadingIndicator: Bool = true) {
     Snapshot.snapshot(name, waitForLoadingIndicator: waitForLoadingIndicator)
 }
 
-class Snapshot: NSObject {
+public class Snapshot: NSObject {
 
-    class func setupSnapshot(app: XCUIApplication) {
+    public class func setupSnapshot(app: XCUIApplication) {
         setLanguage(app)
         setLocale(app)
         setLaunchArguments(app)
@@ -89,7 +89,7 @@ class Snapshot: NSObject {
         }
     }
 
-    class func snapshot(name: String, waitForLoadingIndicator: Bool = true) {
+    public class func snapshot(name: String, waitForLoadingIndicator: Bool = true) {
         if waitForLoadingIndicator {
             waitForLoadingIndicatorToDisappear()
         }

data/lib/snapshot/fixes/hardware_keyboard_fix.rb

@@ -5,8 +5,6 @@ module Snapshot
 
     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)

data/lib/snapshot/fixes/simulator_zoom_fix.rb

@@ -7,8 +7,6 @@ module Snapshot
 
     class SimulatorZoomFix
       def self.patch
-        Snapshot.kill_simulator # First we need to kill the simulator
-
         UI.message "Patching '#{config_path}' to scale simulator to 100%"
 
         FastlaneCore::Simulator.all.each do |simulator|

data/lib/snapshot/latest_ios_version.rb

@@ -14,11 +14,11 @@ module Snapshot
 
       matched = output.match(/iOS ([\d\.]+) \(.*/)
       if matched.nil?
-        raise "Could not determine installed iOS SDK version. Try running the _xcodebuild_ command manually to ensure it works."
+        UI.user_error!("Could not determine installed iOS SDK version. Try running the _xcodebuild_ command manually to ensure it works.")
       elsif matched.length > 1
         return @version ||= matched[1]
       else
-        raise "Could not determine installed iOS SDK version. Please pass it via the environment variable 'SNAPSHOT_IOS_VERSION'".red
+        UI.user_error!("Could not determine installed iOS SDK version. Please pass it via the environment variable 'SNAPSHOT_IOS_VERSION'")
       end
     end
   end

data/lib/snapshot/options.rb

@@ -14,9 +14,9 @@ module Snapshot
                                      description: "Path the workspace file",
                                      verify_block: proc do |value|
                                        v = File.expand_path(value.to_s)
-                                       raise "Workspace file not found at path '#{v}'".red unless File.exist?(v)
-                                       raise "Workspace file invalid".red unless File.directory?(v)
-                                       raise "Workspace file is not a workspace, must end with .xcworkspace".red unless v.include?(".xcworkspace")
+                                       UI.user_error!("Workspace file not found at path '#{v}'") unless File.exist?(v)
+                                       UI.user_error!("Workspace file invalid") unless File.directory?(v)
+                                       UI.user_error!("Workspace file is not a workspace, must end with .xcworkspace") unless v.include?(".xcworkspace")
                                      end),
         FastlaneCore::ConfigItem.new(key: :project,
                                      short_option: "-p",
@@ -25,9 +25,9 @@ module Snapshot
                                      description: "Path the project file",
                                      verify_block: proc do |value|
                                        v = File.expand_path(value.to_s)
-                                       raise "Project file not found at path '#{v}'".red unless File.exist?(v)
-                                       raise "Project file invalid".red unless File.directory?(v)
-                                       raise "Project file is not a project file, must end with .xcodeproj".red unless v.include?(".xcodeproj")
+                                       UI.user_error!("Project file not found at path '#{v}'") unless File.exist?(v)
+                                       UI.user_error!("Project file invalid") unless File.directory?(v)
+                                       UI.user_error!("Project file is not a project file, must end with .xcodeproj") unless v.include?(".xcodeproj")
                                      end),
         FastlaneCore::ConfigItem.new(key: :devices,
                                      description: "A list of devices you want to take the screenshots from",
@@ -38,7 +38,7 @@ module Snapshot
                                        available = FastlaneCore::Simulator.all
                                        value.each do |current|
                                          unless available.any? { |d| d.name.strip == current.strip }
-                                           raise "Device '#{current}' not in list of available simulators '#{available.join(', ')}'".red
+                                           UI.user_error!("Device '#{current}' not in list of available simulators '#{available.join(', ')}'")
                                          end
                                        end
                                      end),
@@ -82,6 +82,11 @@ module Snapshot
                                      description: "Enabling this option will automatically erase the simulator before running the application",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :localize_simulator,
+                                     env_name: 'SNAPSHOT_LOCALIZE_SIMULATOR',
+                                     description: "Enabling this option will configure the Simulator's system language",
+                                     default_value: false,
+                                     is_string: false),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      env_name: 'SNAPSHOT_APP_IDENTIFIER',
                                      short_option: "-a",

data/lib/snapshot/reset_simulators.rb

@@ -7,7 +7,7 @@ module Snapshot
 
       sure = true if ENV["SNAPSHOT_FORCE_DELETE"]
       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
+      UI.user_error!("User cancelled action") unless sure
 
       devices.each do |device|
         _, name, id = device

data/lib/snapshot/runner.rb

@@ -123,14 +123,19 @@ module Snapshot
       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
-
+      # Kill and shutdown all currently running simulators so that the following settings
+      # changes will be picked up when they are started again.
       Snapshot.kill_simulator # because of https://github.com/fastlane/snapshot/issues/337
       `xcrun simctl shutdown booted &> /dev/null`
 
-      if Snapshot.config[:erase_simulator]
+      Fixes::SimulatorZoomFix.patch
+      Fixes::HardwareKeyboardFix.patch
+
+      if Snapshot.config[:erase_simulator] || Snapshot.config[:localize_simulator]
         erase_simulator(device_type)
+        if Snapshot.config[:localize_simulator]
+          localize_simulator(device_type, language, locale)
+        end
       elsif Snapshot.config[:reinstall_app]
         # no need to reinstall if device has been erased
         uninstall_app(device_type)
@@ -139,6 +144,8 @@ module Snapshot
       add_media(device_type, :photo, Snapshot.config[:add_photos]) if Snapshot.config[:add_photos]
       add_media(device_type, :video, Snapshot.config[:add_videos]) if Snapshot.config[:add_videos]
 
+      open_simulator_for_device(device_type)
+
       command = TestCommandGenerator.generate(device_type: device_type)
 
       if locale
@@ -183,6 +190,13 @@ module Snapshot
       return Collector.fetch_screenshots(raw_output, dir_name, device_type, launch_arguments.first)
     end
 
+    def open_simulator_for_device(device)
+      return unless ENV['FASTLANE_EXPLICIT_OPEN_SIMULATOR']
+
+      UI.message("Explicitly opening simulator for device: #{device}")
+      `open -a Simulator --args -CurrentDeviceUDID #{TestCommandGenerator.device_udid(device)}`
+    end
+
     def uninstall_app(device_type)
       UI.verbose "Uninstalling app '#{Snapshot.config[:app_identifier]}' from #{device_type}..."
       Snapshot.config[:app_identifier] ||= ask("App Identifier: ")
@@ -196,14 +210,28 @@ module Snapshot
     end
 
     def erase_simulator(device_type)
-      Helper.log.debug "Erasing #{device_type}..."
+      UI.verbose("Erasing #{device_type}...")
       device_udid = TestCommandGenerator.device_udid(device_type)
 
-      Helper.log.info "Erasing #{device_type}...".yellow
+      UI.important("Erasing #{device_type}...")
 
       `xcrun simctl erase #{device_udid} &> /dev/null`
     end
 
+    def localize_simulator(device_type, language, locale)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+      if device_udid
+        locale ||= language.sub("-", "_")
+        plist = {
+          AppleLocale: locale,
+          AppleLanguages: [language]
+        }
+        UI.message "Localizing #{device_type} (AppleLocale=#{locale} AppleLanguages=[#{language}])"
+        plist_path = "#{ENV['HOME']}/Library/Developer/CoreSimulator/Devices/#{device_udid}/data/Library/Preferences/.GlobalPreferences.plist"
+        File.write(plist_path, Plist::Emit.dump(plist))
+      end
+    end
+
     def add_media(device_type, media_type, paths)
       media_type = media_type.to_s
 

data/lib/snapshot/setup.rb

@@ -5,7 +5,7 @@ module Snapshot
       snapfile_path = File.join(path, 'Snapfile')
 
       if File.exist?(snapfile_path)
-        raise "Snapfile already exists at path '#{snapfile_path}'. Run 'snapshot' to use snapshot.".red
+        UI.user_error!("Snapfile already exists at path '#{snapfile_path}'. Run 'snapshot' to use snapshot.")
       end
 
       gem_path = Helper.gem_path("snapshot")

data/lib/snapshot/test_command_generator.rb

@@ -24,7 +24,7 @@ module Snapshot
       def project_path_array
         proj = Snapshot.project.xcodebuild_parameters
         return proj if proj.count > 0
-        raise "No project/workspace found"
+        UI.user_error!("No project/workspace found")
       end
 
       def options

data/lib/snapshot/version.rb

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

data/lib/snapshot.rb

@@ -38,7 +38,8 @@ module Snapshot
     end
 
     def kill_simulator
-      `killall iOS Simulator &> /dev/null`
+      `killall 'iOS Simulator' &> /dev/null`
+      `killall Simulator &> /dev/null`
     end
   end
 

metadata

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