snapshot 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13928d9326f39b30e569d84dc9b7322b75528461
-  data.tar.gz: 980ee5750a4891dc1a393a3ea9ffaef388eb6fb8
+  metadata.gz: bb22e301c8b01a884a5a8c28d667c7232aec7aac
+  data.tar.gz: ade29b593ed655a723842b8a5a29adab0ec9edd2
 SHA512:
-  metadata.gz: 1f1dd54873bc74cd2ebd857bcc3053fbee2f4008aac3acd904aba4258f2dddf8fff27fd390c6f81c980079116d3b149f995ad120a8d0d949385330cf3138cf99
-  data.tar.gz: ba74fd809f939871c5d95aaeb672bef8e7cec2db92f28472c4fd8103f408d2f925e2a8f53e1ac74a52cbeded4b5abd0e1285b457a6b70e7e4131483e604eb16d
+  metadata.gz: 77e1b8abec203b2821de66c104e0327abd5d4bc07f716dc07494ded8910b364f66c08038a32f839e0164270ea1bacc0b920b392d4eb7cfb8b352d20fa25397ce
+  data.tar.gz: b46801b442b87817743e93575b2f24453ca3fa2851641632cd00aca4ed82b23c34f787c5574f209a136455a69b8c04a6ade27d45af2a53c62c70fbbbe5e3dc8e

data/README.md

@@ -226,6 +226,12 @@ I'll try to keep the script up to date. If you need to change the iOS version, y
 ios_version "9.0"
 ```
 
+### Custom Args for the build command
+
+```ruby
+custom_args "GCC_PREPROCESSOR_DEFINITIONS='SCREENSHOTS'"
+```
+
 ### Custom Build Command
 If for some reason, the default build command does not work for your project, you can pass your own build script. The script will be executed **once** before the tests are being run.
 
@@ -253,7 +259,7 @@ end
 
 setup_for_language_change do |lang, device|
   puts "Running #{lang} on #{device}"
-  system("./popuplateDatabase.sh")
+  system("./populateDatabase.sh")
 end
 
 teardown_language do |lang, device|
@@ -266,6 +272,8 @@ teardown_device do |device|
 end
 ```
 
+If you want to run a script before each run of the app, it's enough to only implement the `setup_for_language_change` callback.
+
 ### Skip alpha removal from screenshots
 In case you want to skip this process, just add ```skip_alpha_removal``` to your ```Snapfile```.
 

data/lib/assets/SnapfileTemplate

@@ -34,7 +34,7 @@ screenshots_path "./screenshots"
 
 # Custom Callbacks
 
-# setup_for_device_change do |device| 
+# setup_for_device_change do |device|
 #   puts "Preparing device: #{device}"
 # end
 

data/lib/snapshot/builder.rb

@@ -58,7 +58,8 @@ module Snapshot
         proj_key = 'project'
         proj_key = 'workspace' if proj_path.end_with?'.xcworkspace'
 
-        build_command = (DependencyChecker.xctool_installed? ? 'xctool' : 'xcodebuild')
+        pre_command = SnapshotConfig.shared_instance.custom_args || ENV["SNAPSHOT_CUSTOM_ARGS"] || ''
+        build_command = pre_command + ' ' + (DependencyChecker.xctool_installed? ? 'xctool' : 'xcodebuild')
 
         actions = []
         actions << 'clean' if clean

data/lib/snapshot/dependency_checker.rb

@@ -37,11 +37,11 @@ module Snapshot
 
     def self.check_xctool
       if not self.xctool_installed?
-        Helper.log.error '#############################################################'
-        Helper.log.error "# xctool is recommended to build the apps"
-        Helper.log.error "# Install it using 'brew install xctool'"
-        Helper.log.error "# Falling back to xcode build instead "
-        Helper.log.error '#############################################################'
+        Helper.log.info '#############################################################'
+        Helper.log.info "# xctool is recommended to build the apps"
+        Helper.log.info "# Install it using 'brew install xctool'"
+        Helper.log.info "# Falling back to xcode build instead "
+        Helper.log.info '#############################################################'
       end
     end
 

data/lib/snapshot/page.html.erb

@@ -40,11 +40,10 @@
             <% screens.each do |screen_path| %>
               <% next if screen_path.include?"_framed.png" %>
               <td>
-                <% path = screen_path.gsub("./screenshots/", "./") %>
-                <% screen_size = FastImage.size(File.join('screenshots', screen_path)) %>
-                <a href="<%= path %>" target="_blank">
+                <% screen_size = FastImage.size(screen_path) %>
+                <a href="<%= screen_path %>" target="_blank">
                   <img class="screenshot" 
-                         src="<%= path %>",
+                         src="<%= screen_path %>",
                        style="width: <%= [(screen_size[0] / divide_size_by).round, max_width].min %>px;" />
                 </a>
               </td>

data/lib/snapshot/reports_generator.rb

@@ -27,7 +27,7 @@ module Snapshot
         end
       end
 
-      html_path = [lib_path, "snapshot/page.html.erb"].join('/')
+      html_path = File.join(lib_path, "snapshot/page.html.erb")
       html = ERB.new(File.read(html_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
 
       export_path = "#{screens_path}/screenshots.html"

data/lib/snapshot/runner.rb

@@ -34,6 +34,8 @@ module Snapshot
         SnapshotConfig.shared_instance.blocks[:teardown_device].call(device) # Callback
       end
 
+      `killall "iOS Simulator"` # close the simulator after the script is finished
+
       ReportsGenerator.new.generate
 
       if errors.count > 0
@@ -161,7 +163,7 @@ module Snapshot
     end
 
     def copy_screenshots(language)
-      resulting_path = [SnapshotConfig.shared_instance.screenshots_path, language].join('/')
+      resulting_path = File.join(SnapshotConfig.shared_instance.screenshots_path, language)
 
       FileUtils.mkdir_p resulting_path
 

data/lib/snapshot/screenshot_flatten.rb

@@ -4,25 +4,16 @@ module Snapshot
     # @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"
-      if image_magick_installed?
-        flatten(path)
-      else
-        Helper.log.info "Could not remove transparency of generated screenhots.".yellow
-        Helper.log.info "This will cause problems when trying to manually upload them to iTC.".yellow
-        Helper.log.info "You can install 'imagemagick' using 'brew install imagemagick' to enable this feature.".yellow
-      end
+      flatten(path)
     end
 
     def flatten(path)
       Dir.glob([path, '/**/*.png'].join('/')).each do |file|
         Helper.log.info "Removing alpha channel from '#{file}'"
-        `convert -flatten '#{file}' -alpha off -alpha remove '#{file}'`
+        `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
-
-    def image_magick_installed?
-      `which convert`.length > 1
-    end
   end
 end

data/lib/snapshot/snapshot_config.rb

@@ -34,6 +34,9 @@ module Snapshot
     # @return (BOOL) Clear previously generated screenshots before creating new ones
     attr_accessor :clear_previous_screenshots
 
+    # @return (String) This will be prepended before the actual build command
+    attr_accessor :custom_args
+
     # @return (Hash) All the blocks, which are called on specific actions
     attr_accessor :blocks
 
@@ -51,12 +54,15 @@ module Snapshot
       if File.exists?path
         Helper.log.info "Using '#{path}'".green
         self.snapshot_file = SnapshotFile.new(path, self)
+
+        self.verify_devices
       else
         if path != './Snapfile'
           raise "Could not find Snapfile at path '#{path}'. Make sure you pass the full path, including 'Snapfile'".red
         else
           # Using default settings, since user didn't provide a path
           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
+          self.verify_devices
         end
       end
 
@@ -66,13 +72,6 @@ module Snapshot
     def set_defaults
       self.ios_version = '8.1'
 
-      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)"
-      ]
-
       self.languages = [
         'de-DE',
         'en-US'
@@ -98,6 +97,33 @@ module Snapshot
       }
     end
 
+    # 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)"
+      ]
+    end
+
+    # This method takes care of appending the iOS version to the simulator name
+    def verify_devices
+      self.set_default_simulators
+
+      actual_devices = []
+      self.devices.each do |current|
+        current += " (#{self.ios_version} Simulator)" unless current.include?"Simulator"
+
+        unless Simulators.available_devices.include?current
+          raise "Device '#{current}' not found. Available device types: #{Simulators.available_devices}".red
+        else
+          actual_devices << current
+        end
+      end
+      self.devices = actual_devices
+    end
+
     def load_env
       # Load environment variables
       self.manual_scheme = ENV["SNAPSHOT_SCHEME"] if ENV["SNAPSHOT_SCHEME"]
@@ -129,7 +155,7 @@ module Snapshot
         end
       end
 
-      unless File.exists?result
+      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
 

data/lib/snapshot/snapshot_file.rb

@@ -24,7 +24,8 @@ module Snapshot
 
       case method_sym
         when :devices
-          self.verify_devices(value)
+          raise "Devices has to be an array".red unless value.kind_of?Array
+          @config.devices = value
         when :languages
           @config.languages = value
         when :ios_version
@@ -43,6 +44,9 @@ module Snapshot
         when :build_command
           raise "build_command has to be an String".red unless value.kind_of?String
           @config.build_command = value
+        when :custom_args
+          raise "custom_args has to be an String".red unless value.kind_of?String
+          @config.custom_args = value
         when :skip_alpha_removal
           @config.skip_alpha_removal = true
         when :clear_previous_screenshots
@@ -66,19 +70,5 @@ module Snapshot
           Helper.log.error "Unknown method #{method_sym}"
         end
     end
-
-    def verify_devices(value)
-      raise "Devices has to be an array".red unless value.kind_of?Array
-      @config.devices = []
-      value.each do |current|
-        current += " (#{@config.ios_version} Simulator)" unless current.include?"Simulator"
-
-        unless Simulators.available_devices.include?current
-          raise "Device '#{current}' not found. Available device types: #{Simulators.available_devices}".red
-        else
-          @config.devices << current
-        end
-      end
-    end
   end
 end

data/lib/snapshot/version.rb

@@ -1,3 +1,3 @@
 module Snapshot
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapshot
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement