nanoc-tidy.rb 0.5.5 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c13d772e4ae2e2a1efc8ca32dec153769c19760bcbd6600ca1ec1501cf7e6df
-  data.tar.gz: 2787f7c6199213d0d819e74a81b0f29e32e39a09afa57a09f092d939a5dcfba1
+  metadata.gz: ee29f7af6d3dbaf443aa2e35e52e696f184481641a493a29292d110760776c07
+  data.tar.gz: c42f3696900ea751574072d35a0005ed4dd2442cde77640e7a56a23f9794a500
 SHA512:
-  metadata.gz: a8e30af2decf9ca18a7d5f0c585682bc7399c8c1809f9039b0ed33480d6db7e5aecb8ef7621c7e48b166cd596491e456cd5fe7f2f2089649680896d6ae7f58a8
-  data.tar.gz: b2d1b2407f3187959dff0ef7d483a98c83fdd269691021aa6b2077d35033f9006c686eec58386d9505291238bb897f7f895bc355bbd863e30c865d2e3251c309
+  metadata.gz: bb1ad99a6c41a010f04d96483aac6cec646b153aeaaa0f827e2c2f176e5d0890435021a301e434600ab37623e5b824db75ce41826bde6b864a2da76a8e5be4ee
+  data.tar.gz: 648fa0abae522cf95225adc508991a7f5698cc4573e3d1cafd56a211fec6376a460c800142521bfe1ca4d400657b2b48fd96cf0074fdcaf2999a35d88259479f

data/lib/nanoc/tidy/filter.rb

@@ -26,7 +26,8 @@ module Nanoc::Tidy
       path = temporary_file(content).path
       spawn tidy,
             [*default_argv, *(options[:argv] || []), "-modify", path],
-            log: File.join(tmpdir, "tidy-html5.log")
+            err: File.join(tmpdir, "stderr"),
+            out: File.join(tmpdir, "stdout")
       File.read(path).tap { rm(path) }
     end
 

data/lib/nanoc/tidy/spawn.rb

@@ -1,9 +1,31 @@
 module Nanoc::Tidy
   module Spawn
+    require "securerandom"
+    require "fileutils"
     Error = Class.new(RuntimeError)
-    def spawn(exe, argv, log:)
+
+    ##
+    # Spawns a process
+    #
+    # @param [String] exe
+    #  The path to an executable
+    #
+    # @param [Array<String>] argv
+    #  An array of command line arguments
+    #
+    # @param [String] err
+    #  A path where stderr is redirected to
+    #
+    # @param [String] out
+    #  A path where stdout is redirected to
+    #
+    # @return [void]
+    def spawn(exe, argv, err:, out:)
+      hex = SecureRandom.hex
+      err = "#{err}-ID#{hex}"
+      out = "#{out}-ID#{hex}"
       Kernel.spawn(
-        exe, *argv, { STDOUT => log, STDERR => log }
+        exe, *argv, { STDERR => err, STDOUT => out }
       )
       Process.wait
       status = $?
@@ -14,16 +36,22 @@ module Nanoc::Tidy
       #  * 2: has errors
       return if [0, 1].include?(status.exitstatus)
 
+      msgs = [err, out].map do
+        FileUtils.touch(_1)
+        [_1.gsub(Dir.getwd, ''), ":", File.binread(_1)].join
+      end.join("\n")
       raise Error,
             "#{File.basename(exe)} exited unsuccessfully " \
             "(" \
             "exit code: #{status.exitstatus}, " \
             "item: #{item.identifier}" \
             ")" \
-            "\n" \
-            "#{log.gsub(Dir.getwd, '')[1..]}:" \
-            "#{File.binread(log)}" \
+            "\n#{msgs}",
             []
+    ensure
+      [err, out]
+        .select { File.exist?(_1) }
+        .each { FileUtils.rm(_1) }
     end
   end
 end

data/lib/nanoc/tidy/version.rb

@@ -1,5 +1,5 @@
 module Nanoc
   module Tidy
-    VERSION = "0.5.5"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-tidy.rb
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.1
 platform: ruby
 authors:
 - '0x1eef'