lineup 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c1277997e4c9f112ae3a09071a8a54ff47ea66
-  data.tar.gz: 91015501ca8250b834c1473b121546a632f0d0b5
+  metadata.gz: 2d9515daedfb284a4e7aedb97d26ba93c78c822b
+  data.tar.gz: ffc0a25a56227a60011a2c1af03ba1cd4907bc2d
 SHA512:
-  metadata.gz: 20cf39c0e193c0c1672fc717bdb8c326b8bce914835c566c3e77545c575c083e4c6685c958040853d63cb0c411cccbc2d5dd1da36c2bcfa17225e2cac6d46929
-  data.tar.gz: fc4a0df84e6779908648a52bd25e512c6ffe3d3c660079a61f9c28886cfbfbbdee0a949f08e0ba7227a5737f608efdb656f8007d99e8e4daefc6a4282c8579e5
+  metadata.gz: 6e8b81e43e1201d21b61b796d2578c40cb4cea33f2e051fad98b339caea33191b3d763b7c253b0536a97f1146973e8320657ace203efec29dbd95386c8a5677f
+  data.tar.gz: d0ed7dc370932a0f1e80eab7e3d0b907103ee813446e2d1bd1cfc7b4d09ec6b4a551ea4eb1c9329354ea5e58b610ed5aefd2789b22fa59c3a31b727d9800d2f3

data/bin/lineup

@@ -1,7 +1,29 @@
 #!/usr/bin/env ruby
 
-require 'lineup'
+require '../lib/lineup'
 
-lineup = Lineup::Screenshot.new('otto.de')
-lineup.use_phantomjs false
+puts("This is an example. And a benchmark.")
+
+lineup = Lineup::Screenshot.new('https://uhr.ptb.de')
+lineup.wait_for_asynchron_pages(1)
+lineup.use_phantomjs true
+start = Time.now
+puts("Taking screenshots")
 lineup.record_screenshot('base')
+screenshots = Time.now
+sleep(2)
+lineup.record_screenshot('nun')
+screenshots2 = Time.now - 2
+puts("Starting comparison")
+lineup.compare('base', 'nun')
+lineup.save_json(".")
+compare = Time.now - 2
+
+s_t = screenshots - start
+puts("Screenshots first run took #{s_t} seconds")
+s_t = screenshots2 - screenshots
+puts("Screenshots second run took #{s_t} seconds")
+c = compare - screenshots2
+puts("Comparison took #{c} seconds")
+
+puts("End")

data/lib/controller/comparer.rb

@@ -17,11 +17,6 @@ class Comparer
     compare_images
   end
 
-  def json(path)
-    FileUtils.mkdir_p path
-    generate_json(path)
-  end
-
   private
 
   def compare_images
@@ -53,12 +48,12 @@ class Comparer
           )
           images.save_difference_image diff_name
           result = {
-                    url: url,
-                    width: width,
-                    difference: images.difference,
-                    base_file: base_name,
-                    new_file: new_name,
-                    difference_file: diff_name
+              url: url,
+              width: width,
+              difference: images.difference,
+              base_file: base_name,
+              new_file: new_name,
+              difference_file: diff_name
           }
           self.difference << result
         end
@@ -66,14 +61,4 @@ class Comparer
     end
   end
 
-  def generate_json(path)
-    json = difference.to_json
-    file = File.open(
-        "#{path}/log.json", "a+"
-    )
-    file.write(json)
-    file.close
-  end
-
-
 end

data/lib/lineup/version.rb

@@ -1,7 +1,7 @@
 module Lineup
   class Version
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
     PATCH = 0
 
     class << self

data/lib/lineup.rb

@@ -51,6 +51,8 @@ module Lineup
       # see more in according method below
 
       difference_path("#{Dir.pwd}/screenshots")
+
+      @comparer = []
     end
 
 
@@ -178,7 +180,7 @@ module Lineup
       # if it is not nil it has to be an array:
       if cookie
         # generate :symbol => "value" hash map from "symbol" => "value"
-        cookie = cookie.inject({}){|element,(symbol,value)| element[symbol.to_sym] = value; element}
+        cookie = cookie.inject({}) { |element, (symbol, value)| element[symbol.to_sym] = value; element }
 
         #Validation
         (raise "Cookie must be a hash of format
@@ -265,7 +267,7 @@ module Lineup
       cookies(configuration["cookies"])
 
       if @cookies
-        cookies_merged= @cookies.inject([]) { |a,element| a << element.dup }
+        cookies_merged= @cookies.inject([]) { |a, element| a << element.dup }
       else
         cookies_merged = []
       end
@@ -293,26 +295,32 @@ module Lineup
       #   @screenshot_path
 
       if @cookies
-        cookies_merged= @cookies.inject([]) { |a,element| a << element.dup }
+        cookies_merged= @cookies.inject([]) { |a, element| a << element.dup }
       else
         cookies_merged = []
       end
       if @cookie_for_experiment
         cookies_merged.push(@cookie_for_experiment)
       end
-      browser = Browser.new(@baseurl, @urls, @resolutions, @screenshots_path, @headless, @wait_for_asynchron_pages, cookies_merged)
-
-      # the only argument missing is if this is the "base" or "new" screenshot, this can be
-      # passed as an argument. The value does not need to be "base" or "new", but can be anything
-
-      browser.record(version)
 
-      # this will close the browser and terminate the headless environment
-
-      browser.end
+      threads = []
+      i=0
+      @urls.each { |url|
+        @resolutions.each { |resolution|
+          threads[i] = Thread.new {
+            browser = Browser.new(@baseurl, [url], [resolution], @screenshots_path, @headless, @wait_for_asynchron_pages, cookies_merged)
+            # the only argument missing is if this is the "base" or "new" screenshot, this can be
+            # passed as an argument. The value does not need to be "base" or "new", but can be anything
+            browser.record(version)
+            # this will close the browser and terminate the headless environment
+            browser.end
+          }
+          i+=1;
+        }
+      }
+      threads.each { |t| t.join }
 
       # this flag is set, so that parameters like resolution or urls cannot be changed any more
-
       @got_base_screenshots = true
     end
 
@@ -324,29 +332,36 @@ module Lineup
       # as "variable" in the method "record_screenshot"!
       # all other information are constants and are passed along
 
-      @comparer = Comparer.new(base, new, @difference_path, @baseurl, @urls, @resolutions, @screenshots_path)
+      threads = []
+      i=0
+      @urls.each { |url|
+        @resolutions.each { |resolution|
+          threads[i] = Thread.new {
+            @comparer.push(Comparer.new(base, new, @difference_path, @baseurl, [url], [resolution], @screenshots_path))
+          }
+          i+=1;
+        }
+      }
+      threads.each { |t| t.join }
 
       # this gives back an array, which as one element for each difference image.
       # [ {diff_1}, {diff_2}, ...]
       # while each diff is a hash with keys:
       # {url: <url>, width: <width in px>, difference: <%of changed pixel>, base_file: <file path>, new_file: <file path>, diff_file: <file path>}
-
-      @comparer.difference
+      @comparer.each { |c| c.difference }
     end
 
     def save_json(path)
 
       # json output can be saved if needed. A path is required to save the file
-
-      raise "screenshots need to be compared before json output can be gernerated" unless @comparer
+      raise "screenshots need to be compared before json output can be generated" unless @comparer.count > 0
 
       # the array from @comparer.difference is saved as json
-
-      @comparer.json(path)
+      save_comparer_log(path)
 
     end
 
-  private
+    private
 
     def raise_base_screenshots_taken(value)
       if @got_base_screenshots
@@ -358,6 +373,19 @@ module Lineup
       urls.gsub(' ', '').gsub(';', ',')
     end
 
+    def save_comparer_log(path)
+      FileUtils.mkdir_p path
+
+      diff = []
+      @comparer.each { |c| diff += c.difference }
+      json = diff.to_json
+      file = File.open(
+          "#{path}/log.json", "w"
+      )
+      file.write(json)
+      file.close
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lineup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Finn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec