likadan 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df8ec3d54bd3fc9f9fa37fac5efbd69c26b4b223
-  data.tar.gz: aa754753cfc9fef241c026f7142a00598f540964
+  metadata.gz: 89d2d8d420a5b4ff0aa9ba929c814f70d1857c29
+  data.tar.gz: 834f1892de7b205fac29b293ef65c75c6e42c436
 SHA512:
-  metadata.gz: dd7be6c3cd2b2d443949464a27f69b9b3347b5b47b33c32eb6cf7c5179412fb1ad7051d42f86d0335600faec8bd2b38ac61ecbcd2a5a2feb13c4e3d90949e880
-  data.tar.gz: 0df70f6aa8be4e7b81ecf65c7e74e12923403cc983f58f8a3d6cc217c7890151bc44b27f77fad15290822dcdda7e35e32a4864a410a80cd8d4856bf2fcc0598f
+  metadata.gz: 7cfdaaace27c25794a2f5fd4a959e758c3ca4dd6985de80f54de4fd0e6913e2044d8c5005974aa0b16c69c25d9e1c50f7bc8a0754c71fc2488e69cb1d18dd9da
+  data.tar.gz: f9a2496c3456d48f313939cb1643215f9ac10f1a62799a077e00d0aba21fbb3eba2ca70c0d8fbee79ce78ea67cf9131f1ba3818a93d42825480676847873ed8c

data/bin/likadan

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'likadan_utils'
+require 'likadan_action'
+require 'likadan_uploader'
+require 'fileutils'
 
 action = ARGV[0] || 'run'
 case action
@@ -9,8 +12,6 @@ when 'run'
     begin
       require 'likadan_runner'
     ensure
-      puts 'Press Enter to exit...'
-      gets
       exit
     end
   end
@@ -20,11 +21,18 @@ when 'review'
   system 'open', LikadanUtils.construct_url('/review')
   require 'likadan_server'
 
+when 'prune'
+  FileUtils.remove_entry_secure LikadanUtils.config['snapshots_folder']
+
 when 'approve', 'reject'
-  require 'likadan_action'
   abort 'Missing example name' unless example_name = ARGV[1]
   abort 'Missing viewport width' unless width = ARGV[2]
   LikadanAction.new(example_name, width).send(action)
+
+when 'upload_diffs'
+  LikadanUploader.new.upload_diffs.each do |url|
+    puts url
+  end
 else
   abort "Unknown action \"#{action}\""
 end

data/lib/likadan_action.rb

@@ -1,5 +1,5 @@
 require 'likadan_utils'
-require 'FileUtils'
+require 'fileutils'
 
 class LikadanAction
   def initialize(example_name, width)

data/lib/likadan_runner.rb

@@ -7,8 +7,9 @@ require 'diffux_core/snapshot_comparison_image/overlayed'
 require 'diffux_core/snapshot_comparison_image/after'
 require 'chunky_png'
 require 'likadan_utils'
+require 'fileutils'
 
-driver = Selenium::WebDriver.for :firefox
+driver = Selenium::WebDriver.for LikadanUtils.config['driver'].to_sym
 begin
   driver.navigate.to LikadanUtils.construct_url('/')
 
@@ -58,7 +59,7 @@ begin
         if img = comparison[:diff_image]
           diff_output = LikadanUtils.path_to(current['name'], width, 'diff.png')
           img.save(diff_output)
-          puts "#{comparison[:diff_in_percent]}% (#{diff_output})"
+          puts "#{comparison[:diff_in_percent].round(1)}% (#{diff_output})"
         else
           File.delete(output_file)
           puts 'No diff.'

data/lib/likadan_server.rb

@@ -9,31 +9,13 @@ class LikadanServer < Sinatra::Base
     set :port, LikadanUtils.config['port']
   end
 
-  def current_snapshots
-    prepare_file = lambda do |file|
-      width_dir = File.expand_path('..', file)
-      name_dir = File.expand_path('..', width_dir)
-      {
-        name: File.basename(name_dir),
-        width: File.basename(width_dir).sub('@', '').to_i,
-        file: file,
-      }
-    end
-    diff_files = Dir.glob("#{LikadanUtils.config['snapshots_folder']}/**/diff.png")
-    baselines = Dir.glob("#{LikadanUtils.config['snapshots_folder']}/**/baseline.png")
-    {
-      diffs: diff_files.map(&prepare_file),
-      baselines: baselines.map(&prepare_file)
-    }
-  end
-
   get '/' do
     @config = LikadanUtils.config
     erb :index
   end
 
   get '/review' do
-    @snapshots = current_snapshots
+    @snapshots = LikadanUtils.current_snapshots
     erb :review
   end
 

data/lib/likadan_uploader.rb

@@ -0,0 +1,28 @@
+require 'likadan_utils'
+require 's3'
+require 'securerandom'
+
+class LikadanUploader
+  def initialize()
+    @s3_access_key_id = LikadanUtils.config['s3_access_key_id']
+    @s3_secret_access_key = LikadanUtils.config['s3_secret_access_key']
+  end
+
+  def upload_diffs
+    service = S3::Service.new(access_key_id: @s3_access_key_id,
+                              secret_access_key: @s3_secret_access_key)
+    current_snapshots = LikadanUtils.current_snapshots
+    return [] if current_snapshots[:diffs].empty?
+
+    bucket = service.buckets.build(SecureRandom.hex)
+    bucket.save(location: :us)
+
+    current_snapshots[:diffs].map do |diff|
+      object = bucket.objects.build("#{diff[:name]}_#{diff[:width]}.png")
+      object.content = open(diff[:file])
+      object.content_type = 'image/png'
+      object.save
+      object.url
+    end
+  end
+end

data/lib/likadan_utils.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'erb'
 
 class LikadanUtils
   def self.config
@@ -6,8 +7,10 @@ class LikadanUtils
       'snapshots_folder' => './snapshots',
       'source_files' => [],
       'stylesheets' => [],
-      'port' => 4567
-    }.merge(YAML.load_file('.likadan.yaml'))
+      'port' => 4567,
+      'driver' => :firefox,
+    }.merge(YAML.load(ERB.new(File.read(
+      ENV['LIKADAN_CONFIG_FILE'] || '.likadan.yaml')).result))
   end
 
   def self.normalize_name(name)
@@ -33,4 +36,22 @@ class LikadanUtils
 
     return "http://localhost:#{config['port']}#{absolute_path}#{params_str}"
   end
+
+  def self.current_snapshots
+    prepare_file = lambda do |file|
+      width_dir = File.expand_path('..', file)
+      name_dir = File.expand_path('..', width_dir)
+      {
+        name: File.basename(name_dir),
+        width: File.basename(width_dir).sub('@', '').to_i,
+        file: file,
+      }
+    end
+    diff_files = Dir.glob("#{LikadanUtils.config['snapshots_folder']}/**/diff.png")
+    baselines = Dir.glob("#{LikadanUtils.config['snapshots_folder']}/**/baseline.png")
+    {
+      diffs: diff_files.map(&prepare_file),
+      baselines: baselines.map(&prepare_file)
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: likadan
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Henric Trotzig
@@ -110,6 +110,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.22
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.22
 description: Likadan, a perceptual diff tool for JS components
 email: henric.trotzig@gmail.com
 executables:
@@ -121,6 +141,7 @@ files:
 - lib/likadan_action.rb
 - lib/likadan_runner.rb
 - lib/likadan_server.rb
+- lib/likadan_uploader.rb
 - lib/likadan_utils.rb
 - lib/public/likadan-runner.js
 - lib/views/index.erb