compatriot 0.0.3 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e100d57f0086c254d7fcd46b1d615dc3ec7570a1
+  data.tar.gz: 3a474ae56359208e474ea4742b3092797e9a13e4
+SHA512:
+  metadata.gz: 1f712342dfd796f65140fadb0251325d2e44f91d698f3c58859b721b010f3ca9ddd538ff0c8eb8275860b928ddeb2bf046c46c6cca9f6c16cfc63cfce7e91c53
+  data.tar.gz: bed0d7c8323e728fa30cadbb044b9ebe8e92829978da39516f7396fa650c91e4cf2b06a402dd0a20f8d50437cb7702438d65a19d0888bb63822875e1097b18fa

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 .DS_STORE
 spec/sample_app/chromedriver.log
+TAGS

data/.ruby-gemset

@@ -0,0 +1 @@
+compatriot

data/.ruby-version

@@ -0,0 +1 @@
+2.1.7

data/.travis.yml

@@ -0,0 +1,4 @@
+before_script: "sh -e /etc/init.d/xvfb start && sudo add-apt-repository ppa:chromium-daily/dev && sudo aptitude update && sudo aptitude -y -q install unzip chromium-browser"
+script: "bundle exec rake travis"
+rvm:
+  - 2.1.7

data/README.md

@@ -1,5 +1,6 @@
 Compatriot
 ==========
