fix calls to shellescape and cleanup checking exit codes

Author: toy

script/worker_analysis

@@ -81,10 +81,6 @@ Process.times.class.class_eval do
 end
 
 ImageOptim::Path.class_eval do
-  def shellescape
-    to_s.shellescape
-  end
-
   def digest
     @digest ||= Digest::SHA256.file(to_s).hexdigest
   end
@@ -313,22 +309,21 @@ class Analyser
         images = [flatten_animation(@path), flatten_animation(other)]
 
         alpha_presence = images.map do |image|
-          Cmd.capture("identify -format '%A' #{image.shellescape}")
+          Cmd.capture("identify -format '%A' #{image.to_s.shellescape}")
         end
         if alpha_presence.uniq.length == 2
           images.map!{ |image| underlay_noise(image) }
         end
 
-        nrmse_command = %W[
+        nrmse = Cmd.capture(*%W[
           convert
           #{images[0]} -auto-orient
           #{images[1]} -auto-orient
           -metric RMSE
           -compare
           -format %[distortion]
           info:
-        ].shelljoin
-        nrmse = Cmd.capture(nrmse_command).to_f
+        ]).to_f
         unless $CHILD_STATUS.success?
           fail "failed comparison of #{@path} with #{other}"
         end
@@ -342,14 +337,11 @@ class Analyser
           flattened = image.temp_path
           Cmd.run(*%W[
             convert
-            #{image.shellescape}
+            #{image}
             -coalesce
             -append
-            #{flattened.shellescape}
-          ])
-          unless $CHILD_STATUS.success?
-            fail "failed flattening of #{image}"
-          end
+            #{flattened}
+          ]) || fail("failed flattening of #{image}")
           flattened
         else
           image
@@ -362,16 +354,13 @@ class Analyser
         with_noise = image.temp_path
         Cmd.run(*%W[
           convert
-          #{image.shellescape}
+          #{image}
           +noise Random
-          #{image.shellescape}
+          #{image}
           -flatten
           -alpha off
-          #{with_noise.shellescape}
-        ])
-        unless $CHILD_STATUS.success?
-          fail "failed underlaying noise to #{image}"
-        end
+          #{with_noise}
+        ]) || fail("failed underlaying noise to #{image}")
         with_noise
       end
     end

spec/spec_helper.rb

@@ -26,11 +26,11 @@ def flatten_animation(image)
     flattened = image.temp_path
     command = %W[
       convert
-      #{image.to_s.shellescape}
+      #{image}
       -coalesce
       -append
-      #{flattened.to_s.shellescape}
-    ].join(' ')
+      #{flattened}
+    ].shelljoin
     expect(ImageOptim::Cmd.run(command)).to be_truthy
     flattened
   else
@@ -41,16 +41,15 @@ def flatten_animation(image)
 def mepp(image_a, image_b)
   coalesce_a = flatten_animation(image_a)
   coalesce_b = flatten_animation(image_b)
-  command = %W[
+  output = ImageOptim::Cmd.capture(%W[
     compare
     -metric MEPP
     -alpha Background
     #{coalesce_a.to_s.shellescape}
     #{coalesce_b.to_s.shellescape}
     #{ImageOptim::Path::NULL}
     2>&1
-  ].join(' ')
-  output = ImageOptim::Cmd.capture(command)
+  ].join(' '))
   unless [0, 1].include?($CHILD_STATUS.exitstatus)
     fail "compare #{image_a} with #{image_b} failed with `#{output}`"
   end