snapshot 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d48db6f3a941d5415f919c885128617eccbd045b
-  data.tar.gz: 48accee55c96d5ae5de75688f3076f3e2cc66ca2
+  metadata.gz: 524dab0c4b7be609151cb4e277fa150257cfa9b0
+  data.tar.gz: 5eae566a40f1a11789385d14fb49d3439dd06acf
 SHA512:
-  metadata.gz: 3575a0c9b77f63f603741441ef3d363f1108c4da48d1b2047d6ae6d08494ea4f3febf43e83ef860fd7839b57c2efdfc6a6a144876531cbba48cc680a82874023
-  data.tar.gz: cd25ef5ec5eb98bb7d708f0ecec4c66bfb91805e0351e62860ccfd0b2cb0d54cc7499b20f69b7d8782258afa6a8ea4e3b9c67f6d7a0ae14f9f8124e659ca5763
+  metadata.gz: 99fcceb0567036b19e04c0c20b1348f1595ffd62094b0c57371e11581f16b31042b97f7554edc41042d5e92f9a0e13c0ae80016f73afa31b9ccc680e12873d82
+  data.tar.gz: 0e3ba863d08edea6ca0ebbb46d742bbfcdfbb5ffaf925abf7c3b81e98ed4cc3d02fafae33c56023eeb26e013e4eca5c3f2641c07ecea2877e54a43f2e5488b2e

data/README.md

@@ -16,7 +16,8 @@
   <a href="https://github.com/KrauseFx/codes">codes</a> &bull;
   <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
   <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
-  <a href="https://github.com/fastlane/boarding">boarding</a>
+  <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
+  <a href="https://github.com/fastlane/gym">gym</a>
 </p>
 -------
 
@@ -376,6 +377,7 @@ You can use the environment variable `SNAPSHOT_FORCE_DELETE` to stop asking for
 - [`spaceship`](https://github.com/fastlane/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
 - [`pilot`](https://github.com/fastlane/pilot): The best way to manage your TestFlight testers and builds from your terminal
 - [`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
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
@@ -477,7 +479,7 @@ Be aware: The file will be executed from the current directory, not the location
 
 ## Available language codes
 ```ruby
-["cs-CZ", "da-DK", "de-DE", "el-GR", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi-FI", "fr-CA", "fr-FR", "id-ID", "it-IT", "ja-JP", "ko-KR", "ms-MY", "nl-NL", "no-NO", "pt-BR", "pt-PT", "ru-RU", "sv-SE", "th-TH", "tr-TR", "vi-VI", "cmn-Hans", "cmn-Hant"]
+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"]
 ```
 
 ## Use a clean status bar
@@ -546,12 +548,3 @@ var language = result.stdout.substring(0, result.stdout.length - 1);
 This project is licensed under the terms of the MIT license. See the LICENSE file.
 
 > This project and all fastlane tools are in no way affiliated with Apple Inc. This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs. All fastlane tools run on your own computer or server, so your credentials or other sensitive information will never leave your own computer. You are responsible for how you use fastlane tools.
-
-# Contributing
-
-1. Create an issue to discuss about your idea
-2. Fork it (https://github.com/KrauseFx/snapshot/fork)
-3. Create your feature branch (`git checkout -b my-new-feature`)
-4. Commit your changes (`git commit -am 'Add some feature'`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create a new Pull Request

data/lib/assets/SnapfileTemplate

@@ -34,7 +34,7 @@ screenshots_path "./screenshots"
 
 # Comment out the line below to add a `SNAPSHOT` preprocessor macro
 # More information available: https://github.com/krausefx/snapshot#custom-args-for-the-build-command
-# custom_build_args "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) SNAPSHOT=1'"
+# custom_build_args "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) SNAPSHOT=1' OTHER_SWIFT_FLAGS='$(inherited) -DSNAPSHOT=1'"
 
 
 # Custom Callbacks

data/lib/snapshot/latest_ios_version.rb

@@ -1,13 +1,15 @@
 module Snapshot
   class LatestIosVersion
+    @version = nil
     def self.version
       return ENV["SNAPSHOT_IOS_VERSION"] if ENV["SNAPSHOT_IOS_VERSION"]
+      return @version if @version
 
       output = `xcodebuild -version -sdk`.split("Mac").last # don't care about the Mac Part
       matched = output.match(/iPhoneSimulator([\d\.]+)\.sdk/)
       
       if matched.length > 1
-        return matched[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
       end

data/lib/snapshot/reset_simulators.rb

@@ -1,42 +1,42 @@
 module Snapshot
   class ResetSimulators
     def self.clear_everything!(ios_version)
-      # Taken from https://gist.github.com/cabeca/cbaacbeb6a1cc4683aa5
-
       # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       # !! Warning: This script will remove all your existing simulators !!
       # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
       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
-       
-      device_types_output = `xcrun simctl list devicetypes`
-      device_types = device_types_output.scan /(.*) \((.*)\)/
-       
-      devices_output = `xcrun simctl list devices`.split("\n")
 
-      devices_output.each do |line|
-        device = line.match(/\s+([\w\s]+)\(([\w\-]+)\)/)
-        if device and device.length == 3
-          name = device[1].strip
-          id = device[2]
-          puts "Removing device #{name} (#{id})"
-          `xcrun simctl delete #{id}`
-        end
-      end
+      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)
 
-      # device_types
-      #  ["iPhone 5", "com.apple.CoreSimulator.SimDeviceType.iPhone-5"],
-      #  ["iPhone 5s", "com.apple.CoreSimulator.SimDeviceType.iPhone-5s"],
-      #  ["iPhone 6", "com.apple.CoreSimulator.SimDeviceType.iPhone-6"],
-      device_types.each do |device_type|
-        next if device_type.first.include?"Watch" # we don't want to deal with the Watch right now
+      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
+        parsed, name, id = parsed.to_a
+        puts "Removing device #{name} (#{id})"
+        `xcrun simctl delete #{id}`
+      end
+       
+      all_device_types = `xcrun simctl list devicetypes`.scan(/(.*)\s\((.*)\)/)
+      # == Device Types ==
+      # iPhone 4s (com.apple.CoreSimulator.SimDeviceType.iPhone-4s)
+      # iPhone 5 (com.apple.CoreSimulator.SimDeviceType.iPhone-5)
+      # 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
 
         puts "Creating #{device_type} for iOS version #{ios_version}"
-        command = "xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{ios_version}"
-        command_output = `#{command}`
+        `xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{ios_version}`
       end
     end
   end

data/lib/snapshot/runner.rb

@@ -85,7 +85,7 @@ module Snapshot
     end
 
     def udid_for_simulator(name) # fetches the UDID of the simulator type
-      all = `instruments -s`.split("\n")
+      all = Simulators.raw_simulators.split("\n")
       all.each do |current|
         return current.match(/\[(.*)\]/)[1] if current.include?name
       end
@@ -100,13 +100,14 @@ module Snapshot
 
       def com(cmd)
         puts cmd.magenta if $verbose
-        result = `#{cmd} 2>&1` # to now show errors
-        puts result if (result.to_s.length > 0 and $verbose)
+        Open3.popen3("#{cmd} 2>&1") do |stdin, stdout, stderr, wait_thr|
+          result = stdout.read
+          puts result if (result.to_s.length > 0 and $verbose)
+        end
       end
 
       udid = udid_for_simulator(device)
 
-
       com("killall 'iOS Simulator'")
       sleep 3
       com("xcrun simctl boot '#{udid}'")
@@ -198,6 +199,11 @@ module Snapshot
     def parse_test_line(line)
       if line =~ /.*Target failed to run.*/
         return :retry
+      elsif line.include?"segmentation fault" # a new bug introduced with Xcode 7
+        return :retry
+      elsif line.include?"Timed out waiting" # a new bug introduced with Xcode 7
+        `killall "iOS Simulator"`
+        return :retry
       elsif line.include?"Screenshot captured"
         return :screenshot
       elsif line.include? "Instruments wants permission to analyze other processes"

data/lib/snapshot/screenshot_flatten.rb

@@ -3,7 +3,7 @@ module Snapshot
   class ScreenshotFlatten
     # @param (String) The path in which the screenshots are located in
     def run(path)
-      Helper.log.info "Going to remove the alpha channel from generated png files"
+      Helper.log.info "Removing the alpha channel from generated png files"
       flatten(path)
     end
 
@@ -13,7 +13,6 @@ module Snapshot
         `sips -s format bmp '#{file}' &> /dev/null ` # &> /dev/null because there is warning because of the extension
         `sips -s format png '#{file}'`
       end
-      Helper.log.info "Finished removing the alpha channel."
     end
   end
 end

data/lib/snapshot/screenshot_rotate.rb

@@ -5,7 +5,7 @@ module Snapshot
   class ScreenshotRotate
     # @param (String) The path in which the screenshots are located in
     def run(path)
-      Helper.log.debug "Going to rotate screenshots from generated png files"
+      Helper.log.debug "Rotating the screenshots (if necessary)"
       rotate(path)
     end
 

data/lib/snapshot/simulators.rb

@@ -1,14 +1,40 @@
+require 'open3'
+
 module Snapshot
   class Simulators
-    def self.available_devices
-      if not @result
-        @result = []
-        `instruments -s`.split("\n").each do |current|
-          # Example: "iPhone 5 (8.1 Simulator) [C49ECC4A-5A3D-44B6-B9BF-4E25BC326400]"
-          @result << current.split(' [').first if current.include?"Simulator"
+    # @return the raw value of the `instruments -s` command
+    # we do it using `open3` since only ` just randomly hangs with instruments -s
+    def self.raw_simulators
+      return @result if @result
+
+      Open3.popen3('instruments -s') do |stdin, stdout, stderr, wait_thr|
+        @result = stdout.read
+      end
+      
+      @result || ''
+    end
+
+    def self.available_devices(name_only = false)
+      Helper.log.info "Fetching available devices" if $verbose
+      result = []
+      
+      output = self.raw_simulators
+
+      output.split("\n").each do |current|
+        # Example: "iPhone 5 (8.1 Simulator) [C49ECC4A-5A3D-44B6-B9BF-4E25BC326400]"
+        # Example: "iPhone 6 (9.0) [072E4EA2-861F-44CD-AB77-FB1FE07E541C]"
+        
+        match = current.match /((.+?) \(.+?\)) \[.+?\]/
+        next if match.nil?
+        
+        if name_only
+          result << match[2]
+        else
+          result << match[1]
         end
       end
-      return @result
+
+      return result
     end
   end
 end

data/lib/snapshot/snapshot_config.rb

@@ -115,10 +115,10 @@ module Snapshot
     # This has to be done after parsing the Snapfile (iOS version)
     def set_default_simulators
       self.devices ||= [
-        "iPhone 6 (#{self.ios_version} Simulator)",
-        "iPhone 6 Plus (#{self.ios_version} Simulator)",
-        "iPhone 5 (#{self.ios_version} Simulator)",
-        "iPhone 4s (#{self.ios_version} Simulator)"
+        "iPhone 6" + version_suffix(self.ios_version),
+        "iPhone 6 Plus" + version_suffix(self.ios_version),
+        "iPhone 5" + version_suffix(self.ios_version),
+        "iPhone 4s" + version_suffix(self.ios_version),
       ]
     end
 
@@ -128,12 +128,12 @@ module Snapshot
 
       actual_devices = []
       self.devices.each do |current|
-        current += " (#{self.ios_version} Simulator)" unless current.include?"Simulator"
+        current += version_suffix(self.ios_version) unless current.include? " ("
 
-        unless Simulators.available_devices.include?current
-          raise "Device '#{current}' not found. Available device types: #{Simulators.available_devices}".red
-        else
+        if Simulators.available_devices.include? current
           actual_devices << current
+        else
+          raise "Device '#{current}' not found. Available device types: #{Simulators.available_devices}".red
         end
       end
       self.devices = actual_devices
@@ -219,5 +219,15 @@ module Snapshot
         raise "Could not fetch available schemes: #{ex}".red
       end
     end
+
+    def version_suffix version
+      # Xcode 6 and before: "iPhone 5 (8.0 Simulator)"
+      # Xcode 7 and later: "iPhone 6 (9.0)"
+      if LatestIosVersion.version.to_i >= 9
+        " (#{version})"
+      else
+        " (#{version} Simulator)"
+      end
+    end
   end
 end

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.16.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement