ngworder 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889f89130c4888e512729e7cba02a6de8ed641b1d602f11727ffe38ed689609e
-  data.tar.gz: cd10c6139594e5f4c8b3da5c6a32461f6f122799a6cde7f82a3ad7080a8cd772
+  metadata.gz: 58b3776df5c32d087309ec1988bc4fdb20627dc5140f66833ed2e6fed8d6e828
+  data.tar.gz: 5cc6fbd146932a83bef18dd91f3c939ca9d7f4bb99b7270ccd29ebb27664b630
 SHA512:
-  metadata.gz: 893e15048ef240a304ffee81f1f8ba92a85335227b44eed47de2e11495881d316ea7f0f9c3ea9c2e418c370514b1b88ad7474873761251b1fb51f1ebab2bd2da
-  data.tar.gz: 528b003d4c2da44561827b70fba0fe50190e825dd634f6ac2fd42d53aaf80aa9d1befab73dcc7673e99caf071e78c1e9f0e3ff4e3bbc9c0f6843e4b6044449d2
+  metadata.gz: c628c99ca4def6086d7c1df8ccb927bcea84cb89901c967d3c1eb03a6c58b5dd0d107359118fd85e033cad7a2a0ada609b1e74d6d8d7f0a287e805c43e737ece
+  data.tar.gz: 755cb4ea9bc96a0bd62f5f40acba64d1d2c8b0fb838a8ea80eb00bb3d42753bb840ddb45e77be94cd6a5d04bbf8ca980a730a81b4cc971fe9e0dd17cf92fa850

data/README.md

@@ -4,8 +4,7 @@ Simple CLI to extract NG words from Japanese text using a plain text rules file.
 
 ## Install
 ```
-gem build ngworder.gemspec
-gem install ./ngworder-0.1.0.gem
+gem install ngworder
 ```
 
 ## Usage
@@ -13,6 +12,8 @@ gem install ./ngworder-0.1.0.gem
 ngworder target.md
 ngworder --rule=NGWORDS.txt target.md
 ngworder --rg target.md
+ngworder --no-line target.md
+ngworder --color=auto target.md
 ngworder --help
 ```
 
@@ -37,7 +38,7 @@ Example:
 
 ## Output
 ```
-path/to/file:line:col  match  NG:<rule>
+path/to/file:line:col  match  # comment
 ```
 
 ## Performance

data/lib/ngworder/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ngworder
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/ngworder.rb

@@ -5,17 +5,18 @@ require "tempfile"
 require_relative "ngworder/version"
 
 module Ngworder
-  Rule = Struct.new(:matcher, :label, :excludes)
+  Rule = Struct.new(:matcher, :label, :excludes, :comment)
   Matcher = Struct.new(:type, :pattern, :label)
 
   module Parser
     module_function
 
-    def strip_comment(line)
+    def split_comment(line)
       out = +""
       escaped = false
+      comment = nil
 
-      line.each_char do |ch|
+      line.each_char.with_index do |ch, idx|
         if escaped
           out << ch
           escaped = false
@@ -28,12 +29,15 @@ module Ngworder
           next
         end
 
-        break if ch == "#"
+        if ch == "#"
+          comment = line[(idx + 1)..-1]
+          break
+        end
 
         out << ch
       end
 
-      out
+      [out, comment]
     end
 
     def split_unescaped_bang(line)
@@ -127,7 +131,7 @@ module Ngworder
       rules = []
 
       File.readlines(path, chomp: true).each do |line|
-        content = strip_comment(line)
+        content, comment = split_comment(line)
         next if content.strip.empty?
 
         parts = split_unescaped_bang(content)
@@ -135,7 +139,9 @@ module Ngworder
         next unless base
 
         excludes = parts.map { |part| parse_matcher(part, trim: :both) }.compact
-        rules << Rule.new(base, base.label, excludes)
+        comment = comment&.strip
+        comment = nil if comment.nil? || comment.empty?
+        rules << Rule.new(base, base.label, excludes, comment)
       end
 
       rules
@@ -225,6 +231,8 @@ module Ngworder
         opts.banner = "Usage: ngworder [--rule=NGWORDS.txt] <files...>"
         opts.on("--rule=PATH", "Rules file path (default: NGWORDS.txt)") { |value| options[:rule] = value }
         opts.on("--rg", "Use ripgrep for literal-only prefiltering") { options[:rg] = true }
+        opts.on("--[no-]line", "Print the entire line after each match") { |value| options[:line] = value }
+        opts.on("--color=MODE", "Colorize matches (auto, always, never)") { |value| options[:color] = value }
         opts.on("-h", "--help", "Show help") do
           puts opts
           return 0
@@ -247,6 +255,48 @@ module Ngworder
       rules = Parser.build_rules(rule_path)
       warn "No rules loaded from #{rule_path}" if rules.empty?
 
+      line_enabled = options.key?(:line) ? options[:line] : true
+
+      color_mode = (options[:color] || "auto").downcase
+      unless %w[auto always never].include?(color_mode)
+        warn "Invalid color mode: #{color_mode} (use auto, always, or never)"
+        return 2
+      end
+
+      color_enabled = case color_mode
+                      when "always"
+                        true
+                      when "never"
+                        false
+                      else
+                        $stdout.tty?
+                      end
+
+      colorize_match = lambda do |text|
+        return text unless color_enabled
+
+        "\e[35m#{text}\e[0m"
+      end
+
+      colorize_path = lambda do |text|
+        return text unless color_enabled
+
+        "\e[36m#{text}\e[0m"
+      end
+
+      highlight_line = lambda do |line, span|
+        return line unless color_enabled
+
+        start_idx = span[0]
+        end_idx = span[1]
+        head = line[0, start_idx]
+        mid = line[start_idx, end_idx - start_idx]
+        tail = line[end_idx..-1]
+        return line if mid.nil?
+
+        "#{head}\e[35m#{mid}\e[0m#{tail}"
+      end
+
       found = false
 
       argv.each do |path|
@@ -284,7 +334,11 @@ module Ngworder
 
                 found = true
                 col_no = span[0] + 1
-                puts "#{path}:#{line_no}:#{col_no}  #{span[2]}  NG:#{rule.label}"
+                match_text = colorize_match.call(span[2])
+                suffix = rule.comment ? "  # #{rule.comment}" : ""
+                path_text = colorize_path.call(path)
+                puts "#{path_text}:#{line_no}:#{col_no}  #{match_text}#{suffix}"
+                puts highlight_line.call(line, span) if line_enabled
               end
             end
           end
@@ -312,7 +366,11 @@ module Ngworder
 
               found = true
               col_no = span[0] + 1
-              puts "#{path}:#{line_no}:#{col_no}  #{span[2]}  NG:#{rule.label}"
+                match_text = colorize_match.call(span[2])
+                suffix = rule.comment ? "  # #{rule.comment}" : ""
+                path_text = colorize_path.call(path)
+                puts "#{path_text}:#{line_no}:#{col_no}  #{match_text}#{suffix}"
+                puts highlight_line.call(line, span) if line_enabled
             end
           end
 
@@ -329,7 +387,11 @@ module Ngworder
 
               found = true
               col_no = span[0] + 1
-              puts "#{path}:#{line_no}:#{col_no}  #{span[2]}  NG:#{rule.label}"
+                match_text = colorize_match.call(span[2])
+                suffix = rule.comment ? "  # #{rule.comment}" : ""
+                path_text = colorize_path.call(path)
+                puts "#{path_text}:#{line_no}:#{col_no}  #{match_text}#{suffix}"
+                puts highlight_line.call(line, span) if line_enabled
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ngworder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Masanori Kado