nanoc-tidy.rb 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6e154d29de034dfe0b684d5e95473021844c209b99fcd5660e7bf9a9f68fd6
-  data.tar.gz: e03bc5eaa2bc6ce7d3b24fd449bc72ad4dd0e31b0aec5af5f4419ae4c298fc1d
+  metadata.gz: a795c8b72d5a01390d1fc1207f591907122770a381b87ce678e07536176e1b84
+  data.tar.gz: 334ae45c5f9d92401b5277a72eab418cd520b7b9cc0f867a6f22b944221ccefb
 SHA512:
-  metadata.gz: 8a92d50b08bdd9bbd65ab664c55a867404a9755ddf3c2f0dd4f40c8fecf48c00e84bfd824e5281cda17083b2963b4b7ccfb8614d3b40c308815570b7b53b8e00
-  data.tar.gz: 840a2eca0b0cbbeec99fa022d13f0674fb0eca061310b070e58d3d99c916cb14b43d249f6234b8c78217834f9ceadcac3dd1907a57692f4d3dfea2f73c505265
+  metadata.gz: e9dcc2d5a72046d5250db9483057e6b64e2ead1ea5ceaea0a4e262cd54612698cd2314a19a5bd1ca52c8c1a22c947f1feddef9fe9fb5aa654b32d56ba169610e
+  data.tar.gz: b4d645c500657c30390a4c7cca1f75c73642cc45ef2e0bc88dc05a65bb7b2de58cdca362b848036b959c040a8f5d464638adcbcd3de0b5ff5d1802a6744be6f8

data/lib/nanoc/tidy/spawn.rb

@@ -19,11 +19,17 @@ 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.exit_status == 1
+        if r.stderr =~ /No such file or directory/
+          raise Nanoc::Tidy::Error, "The #{exe} executable was not found"
+        else
+          r.exit_status
+        end
+      elsif r.exit_status == 0
         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.3"
   end
 end

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-tidy.rb
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - '0x1eef'