wraith 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6105542acd85653ababc6bdc76cb240aa4d26a54
-  data.tar.gz: ffd81274f1516421b07c5ac56bec4d61ea1f5f27
+  metadata.gz: abf148396530bc09262f9c38f34e4c46fc7c8817
+  data.tar.gz: ebd5e8b158b1c637e1df682ecfe52e31b1bf1f3a
 SHA512:
-  metadata.gz: 1b7f396ba01012498b57802889c9c3e978a4561fa89f34fc99903faacbd6150b61e6dfe2075f725c9764d844bcd657987defe801d6fb816f8da6bc3b526481d8
-  data.tar.gz: 2a23a5c7a86196efc8dc4a639a9770329db9edcaf42301a7a36798944569448eb2193bf8e9b1e9677c5149de1d9bb0f386b58397da041f428dbf6af31d6d894f
+  metadata.gz: 4834c4d793c3182d93262625c8a90abcce9adbd82f3a238743e22129b8bed8071368ba8a1108ee79bb3508533db07056a9943af2095fbfe1fefb996d456c85e2
+  data.tar.gz: df0363c19211465311b44e45253ddb0e000632fd6bb455d6bc8e32b29b56a99680b208ec9bd45f40a6590ec59b5b35e6cc2452b2eac9bda427920258172e4f78

data/lib/wraith/compare_images.rb

@@ -2,6 +2,7 @@ require "wraith"
 require "image_size"
 require "open3"
 require "parallel"
+require "shellwords"
 
 class Wraith::CompareImages
   attr_reader :wraith
@@ -27,7 +28,7 @@ class Wraith::CompareImages
   end
 
   def compare_task(base, compare, output, info)
-    cmdline = "compare -dissimilarity-threshold 1 -fuzz #{wraith.fuzz} -metric AE -highlight-color #{wraith.highlight_color} #{base} #{compare} #{output}"
+    cmdline = "compare -dissimilarity-threshold 1 -fuzz #{wraith.fuzz} -metric AE -highlight-color #{wraith.highlight_color} #{base} #{compare.shellescape} #{output}"
     px_value = Open3.popen3(cmdline) { |_stdin, _stdout, stderr, _wait_thr| stderr.read }.to_f
     begin
       img_size = ImageSize.path(output).size.inject(:*)

data/lib/wraith/crop.rb

@@ -1,6 +1,7 @@
 require "wraith"
 require "image_size"
 require "parallel"
+require "shellwords"
 
 class Wraith::CropImages
   attr_reader :wraith
@@ -32,7 +33,7 @@ class Wraith::CropImages
   end
 
   def crop_task(crop, height, width)
-    `convert #{crop} -background none -extent #{width}x#{height} #{crop}`
+    `convert #{crop.shellescape} -background none -extent #{width}x#{height} #{crop.shellescape}`
   end
 
   def image_dimensions(image)

data/lib/wraith/save_images.rb

@@ -1,5 +1,6 @@
 require "wraith"
 require "parallel"
+require "shellwords"
 
 class Wraith::SaveImages
   attr_reader :wraith, :history, :meta
@@ -73,7 +74,7 @@ class Wraith::SaveImages
   end
 
   def set_image_width(image, width)
-    `convert #{image} -background none -extent #{width}x0 #{image}`
+    `convert #{image.shellescape} -background none -extent #{width}x0 #{image.shellescape}`
   end
 end
 
@@ -131,7 +132,7 @@ class SaveMetadata
   end
 
   def engine_label
-    wraith.engine.key(wraith.engine)
+    wraith.engine.key(engine)
   end
 
   def file_names(width, label, domain_label)

data/lib/wraith/thumbnails.rb

@@ -1,6 +1,7 @@
 require "wraith"
 require "parallel"
 require "fileutils"
+require "shellwords"
 
 class Wraith::Thumbnails
   attr_reader :wraith
@@ -25,6 +26,6 @@ class Wraith::Thumbnails
       FileUtils.mkdir_p(File.dirname(output_path))
     end
 
-    `convert #{png_path} -thumbnail 200 -crop 200x200+0+0 #{output_path}`
+    `convert #{png_path.shellescape} -thumbnail 200 -crop 200x200+0+0 #{output_path.shellescape}`
   end
 end

data/lib/wraith/version.rb

@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

data/spec/wraith_spec.rb

@@ -7,7 +7,7 @@ describe Wraith do
   let(:test_url1) { "http://www.bbc.co.uk/russian" }
   let(:test_url2) { "http://www.bbc.co.uk/russian" }
   let(:test_image1) { "shots/test/test1.png" }
-  let(:test_image2) { "shots/test/test2.png" }
+  let(:test_image2) { "shots/test/test(2).png" }
   let(:diff_image) { "shots/test/test_diff.png" }
   let(:data_txt) { "shots/test/test.txt" }
   let(:selector) { "" }
@@ -94,7 +94,7 @@ describe Wraith do
       Wraith::Thumbnails.new(config_name).generate_thumbnails
 
       expect(File).to exist("shots/thumbnails/test/test1.png")
-      expect(File).to exist("shots/thumbnails/test/test2.png")
+      expect(File).to exist("shots/thumbnails/test/test(2).png")
       expect(File).to exist("shots/thumbnails/test/test_diff.png")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraith
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Dave Blooman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry