nanoc-tidy.rb 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c13d772e4ae2e2a1efc8ca32dec153769c19760bcbd6600ca1ec1501cf7e6df
-  data.tar.gz: 2787f7c6199213d0d819e74a81b0f29e32e39a09afa57a09f092d939a5dcfba1
+  metadata.gz: f2a117a2fa83b551326ed6ba05761c1744f182144b2980cd8246757853c67ecc
+  data.tar.gz: 362656c6f68fe0791665ecffaa9606cebeb2950eabe08db6f98f3fe8c1f32d84
 SHA512:
-  metadata.gz: a8e30af2decf9ca18a7d5f0c585682bc7399c8c1809f9039b0ed33480d6db7e5aecb8ef7621c7e48b166cd596491e456cd5fe7f2f2089649680896d6ae7f58a8
-  data.tar.gz: b2d1b2407f3187959dff0ef7d483a98c83fdd269691021aa6b2077d35033f9006c686eec58386d9505291238bb897f7f895bc355bbd863e30c865d2e3251c309
+  metadata.gz: 8c19227fa2c5b0386bfeb148b6ecbc664d42847dc1267370228e68139318749ad53c3ec0b6429f175eb77c04540caa388510ecb4920c50e6846c82c40921389d
+  data.tar.gz: aa0327d39187dee54a4cc3dd356345b2ebaafd4167e46a83698b275c2e0eaffb4cb6d406dba49ec07490a89f6bc7c6b7c76a63a3609b7762a5f351f76f8bcdb3

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,15 +36,19 @@ 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
+      ensure
+        FileUtils.rm(_1)
+      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}",
             []
     end
   end

data/lib/nanoc/tidy/version.rb

@@ -1,5 +1,5 @@
 module Nanoc
   module Tidy
-    VERSION = "0.5.5"
+    VERSION = "0.6.0"
   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.0
 platform: ruby
 authors:
 - '0x1eef'