snapshot 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524dab0c4b7be609151cb4e277fa150257cfa9b0
-  data.tar.gz: 5eae566a40f1a11789385d14fb49d3439dd06acf
+  metadata.gz: a7f64dd119934c713a6b6fc7e05653ac8ebca9d1
+  data.tar.gz: 28d7d068560b15e39d75acdfdaf822bd49464aca
 SHA512:
-  metadata.gz: 99fcceb0567036b19e04c0c20b1348f1595ffd62094b0c57371e11581f16b31042b97f7554edc41042d5e92f9a0e13c0ae80016f73afa31b9ccc680e12873d82
-  data.tar.gz: 0e3ba863d08edea6ca0ebbb46d742bbfcdfbb5ffaf925abf7c3b81e98ed4cc3d02fafae33c56023eeb26e013e4eca5c3f2641c07ecea2877e54a43f2e5488b2e
+  metadata.gz: f5697b920fda9b3352ce8c187f9c9489445ac49d285b02bcbed61fbdb1c55eb63b027d1c86154700f2a60eaf4bb6dcd9234fa5ca746aed1659efa29a10290516
+  data.tar.gz: 4ec9ce6549d8007be4c8dc9e026e96347ed249e7bc17e1505d96eceb7a46aad63a13afe69a36d272fad77160f1c4f42fe78bf40ac74cf1f9fdf2720d85ab35df

data/README.md

@@ -71,6 +71,8 @@ As a result, `snapshot` will be completely rewritten from ground up without chan
 - UI Tests are written in Swift or Objective C
 - UI Tests can be executed in a much cleaner and better way
 
+A note to the new release of Xcode 7: `snapshot` has some issues with the GM, please use Xcode 6 for UI Automation until this is resolved.
+
 -------
 <p align="center">
     <a href="#features">Features</a> &bull; 

data/bin/snapshot

@@ -69,13 +69,14 @@ class SnapshotApplication
     command :reset_simulators do |c|
       c.syntax = 'snapshot reset_simulators'
       c.description = "This will remove all your existing simulators and re-create new ones"
-      c.option '-i', '--ios String', String, 'The iOS Version you want to use'
+      c.option '-i', '--ios String', String, 'The comma separated list of iOS Versions you want to use'
 
       c.action do |args, options|
-        version = options.ios || Snapshot::LatestIosVersion.version
+        versions = [Snapshot::LatestIosVersion.version]
+        versions = options.ios.split(',') if options.ios
         require 'snapshot/reset_simulators'
 
-        Snapshot::ResetSimulators.clear_everything!(version)
+        Snapshot::ResetSimulators.clear_everything!(versions)
       end
     end
 

data/lib/snapshot.rb

@@ -16,4 +16,12 @@ module Snapshot
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
 
   Snapshot::DependencyChecker.check_dependencies
+
+  def self.xcode_version
+		`xcodebuild -version`.match(/Xcode (.*)/)[1]
+  end
+
+  def self.min_xcode7?
+		xcode_version.split(".").first.to_i >= 7
+  end
 end

data/lib/snapshot/page.html.erb

@@ -134,7 +134,6 @@
             tmpImg.src = img.src;
             imageDisplay.style.height     = 'auto';
             imageDisplay.style.width     = 'auto';
-            imageDisplay.style.paddingTop   = '20px';
             if (window.innerHeight < tmpImg.height) {
               imageDisplay.style.height = document.documentElement.clientHeight+'px';
             } else if (window.innerWidth < tmpImg.width) {

data/lib/snapshot/reset_simulators.rb

@@ -1,6 +1,6 @@
 module Snapshot
   class ResetSimulators
-    def self.clear_everything!(ios_version)
+    def self.clear_everything!(ios_versions)
       # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       # !! Warning: This script will remove all your existing simulators !!
       # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -35,8 +35,10 @@ module Snapshot
       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}"
-        `xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{ios_version}`
+        ios_versions.each do |ios_version|
+          puts "Creating #{device_type} for iOS version #{ios_version}"
+          `xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{ios_version}`
+        end
       end
     end
   end

data/lib/snapshot/runner.rb

@@ -51,7 +51,7 @@ module Snapshot
         break if errors.any? && ENV["SNAPSHOT_BREAK_ON_FIRST_ERROR"]
       end
 
-      `killall "iOS Simulator"` # close the simulator after the script is finished
+      kill_simulator # close the simulator after the script is finished
 
       return unless take_snapshots
 
@@ -100,20 +100,24 @@ module Snapshot
 
       def com(cmd)
         puts cmd.magenta if $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)
+
+        IO.popen("#{cmd} 2>&1", err: [:child, :out]) do |io|
+          io.each do |line|
+            puts line if (line.to_s.length > 0 and $verbose)
+          end
+          io.close
         end
       end
 
       udid = udid_for_simulator(device)
 
-      com("killall 'iOS Simulator'")
+      kill_simulator
       sleep 3
       com("xcrun simctl boot '#{udid}'")
-      com("xcrun simctl uninstall booted '#{app_identifier}'")
+
+      com("xcrun simctl uninstall '#{udid}' '#{app_identifier}'") unless Snapshot.min_xcode7?
       sleep 3
-      com("xcrun simctl install booted '#{@app_path.shellescape}'")
+      com("xcrun simctl install '#{udid}' #{@app_path.shellescape}") unless Snapshot.min_xcode7?
       com("xcrun simctl shutdown booted")
     end
 
@@ -221,6 +225,11 @@ module Snapshot
       end
     end
 
+    def kill_simulator
+      `killall "iOS Simulator"`
+      `killall "Simulator"`
+    end
+
     def copy_screenshots(language)
       resulting_path = File.join(SnapshotConfig.shared_instance.screenshots_path, language)
 

data/lib/snapshot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Automate taking localized screenshots of your iOS app on every device