snapshot 0.2.1.beta1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c2536f41985227165492325889d7840b12dde0d
-  data.tar.gz: 35a2065343d4f96e79a1a47be751c44c466cc134
+  metadata.gz: f9587bca312d28377307565bc943291fed8b44f5
+  data.tar.gz: 624c2a496b4c50820964d2626b20a61a413a4535
 SHA512:
-  metadata.gz: 41fa64e0018686214581fbb62e6cb17211b59954274cf77f24b746ba57cd2c8af31269fccbfadac6be89fc060d7aad8bb347d118d65472865d378f9b1d41822c
-  data.tar.gz: 94751b98456aa3a4e824cb37413a8c398b6643a0ef86134b3b3eb9a881a5e581da2bc64fc09448b3af042f5998d71ac822dd58fa012afa663b303d60e1b3eff4
+  metadata.gz: f8ccb3fcc29be45f88c5ce7c9d8d2b61d8fa8c483c60226a2477c5991be56503d3e68b2d24fdd5d943ed41cf2413f992e7dca7b7e37164f42151b811f007691c
+  data.tar.gz: ef10c5745da09e21ccff13dfb420e8a31761949e314e379acd7147518563faffaf1355c256804e2b16ae887877c3bdadc43738a641500cd41c553564b57d725f

data/README.md

@@ -91,13 +91,10 @@ Here a few links to get started:
 
 # Quick Start
 
-## Record your first script
-
+- Run ```snapshot init``` in your project folder
 - Profile your app (CMD + I), choose ```Automation``` and click the Record button on the bottom of the window.
-- This will get you started. Save the generated file with the extension ```js``` into your project root. 
-- Copy the ```SnapshotHelper.js``` file from the example folder to your project.
-- Add ```#import "SnapshotHelper.js"``` on the top of your newly created JS file.
-- Now you can use ```captureLocalizedScreenshot('0-name')``` to take a snapshot.
+- This will get you started. Copy the generated code into ```./snapshot.js```. Make sure, you leave the import statement on the top.
+- To take a screenshot, use ```captureLocalizedScreenshot('0-name')```
 
 You can take a look at the example project to play around with it.
 

data/lib/assets/SnapshotHelper.js

@@ -0,0 +1,43 @@
+function wait_for_loading_indicator_to_be_finished()
+{
+  re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
+  while (re['size']['width'] == 10 && re['size']['height'] == 20) {
+    UIALogger.logMessage("Loading indicator is visible... waiting")
+    UIATarget.localTarget().delay(1)
+    re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
+  }
+}
+
+function captureLocalizedScreenshot(name) {
+  wait_for_loading_indicator_to_be_finished();
+
+  var target = UIATarget.localTarget();
+  var model = target.model();
+  var rect = target.rect();
+
+  if (model.match(/iPhone/)) 
+  {
+    if (rect.size.height > 667) {
+      model = "iPhone6Plus";
+    } else if (rect.size.height == 667) {
+      model = "iPhone6";
+    } else if (rect.size.height == 568){
+      model = "iPhone5";
+    } else {
+    model = "iPhone4";
+    }
+  } 
+  else 
+  {
+    model = "iOS-iPad";
+  }
+
+  var orientation = "portrait";
+  if (rect.size.height < rect.size.width) orientation = "landscape";
+
+  var result = target.host().performTaskWithPathArgumentsTimeout("/usr/bin/printenv" , ["SNAPSHOT_LANGUAGE"], 5);
+  var language = result.stdout.substring(0, result.stdout.length - 1);
+
+  var parts = [language, model, orientation, name];
+  target.captureScreenWithName(parts.join("-"));
+}

data/lib/assets/snapshot.js

@@ -0,0 +1,13 @@
+#import "SnapshotHelper.js"
+
+var target = UIATarget.localTarget();
+var app = target.frontMostApp();
+var window = app.mainWindow();
+
+
+target.delay(3)
+captureLocalizedScreenshot("0-LandingScreen")
+
+target.frontMostApp().tabBar().buttons()[1].tap();
+target.delay(1)
+captureLocalizedScreenshot("1-SecondScreen")

data/lib/snapshot/runner.rb

@@ -14,11 +14,12 @@ module Snapshot
       Builder.new.build_app
 
       counter = 0
+      errors = []
       SnapshotConfig.shared_instance.devices.each do |device|
         SnapshotConfig.shared_instance.languages.each do |language|
 
           begin
-            run_tests(device, language)
+            errors.concat(run_tests(device, language))
             counter += copy_screenshots(language)
           rescue Exception => ex
             Helper.log.error(ex)
@@ -27,9 +28,18 @@ module Snapshot
         end
       end
 
-      Helper.log.info "Successfully finished generating #{counter} screenshots.".green
-      Helper.log.info "Check it out here: #{SnapshotConfig.shared_instance.screenshots_path}".green
       ReportsGenerator.new.generate
+
+      if errors.count > 0
+        Helper.log.error "-----------------------------------------------------------"
+        Helper.log.error errors.join(' - ').red
+        Helper.log.error "-----------------------------------------------------------"
+        raise "Finished generating #{counter} screenshots with #{errors.count} errors.".red
+      else
+        Helper.log.info "Successfully finished generating #{counter} screenshots.".green
+      end
+      
+      Helper.log.info "Check it out here: #{SnapshotConfig.shared_instance.screenshots_path}".green
     end
 
     def clean_old_traces
@@ -50,16 +60,23 @@ module Snapshot
       retry_run = false
 
       lines = []
+      errors = []
       PTY.spawn(command) do |stdin, stdout, pid|
         stdin.each do |line|
           lines << line
-          result = parse_test_line(line)
-
-          case result
-            when :retry
-              retry_run = true
-            when :screenshot
-              Helper.log.info "Successfully took screenshot 📱"
+          begin
+            result = parse_test_line(line)
+
+            case result
+              when :retry
+                retry_run = true
+              when :screenshot
+                Helper.log.info "Successfully took screenshot 📱"
+              end
+            rescue Exception => ex
+              Helper.log.error lines.join('')
+              Helper.log.error ex.to_s.red
+              errors << ex.to_s
             end
         end
       end
@@ -67,8 +84,10 @@ module Snapshot
       if retry_run
         Helper.log.error "Instruments tool failed again. Re-trying..."
         sleep 2 # We need enough sleep... that's an instruments bug
-        run_tests(device, language)
+        errors = run_tests(device, language)
       end
+
+      return errors
     end
 
     def parse_test_line(line)

data/lib/snapshot/snapfile_creator.rb

@@ -2,14 +2,15 @@ module Snapshot
   class SnapfileCreator
     # This method will take care of creating a Snapfile
     def self.create(path)
-      path = [path, 'Snapfile'].join("/")
+      snapfile_path = [path, 'Snapfile'].join("/")
 
-      raise "Snapfile already exists at path '#{path}'. Run 'snapshot' to use Snapshot.".red if File.exists?(path)
+      raise "Snapfile already exists at path '#{snapfile_path}'. Run 'snapshot' to use Snapshot.".red if File.exists?(snapfile_path)
 
-      template = File.read("#{gem_path}/lib/assets/SnapfileTemplate")
-      File.write(path, template)
+      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, 'SnapshotHelper.js'].join('/'), File.read("#{gem_path}/lib/assets/SnapshotHelper.js"))
 
-      puts "Successfully created new Snapfile at '#{path}'".green
+      puts "Successfully created new Snapfile at '#{snapfile_path}'".green
     end
 
      private

data/lib/snapshot/snapshot_config.rb

@@ -41,7 +41,7 @@ module Snapshot
       if path and File.exists?path
         self.snapshot_file = SnapshotFile.new(path, self)
       else
-        Helper.log.error "Could not find './Snapfile'. It is recommended to create a file into the current directory. Using the defaults now."
+        Helper.log.error "Could not find './Snapfile'. It is recommended to create a file using 'snapshot init' into the current directory. Using the defaults now."
       end
     end
 

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.2.1.beta1"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.2.1.beta1
+  version: 0.2.1
 platform: ruby
 authors:
 - Felix Krause
@@ -176,6 +176,8 @@ files:
 - README.md
 - bin/snapshot
 - lib/assets/SnapfileTemplate
+- lib/assets/SnapshotHelper.js
+- lib/assets/snapshot.js
 - lib/snapshot.rb
 - lib/snapshot/builder.rb
 - lib/snapshot/dependency_checker.rb
@@ -204,9 +206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2