nanoc-tidy.rb 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0898b9a7ec2f3c137c9fa5233313a88102ea13ad27f8b6093f258c1f0f096e66'
-  data.tar.gz: 344d471e7428617674f06a759da09dcde5807ccdbc811ee76ab0a8e3d5d01083
+  metadata.gz: a795c8b72d5a01390d1fc1207f591907122770a381b87ce678e07536176e1b84
+  data.tar.gz: 334ae45c5f9d92401b5277a72eab418cd520b7b9cc0f867a6f22b944221ccefb
 SHA512:
-  metadata.gz: dd18a0e8598f6cfd2fe27a2294deed691d8e671110ea1efa3521fbb7c0005a17e43178251c9a90a331a0a8bbfdea46fb728982b78debb49a8c8699d7eb0a1fd7
-  data.tar.gz: 84471209421d20f88c6a6b36e05ed51f11c85cfebb623ad63c93ba35cf92a53335461cf518ea1ed56a32f4295e07d0924e91a5ad2be06ccf52dfbca9667c4d8a
+  metadata.gz: e9dcc2d5a72046d5250db9483057e6b64e2ead1ea5ceaea0a4e262cd54612698cd2314a19a5bd1ca52c8c1a22c947f1feddef9fe9fb5aa654b32d56ba169610e
+  data.tar.gz: b4d645c500657c30390a4c7cca1f75c73642cc45ef2e0bc88dc05a65bb7b2de58cdca362b848036b959c040a8f5d464638adcbcd3de0b5ff5d1802a6744be6f8

data/lib/nanoc/tidy/filter.rb

@@ -34,12 +34,13 @@ module Nanoc::Tidy
     # @return [String]
     #  Returns HTML content (modified)
     def run(content, options = {})
+      options = Ryo(options)
       file = temporary_file(
         File.basename(item.identifier.to_s),
         content
       )
-      spawn options[:exe] || "tidy5",
-            [*default_argv, *(options[:argv] || []), "-modify", file.path]
+      spawn options.exe || "tidy5",
+            [*default_argv, *(options.argv || []), "-modify", file.path]
       File.read(file.path)
     ensure
       file ? file.tap(&:unlink).close : nil

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.1"
+    VERSION = "0.8.3"
   end
 end

data/lib/nanoc/tidy.rb

@@ -6,6 +6,7 @@ module Nanoc::Tidy
   # Generic error
   Error = Class.new(RuntimeError)
 
+  require "ryo"
   require_relative "tidy/version"
   require_relative "tidy/filter"
 

data/nanoc-tidy.rb.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.summary = "nanoc-tidy.rb = nanoc + tidy-html5"
   gem.description = gem.summary
-  gem.add_runtime_dependency "test-cmd.rb", "~> 0.12.2"
+  gem.add_runtime_dependency "ryo.rb", "~> 0.5"
+  gem.add_runtime_dependency "test-cmd.rb", "~> 0.12.3"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-tidy.rb
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - '0x1eef'
@@ -10,20 +10,34 @@ bindir: bin
 cert_chain: []
 date: 2024-06-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ryo.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: test-cmd.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement