diffux_ci 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b7c2de4ab8683d94cba7d17e480431e4d0c727
-  data.tar.gz: 0e45a3e707cdb960112dc9f0f6ff37ed01169616
+  metadata.gz: 487ecb122914c87206dc4e593571f405b732b71c
+  data.tar.gz: 7c49e81764fcf6c5e0553357cab570a7214be0b8
 SHA512:
-  metadata.gz: 30a700e0bc8a120ce29fc7a634a740ce32d86cd0169ce2fdd1bb3e7feb70fcea916f7e297ad6bc812c0c0057e1d562a038dcc9df2656aec7b2d99e762823af18
-  data.tar.gz: 8654640c02c0ea6911ab04c3aa0b04b045f923872b4a7f6efa76370f4961b58b2b425c5d654b399a3896904ec6a77ee38ea0cb65c03fddc855ee05240cc04eb4
+  metadata.gz: 45d01fffa9f37fceac8764c6d7d1067e987e49e423aedf736aec068df69267f5330a19c3c9a57b05d699ed20bb64b89d5df96ec122be6e9a0c651307cfbafe20
+  data.tar.gz: 8b2c46ca61c72880c664346f58a8ffc6efc5ae3fb14a9d5d8e2bdde22b572d90d8d1554964d4778ae251d9f8585042d6d86602437785a8b043f0bc18defe3535

data/lib/diffux_ci-diffs.html.erb

@@ -8,11 +8,22 @@
     <h1>Diffux-CI diffs</h1>
     <p>File generated: <%= Time.now %></p>
 
+    <h2>Diffs</h2>
     <% diff_images.each do |diff| %>
       <h3>
         <%= Rack::Utils.escape_html(diff[:description]) %> @ <%= diff[:viewport] %>
       </h3>
       <p><img src="<%= diff[:url] %>"></p>
     <% end %>
+
+    <hr>
+
+    <h2>New examples</h2>
+    <% new_images.each do |image| %>
+      <h3>
+        <%= Rack::Utils.escape_html(image[:description]) %> @ <%= image[:viewport] %>
+      </h3>
+      <p><img src="<%= image[:url] %>"></p>
+    <% end %>
   </body>
 </html>

data/lib/diffux_ci_runner.rb

@@ -8,6 +8,7 @@ require 'diffux_core/snapshot_comparison_image/after'
 require 'oily_png'
 require 'diffux_ci_utils'
 require 'fileutils'
+require 'yaml'
 
 def resolve_viewports(example)
   configured_viewports = DiffuxCIUtils.config['viewports']
@@ -50,6 +51,13 @@ begin
     fail "JavaScript errors found during initialization: \n#{errors.inspect}"
   end
 
+  # Initialize a hash to store a summary of the results from the run
+  result_summary = {
+    new_examples: [],
+    diff_examples: [],
+    okay_examples: []
+  }
+
   all_examples = driver.execute_script('return window.diffux.getAllExamples()')
 
   # To avoid the overhead of resizing the window all the time, we are going to
@@ -169,10 +177,18 @@ begin
           print '.'
 
           puts " #{comparison[:diff_in_percent].round(1)}% (#{candidate_path})"
+          result_summary[:diff_examples] << {
+            description: description,
+            viewport: viewport['name']
+          }
         else
           # No visual difference was found, so we don't need to do any more
           # work.
           puts ' No diff.'
+          result_summary[:okay_examples] << {
+            description: description,
+            viewport: viewport['name']
+          }
         end
       else
         # There was no baseline image yet, so we want to start by saving a new
@@ -185,9 +201,19 @@ begin
         screenshot.save(baseline_path, :fast_rgba)
         print '.'
         puts " First snapshot created (#{baseline_path})"
+        result_summary[:new_examples] << {
+          description: description,
+          viewport: viewport['name']
+        }
       end
     end
   end
+
+  result_summary_file = File.join(DiffuxCIUtils.config['snapshots_folder'],
+                                  'result_summary.yaml')
+  File.open(result_summary_file, 'w') do |file|
+    file.write result_summary.to_yaml
+  end
 ensure
   driver.quit
 end

data/lib/diffux_ci_uploader.rb

@@ -17,16 +17,32 @@ class DiffuxCIUploader
 
     dir = SecureRandom.uuid
 
-    diff_images = current_snapshots[:diffs].map do |diff|
+    result_summary = YAML.load(File.read(File.join(
+      DiffuxCIUtils.config['snapshots_folder'], 'result_summary.yaml')))
+    diff_images = result_summary[:diff_examples].map do |diff|
       image = bucket.objects.build(
         "#{dir}/#{diff[:description]}_#{diff[:viewport]}.png")
-      image.content = open(diff[:file])
+      image.content = open(DiffuxCIUtils.path_to(diff[:description],
+                                                 diff[:viewport],
+                                                 'diff.png'))
       image.content_type = 'image/png'
       image.save
       diff[:url] = image.url
       diff
     end
 
+    new_images = result_summary[:new_examples].map do |example|
+      image = bucket.objects.build(
+        "#{dir}/#{example[:description]}_#{example[:viewport]}.png")
+      image.content = open(DiffuxCIUtils.path_to(example[:description],
+                                                 example[:viewport],
+                                                 'baseline.png'))
+      image.content_type = 'image/png'
+      image.save
+      example[:url] = image.url
+      example
+    end
+
     html = bucket.objects.build("#{dir}/index.html")
     path = File.expand_path(
       File.join(File.dirname(__FILE__), 'diffux_ci-diffs.html.erb'))

data/lib/diffux_ci_utils.rb

@@ -34,7 +34,7 @@ class DiffuxCIUtils
   end
 
   def self.normalize_description(description)
-    Base64.encode64(description)
+    Base64.encode64(description).strip
   end
 
   def self.path_to(description, viewport_name, file_name)

data/lib/diffux_ci_version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module DiffuxCI
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffux_ci
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Henric Trotzig