zucchini-ios 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.7.2 / 2013-08-19
+* Implement orientation specific masks - [@phatmann][], [#34][]
+* Archivable HTML reports - [@vaskas][], [#33][]
+* TAP-compatible output and reporting - [@vaskas][], [#32][]
+
+## 0.7.1 / 2013-08-12
+* Compile config file with ERB - [@vaskas][], [#30][]
+* Reduce gem size by not bundling specs with their sample setups
+
 ## 0.7.0 / 2013-08-11
 * Integrate mechanic.js - [@vaskas][], [#29][]
 * Configure simulator with device and orientation - [@phatmann][], [#27][]
@@ -59,6 +68,10 @@
 [#26]: https://github.com/zucchini-src/zucchini/issues/26
 [#27]: https://github.com/zucchini-src/zucchini/issues/27
 [#29]: https://github.com/zucchini-src/zucchini/issues/29
+[#30]: https://github.com/zucchini-src/zucchini/issues/30
+[#32]: https://github.com/zucchini-src/zucchini/issues/32
+[#33]: https://github.com/zucchini-src/zucchini/issues/33
+[#34]: https://github.com/zucchini-src/zucchini/issues/34
 
 [@Jaco-Pretorius]: https://github.com/Jaco-Pretorius
 [@NathanSudell]: https://github.com/NathanSudell

data/README.md

@@ -25,21 +25,21 @@ gem install zucchini-ios
 Using Zucchini doesn't involve making any modifications to your application code.
 You might as well keep your Zucchini tests in a separate project.
 
-Start by creating a project scaffold:
+To create a project scaffold:
 
 ```
 zucchini generate --project /path/to/my_project
 ```
 
-Create a feature scaffold for your first feature:
+Then to create a feature scaffold for your first feature:
 
 ```
 zucchini generate --feature /path/to/my_project/features/my_feature
 ```
 
-Start hacking by modifying `features/my_feature/feature.zucchini` and `features/support/screens/welcome.coffee`.
+Start developing by editing `features/my_feature/feature.zucchini` and `features/support/screens/welcome.coffee`.
 
-Alternatively, check out the [zucchini-demo](https://github.com/zucchini-src/zucchini-demo) project featuring an easy to explore Zucchini setup around Apple's CoreDataBooks sample.
+Make sure you check out the [zucchini-demo](https://github.com/zucchini-src/zucchini-demo) project featuring an easy to explore Zucchini setup around Apple's CoreDataBooks sample.
 
 ## Running on the device
 
@@ -50,53 +50,76 @@ The [udidetect](https://github.com/vaskas/udidetect) utility comes in handy if y
 ```
 ZUCCHINI_DEVICE="My Device" zucchini run /path/to/my_feature
 ```
+You can set one of the devices to be used by default in `config.yml` so that you can avoid setting `ZUCCHINI_DEVICE` each time:
+
+```
+devices:
+  My Device:
+	default: true
+	...
+```
 
 ## Running on the iOS Simulator
 
 We encourage you to run your Zucchini features on real hardware. However you can also run them on the iOS Simulator.
 
-First off, modify your `features/support/config.yml` to include the path to your compiled app, e.g.
+First off, modify your `features/support/config.yml` to include the path to your compiled app (relative or absolute), e.g.
 
 ```
 app: ./Build/Products/Debug-iphonesimulator/CoreDataBooks.app
 ```
 
-Secondly, add an `iOS Simulator` entry to the devices section (no UDID needed) and make sure you provide the actual value for 'screen' based on your iOS Simulator settings:
+Secondly, add a simulator device entry (no UDID needed) and make sure you provide the actual value for `screen` based on your iOS Simulator settings:
 
 ```
 devices:
-  iOS Simulator:
-    screen: low_ios5
+  My Simulator:
+    screen: retina_ios7
+    simulator: iPhone (Retina 4-inch)
+    ...
 ```
 
-Alternatively, you can specify the app path in the device section:
+You can also override the app path per device:
 
 ```
 devices:
-  iOS Simulator:
-    screen: low_ios5
-    app: ./Build/Products/Debug-iphonesimulator/CoreDataBooks.app
   iPad2:
-    screen: ipad_ios5
+    screen: ipad_ios6
     app: ./Build/Products/Debug-iphoneos/CoreDataBooks.app
 ```
 
-If you do not want to hard-code the app path in your config files, you can use the environment variable `ZUCCHINI_APP`:
+Note that `config.yml` is compiled through ERB so that you can use environment variables, e.g.
 
-```
-ZUCCHINI_APP="/path/to/app" zucchini...
+```erb
+app: <%= ENV['ZUCCHINI_APP'] %>
 ```
 
+
 Run Zucchini and watch the simulator go!
 
 ```
-ZUCCHINI_DEVICE="iOS Simulator" zucchini run /path/to/my_feature
+ZUCCHINI_DEVICE="My Simulator" zucchini run /path/to/my_feature
 ```
 
 ## See also
 
+### Built-in help
+
 ```
 zucchini --help
 zucchini run --help
 zucchini generate --help
 ```
+
+### Further reading
+
+* [Zucchini features on the inside](https://github.com/zucchini-src/zucchini/wiki/Features-on-the-inside)
+* [Continuous Integration with Zucchini](https://github.com/zucchini-src/zucchini/wiki/CI)
+* [Automated iOS Testing with Zucchini](http://www.jacopretorius.net/2013/04/automated-ios-testing-with-zucchini.html) - a tutorial by [@Jaco-Pretorius](https://github.com/Jaco-Pretorius)
+* [Zucchini Google Group](https://groups.google.com/forum/#!forum/zucchini-discuss)
+
+## Credits
+* [Zucchini contributors](https://github.com/zucchini-src/zucchini/graphs/contributors) also known as the awesome [CHANGELOG](https://github.com/zucchini-src/zucchini/blob/master/CHANGELOG.md) guys
+* [Rajesh Kumar](https://github.com/rajbeniwal) for alpha and beta testing, ideas and the initial feedback
+* [Kevin O'Neill](https://github.com/kevinoneill) for the original idea and inspiration
+* [PlayUp](http://www.playup.com/) where the project was born and first released.

data/lib/zucchini.rb

@@ -7,6 +7,7 @@ module Zucchini
   require 'zucchini/compiler'
   require 'zucchini/device'
   require 'zucchini/feature'
+  require 'zucchini/log'
   require 'zucchini/detector'
   require 'zucchini/runner'
   require 'zucchini/generator'

data/lib/zucchini/approver.rb

@@ -1,6 +1,6 @@
 class Zucchini::Approver < Zucchini::Detector
   parameter "PATH", "a path to feature or a directory"
-  
+
   option %W(-p --pending), :flag, "update pending screenshots instead"
 
   def run_command
@@ -11,4 +11,4 @@ class Zucchini::Approver < Zucchini::Detector
     end
     features.inject(true){ |result, feature| result &= feature.succeeded }
   end
-end
+end

data/lib/zucchini/compiler.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Zucchini
   module Compiler
 
@@ -53,7 +55,7 @@ module Zucchini
         f.puts(File.read(js_path))
       end
 
-      File.rename(tmp_file, js_path)
+      FileUtils.mv(tmp_file, js_path)
     end
   end
 end

data/lib/zucchini/feature.rb

@@ -5,24 +5,30 @@ class Zucchini::Feature
   attr_accessor :path
   attr_accessor :device
   attr_accessor :stats
+  attr_accessor :js_exception
 
   attr_reader :succeeded
   attr_reader :name
 
   def initialize(path)
-    @path      = path
-    @device    = nil
-    @succeeded = false
-    @name      = File.basename(path)
+    @path         = path
+    @name         = File.basename(path)
+    @device       = nil
+    @succeeded    = false
+    @js_exception = false
   end
 
   def run_data_path
      "#{@path}/run_data"
   end
 
+  def run_path
+    "#{run_data_path}/Run\ 1"
+  end
+
   def unmatched_pending_screenshots
-    Dir.glob("#{@path}/pending/#{@device[:screen]}/[^0-9]*.png").map do |file|
-      screenshot = Zucchini::Screenshot.new(file, nil, true)
+    Dir.glob("#{@path}/pending/#{@device[:screen]}/[^0-9]*.png").sort.map do |file|
+      screenshot = Zucchini::Screenshot.new(file, nil, nil, true)
       screenshot.test_path = File.expand_path(file)
       screenshot.diff = [:pending, "unmatched"]
       screenshot
@@ -30,8 +36,10 @@ class Zucchini::Feature
   end
 
   def screenshots(process = true)
-    @screenshots ||= Dir.glob("#{run_data_path}/Run\ 1/*.png").map do |file|
-      screenshot = Zucchini::Screenshot.new(file, @device)
+    log = Zucchini::Log.new(run_path) if process && @screenshot_log_exists
+    
+    @screenshots ||= Dir.glob("#{run_path}/*.png").sort.map do |file|
+      screenshot = Zucchini::Screenshot.new(file, @device, log)
       if process
         screenshot.mask
         screenshot.compare
@@ -58,16 +66,17 @@ class Zucchini::Feature
                -e UIARESULTSPATH "#{run_data_path}" 2>&1`
         puts out
         # Hack. Instruments don't issue error return codes when JS exceptions occur
-        raise "Instruments run error" if (out.match /JavaScript error/) || (out.match /Instruments\ .{0,5}\ Error\ :/ )
+        @js_exception = true if (out.match /JavaScript error/) || (out.match /Instruments\ .{0,5}\ Error\ :/ )
       ensure
         `rm -rf instrumentscli*.trace`
+        @screenshot_log_exists = Zucchini::Log.parse_automation_log(run_path)
       end
     end
   end
 
   def compare
     `rm -rf #{run_data_path}/Diff/*`
-    @succeeded = (stats[:failed].length == 0)
+    @succeeded = !@js_exception && (stats[:failed].length == 0)
   end
 
   def with_setup

data/lib/zucchini/log.rb

@@ -0,0 +1,59 @@
+require 'plist'
+
+class Zucchini::Log
+  YAML_FILE = 'screenshots.yml'
+
+  attr_reader :screenshot_log_path
+
+  def initialize(path)
+    @screenshot_log_path = File.join(path, YAML_FILE)
+    raise "Screenshot log not found at #{@screenshot_log_path}" unless File.exists?(@screenshot_log_path)
+    @screenshots = File.open(@screenshot_log_path, 'r') { |f| YAML.load(f) }
+  end
+
+  def exists?
+    @screenshots != nil
+  end
+
+  def screenshot_metadata(sequence_number)
+    raise "Invalid screenshot sequence number #{sequence_number}" if sequence_number > @screenshots.size
+    @screenshots[sequence_number - 1]
+  end
+
+  def mark_screenshot_as_rotated(sequence_number)
+    screenshot_metadata(sequence_number)[:rotated] = true
+  end
+
+  def save
+    File.open(@screenshot_log_path, 'w') {|f| f.write(@screenshots.to_yaml) }
+  end
+
+  def self.parse_automation_log(path, screenshot_log_path = nil)
+    automation_log_path = File.join(path, 'Automation Results.plist')
+
+    if File.exists?(automation_log_path)
+      log = Plist::parse_xml(automation_log_path)
+      raise "Automation log at #{log_path} could not be parsed" unless log
+      entries = log["All Samples"]
+      screenshots = []
+
+      entries.each do |entry|
+        next unless entry['LogType'] == 'Default'
+        match = entry["Message"].match(/^Screenshot.*screen '(?<screen>[^']*)'.*orientation '(?<orientation>[^']*)'$/)
+        
+        if match
+          metadata = {:screen => match[:screen], :orientation => match[:orientation] }
+          screenshots << metadata
+        end
+      end
+
+      screenshot_log_path ||= File.join(path, YAML_FILE)
+      File.open(screenshot_log_path, 'w') {|f| f.write(screenshots.to_yaml) }
+      true
+    else
+      false
+    end
+  end
+end
+
+     

data/lib/zucchini/report.rb

@@ -1,40 +1,23 @@
-require 'erb'
-require 'zucchini/report/view'
+require 'zucchini/reporters/tap'
+require 'zucchini/reporters/html'
 
 class Zucchini::Report
-
-  def initialize(features, ci = false, html_path = '/tmp/zucchini_report.html')
-    @features, @ci, @html_path = [features, ci, html_path]
-    generate!
-  end
-
-  def text
-    @features.map do |f|
-      failed_list = f.stats[:failed].empty? ? "" : "\n\nFailed:\n" + f.stats[:failed].map { |s| "   #{s.file_name}: #{s.diff[1]}" }.join
-      summary = f.stats.map { |key, set| "#{set.length.to_s} #{key}" }.join(", ")
-
-      "#{f.name}:\n#{summary}#{failed_list}"
-    end.join("\n\n")
-  end
-
-  def html
-    @html ||= begin
-      template_path = File.expand_path("#{File.dirname(__FILE__)}/report/template.erb.html")
-
-      view = Zucchini::ReportView.new(@features, @ci)
-      compiled = (ERB.new(File.open(template_path).read)).result(view.get_binding)
-
-      File.open(@html_path, 'w+') { |f| f.write(compiled) }
-      compiled
-    end
+  def initialize(features, ci = false, reports_dir)
+    FileUtils.mkdir_p(reports_dir)
+
+    @paths = {
+      :html => "#{reports_dir}/zucchini_report.html",
+      :tap  => "#{reports_dir}/zucchini.t"
+    }
+    generate(features, ci, @paths)
   end
 
-  def generate!
-    log text
-    html
+  def generate(features, ci, paths)
+    log Zucchini::Reporter::TAP.generate  features, paths[:tap]
+    log Zucchini::Reporter::HTML.generate features, paths[:html], ci
   end
 
-  def open; system "open #{@html_path}"; end
+  def open; system "open #{@paths[:html]}"; end
 
   def log(buf); puts buf; end
 end

data/lib/zucchini/reporters/html.rb

@@ -0,0 +1,75 @@
+require 'time'
+require 'erb'
+require 'fileutils'
+require 'pathname'
+
+module Zucchini::Reporter
+  class HTML
+    def self.generate(features, report_path, ci)
+      Zucchini::Reporter::HTML.new(features, ci).write(report_path)
+      "HTML report generated to #{report_path}"
+    end
+
+    def initialize(features, ci)
+      @features = features
+      @device   = features[0].device
+      @time     = Time.now.strftime("%T, %e %B %Y")
+      @ci       = ci ? 'ci' : ''
+    end
+
+    def write(report_path)
+      template_path  = "#{File.dirname(__FILE__)}/html/template.erb.html"
+      gem_assets_dir = "#{File.dirname(__FILE__)}/html"
+
+      files_path = report_path.chomp(File.extname report_path) + '_files'
+
+      @assets_path = copy_assets(gem_assets_dir, "#{files_path}/assets", report_path)
+      @features    = copy_images(@features,      "#{files_path}/images", report_path)
+
+      File.open(report_path, 'w+') do |f|
+        f.write ERB.new(File.read(template_path)).result(binding)
+      end
+    end
+
+    private
+
+    def recreate_dir(path)
+      FileUtils.rm_rf   path
+      FileUtils.mkdir_p path
+    end
+
+    def relative_path(dest_path, base_path)
+      Pathname.new(dest_path).relative_path_from(Pathname.new(base_path).dirname)
+    end
+
+    def copy_assets(src_dir, dest_dir, report_path)
+      recreate_dir(dest_dir)
+      %W(js css).each { |t| FileUtils.cp_r("#{src_dir}/#{t}", dest_dir) }
+
+      relative_path(dest_dir, report_path)
+    end
+
+    def copy_images(features, dest_dir, report_path)
+      recreate_dir(dest_dir)
+
+      features.each do |f|
+        f.screenshots.each do |s|
+          %W(actual expected difference).each do |type|
+            src_path = s.result_images[type.to_sym]
+            if src_path
+              name      = File.basename(src_path)
+              type_dir  = "#{dest_dir}/#{f.name}/#{type}"
+              dest_path = "#{type_dir}/#{name}"
+
+              FileUtils.mkdir_p(type_dir)
+              FileUtils.cp(src_path, dest_path)
+
+              s.result_images[type.to_sym] = relative_path(dest_path, report_path)
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/zucchini/{report → reporters/html}/template.erb.html

@@ -35,7 +35,10 @@
         <dl class="<%= css_class %> <%= css_class == 'failed' ? 'expanded' :'' %> screen">
           <dt><%= s.file_name %></dt>
           <% %W(actual expected difference).each do |type| %>
-          <dd class="<%= s.result_images[type.to_sym] ? '' : 'hidden' %>"><p><%= type.capitalize %></p><img src="<%= s.result_images[type.to_sym] %>"/></dd>
+          <dd class="<%= s.result_images[type.to_sym] ? '' : 'hidden' %>">
+            <p><%= type.capitalize %></p>
+            <img src="<%= s.result_images[type.to_sym] %>"/>
+          </dd>
           <% end %>
         </dl>
         <% end %>

data/lib/zucchini/reporters/tap.rb

@@ -0,0 +1,30 @@
+module Zucchini::Reporter
+  module TAP
+    extend self
+
+    def generate(features, report_path)
+      File.open(report_path, 'w+') do |io|
+        io.puts "1..#{features.length}"
+        features.each_with_index do |f, i|
+          io.puts (f.succeeded ? "ok" : "not ok") + " #{i + 1} - #{f.name}"
+          io.puts "    1..#{f.screenshots.length}"
+          f.screenshots.each_with_index do |s, j|
+            failed  = s.diff[0] == :failed
+            pending = s.diff[0] == :pending
+
+            out = "    "
+            out += failed ? "not ok" : "ok"
+            out += " #{j + 1} - #{s.file_name}"
+            out += failed  ? " does not match (#{s.diff[1]})" : ''
+            out += pending ? " # pending" : ''
+
+            io.puts(out)
+          end
+          io.puts '    Bail out! Instruments run error' if f.js_exception
+        end
+        io.close
+      end
+      File.read(report_path) + "\nTAP report generated to #{report_path}"
+    end
+  end
+end

data/lib/zucchini/runner.rb

@@ -4,9 +4,10 @@ class Zucchini::Runner < Zucchini::Detector
   option %W(-c --collect), :flag, "only collect the screenshots from the device"
   option %W(-p --compare), :flag, "perform screenshots comparison based on the last collection"
   option %W(-s --silent),  :flag, "do not open the report"
-
   option "--ci",           :flag, "produce a CI version of the report after comparison"
 
+  option %W(-r --reports-dir), "DIR", "specify the directory for generated reports" , :default => '/tmp'
+
   def run_command
     compare_threads = {}
 
@@ -22,7 +23,7 @@ class Zucchini::Runner < Zucchini::Detector
     compare_threads.each { |name, t| t.abort_on_exception = true; t.join }
 
     unless (collect? && !compare?)
-      report = Zucchini::Report.new(features, ci?)
+      report = Zucchini::Report.new(features, ci?, reports_dir)
       report.open unless silent?
     end
 

data/lib/zucchini/screenshot.rb

@@ -1,54 +1,50 @@
 class Zucchini::Screenshot
-  FILE_NAME_PATTERN = /^\d\d_((?<orientation>Unknown|Portrait|PortraitUpsideDown|LandscapeLeft|LandscapeRight|FaceUp|FaceDown)_)?((?<screen>.*)-screen_)?.*$/
+  FILE_NAME_PATTERN = /^(?<sequence_number>\d\d)_(?<screenshot_name>[^\.]*)\.png$/
 
   attr_reader   :file_path, :original_file_path, :file_name
-  attr_accessor :diff, :masks_paths, :masked_paths, :test_path, :diff_path
+  attr_accessor :diff, :mask_paths, :masked_paths, :test_path, :diff_path
 
-  def initialize(file_path, device, unmatched_pending = false)
-    @original_file_path = file_path
-    @file_path = file_path.dup
-    
+  def initialize(file_path, device, log, unmatched_pending = false)
+    @file_path = file_path
+    @log = log
     @device = device
     
-    match = FILE_NAME_PATTERN.match(File.basename(@file_path))
+    @file_name = File.basename(@file_path)
+    match = FILE_NAME_PATTERN.match(@file_name)
+    raise "Illegal screenshot name #{file_path}" unless match
 
-    if match
-      @orientation = match[:orientation]
-      @screen      = match[:screen]
-      @file_path.gsub!("_#{@screen}-screen", '') if @screen
-      @file_path.gsub!("_#{@orientation}", '')   if @orientation
-    end
+    @screenshot_name      = match[:screenshot_name]
+    @sequence_number      = match[:sequence_number].to_i
 
     @file_name = File.basename(@file_path)
 
     unless unmatched_pending
-      file_base_path = File.dirname(@file_path)
+      run_data_path      = File.dirname(@file_path)
+      support_path       = File.join(run_data_path, '../../../support')
+
+      if @log
+        metadata     = @log.screenshot_metadata(@sequence_number)
+        @orientation = metadata[:orientation]
+        @screen      = metadata[:screen]
+        @rotated     = metadata[:rotated]
+      end
 
-      support_masks_path = "#{file_base_path}/../../../support/masks"
+      if @orientation && !@rotated
+        rotate
+        @log.mark_screenshot_as_rotated(@sequence_number)
+        @log.save
+      end
 
-      @masks_paths = {
-        :global   => "#{support_masks_path}/#{@device[:screen]}.png",
-        :screen   => "#{support_masks_path}/#{@screen.to_s.underscore}.png",
-        :specific => "#{file_base_path}/../../masks/#{@device[:screen]}/#{@file_name}"
+      @mask_paths = {
+        :global   => mask_path(File.join(support_path,  'masks',         @device[:screen])),
+        :specific => mask_path(File.join(run_data_path, '../../masks',   @device[:screen], @file_name.sub('.png', ''))),
+        :screen   => mask_path(File.join(support_path,  'screens/masks', @device[:screen], @screen.to_s.underscore))
       }
 
-      masked_path   = "#{file_base_path}/../Masked/actual/#{@file_name}"
+      masked_path   = File.join(run_data_path, "../Masked/actual/#{@file_name}")
       @masked_paths = { :global => masked_path, :screen => masked_path, :specific => masked_path }
 
-      @diff_path = "#{file_base_path}/../Diff/#{@file_name}"
-    end
-
-    preprocess
-  end
-
-  def preprocess
-    return if @original_file_path == @file_path
-    
-    if @orientation
-      rotate
-    else
-      FileUtils.rm @file_path if File.exists?(@file_path)
-      FileUtils.mv @original_file_path, @file_path
+      @diff_path = "#{run_data_path}/../Diff/#{@file_name}"
     end
   end
 
@@ -56,11 +52,11 @@ class Zucchini::Screenshot
     create_masked_paths_dirs
     masked_path = apply_mask(@file_path, :global)
 
-    if mask?(:screen)
+    if mask_present?(:screen)
       masked_path = apply_mask(masked_path, :screen)
     end
 
-    if mask?(:specific)
+    if mask_present?(:specific)
       apply_mask(masked_path, :specific)
     end
   end
@@ -77,7 +73,7 @@ class Zucchini::Screenshot
       @diff = (out == '0') ? [:passed, nil] : [:failed, out]
       @diff = [:pending, @diff[1]] if @pending
     else
-      @diff = [:failed, "no reference or pending screenshot for #{@device[:screen]}\n"]
+      @diff = [:failed, "no reference or pending screenshot for #{@device[:screen]}"]
     end
   end
 
@@ -90,18 +86,18 @@ class Zucchini::Screenshot
   end
 
   def mask_reference
-    file_base_path = File.dirname(@file_path)
+    run_data_path = File.dirname(@file_path)
     %W(reference pending).each do |reference_type|
-      reference_file_path = "#{file_base_path}/../../#{reference_type}/#{@device[:screen]}/#{@file_name}"
-      output_path         = "#{file_base_path}/../Masked/#{reference_type}/#{@file_name}"
+      reference_file_path = "#{run_data_path}/../../#{reference_type}/#{@device[:screen]}/#{@file_name}"
+      output_path         = "#{run_data_path}/../Masked/#{reference_type}/#{@file_name}"
 
       if File.exists?(reference_file_path)
         @test_path = output_path
         @pending   = (reference_type == "pending")
         FileUtils.mkdir_p(File.dirname(output_path))
 
-        reference = Zucchini::Screenshot.new(reference_file_path, @device)
-        reference.masks_paths  = @masks_paths
+        reference = Zucchini::Screenshot.new(reference_file_path, @device, @log)
+        reference.mask_paths  = @mask_paths
         reference.masked_paths = { :global => output_path, :screen => output_path, :specific => output_path }
         reference.mask
       end
@@ -109,8 +105,22 @@ class Zucchini::Screenshot
   end
 
   private
-  def mask?(mask)
-    @masks_paths[mask] && File.exists?(@masks_paths[mask])
+  def mask_path(path)
+    suffix = case @orientation
+    when 'LandscapeRight', 'LandscapeLeft' then '_landscape'
+    when 'Portrait', 'PortraitUpsideDown'  then '_portrait'
+    else
+      ''
+    end
+    
+    file_path = path + suffix + '.png'
+    file_path = path + '.png' unless File.exists?(file_path)
+
+    File.expand_path(file_path)
+  end
+
+  def mask_present?(mask)
+    @mask_paths[mask] && File.exists?(@mask_paths[mask])
   end
 
   def create_masked_paths_dirs
@@ -118,8 +128,8 @@ class Zucchini::Screenshot
   end
 
   def apply_mask(src_path, mask)
-    mask_path   = @masks_paths[mask]
-    dest_path   = @masked_paths[mask]
+    mask_path = @mask_paths[mask]
+    dest_path = @masked_paths[mask]
     `convert -page +0+0 \"#{src_path}\" -page +0+0 \"#{mask_path}\" -flatten \"#{dest_path}\"`
     return dest_path
   end
@@ -132,8 +142,9 @@ class Zucchini::Screenshot
     else
       0
     end
-    `convert \"#{@original_file_path}\" -rotate \"#{degrees}\" \"#{@file_path}\"`
-    FileUtils.rm @original_file_path
+    
+    `mogrify -rotate \"#{degrees}\" \"#{@file_path}\"` if degrees > 0
+    @rotated = true
   end
 end
 

data/lib/zucchini/uia/screen.coffee

@@ -9,8 +9,8 @@ class Screen
       when 4 then 'LandscapeRight'
       when 5 then 'FaceUp'
       when 6 then 'FaceDown'
-    $.log "Screenshot of screen '#{@name}' taken"
-    target.captureScreenWithName("#{orientation}_#{@name}-screen_#{screenshotName}")
+    $.log "Screenshot of screen '#{@name}' taken with orientation '#{orientation}'"
+    target.captureScreenWithName(screenshotName)
 
   element: (name) ->
     finder = @elements[name] || -> $('#' + name)

data/lib/zucchini/version.rb

@@ -1,3 +1,3 @@
 module Zucchini
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/templates/feature/feature.zucchini

@@ -1,6 +1,5 @@
-# Start on the "Welcome" screen:
-# 	Take a screenshot named "welcome_first_boot"
-# 	Type "Zucchini" in the username field
-# 	Tap "Go"  
-	 
-	
+Start on the "Welcome" screen:
+  Take a screenshot named "welcome_first_boot"
+  Type "Zucchini" in the username field
+  Tap "Go"
+

data/templates/project/features/support/config.yml

@@ -1,12 +1,13 @@
 app: MyApp.app
 
 devices:
-  My iDevice:
-    UDID  : lolffb28d74a6fraj2156090784avasc50725dd0
-    screen: retina_ios5
+  iPhone Simulator:
+    default: true
+    simulator: iPhone (Retina 3.5-inch)
+    screen: retina_ios6
+    app: /Users/yourname/Library/Developer/Xcode/DerivedData/MyApp-fofsuperjgolongsfzappyoeidss/Build/Products/Debug-iphonesimulator/MyApp.app
 
+  iPhone 4S:
+    UDID: lolffb28d74a6fraj2156090784avasc50725dd0
+    screen: retina_ios6
 
-servers:
-  backend:
-    host: 192.168.1.2
-    port: 8080

data/templates/project/features/support/lib/helpers.coffee

@@ -1,3 +1,3 @@
 class Helpers
   @example: ->
-   puts "Helpers.example method is available in your screen classes"
+   $.log "Helpers.example method is available in your screen classes"

data/templates/project/features/support/screens/welcome.coffee

@@ -1,13 +1,13 @@
 class WelcomeScreen extends Screen
-  anchor: -> view.elements()["Welcome to MyApp"]
-  
+  anchor: -> $("navigationBar[name=Welcome]")
+
   constructor: ->
     super 'welcome'
-    
+
     extend @elements,
     'Go' : -> view.buttons()["Go"]
-    
+
     extend @actions,
     'Type "([^"]*)" in the username field$': (text) ->
       field = view.elements()['Username']
-      field.setValue text
+      field.setValue text

data/zucchini-ios.gemspec

@@ -6,14 +6,15 @@ require 'zucchini/version'
 Gem::Specification.new do |s|
   s.name        = "zucchini-ios"
   s.version     = Zucchini::VERSION
-  s.authors     = ["Vasily Mikhaylichenko", "Rajesh Kumar", "Kevin O'Neill"]
+  s.authors     = ["Vasily Mikhaylichenko"]
   s.licenses    = %w{ BSD MIT }
-  s.email       = ["vaskas@zucchiniframework.org"]
+  s.email       = ["vaskas@lxmx.com.au"]
   s.homepage    = "http://www.zucchiniframework.org"
   s.summary     = %q{A visual iOS testing framework}
   s.description = %q{Zucchini follows simple walkthrough scenarios for your iOS app, takes screenshots and compares them to the reference ones.}
 
   s.add_runtime_dependency     'clamp'
+  s.add_runtime_dependency     'plist'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'coveralls'

metadata

@@ -1,17 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zucchini-ios
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
 - Vasily Mikhaylichenko
-- Rajesh Kumar
-- Kevin O'Neill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -29,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +94,7 @@ dependencies:
 description: Zucchini follows simple walkthrough scenarios for your iOS app, takes
   screenshots and compares them to the reference ones.
 email:
-- vaskas@zucchiniframework.org
+- vaskas@lxmx.com.au
 executables:
 - zucchini
 extensions: []
@@ -102,14 +116,16 @@ files:
 - lib/zucchini/device.rb
 - lib/zucchini/feature.rb
 - lib/zucchini/generator.rb
+- lib/zucchini/log.rb
 - lib/zucchini/report.rb
-- lib/zucchini/report/css/zucchini.report.css
-- lib/zucchini/report/js/jquery.effects.core.js
-- lib/zucchini/report/js/jquery.js
-- lib/zucchini/report/js/jquery.ui.core.js
-- lib/zucchini/report/js/zucchini.report.js
-- lib/zucchini/report/template.erb.html
-- lib/zucchini/report/view.rb
+- lib/zucchini/reporters/html.rb
+- lib/zucchini/reporters/html/css/zucchini.report.css
+- lib/zucchini/reporters/html/js/jquery.effects.core.js
+- lib/zucchini/reporters/html/js/jquery.js
+- lib/zucchini/reporters/html/js/jquery.ui.core.js
+- lib/zucchini/reporters/html/js/zucchini.report.js
+- lib/zucchini/reporters/html/template.erb.html
+- lib/zucchini/reporters/tap.rb
 - lib/zucchini/runner.rb
 - lib/zucchini/screenshot.rb
 - lib/zucchini/uia/lib/compat.coffee
@@ -120,17 +136,16 @@ files:
 - lib/zucchini/uia/zucchini.coffee
 - lib/zucchini/version.rb
 - templates/feature/feature.zucchini
-- templates/feature/masks/retina_ios5/.gitkeep
-- templates/feature/pending/retina_ios5/.gitkeep
-- templates/feature/reference/retina_ios5/.gitkeep
+- templates/feature/masks/retina_ios6/.gitkeep
+- templates/feature/pending/retina_ios6/.gitkeep
+- templates/feature/reference/retina_ios6/.gitkeep
 - templates/feature/run_data/.gitignore
 - templates/feature/setup.rb
 - templates/project/features/support/config.yml
 - templates/project/features/support/lib/helpers.coffee
-- templates/project/features/support/masks/ipad_ios5.png
+- templates/project/features/support/masks/ipad_ios6.png
 - templates/project/features/support/masks/ipad_retina_ios6.png
-- templates/project/features/support/masks/low_ios4.png
-- templates/project/features/support/masks/retina_ios5.png
+- templates/project/features/support/masks/retina_ios6.png
 - templates/project/features/support/screens/welcome.coffee
 - zucchini-ios.gemspec
 homepage: http://www.zucchiniframework.org
@@ -155,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1435969441614600881
+      hash: 3231635061301993483
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/zucchini/report/view.rb

@@ -1,16 +0,0 @@
-require 'time'
-
-class Zucchini::ReportView
-  
-  def initialize(features, ci)
-    @features    = features
-    @device      = features[0].device
-    @time        = Time.now.strftime("%T, %e %B %Y")
-    @assets_path = File.expand_path(File.dirname(__FILE__))
-    @ci          = ci ? 'ci' : ''
-  end
-  
-  def get_binding
-    binding
-  end
-end