snapshot 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1657aac81439fe19362e073f189c137b841c194
-  data.tar.gz: 486885b3dc7e0a4e9917be796d9a4a9b834e5472
+  metadata.gz: 28f9044173c73c9227c4e372ca91977e262a3166
+  data.tar.gz: 93c57e0423a893e5cb97ef1e3e7198cdeedb72c2
 SHA512:
-  metadata.gz: cb7ceeb2cebc1d40066f1da16c2ee655ed65ca1df41ac3a0df6f0ba3abbddaaccc30484262521d223592fbc2da5c005f54158e33d75c301c4df04002ebb9299a
-  data.tar.gz: bc4b7a77f96d64113ad0ecf9104a8335e9b463eae5cc7fd195170b5a49b97899284f67d397c9dc3f37b0b779a10a5a0cffe6527961c5cdac805c8faec5c20a61
+  metadata.gz: c98f7667067c7ab9e0daee297868b1c9938668152de527ecd63752db9a510a35b77f73e97f87faff5adc7f0f84eba82e164d8673808b9fb4a2f138fbc8df2bf1
+  data.tar.gz: fb94311fe51e3f1f62e284fa46689797931e0f0cbc66d3f39d6b01420a8a4ea74487dff559063bbd8a9b57467fa176bde992f3b97ec77b758b096ffd4d9087e5

data/README.md

@@ -1,7 +1,8 @@
 <p align="center">
 <a href="https://github.com/KrauseFx/deliver">Deliver</a> &bull; 
 <b>Snapshot</b> &bull; 
-<a href="https://github.com/KrauseFx/frameit">FrameIt</a>
+<a href="https://github.com/KrauseFx/frameit">FrameIt</a> &bull; 
+<a href="https://github.com/KrauseFx/PEM">PEM</a>
 </p>
 -------
 
@@ -91,7 +92,7 @@ Make sure, you have the latest version of the Xcode command line tools installed
     
 # UI Automation
 
-## Get started
+## Getting started
 This project uses Apple's ```UI Automation``` under the hood. I will not go into detail on how to write scripts. 
 
 Here a few links to get started:
@@ -233,7 +234,16 @@ teardown_device do |device|
 end
 ```
 
+### Skip alpha removal from screenshots
+In case you want to skip this process, just add ```skip_alpha_removal``` to your ```Snapfile```.
+
 # Tips
+## Specify a custom ```Snapfile```
+
+    snapshot --snapfile ./SpecialSnapfile
+
+Be aware: The file will be executed from the current directory, not the location of the ```Snapfile```. That means: ```./screenshots``` will export the screenshots to the current directory of your terminal session.
+
 ## Available language codes
 ```ruby
 ["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", "zh_CN", "cmn-Hant"]
@@ -246,7 +256,7 @@ You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/Simulator
 Change syntax highlighting to *Ruby*.
 
 ## Instruments is not responding
-Unfortunately, from time to time, ```Instruments``` decide, to not respond to anything. Which means, neither the ```Instruments``` application, nor the ```instruments``` command line work. Killing the process doesn't help.
+Unfortunately ```Instruments``` sometimes decides, to not respond to anything. Which means, neither the ```Instruments``` application, nor the ```instruments``` command line work. Killing the process doesn't help.
 
 The only way to fix this, is a restart of the Mac. 
 

data/bin/snapshot

@@ -7,6 +7,7 @@ require 'commander/import'
 require 'snapshot/update_checker'
 require 'snapshot/dependency_checker'
 require 'snapshot/snapfile_creator'
+require 'snapshot/snapshot_config'
 
 HighLine.track_eof = false
 
@@ -29,7 +30,10 @@ default_command :run
 command :run do |c|
   c.syntax = 'snapshot'
   c.description = 'Run the script, to take all the screenshots'
+  c.option '--snapfile STRING', String, 'Custom path for your Snapfile'
+
   c.action do |args, options|
+    Snapshot::SnapshotConfig.shared_instance(options.snapfile) if options.snapfile # to set the custom Snapfile path if given
     Snapshot::Runner.new.work
   end
 end

data/lib/assets/SnapshotHelper.js

@@ -1,15 +1,17 @@
 function wait_for_loading_indicator_to_be_finished()
 {
-  re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
-  re2 = UIATarget.localTarget().frontMostApp().statusBar().elements()[3].rect()
-  while ((re['size']['width'] == 10 && re['size']['height'] == 20) ||
-         (re2['size']['width'] == 10 && re2['size']['height'] == 20))
-   {
-    UIALogger.logMessage("Loading indicator is visible... waiting")
-    UIATarget.localTarget().delay(1)
+  try {
     re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
     re2 = UIATarget.localTarget().frontMostApp().statusBar().elements()[3].rect()
-  }
+    while ((re['size']['width'] == 10 && re['size']['height'] == 20) ||
+           (re2['size']['width'] == 10 && re2['size']['height'] == 20))
+     {
+      UIALogger.logMessage("Loading indicator is visible... waiting")
+      UIATarget.localTarget().delay(1)
+      re = UIATarget.localTarget().frontMostApp().statusBar().elements()[2].rect()
+      re2 = UIATarget.localTarget().frontMostApp().statusBar().elements()[3].rect()
+    }
+  } catch (e) {}
 }
 
 function captureLocalizedScreenshot(name) {

data/lib/snapshot.rb

@@ -5,7 +5,6 @@ require 'snapshot/snapshot_config'
 require 'snapshot/runner'
 require 'snapshot/builder'
 require 'snapshot/snapshot_file'
-require 'snapshot/languages'
 require 'snapshot/reports_generator'
 require 'snapshot/screenshot_flatten'
 require 'snapshot/simulators'

data/lib/snapshot/runner.rb

@@ -26,7 +26,7 @@ module Snapshot
             errors.concat(run_tests(device, language))
             counter += copy_screenshots(language)
           rescue SystemExit, Interrupt => ex
-            raise ex # system interrupted exception (Strg + C)
+            raise ex # system interrupted exception (ctrl + C)
           rescue StandardError => ex
             Helper.log.error(ex)
           end
@@ -45,8 +45,6 @@ module Snapshot
       else
         Helper.log.info "Successfully finished generating #{counter} screenshots.".green
       end
-
-      ScreenshotFlatten.new.run(SnapshotConfig.shared_instance.screenshots_path)
       
       Helper.log.info "Check it out here: #{SnapshotConfig.shared_instance.screenshots_path}".green
     end
@@ -65,6 +63,7 @@ module Snapshot
 
       ENV['SNAPSHOT_LANGUAGE'] = language
       command = generate_test_command(device, language, app_path)
+      Helper.log.debug command.yellow
       
       retry_run = false
 
@@ -118,6 +117,10 @@ module Snapshot
 
       FileUtils.mkdir_p resulting_path
 
+      unless SnapshotConfig.shared_instance.skip_alpha_removal
+        ScreenshotFlatten.new.run(TRACE_DIR)
+      end
+
       Dir.glob("#{TRACE_DIR}/**/*.png") do |file|
         FileUtils.cp_r(file, resulting_path + '/')
       end

data/lib/snapshot/snapshot_config.rb

@@ -31,23 +31,31 @@ module Snapshot
     # @return (String) The build command, wich should build the app to '/tmp/snapshot'
     attr_accessor :build_command
 
+    # @return (BOOl) Skip the removal of the alpha channel from the screenshots
+    attr_accessor :skip_alpha_removal
+
     # @return (Hash) All the blocks, which are called on specific actions
     attr_accessor :blocks
 
 
     # A shared singleton
-    def self.shared_instance
-      @@instance ||= SnapshotConfig.new
+    def self.shared_instance(path = nil)
+      @@instance ||= SnapshotConfig.new(path)
     end
 
     # @param path (String) the path to the config file to use (including the file name)
-    def initialize(path = './Snapfile')
+    def initialize(path = nil)
+      path ||= './Snapfile'
       set_defaults
 
       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 using 'snapshot init' into the current directory. Using the defaults now."
+        if path != './Snapfile'
+          raise "Could not find Snapfile at path '#{path}'. Make sure you pass the full path, including 'Snapfile'".red
+        else
+          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.".red
+        end
       end
 
       load_env

data/lib/snapshot/snapshot_file.rb

@@ -26,7 +26,7 @@ module Snapshot
         when :devices
           self.verify_devices(value)
         when :languages
-          self.verify_languages(value)
+          @config.languages = value
         when :ios_version
           raise "ios_version has to be an String".red unless value.kind_of?String
           @config.ios_version = value
@@ -47,6 +47,8 @@ module Snapshot
         when :build_command
           raise "build_command has to be an String".red unless value.kind_of?String
           @config.build_command = value
+        when :skip_alpha_removal
+          @config.skip_alpha_removal = true
         when :project_path
           raise "project_path has to be an String".red unless value.kind_of?String
 
@@ -78,15 +80,5 @@ module Snapshot
         end
       end
     end
-
-    def verify_languages(value)
-      raise "Languages has to be an array".red unless value.kind_of?Array
-      value.each do |current|
-        unless Languages::ALL_LANGUAGES.include?current
-          raise "Language '#{current}' not found. Available languages: #{Languages::ALL_LANGUAGES}".red
-        end
-      end
-      @config.languages = value
-    end
   end
 end

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -182,7 +182,6 @@ files:
 - lib/snapshot/builder.rb
 - lib/snapshot/dependency_checker.rb
 - lib/snapshot/helper.rb
-- lib/snapshot/languages.rb
 - lib/snapshot/page.html.erb
 - lib/snapshot/reports_generator.rb
 - lib/snapshot/runner.rb

data/lib/snapshot/languages.rb

@@ -1,6 +0,0 @@
-module Snapshot
-  module Languages
-    # These are all the languages which are available to choose for the simulator
-    ALL_LANGUAGES = ["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", "zh_CN", "cmn-Hant"]
-  end
-end