nanoc-tidy.rb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 377f965bc7630e3d0208011340dedea0c8e1463d17755d2ced834a5a2b10cec1
-  data.tar.gz: 2cac200122ecebbfcc9b0b28a8264bc83a0706ed8cdc4fdb4524e121aa977510
+  metadata.gz: d805396fd479848ce7e69377255fc4b646dd34bf35f4453337d79c3c2560bdce
+  data.tar.gz: '08f58910fda43532c3ab1161036cdabf810067a84dc1847211f07315e433dca5'
 SHA512:
-  metadata.gz: '0159259928a18678becc9df9ada135133f8fbd917e15a479cc81d97d42cc8cb70ffc1df1a9aac1e5828dbb5af83e36163920c9ca288873185c14fc41eb541bb2'
-  data.tar.gz: 64592fabd2529dfa1b28f6c6f423702a0c38ae0dd72edcb029cd57818235533f4d750b78ad4667bf426a0560432c70e31193693c191133edc345d769150cf51b
+  metadata.gz: 74c898f367043cf746d9d4a5b292d261b13ce551071232558215b9ea86573127590330534c960da49252a1ccd533008a7e9d89d133f4d9bd2b70b5391e038efc
+  data.tar.gz: 200c914a37b4fa14b350be967643dc3a5d97f95e7eb57169724b3450805f4462de03a66e593ebcbb0fad5f171a86103c78ac2335cd5857b006b1b26d33c14b10

data/lib/nanoc/tidy/filter.rb

@@ -22,18 +22,45 @@ class Nanoc::Tidy::Filter < Nanoc::Filter
   end
 
   def run(content, options = {})
-    file = temporary_file_for(content)
-    tidy file, self.class.default_options.merge(options)
+    tidy temporary_file(content),
+         self.class.default_options.merge(options)
   end
 
   private
 
+  def temporary_file(content)
+    dir = cwd
+    mkdir_p(dir) unless Dir.exist?(dir)
+    file = Tempfile.new(File.basename(item.identifier.to_s), dir)
+    file.write(content)
+    file.tap(&:flush)
+  end
+
+  ##
+  # tidy executable interface
+
   def tidy(file, options)
-    system tidy_exe, "-modify", "-quiet", *tidy_args(options), file.path
+    Process.wait spawn(
+      tidy_exe, "-modify", "-quiet", *tidy_args(options), file.path,
+      spawn_options
+    )
     if $?.success?
       File.read(file.path).tap { file.tap(&:unlink).close }
     else
-      raise Error, "tidy exited unsuccessfully (exit code: #{$?.exitstatus})", []
+      raise Error,
+            "tidy exited unsuccessfully " \
+            "(exit code: #{$?.exitstatus}, " \
+            "item: #{item.identifier}, " \
+            "log: #{log.gsub(Dir.getwd, '')[1..]})",
+            []
+    end
+  end
+
+  def tidy_exe
+    case
+    when system("which tidy > /dev/null 2>&1") then "tidy"
+    when system("which tidy5 > /dev/null 2>&1") then "tidy5"
+    else raise Error, "unable to find a tidy executable on $PATH"
     end
   end
 
@@ -47,19 +74,18 @@ class Nanoc::Tidy::Filter < Nanoc::Filter
     end
   end
 
-  def tidy_exe
-    case
-    when system("which tidy > /dev/null 2>&1") then "tidy"
-    when system("which tidy5 > /dev/null 2>&1") then "tidy5"
-    else raise Error, "unable to find a tidy executable on $PATH"
-    end
+  ##
+  # spawn-related methods
+
+  def spawn_options
+    { STDOUT => log, STDERR => log }
   end
 
-  def temporary_file_for(content)
-    dir = File.join(Dir.getwd, "tmp", "nanoc-tidy.rb")
-    mkdir_p(dir) unless Dir.exist?(dir)
-    file = Tempfile.new(File.basename(item.identifier.to_s), dir)
-    file.write(content)
-    file.tap(&:flush)
+  def log
+    File.join(cwd, "tidy.log")
+  end
+
+  def cwd
+    File.join(Dir.getwd, "tmp", "nanoc-tidy.rb")
   end
 end

data/lib/nanoc/tidy/version.rb

@@ -1,5 +1,5 @@
 module Nanoc
   module Tidy
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-tidy.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-25 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard