diffux_ci 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f25586ff4d7dd99dbe60ef93c34fb501f1c61447
-  data.tar.gz: 0b16cf2a646f2fd16467f7bab6eca4d5a18f1b34
+  metadata.gz: 655dc75096ce2012e0e6f1ccd231d57c086d4d7b
+  data.tar.gz: 8f3a8617e9b91e630efd7c8ba79b323dcff33c2f
 SHA512:
-  metadata.gz: 0b6d5127b86bb9024e84d660f19eeafd933f902ca78dcde1b5b59b3fb1742fbfbf5122d8d099639691db913a522acc175a1418f2a195e5969a3cc3b2454ca730
-  data.tar.gz: 0ca9eb6f83b7419d5ec05d9d4cc17fe251cd2ad8fe14460f32a9f446ffa2c6161ed79fe804db1f7c4cbab3c67004ee8bd0e08bcd278b8c53b42aead87a49d1cf
+  metadata.gz: f6f420363c7def23d0115ebc21a12782f68c2863a7888a423cc15342a4c86d882f00779b379b34b3b585bbe36ead7033c98f042f47f537cc4201286af60ad6eb
+  data.tar.gz: 9497fc103436f030f9b2978496707e6ad4be3de35fc6cbfc7da9650203e149b8359f6eeaffc26402a59006829cc00cd7dd60647401b4338c60286ef8a5279c02

data/bin/diffux

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'diffux_ci_utils'
-require 'diffux_ci_action'
-require 'diffux_ci_uploader'
-require 'diffux_ci_version'
+require 'diffux_ci'
 require 'fileutils'
 
 help_text = <<-EOS
@@ -24,22 +21,22 @@ case action
 when 'run'
   Thread.abort_on_exception = true
   Thread.new do
-    require 'diffux_ci_runner'
+    require 'diffux_ci/runner'
     exit
   end
-  require 'diffux_ci_server'
+  require 'diffux_ci/server'
 
 when 'debug'
-  system 'open', DiffuxCIUtils.construct_url('/debug')
-  require 'diffux_ci_server'
+  system 'open', DiffuxCI::Utils.construct_url('/debug')
+  require 'diffux_ci/server'
 
 when 'review'
-  system 'open', DiffuxCIUtils.construct_url('/review')
-  require 'diffux_ci_server'
+  system 'open', DiffuxCI::Utils.construct_url('/review')
+  require 'diffux_ci/server'
 
 when 'clean'
-  if File.directory? DiffuxCIUtils.config['snapshots_folder']
-    FileUtils.remove_entry_secure DiffuxCIUtils.config['snapshots_folder']
+  if File.directory? DiffuxCI::Utils.config['snapshots_folder']
+    FileUtils.remove_entry_secure DiffuxCI::Utils.config['snapshots_folder']
   end
 
 when 'approve', 'reject'
@@ -47,11 +44,11 @@ when 'approve', 'reject'
   abort 'Missing example description' unless example_description
   viewport_name = ARGV[2]
   abort 'Missing viewport name' unless viewport_name
-  DiffuxCIAction.new(example_description, viewport_name).send(action)
+  DiffuxCI::Action.new(example_description, viewport_name).send(action)
 
 when 'upload_diffs'
   # `upload_diffs` returns a URL to a static html file
-  puts DiffuxCIUploader.new.upload_diffs
+  puts DiffuxCI::Uploader.new.upload_diffs
 
 when '--version'
   puts "diffux_ci version #{DiffuxCI::VERSION}"

data/lib/diffux_ci/action.rb

@@ -0,0 +1,33 @@
+require 'diffux_ci/utils'
+require 'fileutils'
+
+module DiffuxCI
+  class Action
+    def initialize(example_description, viewport_name)
+      @example_description = example_description
+      @viewport_name = viewport_name
+    end
+
+    def approve
+      diff_path = DiffuxCI::Utils.path_to(
+        @example_description, @viewport_name, 'diff.png')
+      baseline_path = DiffuxCI::Utils.path_to(
+        @example_description, @viewport_name, 'baseline.png')
+      candidate_path = DiffuxCI::Utils.path_to(
+        @example_description, @viewport_name, 'candidate.png')
+
+      FileUtils.rm(diff_path, force: true)
+      FileUtils.mv(candidate_path, baseline_path) if File.exist? candidate_path
+    end
+
+    def reject
+      diff_path = DiffuxCI::Utils.path_to(
+        @example_description, @viewport_name, 'diff.png')
+      candidate_path = DiffuxCI::Utils.path_to(
+        @example_description, @viewport_name, 'candidate.png')
+
+      FileUtils.rm(diff_path, force: true)
+      FileUtils.rm(candidate_path, force: true)
+    end
+  end
+end

