nanoc-tidy.rb 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6e154d29de034dfe0b684d5e95473021844c209b99fcd5660e7bf9a9f68fd6
-  data.tar.gz: e03bc5eaa2bc6ce7d3b24fd449bc72ad4dd0e31b0aec5af5f4419ae4c298fc1d
+  metadata.gz: 75a424457999e15e194c8f3554ee093a6c167b43b6e92e8d278761581b223a5c
+  data.tar.gz: 7df3dceb9b56809423b686cabed730e7364b9969a631d16f607360814393b34b
 SHA512:
-  metadata.gz: 8a92d50b08bdd9bbd65ab664c55a867404a9755ddf3c2f0dd4f40c8fecf48c00e84bfd824e5281cda17083b2963b4b7ccfb8614d3b40c308815570b7b53b8e00
-  data.tar.gz: 840a2eca0b0cbbeec99fa022d13f0674fb0eca061310b070e58d3d99c916cb14b43d249f6234b8c78217834f9ceadcac3dd1907a57692f4d3dfea2f73c505265
+  metadata.gz: 99d9987e8a238e0f4d296b63c279e407affd095554e4cd70298ebe4b0e1938654ba66647b5d23ab59d5bdb3f645349315f0d58172f6c563610949dab630b348e
+  data.tar.gz: c9af1e3c5fa769f91da03968b73ad28daba8d42af491ae1489d9693af3bfdeb8233a2d0a4e7d7adb54daf011fb11958c455db2d00dce34104b7abaf25797cd2a

data/lib/nanoc/tidy/filter.rb

@@ -56,7 +56,7 @@ module Nanoc::Tidy
       tmpdir = File.join(Dir.getwd, "tmp", "tidy")
       name = item.identifier.to_s
       file = Tempfile.new(
-        [ File.basename(name), File.extname(name) ],
+        [File.basename(name), File.extname(name)],
         mkdir_p(tmpdir).last
       )
       file.write(content)

data/lib/nanoc/tidy/spawn.rb

@@ -19,11 +19,13 @@ module Nanoc::Tidy
     def spawn(exe, argv)
       r = cmd(exe, *argv)
       ##
-      # exit codes
+      # tidy-html5 exit codes
       #  * 0: no warnings, no errors
       #  * 1: has warnings
       #  * 2: has errors
-      if [0, 1].include?(r.exit_status)
+      if r.not_found?
+        raise Nanoc::Tidy::Error, "The #{exe} executable was not found"
+      elsif [0, 1].include?(r.exit_status)
         r.exit_status
       else
         raise Nanoc::Tidy::Error,

data/lib/nanoc/tidy/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Tidy
-    VERSION = "0.8.2"
+    VERSION = "0.8.4"
   end
 end

data/nanoc-tidy.rb.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary = "nanoc-tidy.rb = nanoc + tidy-html5"
   gem.description = gem.summary
   gem.add_runtime_dependency "ryo.rb", "~> 0.5"
-  gem.add_runtime_dependency "test-cmd.rb", "~> 0.12.3"
+  gem.add_runtime_dependency "test-cmd.rb", "~> 0.12.4"
   gem.add_development_dependency "yard", "~> 0.9"
   gem.add_development_dependency "redcarpet", "~> 3.5"
   gem.add_development_dependency "test-unit", "~> 3.6"

data/test/tidy_filter_test.rb

@@ -4,17 +4,25 @@ require_relative "setup"
 
 class FilterTest < Test::Unit::TestCase
   def test_default_options
-    options = {argv: ["--tidy-mark", "false"]}
+    options = {exe:, argv: ["--tidy-mark", "false"]}
     assert_equal read_result("default_options.html"),
                  filter_for("fixture.html").run(html, options)
   end
 
   def test_upper_option
-    options = {argv: ["-upper", "--tidy-mark", "false"]}
+    options = {exe:, argv: ["-upper", "--tidy-mark", "false"]}
     assert_equal read_result("upper_option.html"),
                  filter_for("fixture.html").run(html, options)
   end
 
+  def test_exe_not_found
+    options = {exe: "/path/not/found", argv: ["-upper", "--tidy-mark", "false"]}
+    assert_raises(
+      Nanoc::Tidy::Error,
+      "The /path/not/found executable was not found"
+    ) { filter_for("fixture.html").run(html, options) }
+  end
+
   private
 
   def filter_for(basename)
@@ -39,4 +47,8 @@ class FilterTest < Test::Unit::TestCase
   def html
     File.binread "./test/fixtures/fixture.html"
   end
+
+  def exe
+    `which tidy || which tidy5`.chomp
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-tidy.rb
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
 - '0x1eef'
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2024-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ryo.rb
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement