snapshot 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9a3bdd92f26c6fb438e58ac38b9e3dacd4b55d
-  data.tar.gz: 0f72ce53c3c5fbe8634ff5fc9d61d88c0929e8f8
+  metadata.gz: ca1d44f5d3981444263228bcb8c0528b97cede47
+  data.tar.gz: 2a84ee85f3a7c0dd2c1d7da5557857abe5ee869a
 SHA512:
-  metadata.gz: 9bf6c703c5d25c7cb403c1b644ecf1e94949fac393d62d29b6478bb77e5c2fd5fe596c321f84fe93535dc49bcd37adf27677fd479f6d83fcb5e6247441687886
-  data.tar.gz: c4d53cd5b1fe7ceb648f064a01e238866d38264bec7537a980cc00917cfaf7dadf4804c82cc5deaae8e98012756fc2caf5e0f0df58d2bac317a15a553db5e473
+  metadata.gz: f80391c3b5d104f8271c4cd90f03110cb4ee900d6edbe582ba9b061c83d744d13942ba9cda5c4853e4365275e16136f325f07db2665925eefcee8329cc297f92
+  data.tar.gz: 4a194d765aa44cfa75b3cca707dd65753e60e65874052cbc1e881acd558b8ad8b44edbdec69a5510dbb43675bc2fd683f3e69aabd23a3d5748a3365724e2d422

data/README.md

@@ -197,6 +197,8 @@ to your test file.
 js_file './path/file.js'
 ```
 
+You can add a custom script for iPads: `./path/file-iPad.js` and it will automatically be used if found. Just append the `-iPad` to your existing file.
+
 ### Scheme
 To not be asked which scheme to use, just set it like this:
 ```ruby
@@ -242,8 +244,11 @@ This can be used to
 
 To run a shell script, just use ```system('./script.sh')```.
 ```ruby
-setup_for_device_change do |device| 
-  puts "Preparing device: #{device}"
+setup_for_device_change do |device, udid|
+  puts "Preparing device: #{device} with udid #{udid}"
+
+  # Completely reset the device before we start taking screenshots
+  system("xcrun simctl erase #{udid}")
 end
 
 setup_for_language_change do |lang, device|

data/lib/snapshot/page.html.erb

@@ -41,7 +41,7 @@
               <% next if screen_path.include?"_framed.png" %>
               <td>
                 <% path = screen_path.gsub("./screenshots/", "./") %>
-                <% screen_size = FastImage.size(screen_path) %>
+                <% screen_size = FastImage.size(File.join('screenshots', screen_path)) %>
                 <a href="<%= path %>" target="_blank">
                   <img class="screenshot" 
                          src="<%= path %>",

data/lib/snapshot/reports_generator.rb

@@ -9,17 +9,19 @@ module Snapshot
       @data = {}
 
       Dir["#{screens_path}/*"].sort.each do |language_path|
-        language = language_path.split('/').last
-        Dir[[language_path, '*'].join('/')].sort.each do |screenshot|
+        language = File.basename(language_path)
+        Dir[File.join(language_path, '*')].sort.each do |screenshot|
 
           available_devices.each do |key_name, output_name|
 
-            if screenshot.split('/').last.include?key_name
+            if File.basename(screenshot).include?key_name
               # This screenshot it from this device
               @data[language] ||= {}
               @data[language][output_name] ||= []
-              @data[language][output_name] << screenshot
-              break # to not include iPhone 6 and 6 Plus
+
+              resulting_path = File.join('.', language, File.basename(screenshot))
+              @data[language][output_name] << resulting_path
+              break # to not include iPhone 6 and 6 Plus (name is contained in the other name)
             end
           end
         end

data/lib/snapshot/runner.rb

@@ -5,7 +5,7 @@ module Snapshot
     TRACE_DIR = '/tmp/snapshot_traces'
 
     def work(clean: true)
-      SnapshotConfig.shared_instance.js_file # to verify the file can be found
+      SnapshotConfig.shared_instance.js_file # to verify the file can be found earlier
 
       Builder.new.build_app(clean: clean)
       @app_path = Dir.glob("/tmp/snapshot/build/*.app").first
@@ -15,7 +15,7 @@ module Snapshot
 
       SnapshotConfig.shared_instance.devices.each do |device|
         
-        SnapshotConfig.shared_instance.blocks[:setup_for_device_change].call(device)  # Callback
+        SnapshotConfig.shared_instance.blocks[:setup_for_device_change].call(device, udid_for_simulator(device))  # Callback
 
         SnapshotConfig.shared_instance.languages.each do |language|
           SnapshotConfig.shared_instance.blocks[:setup_for_language_change].call(language, device) # Callback
@@ -51,17 +51,21 @@ module Snapshot
       FileUtils.mkdir_p(TRACE_DIR)
     end
 
-    def reinstall_app(device, language)
-      def find_simulator(name) # fetches the UDID of the simulator type
-        all = `instruments -s`.split("\n")
-        all.each do |current|
-          return current.match(/\[(.*)\]/)[1] if current.include?name
-        end
-        raise "Could not find simulator '#{name}' to install the app on."
+    def udid_for_simulator(name) # fetches the UDID of the simulator type
+      all = `instruments -s`.split("\n")
+      all.each do |current|
+        return current.match(/\[(.*)\]/)[1] if current.include?name
       end
+      raise "Could not find simulator '#{name}' to install the app on."
+    end
+
+    def reinstall_app(device, language)
 
       def app_identifier
-        @app_identifier ||= (ENV["SNAPSHOT_APP_IDENTIFIER"] || `/usr/libexec/PlistBuddy -c 'Print CFBundleIdentifier' /tmp/snapshot/build/*.app/*.plist`)
+        @app_identifier ||= ENV["SNAPSHOT_APP_IDENTIFIER"] 
+        @app_identifier ||= `/usr/libexec/PlistBuddy -c 'Print CFBundleIdentifier' /tmp/snapshot/build/*.app/Info.plist`
+        @app_identifier ||= `/usr/libexec/PlistBuddy -c 'Print CFBundleIdentifier' /tmp/snapshot/build/*.app/*.plist`
+        @app_identifier.strip
       end
 
       def com(cmd)
@@ -70,13 +74,16 @@ module Snapshot
         puts result if result.to_s.length > 0
       end
 
-      udid = find_simulator(device)
+      udid = udid_for_simulator(device)
+
+
       com("killall 'iOS Simulator'")
+      sleep 3
       com("xcrun simctl boot '#{udid}'")
-      com("xcrun simctl uninstall '#{udid}' '#{app_identifier}'")
+      com("xcrun simctl uninstall booted '#{app_identifier}'")
       sleep 3
-      com("xcrun simctl install '#{udid}' '#{@app_path}'")
-      com("xcrun simctl shutdown '#{udid}'")
+      com("xcrun simctl install booted '#{@app_path}'")
+      com("xcrun simctl shutdown booted")
     end
 
     def run_tests(device, language)
@@ -169,7 +176,8 @@ module Snapshot
     end
 
     def generate_test_command(device, language)
-      script_path = SnapshotConfig.shared_instance.js_file
+      is_ipad = (device.downcase.include?'ipad')
+      script_path = SnapshotConfig.shared_instance.js_file(is_ipad)
 
       [
         "instruments",
@@ -184,4 +192,4 @@ module Snapshot
       ].join(' ')
     end
   end
-end
+end

data/lib/snapshot/snapfile_creator.rb

@@ -10,10 +10,12 @@ module Snapshot
 
       File.write(snapfile_path, File.read("#{gem_path}/lib/assets/SnapfileTemplate"))
       File.write([path, 'snapshot.js'].join('/'), File.read("#{gem_path}/lib/assets/snapshot.js"))
+      File.write([path, 'snapshot-iPad.js'].join('/'), File.read("#{gem_path}/lib/assets/snapshot.js"))
       File.write([path, 'SnapshotHelper.js'].join('/'), File.read("#{gem_path}/lib/assets/SnapshotHelper.js"))
 
       puts "Successfully created SnapshotHelper.js '#{[path, 'SnapshotHelper.js'].join('/')}'".green
       puts "Successfully created new UI Automation JS file at '#{[path, 'snapshot.js'].join('/')}'".green
+      puts "Successfully created new UI Automation JS file for iPad at '#{[path, 'snapshot-iPad.js'].join('/')}'".green
       puts "Successfully created new Snapfile at '#{snapfile_path}'".green
     end
 

data/lib/snapshot/snapshot_config.rb

@@ -109,15 +109,28 @@ module Snapshot
     end
 
     # The JavaScript UIAutomation file
-    def js_file
-      return manual_js_file if manual_js_file
+    def js_file(ipad = false)
+      result = manual_js_file
 
-      files = Dir.glob("./*.js").delete_if { |path| path.include?"SnapshotHelper.js" }
-      if files.count == 1
-        return files.first
-      else
+      unless result
+        files = Dir.glob("./*.js").delete_if { |path| (path.include?"SnapshotHelper.js" or path.include?"iPad.js") }
+        if files.count == 1
+          result = files.first
+        end
+      end
+
+      if ipad
+        ipad_file = result.split('.js').join('/') + '-iPad.js'
+        if File.exists?(ipad_file)
+          result = ipad_file
+        end
+      end
+
+      unless File.exists?result
         raise "Could not determine which UIAutomation file to use. Please pass a path to your Javascript file using 'js_file'.".red
       end
+
+      return result
     end
 
     # The scheme to use (either it's set, or there is only one, or user has to enter it)

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json