+[![Build Status](https://secure.travis-ci.org/clnclarinet/compatriot.png?branch=master)](http://travis-ci.org/clnclarinet/compatriot)
 
 **Compat**ibility + **riot**! It's the **friend** that helps with browser compatibility!
 This Ruby gem makes cross-browser testing less painful.
@@ -11,6 +12,7 @@ Don't let your users find the inconsistencies and get to them first.
 What it does now
 ----------------
 
+* [Documentation on RelishApp](https://www.relishapp.com/clnclarinet/compatriot)
 * In firefox and chrome, visits a list of paths to a Rack app and takes a screenshot on each page.
 * Stores the screenshot in `tmp/results/_timestamp_/_browser_/`
 * Creates `tmp/results/_timestamp_/index.html` that shows thumbnails of each screenshot plus a diff of the two in a table for easy comparison.
@@ -19,11 +21,9 @@ What it does now
 What it will do in the future
 -----------------------------
 
-* Have documentation
+* Have more documentation (a start is [on RelishApp](https://www.relishapp.com/clnclarinet/compatriot)!)
 * Have a screenshot of sample results in the README
-* Have unit tests and better tests
-* Be on travis-ci
-* Not have a diff that's a different size than the originals
+* Have more and better tests
 * Find the largest, darkest contiguous region in the image diff and have a threshold of pass/fail based on that
 * Perform better on the image processing (by sampling/resizing, using oily_png, etc)
 * Given a list of URLs/paths to visit, will take a screenshot of each and display which URL it came from in the index
@@ -31,6 +31,7 @@ What it will do in the future
 * Automatically compare the screenshots across browsers and flags those that are more than some configurable threshold different
 * Allow configuration of which browsers to use
 * Connect to virtual machines so that you don't have to have all the browsers on the machine you're running the tests on
+* Steal some of VCR's relish rake tasks
 
 
 How To Use
@@ -38,17 +39,19 @@ How To Use
 
 **Requirements**
 
-* Ruby v1.9.2
+* Ruby v2.1.7
 * [Firefox](http://getfirefox.net)
 * [chromedriver](http://code.google.com/p/selenium/wiki/ChromeDriver)
 
+There are setup examples in the examples directory and [documentation on RelishApp](https://www.relishapp.com/clnclarinet/compatriot)
+
 When you run a file similar to the examples it will save results in `_current-directory_/tmp/results/_timestamp_/_browser_`
 
 
 What to do to run its tests
 ---------------------------
 
-Using at least ruby 1.9.2:
+Using at least ruby 2.1.7:
 
     bundle install
     bundle exec rake test
@@ -83,14 +86,17 @@ Many thanks to the wonderful libraries that make this gem possible:
 * [capybara](https://github.com/jnicklas/capybara)
 * [selenium-webdriver](http://seleniumhq.org/docs/01_introducing_selenium.html#selenium-2-aka-selenium-webdriver)
 * [chunky_png](https://github.com/wvanbergen/chunky_png) (and especially [this blog post about using chunky_png to create image diffs](http://jeffkreeftmeijer.com/2011/comparing-images-and-creating-image-diffs/?utm_source=rubyweekly&utm_medium=email) by Jeff Kreeftmeijer)
+* [travis](http://travis-ci.org/) for CI
+* [relishapp](https://www.relishapp.com/) for documentation
+* [vcr](https://github.com/myronmarston/vcr) for having such awesome documentation that it inspired me to use Relishapp
 
 
 Contributors
 ------------
 * Carol Nichols ([twitter](http://twitter.com/carols10cents), [website](http://carol-nichols.com))
 * Andrew Cox ([twitter](https://twitter.com/coxandrew), [website](http://andrewcox.org/))
-* Kurtis Rainbolt-Greene ([twitter](https://twitter.com/krainboltgreene)) ([website](http://kurtisrainboltgreene.name/))
-* Steve Klabnik ([twitter](https://twitter.com/steveklabnik)) ([website](http://www.steveklabnik.com/))
+* Kurtis Rainbolt-Greene ([twitter](https://twitter.com/krainboltgreene), [website](http://kurtisrainboltgreene.name/))
+* Steve Klabnik ([twitter](https://twitter.com/steveklabnik), [website](http://www.steveklabnik.com/))
 * You???
 
 

data/Rakefile

@@ -13,4 +13,14 @@ end
 desc "Run tests"
 task :spec do
   task("test").execute
-end
+end
+
+task :travis do
+  puts "Grabbing chromedriver..."
+  mkdir_p "/tmp/bin"
+  system "cd /tmp/bin && wget http://chromium.googlecode.com/files/chromedriver_linux32_16.0.902.0.zip && unzip chromedriver_linux32_16.0.902.0.zip"
+
+  puts "Starting to run tests..."
+  system("export PATH=/tmp/bin:$PATH && export DISPLAY=:99.0 && bundle exec rake test && bundle exec cucumber features")
+  raise "`rake test` failed!" unless $?.exitstatus == 0
+end

data/compatriot.gemspec

@@ -18,13 +18,17 @@ Gem::Specification.new do |gem|
   gem.name          = "compatriot"
   gem.require_paths = ["lib"]
   gem.version       = Compatriot::VERSION
+  gem.licenses      = "MIT"
 
-  # To get the newest minitest features!
-  gem.add_development_dependency 'minitest', '~> 2.8.1'
-  gem.add_development_dependency 'sinatra',  '~> 1.3.1'
-  gem.add_development_dependency 'mocha',    '~> 0.10.0'
+  gem.add_development_dependency 'minitest', '~> 5.8', '>= 5.8.2'
+  gem.add_development_dependency 'sinatra', '~> 1.4', '>= 1.4.6'
+  gem.add_development_dependency 'mocha', '~> 1.1', '>= 1.1.0'
+  gem.add_development_dependency 'cucumber', '~> 2.1', '>= 2.1.0'
+  gem.add_development_dependency 'aruba', '~> 0.10.0'
+  gem.add_development_dependency 'relish', '~> 0.7.1'
 
-  gem.add_dependency 'capybara',   '~> 1.1.2'
-  gem.add_dependency 'rake',       '~> 0.9.2.2'
-  gem.add_dependency 'chunky_png', '~> 1.2.5'
+  gem.add_runtime_dependency 'capybara', '~> 2.5', '>= 2.5.0'
+  gem.add_runtime_dependency 'selenium-webdriver', '~> 2.48', '>= 2.48.1'
+  gem.add_runtime_dependency 'rake', '~> 10.4', '>= 10.4.2'
+  gem.add_runtime_dependency 'chunky_png', '~> 1.3', '>= 1.3.5'
 end

data/examples/compatriot_tests.rb

@@ -1,7 +1,7 @@
 require 'compatriot'
-require_relative "../spec/sample_app/test_app"
+require_relative "../spec/sample_app/sample_app"
 
-Compatriot.app = TestApp
+Compatriot.app = SampleApp
 
 Compatriot.run(%w[
   /

data/features/list_of_urls.feature

@@ -0,0 +1,31 @@
+Feature: list_of_urls
+
+  Passing a list of URLs to Compatriot.run will visit each of them in each browser and take a screenshot.
+
+  Scenario: List of URLs
+    Given a Sinatra app named "simple_app.rb" with:
+      """ruby
+        get '/' do
+          'Hello'
+        end
+
+        get '/goodbye' do
+          'Goodbye'
+        end
+      """
+    And a file named "compatriot_urls.rb" with:
+      """ruby
+      $:.unshift(File.expand_path('../../lib', File.dirname(__FILE__)))
+      require 'compatriot'
+      require_relative 'simple_app'
+      Compatriot.app = SimpleApp
+      Compatriot.run(%w[
+        /
+        /goodbye
+      ])
+
+      """
+    And the directory "tmp/results" does not exist
+    When I run `ruby compatriot_urls.rb`
+    Then "tmp/results" should have 1 subdirectory
+    And there should be results for 2 screenshots

data/features/step_definitions/cli_steps.rb

@@ -0,0 +1,60 @@
+module CompatriotHelpers
+  def create_sinatra_app(file_name, content)
+    app_class = camelize(file_name.gsub(/\.rb$/, ''))
+    beginning_sinatra_app = <<-HERE
+require 'sinatra/base'
+require 'rack'
+require 'yaml'
+
+class #{app_class} < Sinatra::Base
+  set :root, File.dirname(__FILE__)
+  set :static, true
+HERE
+
+    ending_sinatra_app = <<-HERE
+
+end
+
+if __FILE__ == $0
+  Rack::Handler::WEBrick.run #{app_class}, :Port => 8070
+end
+HERE
+    beginning_sinatra_app + content + ending_sinatra_app
+  end
+
+  def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+    if first_letter_in_uppercase
+      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+    else
+      lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+    end
+  end
+end
+World(CompatriotHelpers)
+
+Given /^a Sinatra app named "([^"]*)" with:$/ do |file_name, content|
+  write_file(file_name, create_sinatra_app(file_name, content))
+end
+
+Then /^"([^"]*)" should have (\d+) subdir/ do |directory, subdirectory_count|
+  cd('.') {
+    expect((Dir.entries(directory) - [".", ".."]).size).to eql subdirectory_count.to_i
+  }
+end
+
+Then /^there should be results for (\d+) screenshots?$/ do |screenshot_count|
+  screenshot_count = screenshot_count.to_i
+  results_tmp_dir = "tmp/results"
+  cd('.') {
+    current_results_dir = (Dir.entries(results_tmp_dir) - [".", ".."]).first
+    current_results_dir = File.join(results_tmp_dir, current_results_dir)
+
+    firefox_dir = File.join(current_results_dir, "firefox")
+    chrome_dir  = File.join(current_results_dir, "chrome")
+    diffs_dir   = File.join(current_results_dir, "diffs")
+
+    expect(Dir.glob(File.join(firefox_dir, "*.png")).size).to eql 2
+    expect(Dir.glob(File.join(chrome_dir, "*.png")).size).to eql 2
+    expect(Dir.glob(File.join(diffs_dir, "*.png")).size).to eql 2
+  }
+end

data/features/support/env.rb

@@ -0,0 +1,5 @@
+require 'aruba/cucumber'
+
+Aruba.configure do |config|
+  config.exit_timeout = 60
+end

data/lib/compatriot.rb

@@ -2,8 +2,7 @@ require "compatriot/version"
 require "compatriot/runner"
 require "compatriot/browser"
 require "compatriot/results_presenter"
-require "compatriot/results"
-require "compatriot/image_differ"
+require "compatriot/image_differ/image_differ"
 
 module Compatriot
   class << self

data/lib/compatriot/image_differ/color_differ.rb

@@ -0,0 +1,70 @@
+require 'chunky_png'
+include ChunkyPNG::Color
+
+module Compatriot
+  class ColorDiffer
+
+    def self.diff(filename1, filename2, results_directory)
+      image1 = ChunkyPNG::Image.from_file(filename1)
+      image2 = ChunkyPNG::Image.from_file(filename2)
+      @results_directory = results_directory
+
+      output = ChunkyPNG::Image.new(image1.width, image1.height, WHITE)
+      diff = []
+
+      each_pixel(image1) do |x, y|
+        pixel1 = image1[x,y]
+        pixel2 = image2[x,y]
+        unless pixel1 == pixel2
+          output[x,y], score = color_difference_of_pixels(pixel1, pixel2)
+          diff << score
+        end
+      end
+
+      save_diff_image(output, filename1, filename2)
+    end
+
+    def self.save_diff_image(output, filename1, filename2)
+      filename = diff_name(filename1, filename2)
+      path = File.join(
+        @results_directory,
+        "diffs",
+        filename
+      )
+      output.save(path)
+      File.join("diffs", filename)
+    end
+
+    def self.diff_name(image1, image2)
+      browser1 = File.basename(File.dirname(image1))
+      browser2 = File.basename(File.dirname(image2))
+
+      "color_#{browser1}_vs_#{browser2}_#{File.basename(image1)}"
+    end
+
+    def self.color_difference_of_pixels(pixel1, pixel2)
+      score = Math.sqrt(
+        (r(pixel2) - r(pixel1)) ** 2 +
+        (g(pixel2) - g(pixel1)) ** 2 +
+        (b(pixel2) - b(pixel1)) ** 2
+      ) / Math.sqrt(MAX ** 2 * 3)
+
+      [grayscale(MAX - (score * MAX).round), score]
+    end
+
+    # Not called anywhere
+    def color_difference_total_score
+      pixels_total = image1.width * image1.height
+      pixels_changed = diff.length
+      pixels_changed_percentage = (diff.inject {|sum, value| sum + value} / pixels_total) * 100
+    end
+
+    def self.each_pixel(image)
+      image.width.times do |x|
+        image.height.times do |y|
+          yield(x, y)
+        end
+      end
+    end
+  end
+end

data/lib/compatriot/image_differ/image_differ.rb

@@ -0,0 +1,41 @@
+require_relative 'color_differ'
+
+module Compatriot
+  class ImageDiffer
+
+    def initialize(params = {})
+      @paths    = params[:paths]
+      @browsers = params[:browsers]
+      @strategy = params[:strategy] || Compatriot::ColorDiffer
+      @results_directory = params[:results_directory]
+      @diffs    = {}
+
+      create_diffs_path
+    end
+
+    def diff_for(path)
+      @diffs[path]
+    end
+
+    def compute!
+      @paths.map do |path|
+        images_to_diff = @browsers.map { |b| b.absolute_screenshot_for(path) }
+        @diffs[path] = diff(images_to_diff)
+      end
+    end
+
+    def diff(results)
+      @strategy.diff(results.first, results.last, @results_directory)
+    end
+
+    def diffs_path
+      File.join(@results_directory, "diffs")
+    end
+
+    private
+
+    def create_diffs_path
+      FileUtils.mkdir_p(diffs_path)
+    end
+  end
+end

data/lib/compatriot/results_presenter.rb

@@ -48,7 +48,7 @@ module Compatriot
                     </td>
                   <% end %>
                   <td>
-                    <img src="<%= differ.diffs[path] %>" />
+                    <img src="<%= differ.diff_for(path) %>" />
                   </td>
                 </tr>
               <% end %>

data/lib/compatriot/runner.rb

@@ -1,4 +1,5 @@
-require "fileutils"
+require 'fileutils'
+require 'date'
 
 module Compatriot
   class Runner
@@ -42,7 +43,8 @@ module Compatriot
       @differ = Compatriot::ImageDiffer.new(
         :paths    => @paths,
         :browsers => @browsers,
-        :strategy => :color_difference
+        :strategy => Compatriot::ColorDiffer,
+        :results_directory => @results_directory
       )
       @differ.compute!
     end
@@ -60,4 +62,4 @@ module Compatriot
       FileUtils.mkdir_p(@results_directory)
     end
   end
-end
+end

data/lib/compatriot/version.rb

@@ -1,3 +1,3 @@
 module Compatriot
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/sample_app/{test_app.rb → sample_app.rb}

@@ -2,12 +2,12 @@ require 'sinatra/base'
 require 'rack'
 require 'yaml'
 
-class TestApp < Sinatra::Base
+class SampleApp < Sinatra::Base
   set :root, File.dirname(__FILE__)
   set :static, true
 
   get '/' do
-    "<h1>Hello world!</h1"
+    "<h1>Hello world!</h1><div><a href='chrome-css-bug'>Try another page</a></div>"
   end
 
   get "/chrome-css-bug" do
@@ -17,5 +17,5 @@ class TestApp < Sinatra::Base
 end
 
 if __FILE__ == $0
-  Rack::Handler::WEBrick.run TestApp, :Port => 8070
+  Rack::Handler::WEBrick.run SampleApp, :Port => 8070
 end

data/spec/spec_helper.rb

@@ -1,13 +1,11 @@
 $:.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
-require 'rubygems'
-gem 'minitest' # ensures you're using the gem, and not the built in MT
-require 'minitest/autorun'
-require 'mocha'
+require "minitest/autorun"
+require "mocha/mini_test"
 
 require 'compatriot'
 
-require_relative "sample_app/test_app"
+require_relative "sample_app/sample_app"
 
 # A custom runner to enable before_suite and after_suite setup/teardown.
 # http://bfts.rubyforge.org/minitest/index.html
@@ -15,37 +13,13 @@ require_relative "sample_app/test_app"
 # before running the suite; it's useful to be able to look at the screenshots
 # after a test run so we're not deleting them then.
 
-module MiniTestWithHooks
-  class Unit < MiniTest::Unit
-    def before_suites
-    end
-
-    def after_suites
-    end
-
-    def _run_suites(suites, type)
-      begin
-        before_suites
-        super(suites, type)
-      ensure
-        after_suites
-      end
-    end
+module TestRunner
+  def before_setup
+    super
+    FileUtils.remove_dir(File.join("sample_app", "tmp", "results"), true)
   end
 end
 
-module MiniTestRemoveScreenshots
-  class Unit < MiniTestWithHooks::Unit
-
-    def before_suites
-      super
-      FileUtils.remove_dir(File.join("sample_app", "tmp", "results"), true)
-    end
-
-    def after_suites
-      super
-    end
-  end
+class Minitest::Spec
+  include TestRunner
 end
-
-MiniTest::Unit.runner = MiniTestRemoveScreenshots::Unit.new

data/spec/unit/browser_spec.rb

@@ -86,6 +86,8 @@ describe Compatriot::Browser do
         :name => "foo",
         :screenshot_directory => "bar"
       )
+      app = stub
+      @b.initialize_capybara(app)
     end
 
     it "visits the path" do
@@ -132,6 +134,8 @@ describe Compatriot::Browser do
         :name => "foo",
         :screenshot_directory => "bar"
       )
+      app = stub
+      @b.initialize_capybara(app)
     end
 
     it "returns nil if there is no screenshot for that path" do

data/spec/unit/image_differ/color_differ_spec.rb

@@ -0,0 +1,39 @@
+require_relative '../../spec_helper'
+
+describe Compatriot::ColorDiffer do
+  it "calls chunky_png on each image path" do
+    image1 = stub_everything("1", :width => 1, :height => 2)
+    image2 = stub_everything("2", :width => 3, :height => 4)
+
+    ChunkyPNG::Image.expects(:from_file).with("file_one").returns(image1)
+    ChunkyPNG::Image.expects(:from_file).with("file_two").returns(image2)
+    Compatriot::ColorDiffer.stubs(:save_diff_image)
+
+    Compatriot::ColorDiffer.diff("file_one", "file_two", "some/dir")
+  end
+
+  it "starts a new white image with the same dimensions" do
+    diff_image = stub_everything
+    ChunkyPNG::Image.expects(:new).with(
+      1,
+      2,
+      ChunkyPNG::Image::WHITE
+    ).returns(diff_image)
+
+    image1 = stub_everything("1", :width => 1, :height => 2)
+    image2 = stub_everything("2", :width => 3, :height => 4)
+
+    ChunkyPNG::Image.stubs(:from_file).returns(image1, image2)
+    Compatriot::ColorDiffer.stubs(:save_diff_image)
+
+    differ = Compatriot::ColorDiffer.diff(image1, image2, "some/dir")
+  end
+
+  it "names the image based on the strategy and the browsers" do
+    name = Compatriot::ColorDiffer.diff_name(
+      "/something/firefox/1.png",
+      "/something/chrome/1.png"
+    )
+    name.must_equal("color_firefox_vs_chrome_1.png")
+  end
+end

data/spec/unit/image_differ/image_differ_spec.rb

@@ -0,0 +1,67 @@
+require_relative '../../spec_helper'
+
+describe Compatriot::ImageDiffer do
+  describe "compute!" do
+    it "diffs each set of images and stores the location by path" do
+      Compatriot::ImageDiffer.any_instance.stubs(:create_diffs_path)
+
+      d = Compatriot::ImageDiffer.new(
+        :paths => ["/home"],
+        :browsers => [
+          stub(:absolute_screenshot_for => "1.png"),
+          stub(:absolute_screenshot_for => "2.png")
+        ]
+      )
+      d.expects(:diff).with(["1.png", "2.png"]).returns("diff.png")
+      d.compute!
+      d.diff_for("/home").must_equal("diff.png")
+    end
+
+    it "creates a diffs dir" do
+      FileUtils.expects(:mkdir_p).with("foo/bar/diffs")
+      d = Compatriot::ImageDiffer.new(
+        :results_directory => "foo/bar"
+      )
+      d.diffs_path.must_equal("foo/bar/diffs")
+    end
+  end
+
+  describe "diff" do
+    it "returns the filename of the diff" do
+      file_one = stub
+      file_two = stub
+      strategy = stub(:diff => "diff_filename.png")
+      ChunkyPNG::Image.stubs(:from_file)
+      FileUtils.expects(:mkdir_p).with("something/diffs")
+
+      c = Compatriot::ImageDiffer.new(
+        :strategy => strategy,
+        :results_directory => "something"
+      )
+
+      c.diff([file_one, file_two]).must_equal("diff_filename.png")
+    end
+
+    it "uses the strategy passed in" do
+      file_one = stub
+      file_two = stub
+      strategy = stub
+
+      ChunkyPNG::Image.stubs(:from_file).returns(file_one, file_two)
+      FileUtils.expects(:mkdir_p).with("something/diffs")
+
+      strategy.expects(:diff).with(
+        file_one,
+        file_two,
+        "something"
+      ).returns("diff_filename.png")
+
+      c = Compatriot::ImageDiffer.new(
+        :strategy => strategy,
+        :results_directory => "something"
+      )
+
+      c.diff([file_one, file_two]).must_equal("diff_filename.png")
+    end
+  end
+end

data/spec/unit/runner_spec.rb

@@ -55,7 +55,7 @@ describe Compatriot::Runner do
 
   describe "#results_directory" do
     it "names a results directory in tmp/results based on the clock" do
-      runner = Compatriot::Runner.new(TestApp, ["/"], @fixed_clock)
+      runner = Compatriot::Runner.new(SampleApp, ["/"], @fixed_clock)
 
       runner.results_directory.must_equal(@results_dir_name)
     end

metadata

@@ -1,82 +1,203 @@
 --- !ruby/object:Gem::Specification
 name: compatriot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Carol Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2157131520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '5.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.8.2
   type: :development
   prerelease: false
-  version_requirements: *2157131520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.8.2
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157131020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *2157131020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157130560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2157130560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: relish
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2157130100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '2.48'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.48.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157130100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.48'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.48.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157129640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 10.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157129640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.4.2
 - !ruby/object:Gem::Dependency
   name: chunky_png
-  requirement: &2157129180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157129180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 description: Finds likely UI browser cross-compatibility issues.
 email:
 - carol.nichols@gmail.com
@@ -84,57 +205,66 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - compatriot.gemspec
 - examples/compatriot_tests.rb
+- features/list_of_urls.feature
+- features/step_definitions/cli_steps.rb
+- features/support/env.rb
 - lib/compatriot.rb
 - lib/compatriot/browser.rb
-- lib/compatriot/image_differ.rb
+- lib/compatriot/image_differ/color_differ.rb
+- lib/compatriot/image_differ/image_differ.rb
 - lib/compatriot/results_presenter.rb
 - lib/compatriot/runner.rb
 - lib/compatriot/version.rb
-- spec/integration/full_stack_spec.rb
 - spec/sample_app/public/images/smileyface.jpg
-- spec/sample_app/test_app.rb
+- spec/sample_app/sample_app.rb
 - spec/spec_helper.rb
 - spec/unit/browser_spec.rb
-- spec/unit/image_differ_spec.rb
+- spec/unit/image_differ/color_differ_spec.rb
+- spec/unit/image_differ/image_differ_spec.rb
 - spec/unit/runner_spec.rb
 homepage: https://github.com/clnclarinet/compatriot
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Runs a command in multiple browsers using selenium then compares the screenshots
   and presents those likely to have cross-browser incompatibilities.
 test_files:
-- spec/integration/full_stack_spec.rb
+- features/list_of_urls.feature
+- features/step_definitions/cli_steps.rb
+- features/support/env.rb
 - spec/sample_app/public/images/smileyface.jpg
-- spec/sample_app/test_app.rb
+- spec/sample_app/sample_app.rb
 - spec/spec_helper.rb
 - spec/unit/browser_spec.rb
-- spec/unit/image_differ_spec.rb
+- spec/unit/image_differ/color_differ_spec.rb
+- spec/unit/image_differ/image_differ_spec.rb
 - spec/unit/runner_spec.rb

data/.rvmrc

@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2@compatriot"
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file, this is very fast and efficicent compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id"
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded, uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]] ; then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-#
-# If you use bundler and would like to run bundle each time you enter the
-# directory you can uncomment the following code.
-#
-#   # Ensure that Bundler is installed, install it if it is not.
-#   if ! command -v bundle ; then
-#      printf "The rubygem 'bundler' is not installed, installing it now.\n"
-#      gem install bundler
-#   fi
-#
-#   # Bundle while redcing excess noise.
-#   printf "Bundling your gems this may take a few minutes on a fresh clone.\n"
-#   bundle | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'
-#
-

data/lib/compatriot/image_differ.rb

@@ -1,100 +0,0 @@
-require 'chunky_png'
-include ChunkyPNG::Color
-
-module Compatriot
-  class ImageDiffer
-
-    attr_reader :diffs
-
-    def initialize(params = {})
-      @paths    = params[:paths]
-      @browsers = params[:browsers]
-      @strategy = params[:strategy] || :color_difference
-      @diffs    = {}
-    end
-
-    def compute!
-      @paths.map do |path|
-        images_to_diff = @browsers.map { |b| b.absolute_screenshot_for(path) }
-        @diffs[path] = diff(images_to_diff)
-      end
-    end
-
-    def diff(results)
-      images = results.map{|r| ChunkyPNG::Image.from_file(r) }
-      self.send(@strategy, images.first, images.last, results.first)
-    end
-
-    def same_pixels_exactly(image1, image2, name)
-      output = ChunkyPNG::Image.new(image1.width, image2.height, WHITE)
-      diff = []
-
-      each_pixel(image1) do |x, y|
-        pixel1 = image1[x, y]
-        pixel2 = image2[x, y]
-        output[x,y] = pixel1
-        diff << [x,y] unless pixel1 == pixel2
-      end
-
-      pixels_total = image1.pixels.length
-      pixels_changed = diff.length
-      pixels_changed_percentage = (diff.length.to_f / image1.pixels.length) * 100
-
-      x, y = diff.map{ |xy| xy[0] }, diff.map{ |xy| xy[1] }
-
-      output.rect(x.min, y.min, x.max, y.max, ChunkyPNG::Color.rgb(0,255,0))
-      filename = "#{name}-same_exactly.png"
-      output.save(filename)
-      File.join(
-        File.basename(File.dirname(filename)),
-        File.basename(filename)
-      )
-    end
-
-    def color_difference(image1, image2, name)
-      output = ChunkyPNG::Image.new(image1.width, image1.height, WHITE)
-      diff = []
-
-      each_pixel(image1) do |x, y|
-        pixel1 = image1[x,y]
-        pixel2 = image2[x,y]
-        unless pixel1 == pixel2
-          output[x,y], score = color_difference_of_pixels(pixel1, pixel2)
-          diff << score
-        end
-      end
-
-      filename = "#{name}-color_difference.png"
-      output.save(filename)
-      File.join(
-        File.basename(File.dirname(filename)),
-        File.basename(filename)
-      )
-    end
-
-    def color_difference_of_pixels(pixel1, pixel2)
-      score = Math.sqrt(
-        (r(pixel2) - r(pixel1)) ** 2 +
-        (g(pixel2) - g(pixel1)) ** 2 +
-        (b(pixel2) - b(pixel1)) ** 2
-      ) / Math.sqrt(MAX ** 2 * 3)
-
-      [grayscale(MAX - (score * MAX).round), score]
-    end
-
-    # Not called anywhere
-    def color_difference_total_score
-      pixels_total = image1.width * image1.height
-      pixels_changed = diff.length
-      pixels_changed_percentage = (diff.inject {|sum, value| sum + value} / pixels_total) * 100
-    end
-
-    def each_pixel(image)
-      image.width.times do |x|
-        image.height.times do |y|
-          yield(x, y)
-        end
-      end
-    end
-  end
-end

data/spec/integration/full_stack_spec.rb

@@ -1,36 +0,0 @@
-require_relative '../spec_helper'
-require 'fileutils'
-require 'date'
-require 'nokogiri'
-
-describe "Hit a list of paths for this app" do
-  it "takes screenshots, diffs them, and creates an index" do
-    root_dir = Dir.getwd
-    Dir.chdir(File.join(File.dirname(__FILE__), '..', 'sample_app'))
-
-    results_tmp_dir = File.join("tmp", "results")
-
-    FileUtils.remove_dir(results_tmp_dir, true)
-
-    Compatriot.app = TestApp
-    Compatriot.run(%w[
-      /
-      /chrome-css-bug
-    ])
-
-    current_results_dir = (Dir.entries(results_tmp_dir) - [".", ".."]).first
-    current_results_dir = File.join(results_tmp_dir, current_results_dir)
-
-    firefox_dir = File.join(current_results_dir, "firefox")
-    chrome_dir  = File.join(current_results_dir, "chrome")
-
-    Dir.glob(File.join(firefox_dir, "*.png")).size.must_equal 4
-    Dir.glob(File.join(chrome_dir, "*.png")).size.must_equal 2
-
-    results_index = IO.read(File.join(current_results_dir, "index.html"))
-    xml = Nokogiri::XML(results_index)
-    xml.xpath("//tr[td]").size.must_equal(2)
-
-    Dir.chdir(root_dir)
-  end
-end

data/spec/unit/image_differ_spec.rb

@@ -1,53 +0,0 @@
-require_relative '../spec_helper'
-
-describe Compatriot::ImageDiffer do
-  describe "compute!" do
-    it "diffs each set of images and stores the location by path" do
-      d = Compatriot::ImageDiffer.new(
-        :paths => ["/home"],
-        :browsers => [
-          stub(:absolute_screenshot_for => "1.png"),
-          stub(:absolute_screenshot_for => "2.png")
-        ]
-      )
-      d.expects(:diff).with(["1.png", "2.png"]).returns("diff.png")
-      d.compute!
-      d.diffs["/home"].must_equal("diff.png")
-    end
-  end
-  describe "diff" do
-    it "calls chunky_png on each image path" do
-      file_one = stub
-      file_two = stub
-
-      ChunkyPNG::Image.expects(:from_file).with(file_one)
-      ChunkyPNG::Image.expects(:from_file).with(file_two)
-
-      c = Compatriot::ImageDiffer.new
-      c.stubs(:color_difference)
-      c.diff([file_one, file_two])
-    end
-
-    it "returns the filename of the diff" do
-    end
-
-    it "uses the strategy passed in" do
-    end
-  end
-
-  describe "self#color_difference" do
-    it "starts a new white image with the same dimensions" do
-      diff = stub_everything
-      ChunkyPNG::Image.expects(:new).with(
-        1,
-        2,
-        ChunkyPNG::Image::WHITE
-      ).returns(diff)
-
-      image1 = stub_everything("1", :width => 1, :height => 2)
-      image2 = stub_everything("2", :width => 3, :height => 4)
-
-      Compatriot::ImageDiffer.new.color_difference(image1, image2, stub)
-    end
-  end
-end