nanoc-tidy.rb 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2a117a2fa83b551326ed6ba05761c1744f182144b2980cd8246757853c67ecc
-  data.tar.gz: 362656c6f68fe0791665ecffaa9606cebeb2950eabe08db6f98f3fe8c1f32d84
+  metadata.gz: fc9b28f3f15fbbf7cfa46c1111b7d8c5a0b6c31f6363a7c90d74e08ce6894d8b
+  data.tar.gz: b57bd052f6d65a3c04edf7f145ee53ec60594df0caa8cd3c4f1b8f0259fd7449
 SHA512:
-  metadata.gz: 8c19227fa2c5b0386bfeb148b6ecbc664d42847dc1267370228e68139318749ad53c3ec0b6429f175eb77c04540caa388510ecb4920c50e6846c82c40921389d
-  data.tar.gz: aa0327d39187dee54a4cc3dd356345b2ebaafd4167e46a83698b275c2e0eaffb4cb6d406dba49ec07490a89f6bc7c6b7c76a63a3609b7762a5f351f76f8bcdb3
+  metadata.gz: 26938031e1f797cbdcdc7ccada9b57c516c80c5ef9250c23dd36d4791b68e01e3f9f9262b37345f5cf76c89092c43730efd15f1546028b185e6a7d5e34ef36fd
+  data.tar.gz: 4e64a7be6793e07884f54455a3a447793ec1eb35852ffb2e96e058f345156a902107472aeeb1b852b3d12ecf4c303c3bf54639b8fe02901dbe08e14c707f8973

data/lib/nanoc/tidy/filter.rb

@@ -22,13 +22,26 @@ module Nanoc::Tidy
       @default_argv ||= ["-wrap", "120", "-indent"]
     end
 
+    ##
+    # Runs the filter
+    #
+    # @param [String] content
+    #  HTML content
+    #
+    # @param [Hash] options
+    #  Filter options
+    #
+    # @return [String]
+    #  Returns HTML content (modified)
     def run(content, options = {})
       path = temporary_file(content).path
       spawn tidy,
             [*default_argv, *(options[:argv] || []), "-modify", path],
             err: File.join(tmpdir, "stderr"),
             out: File.join(tmpdir, "stdout")
-      File.read(path).tap { rm(path) }
+      File.read(path)
+    ensure
+      rm(path) if File.exist?(path)
     end
 
     private

data/lib/nanoc/tidy/spawn.rb

@@ -21,9 +21,9 @@ module Nanoc::Tidy
     #
     # @return [void]
     def spawn(exe, argv, err:, out:)
-      hex = SecureRandom.hex
-      err = "#{err}-ID#{hex}"
-      out = "#{out}-ID#{hex}"
+      id = SecureRandom.hex
+      err = "#{err}+#{id}"
+      out = "#{out}+#{id}"
       Kernel.spawn(
         exe, *argv, { STDERR => err, STDOUT => out }
       )
@@ -38,9 +38,7 @@ module Nanoc::Tidy
 
       msgs = [err, out].map do
         FileUtils.touch(_1)
-        [_1.gsub(Dir.getwd, ''), ":", File.binread(_1)].join
-      ensure
-        FileUtils.rm(_1)
+        [_1.gsub(Dir.getwd, ''), ":", "\n", File.binread(_1)].join
       end.join("\n")
       raise Error,
             "#{File.basename(exe)} exited unsuccessfully " \
@@ -50,6 +48,10 @@ module Nanoc::Tidy
             ")" \
             "\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.6.0"
+    VERSION = "0.6.2"
   end
 end

metadata

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