data/lib/diffux_ci/logger.rb

@@ -0,0 +1,40 @@
+module DiffuxCI
+  # Used for all CLI output
+  class Logger
+    # @param out [IO] the output destination
+    def initialize(out = STDOUT)
+      @out = out
+    end
+
+    # Print the specified output
+    # @param str [String] the output to send
+    # @param newline [Boolean] whether to append a newline
+    def log(str, newline = true)
+      @out.print(str)
+      @out.print("\n") if newline
+    end
+
+    # Mark the string in cyan
+    # @param str [String] the str to format
+    def cyan(str)
+      color(36, str)
+    end
+
+    private
+
+    # Whether this logger is outputting to a TTY
+    #
+    # @return [Boolean]
+    def tty?
+      @out.respond_to?(:tty?) && @out.tty?
+    end
+
+    # Mark the string in a color
+    # @see http://ascii-table.com/ansi-escape-sequences.php
+    # @param color_code [Number] the ANSI color code
+    # @param str [String] the str to format
+    def color(color_code, str)
+      tty? ? str : "\033[#{color_code}m#{str}\033[0m"
+    end
+  end
+end

data/lib/{public → diffux_ci/public}/diffux_ci-runner.js

@@ -101,7 +101,7 @@ window.diffux = {
    *
    * @param {String} exampleDescription
    * @param {Function} doneFunc injected by driver.execute_async_script in
-   *   diffux_ci_runner.rb
+   *   diffux_ci/runner.rb
    */
   renderExample: function(exampleDescription, doneFunc) {
     try {

data/lib/{diffux_ci_runner.rb → diffux_ci/runner.rb}

@@ -6,12 +6,12 @@ require 'diffux_core/snapshot_comparison_image/before'
 require 'diffux_core/snapshot_comparison_image/overlayed'
 require 'diffux_core/snapshot_comparison_image/after'
 require 'oily_png'
-require 'diffux_ci_utils'
+require 'diffux_ci'
 require 'fileutils'
 require 'yaml'
 
 def resolve_viewports(example)
-  configured_viewports = DiffuxCIUtils.config['viewports']
+  configured_viewports = DiffuxCI::Utils.config['viewports']
 
   viewports =
     example['options']['viewports'] || [configured_viewports.first.first]
@@ -24,7 +24,7 @@ end
 def init_driver
   tries = 0
   begin
-    driver = Selenium::WebDriver.for DiffuxCIUtils.config['driver'].to_sym
+    driver = Selenium::WebDriver.for DiffuxCI::Utils.config['driver'].to_sym
   rescue Selenium::WebDriver::Error::WebDriverError => e
     # "unable to obtain stable firefox connection in 60 seconds"
     #
@@ -40,10 +40,11 @@ def init_driver
   driver
 end
 
+log = DiffuxCI::Logger.new(STDOUT)
 driver = init_driver
 
 begin
-  driver.navigate.to DiffuxCIUtils.construct_url('/')
+  driver.navigate.to DiffuxCI::Utils.construct_url('/')
 
   # Check for errors during startup
   errors = driver.execute_script('return window.diffux.errors;')
@@ -80,21 +81,21 @@ begin
     viewport = example_by_viewport[:viewport]
     examples = example_by_viewport[:examples]
 
-    puts "#{viewport['name']} (#{viewport['width']}x#{viewport['height']})"
+    log.log "#{viewport['name']} (#{viewport['width']}x#{viewport['height']})"
 
     # Resize window to the right size before rendering
     driver.manage.window.resize_to(viewport['width'], viewport['height'])
 
     examples.each do |example|
       if example == examples.last
-        print '└─ '
+        log.log '└─ ', false
       else
-        print '├─ '
+        log.log '├─ ', false
       end
       description = example['description']
-      print " #{description} "
+      log.log " #{description} ", false
 
-      print '.'
+      log.log '.', false
 
       # Render the example
 
@@ -114,20 +115,20 @@ begin
         window.diffux.renderExample(arguments[0], doneFunc);
       EOS
       rendered = driver.execute_async_script(script, description)
-      print '.'
+      log.log '.', false
 
       if rendered['error']
         fail <<-EOS
           Error while rendering "#{description}" @#{viewport['name']}:
             #{rendered['error']}
           Debug by pointing your browser to
-          #{DiffuxCIUtils.construct_url('/', description: description)}
+          #{DiffuxCI::Utils.construct_url('/', description: description)}
         EOS
       end
 
       # Crop the screenshot to the size of the rendered element
       screenshot = ChunkyPNG::Image.from_blob(driver.screenshot_as(:png))
-      print '.'
+      log.log '.', false
 
       # In our JavaScript we are rounding up, which can sometimes give us a
       # dimensions that are larger than the screenshot dimensions. We need to
@@ -146,11 +147,11 @@ begin
                          rendered['top'],
                          crop_width,
                          crop_height)
-        print '.'
+        log.log '.', false
       end
 
       # Run the diff if needed
-      baseline_path = DiffuxCIUtils.path_to(
+      baseline_path = DiffuxCI::Utils.path_to(
         description, viewport['name'], 'baseline.png')
 
       if File.exist? baseline_path
@@ -160,23 +161,24 @@ begin
           ChunkyPNG::Image.from_file(baseline_path),
           screenshot
         ).compare!
-        print '.'
+        log.log '.', false
 
         if comparison[:diff_image]
           # There was a visual difference between the new snapshot and the
           # baseline, so we want to write the diff image and the new snapshot
           # image to disk. This will allow it to be reviewed by someone.
-          diff_path = DiffuxCIUtils.path_to(
+          diff_path = DiffuxCI::Utils.path_to(
             description, viewport['name'], 'diff.png')
           comparison[:diff_image].save(diff_path, :fast_rgba)
-          print '.'
+          log.log '.', false
 
-          candidate_path = DiffuxCIUtils.path_to(
+          candidate_path = DiffuxCI::Utils.path_to(
             description, viewport['name'], 'candidate.png')
           screenshot.save(candidate_path, :fast_rgba)
-          print '.'
+          log.log '.', false
 
-          puts " #{comparison[:diff_in_percent].round(1)}% (#{candidate_path})"
+          percent = comparison[:diff_in_percent].round(1)
+          log.log log.cyan(" #{percent}% (#{candidate_path})")
           result_summary[:diff_examples] << {
             description: description,
             viewport: viewport['name']
@@ -184,7 +186,7 @@ begin
         else
           # No visual difference was found, so we don't need to do any more
           # work.
-          puts ' No diff.'
+          log.log ' No diff.'
           result_summary[:okay_examples] << {
             description: description,
             viewport: viewport['name']
@@ -199,8 +201,8 @@ begin
           FileUtils.mkdir_p(dirname)
         end
         screenshot.save(baseline_path, :fast_rgba)
-        print '.'
-        puts " First snapshot created (#{baseline_path})"
+        log.log '.', false
+        log.log " First snapshot created (#{baseline_path})"
         result_summary[:new_examples] << {
           description: description,
           viewport: viewport['name']
@@ -209,7 +211,7 @@ begin
     end
   end
 
-  result_summary_file = File.join(DiffuxCIUtils.config['snapshots_folder'],
+  result_summary_file = File.join(DiffuxCI::Utils.config['snapshots_folder'],
                                   'result_summary.yaml')
   File.open(result_summary_file, 'w') do |file|
     file.write result_summary.to_yaml

data/lib/diffux_ci/server.rb

@@ -0,0 +1,53 @@
+require 'sinatra/base'
+require 'yaml'
+
+module DiffuxCI
+  class Server < Sinatra::Base
+    configure do
+      enable :static
+      set :port, DiffuxCI::Utils.config['port']
+    end
+
+    helpers do
+      def h(text)
+        Rack::Utils.escape_html(text)
+      end
+    end
+
+    get '/' do
+      @config = DiffuxCI::Utils.config
+      erb :index
+    end
+
+    get '/debug' do
+      @config = DiffuxCI::Utils.config
+      erb :debug
+    end
+
+    get '/review' do
+      @snapshots = DiffuxCI::Utils.current_snapshots
+      erb :review
+    end
+
+    get '/resource' do
+      file = params[:file]
+      if file.start_with? 'http'
+        redirect file
+      else
+        send_file file
+      end
+    end
+
+    post '/reject' do
+      DiffuxCI::Action.new(params[:description], params[:viewport]).reject
+      redirect back
+    end
+
+    post '/approve' do
+      DiffuxCI::Action.new(params[:description], params[:viewport]).approve
+      redirect back
+    end
+
+    run!
+  end
+end

data/lib/diffux_ci/uploader.rb

@@ -0,0 +1,70 @@
+require 's3'
+require 'securerandom'
+
+module DiffuxCI
+  class Uploader
+    def initialize
+      @s3_access_key_id = DiffuxCI::Utils.config['s3_access_key_id']
+      @s3_secret_access_key = DiffuxCI::Utils.config['s3_secret_access_key']
+      @s3_bucket_name = DiffuxCI::Utils.config['s3_bucket_name']
+    end
+
+    def upload_diffs
+      result_summary = YAML.load(File.read(File.join(
+        DiffuxCI::Utils.config['snapshots_folder'], 'result_summary.yaml')))
+
+      return [] if result_summary[:diff_examples].empty? &&
+                   result_summary[:new_examples].empty?
+
+      bucket = find_or_build_bucket
+      dir = SecureRandom.uuid
+
+      diff_images = result_summary[:diff_examples].map do |diff|
+        image = bucket.objects.build(
+          "#{dir}/#{diff[:description]}_#{diff[:viewport]}.png")
+        image.content = open(DiffuxCI::Utils.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(DiffuxCI::Utils.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__), 'diffs.html.erb'))
+      html.content = ERB.new(File.read(path)).result(binding)
+      html.content_type = 'text/html'
+      html.save
+      html.url
+    end
+
+    private
+
+    def find_or_build_bucket
+      service = S3::Service.new(access_key_id: @s3_access_key_id,
+                                secret_access_key: @s3_secret_access_key)
+      bucket = service.buckets.find(@s3_bucket_name)
+
+      if bucket.nil?
+        bucket = service.buckets.build(@s3_bucket_name)
+        bucket.save(location: :us)
+      end
+
+      bucket
+    end
+  end
+end

data/lib/diffux_ci/utils.rb

@@ -0,0 +1,80 @@
+require 'yaml'
+require 'erb'
+require 'uri'
+require 'base64'
+
+module DiffuxCI
+  class Utils
+    def self.config
+      @@config ||= {
+        'snapshots_folder' => './snapshots',
+        'source_files' => [],
+        'stylesheets' => [],
+        'port' => 4567,
+        'driver' => :firefox,
+        'viewports' => {
+          'large' => {
+            'width' => 1024,
+            'height' => 768
+          },
+          'medium' => {
+            'width' => 640,
+            'height' => 888
+          },
+          'small' => {
+            'width' => 320,
+            'height' => 444
+          }
+        }
+      }.merge(config_from_file)
+    end
+
+    def self.config_from_file
+      config_file_name = ENV['DIFFUX_CI_CONFIG_FILE'] || '.diffux_ci.yaml'
+      YAML.load(ERB.new(File.read(config_file_name)).result)
+    end
+
+    def self.normalize_description(description)
+      Base64.encode64(description).strip
+    end
+
+    def self.path_to(description, viewport_name, file_name)
+      File.join(
+        config['snapshots_folder'],
+        normalize_description(description),
+        "@#{viewport_name}",
+        file_name
+      )
+    end
+
+    def self.construct_url(absolute_path, params = {})
+      query = URI.encode_www_form(params) unless params.empty?
+
+      URI::HTTP.build(host: 'localhost',
+                      port: config['port'],
+                      path: absolute_path,
+                      query: query).to_s
+    end
+
+    def self.current_snapshots
+      prepare_file = lambda do |file|
+        viewport_dir = File.expand_path('..', file)
+        description_dir = File.expand_path('..', viewport_dir)
+        {
+          description: Base64.decode64(File.basename(description_dir)),
+          viewport: File.basename(viewport_dir).sub('@', ''),
+          file: file
+        }
+      end
+
+      snapshots_folder = DiffuxCI::Utils.config['snapshots_folder']
+      diff_files = Dir.glob("#{snapshots_folder}/**/diff.png")
+      baselines = Dir.glob("#{snapshots_folder}/**/baseline.png")
+
+      {
+        diffs: diff_files.map(&prepare_file),
+        baselines: baselines.map(&prepare_file)
+      }
+    end
+  end
+end

data/lib/{diffux_ci_version.rb → diffux_ci/version.rb}

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

data/lib/diffux_ci.rb

@@ -0,0 +1,5 @@
+require 'diffux_ci/utils'
+require 'diffux_ci/action'
+require 'diffux_ci/uploader'
+require 'diffux_ci/version'
+require 'diffux_ci/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffux_ci
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Henric Trotzig
@@ -51,20 +51,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.44'
+        version: '2.53'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.44.0
+        version: 2.53.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.44'
+        version: '2.53'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.44.0
+        version: 2.53.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -135,19 +135,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/diffux
-- lib/diffux_ci-diffs.html.erb
-- lib/diffux_ci_action.rb
-- lib/diffux_ci_runner.rb
-- lib/diffux_ci_server.rb
-- lib/diffux_ci_uploader.rb
-- lib/diffux_ci_utils.rb
-- lib/diffux_ci_version.rb
-- lib/public/diffux_ci-runner.js
+- lib/diffux_ci.rb
+- lib/diffux_ci/action.rb
+- lib/diffux_ci/diffs.html.erb
+- lib/diffux_ci/logger.rb
+- lib/diffux_ci/public/diffux_ci-runner.js
+- lib/diffux_ci/public/diffux_ci-styles.css
+- lib/diffux_ci/runner.rb
+- lib/diffux_ci/server.rb
+- lib/diffux_ci/uploader.rb
+- lib/diffux_ci/utils.rb
+- lib/diffux_ci/version.rb
+- lib/diffux_ci/views/debug.erb
+- lib/diffux_ci/views/index.erb
+- lib/diffux_ci/views/review.erb
 - lib/public/diffux_ci-scripts.js
-- lib/public/diffux_ci-styles.css
-- lib/views/debug.erb
-- lib/views/index.erb
-- lib/views/review.erb
 homepage: http://rubygems.org/gems/diffux_ci
 licenses:
 - MIT
@@ -168,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Diffux-CI

data/lib/diffux_ci_action.rb

@@ -1,31 +0,0 @@
-require 'diffux_ci_utils'
-require 'fileutils'
-
-class DiffuxCIAction
-  def initialize(example_description, viewport_name)
-    @example_description = example_description
-    @viewport_name = viewport_name
-  end
-
-  def approve
-    diff_path = DiffuxCIUtils.path_to(
-      @example_description, @viewport_name, 'diff.png')
-    baseline_path = DiffuxCIUtils.path_to(
-      @example_description, @viewport_name, 'baseline.png')
-    candidate_path = DiffuxCIUtils.path_to(
-      @example_description, @viewport_name, 'candidate.png')
-
-    FileUtils.rm(diff_path, force: true)
-    FileUtils.mv(candidate_path, baseline_path) if File.exist? candidate_path
-  end
-
-  def reject
-    diff_path = DiffuxCIUtils.path_to(
-      @example_description, @viewport_name, 'diff.png')
-    candidate_path = DiffuxCIUtils.path_to(
-      @example_description, @viewport_name, 'candidate.png')
-
-    FileUtils.rm(diff_path, force: true)
-    FileUtils.rm(candidate_path, force: true)
-  end
-end

data/lib/diffux_ci_server.rb

@@ -1,53 +0,0 @@
-require 'sinatra/base'
-require 'yaml'
-require 'diffux_ci_utils'
-require 'diffux_ci_action'
-
-class DiffuxCIServer < Sinatra::Base
-  configure do
-    enable :static
-    set :port, DiffuxCIUtils.config['port']
-  end
-
-  helpers do
-    def h(text)
-      Rack::Utils.escape_html(text)
-    end
-  end
-
-  get '/' do
-    @config = DiffuxCIUtils.config
-    erb :index
-  end
-
-  get '/debug' do
-    @config = DiffuxCIUtils.config
-    erb :debug
-  end
-
-  get '/review' do
-    @snapshots = DiffuxCIUtils.current_snapshots
-    erb :review
-  end
-
-  get '/resource' do
-    file = params[:file]
-    if file.start_with? 'http'
-      redirect file
-    else
-      send_file file
-    end
-  end
-
-  post '/reject' do
-    DiffuxCIAction.new(params[:description], params[:viewport]).reject
-    redirect back
-  end
-
-  post '/approve' do
-    DiffuxCIAction.new(params[:description], params[:viewport]).approve
-    redirect back
-  end
-
-  run!
-end

data/lib/diffux_ci_uploader.rb

@@ -1,69 +0,0 @@
-require 'diffux_ci_utils'
-require 's3'
-require 'securerandom'
-
-class DiffuxCIUploader
-  def initialize
-    @s3_access_key_id = DiffuxCIUtils.config['s3_access_key_id']
-    @s3_secret_access_key = DiffuxCIUtils.config['s3_secret_access_key']
-    @s3_bucket_name = DiffuxCIUtils.config['s3_bucket_name']
-  end
-
-  def upload_diffs
-    result_summary = YAML.load(File.read(File.join(
-      DiffuxCIUtils.config['snapshots_folder'], 'result_summary.yaml')))
-
-    return [] if result_summary[:diff_examples].empty? &&
-                 result_summary[:new_examples].empty?
-
-    bucket = find_or_build_bucket
-    dir = SecureRandom.uuid
-
-    diff_images = result_summary[:diff_examples].map do |diff|
-      image = bucket.objects.build(
-        "#{dir}/#{diff[:description]}_#{diff[:viewport]}.png")
-      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'))
-    html.content = ERB.new(File.read(path)).result(binding)
-    html.content_type = 'text/html'
-    html.save
-    html.url
-  end
-
-  private
-
-  def find_or_build_bucket
-    service = S3::Service.new(access_key_id: @s3_access_key_id,
-                              secret_access_key: @s3_secret_access_key)
-    bucket = service.buckets.find(@s3_bucket_name)
-
-    if bucket.nil?
-      bucket = service.buckets.build(@s3_bucket_name)
-      bucket.save(location: :us)
-    end
-
-    bucket
-  end
-end

data/lib/diffux_ci_utils.rb

@@ -1,78 +0,0 @@
-require 'yaml'
-require 'erb'
-require 'uri'
-require 'base64'
-
-class DiffuxCIUtils
-  def self.config
-    @@config ||= {
-      'snapshots_folder' => './snapshots',
-      'source_files' => [],
-      'stylesheets' => [],
-      'port' => 4567,
-      'driver' => :firefox,
-      'viewports' => {
-        'large' => {
-          'width' => 1024,
-          'height' => 768
-        },
-        'medium' => {
-          'width' => 640,
-          'height' => 888
-        },
-        'small' => {
-          'width' => 320,
-          'height' => 444
-        }
-      }
-    }.merge(config_from_file)
-  end
-
-  def self.config_from_file
-    config_file_name = ENV['DIFFUX_CI_CONFIG_FILE'] || '.diffux_ci.yaml'
-    YAML.load(ERB.new(File.read(config_file_name)).result)
-  end
-
-  def self.normalize_description(description)
-    Base64.encode64(description).strip
-  end
-
-  def self.path_to(description, viewport_name, file_name)
-    File.join(
-      config['snapshots_folder'],
-      normalize_description(description),
-      "@#{viewport_name}",
-      file_name
-    )
-  end
-
-  def self.construct_url(absolute_path, params = {})
-    query = URI.encode_www_form(params) unless params.empty?
-
-    URI::HTTP.build(host: 'localhost',
-                    port: config['port'],
-                    path: absolute_path,
-                    query: query).to_s
-  end
-
-  def self.current_snapshots
-    prepare_file = lambda do |file|
-      viewport_dir = File.expand_path('..', file)
-      description_dir = File.expand_path('..', viewport_dir)
-      {
-        description: Base64.decode64(File.basename(description_dir)),
-        viewport: File.basename(viewport_dir).sub('@', ''),
-        file: file
-      }
-    end
-
-    snapshots_folder = DiffuxCIUtils.config['snapshots_folder']
-    diff_files = Dir.glob("#{snapshots_folder}/**/diff.png")
-    baselines = Dir.glob("#{snapshots_folder}/**/baseline.png")
-
-    {
-      diffs: diff_files.map(&prepare_file),
-      baselines: baselines.map(&prepare_file)
-    }
-  end
-end