docdiff 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cde4401e24dbddfd093efe812847c7cc57f12cea257c113bc2625ac2c38361d5
-  data.tar.gz: aa7fd969d604d090f16817dcdb09f2f4a1e5218c2063d3467e29929305afdd41
+  metadata.gz: e6c9449dff2946f72c9da89b1a9cd443ea999368160f1712e6da7c56dc2a094f
+  data.tar.gz: 67b4fbff27a464b6605e1a7b255c5de811a1fbdba86c9049f8b4adce8a7159f2
 SHA512:
-  metadata.gz: b0f085aa58f164c0b6a0d0cfaec0439df555d37fbe1c8dacd66962ab41084ec93cc6d0d13c3852ca9404d62c3941edc4477261b44f9402d0353b71cd3a3f257c
-  data.tar.gz: b5b1bbb4a18524f5d9278f0afac27dc732dde0be686d4b526301219499fa3ef5a073b132a27a4e12a8bbc7bf847c8440c81179453243b1d30190d8901ea05770
+  metadata.gz: 6ee7f1e478639c73fe75bfe642e37912cbbb9df3bf7a13c287c932440e6c3fed68c99340c06e1411302f0afcadaefbabf442e1b229457d9615fe77a367f62682
+  data.tar.gz: f62327185b55508a7a1045e1f479c1e1a79998c005aeede62f759743bd013f6e1b11bbd69343083c38f7587cf29aa069a3a9808b49c78eaae8d71756a4e7f747

data/Makefile

@@ -14,12 +14,12 @@ DESTDIR =
 PREFIX  = /usr/local
 datadir = $(DESTDIR)$(PREFIX)/share
 
-all:	$(DOCS)
+all: test
 
 test: $(TESTS)
 	$(RUBY) -I./lib -e 'ARGV.map{|a| require_relative "#{a}"}' $^
 
-docs:	$(DOCS)
+docs: $(DOCS)
 
 %.html: %.md
 	$(MD2HTML) --html-title="$(shell grep '^# .*' $< | head -n 1 | sed 's/^# //')" $< \
@@ -65,8 +65,9 @@ uninstall:
 	-rm -fr $(DESTDIR)/etc/$(PRODUCT)
 	-rm -fr $(datadir)/doc/$(PRODUCT)
 
-dist:
-	git archive --prefix="$(PRODUCT)-$(VERSION)/" --format=tar HEAD --output="$(PRODUCT)-$(VERSION).tar.gz"
+dist: $(PRODUCT)-$(VERSION).tar.gz
+$(PRODUCT)-$(VERSION).tar.gz:
+	git archive --prefix="$(PRODUCT)-$(VERSION)/" --format=tar HEAD --output="$@"
 
 gem: $(PRODUCT)-$(VERSION).gem
 $(PRODUCT)-$(VERSION).gem: $(PRODUCT).gemspec
@@ -74,9 +75,7 @@ $(PRODUCT)-$(VERSION).gem: $(PRODUCT).gemspec
 
 clean:
 	-rm -fr $(DOCS)
-
-distclean: clean
 	-rm -fr $(PRODUCT)-$(VERSION).tar.gz
 	-rm -fr $(PRODUCT)-$(VERSION).gem
 
-.PHONY:	all test docs install uninstall dist gem clean distclean
+.PHONY: all test docs install uninstall dist gem clean

data/README.md

@@ -85,6 +85,7 @@ $
 * Runtime requirements:
   - [Ruby](https://www.ruby-lang.org/) (>= 3.0)
 * Development requirements:
+  - [Test::Unit](https://test-unit.github.io/)
   - Make ([GNU Make](https://www.gnu.org/software/make/))
   - [Git](https://git-scm.com/)
   - [md2html](https://github.com/mity/md4c) (for generating documents)

data/README_ja.md

@@ -85,6 +85,7 @@ $
 * 実行時に必要なソフトウェア:
   - [Ruby](https://www.ruby-lang.org/) (>= 3.0)
 * 開発時に必要なソフトウェア:
+  - [Test::Unit](https://test-unit.github.io/)
   - Make ([GNU Make](https://www.gnu.org/software/make/))
   - [Git](https://git-scm.com/)
   - [md2html](https://github.com/mity/md4c)（ドキュメント生成用）

data/bin/docdiff

@@ -3,212 +3,5 @@
 # Copyright (C) 2002-2011 Hisashi MORITA
 # Requirements: Ruby (>= 2.0)
 require 'docdiff'
-require 'optparse'
 
-# do_config_stuff
-
-default_config = {
-  :resolution    => "word",
-  :encoding      => "auto",
-  :eol           => "auto",
-  :format        => "html",
-  :cache         => true,
-  :digest        => false,
-  :pager         => nil,
-  :verbose       => false
-}
-
-clo = command_line_options = {}
-
-# if invoked as "worddiff" or "chardiff",
-# appropriate resolution is set respectively.
-case File.basename($0, ".*")
-when "worddiff" then; clo[:resolution] = "word"
-when "chardiff" then; clo[:resolution] = "char"
-end
-
-ARGV.options {|o|
-  o.def_option('--resolution=RESOLUTION',
-    resolutions = ['line', 'word', 'char'],
-    'specify resolution (granularity)',
-    "#{resolutions.join('|')} (default: word)"
-    ){|s| clo[:resolution] = (s || "word")}
-  o.def_option('--line', 'same as --resolution=line'){clo[:resolution] = "line"}
-  o.def_option('--word', 'same as --resolution=word'){clo[:resolution] = "word"}
-  o.def_option('--char', 'same as --resolution=char'){clo[:resolution] = "char"}
-
-  o.def_option('--encoding=ENCODING',
-    encodings = ['ASCII', 'EUC-JP', 'Shift_JIS', 'CP932', 'UTF-8', 'auto'],
-    "specify character encoding",
-    "#{encodings.join('|')} (default: auto)",
-    "(try ASCII for single byte encodings such as ISO-8859)"
-    ){|s| clo[:encoding] = (s || "auto")}
-  o.def_option('--ascii', 'same as --encoding=ASCII'){clo[:encoding] = "ASCII"}
-  o.def_option('--iso8859', 'same as --encoding=ASCII'){clo[:encoding] = "ASCII"}
-  o.def_option('--iso8859x', 'same as --encoding=ASCII (deprecated)'){clo[:encoding] = "ASCII"}
-  o.def_option('--eucjp', 'same as --encoding=EUC-JP'){clo[:encoding] = "EUC-JP"}
-  o.def_option('--sjis', 'same as --encoding=Shift_JIS'){clo[:encoding] = "Shift_JIS"}
-  o.def_option('--cp932', 'same as --encoding=CP932'){clo[:encoding] = "CP932"}
-  o.def_option('--utf8', 'same as --encoding=UTF-8'){clo[:encoding] = "UTF-8"}
-
-  o.def_option('--eol=EOL',
-    eols = ['CR','LF','CRLF','auto'],
-    'specify end-of-line character',
-    "#{eols.join('|')} (default: auto)",
-    ){|s| clo[:eol] = (s || "auto")}
-  o.def_option('--cr', 'same as --eol=CR'){clo[:eol] = "CR"}
-  o.def_option('--lf', 'same as --eol=LF'){clo[:eol] = "LF"}
-  o.def_option('--crlf', 'same as --eol=CRLF'){clo[:eol] = "CRLF"}
-
-  o.def_option('--format=FORMAT',
-    formats = ['tty', 'manued', 'html', 'wdiff', 'stat', 'user'],
-    'specify output format',
-    "#{formats.join('|')} (default: html) (stat is deprecated)",
-    '(user tags can be defined in config file)'
-    ){|s| clo[:format] = (s || "manued")}
-  o.def_option('--tty', 'same as --format=tty'){clo[:format] = "tty"}
-  o.def_option('--manued', 'same as --format=manued'){clo[:format] = "manued"}
-  o.def_option('--html', 'same as --format=html'){clo[:format] = "html"}
-  o.def_option('--wdiff', 'same as --format=wdiff'){clo[:format] = "wdiff"}
-  o.def_option('--stat', 'same as --format=stat (not implemented) (deprecated)'){clo[:format] = "stat"}
-
-  o.def_option('--label LABEL', '-L LABEL',
-    'use label instead of file name (not implemented; exists for compatibility with diff)'
-    ){|s1, s2| clo[:label1], clo[:label2] = s1, s2}
-
-  o.def_option('--digest', 'digest output, do not show all'){clo[:digest] = true}
-  o.def_option('--summary', 'same as --digest'){clo[:digest] = true}
-  o.def_option('--display=DISPLAY',
-    display_types = ['inline', 'block', 'multi'],
-    'specify presentation type (effective only with digest; experimental feature)',
-    "#{display_types.join('|')} (default: inline) (multi is deprecated)",
-    ){|s| clo[:display] ||= s.downcase}
-  o.def_option('--cache', 'use file cache (not implemented) (deprecated)'){clo[:cache] = true}
-  o.def_option('--pager=PAGER', String,
-    'specify pager (if available, $DOCDIFF_PAGER is used by default)'
-    ){|s| clo[:pager] = s}
-  o.def_option('--no-pager', 'do not use pager'){clo[:pager] = false}
-  o.def_option('--config-file=FILE', String,
-    'specify config file to read'){|s| clo[:config_file] = s}
-  o.def_option('--no-config-file',
-    'do not read config files'){clo[:no_config_file] = true}
-  o.def_option('--verbose', 'run verbosely (not well-supported) (deprecated)'){clo[:verbose] = true}
-
-  o.def_option('--help', 'show this message'){puts o; exit(0)}
-  o.def_option('--version', 'show version'){puts DocDiff::AppVersion; exit(0)}
-  o.def_option('--license', 'show license (deprecated)'){puts DocDiff::License; exit(0)}
-  o.def_option('--author', 'show author(s) (deprecated)'){puts DocDiff::Author; exit(0)}
-
-  o.on_tail("When invoked as worddiff or chardiff, resolution will be set accordingly.",
-    "Config files: /etc/docdiff/docdiff.conf, ~/.config/docdiff/docdiff.conf (or ~/etc/docdiff/docdiff.conf (deprecated))")
-
-  o.parse!
-} or exit(1)
-
-docdiff = DocDiff.new()
-docdiff.config.update(default_config)
-unless clo[:no_config_file] == true # process_commandline_option
-  message = docdiff.process_config_file(DocDiff::SystemConfigFileName)
-  if clo[:verbose] == true || docdiff.config[:verbose] == true
-    STDERR.print message
-  end
-  #    message = docdiff.process_config_file(DocDiff::UserConfigFileName)
-  case
-  when [File.exist?(DocDiff::UserConfigFileName),
-        File.exist?(DocDiff::AltUserConfigFileName),
-        File.exist?(DocDiff::XDGUserConfigFileName)].count(true) >= 2
-    raise <<~EOS
-      #{DocDiff::UserConfigFileName}, #{DocDiff::AltUserConfigFileName}, and \
-      #{DocDiff::XDGUserConfigFileName} cannot be used at the same time. \
-      Keep one and remove or rename the others.
-    EOS
-  when File.exist?(DocDiff::UserConfigFileName)
-    message = docdiff.process_config_file(DocDiff::UserConfigFileName)
-  when File.exist?(DocDiff::AltUserConfigFileName)
-    message = docdiff.process_config_file(DocDiff::AltUserConfigFileName)
-  when File.exist?(DocDiff::XDGUserConfigFileName)
-    message = docdiff.process_config_file(DocDiff::XDGUserConfigFileName)
-  end
-  if clo[:verbose] == true || docdiff.config[:verbose] == true
-    STDERR.print message
-  end
-end
-unless clo[:config_file].nil?
-  if File.exist?(clo[:config_file])
-    message = docdiff.process_config_file(clo[:config_file])
-  else
-    raise "#{clo[:config_file]} does not exist."
-  end
-  if clo[:verbose] == true || docdiff.config[:verbose] == true
-    STDERR.print message
-  end
-end
-docdiff.config.update(clo)
-
-docdiff.config[:pager] =
-  if (pager = docdiff.config[:pager]).is_a?(String) && !pager.empty?
-    pager
-  elsif (pager = docdiff.config[:pager]) == false
-    pager
-  elsif (pager = ENV['DOCDIFF_PAGER']) && !pager.empty?
-    pager
-  end
-
-# config stuff done
-
-# process the documents
-
-file1_content = nil
-file2_content = nil
-raise "Try `#{File.basename($0)} --help' for more information." if ARGV[0].nil?
-raise "Specify at least 2 target files." unless ARGV[0] && ARGV[1]
-ARGV[0] = "/dev/stdin" if ARGV[0] == "-"
-ARGV[1] = "/dev/stdin" if ARGV[1] == "-"
-raise "No such file: #{ARGV[0]}." unless FileTest.exist?(ARGV[0])
-raise "No such file: #{ARGV[1]}." unless FileTest.exist?(ARGV[1])
-raise "#{ARGV[0]} is not readable." unless FileTest.readable?(ARGV[0])
-raise "#{ARGV[1]} is not readable." unless FileTest.readable?(ARGV[1])
-File.open(ARGV[0], "r"){|f| file1_content = f.read}
-File.open(ARGV[1], "r"){|f| file2_content = f.read}
-
-doc1 = nil
-doc2 = nil
-
-encoding1 = docdiff.config[:encoding]
-encoding2 = docdiff.config[:encoding]
-eol1 = docdiff.config[:eol]
-eol2 = docdiff.config[:eol]
-
-if docdiff.config[:encoding] == "auto"
-  encoding1 = DocDiff::CharString.guess_encoding(file1_content)
-  encoding2 = DocDiff::CharString.guess_encoding(file2_content)
-  case
-  when (encoding1 == "UNKNOWN" or encoding2 == "UNKNOWN")
-    raise "Document encoding unknown (#{encoding1}, #{encoding2})."
-  when encoding1 != encoding2
-    raise "Document encoding mismatch (#{encoding1}, #{encoding2})."
-  end
-end
-
-if docdiff.config[:eol] == "auto"
-  eol1 = DocDiff::CharString.guess_eol(file1_content)
-  eol2 = DocDiff::CharString.guess_eol(file2_content)
-  case
-  when (eol1.nil? or eol2.nil?)
-    raise "Document eol is nil (#{eol1.inspect}, #{eol2.inspect}).  The document might be empty."
-  when (eol1 == 'UNKNOWN' or eol2 == 'UNKNOWN')
-    raise "Document eol unknown (#{eol1.inspect}, #{eol2.inspect})."
-  when (eol1 != eol2)
-    raise "Document eol mismatch (#{eol1}, #{eol2})."
-  end
-end
-
-doc1 = DocDiff::Document.new(file1_content, encoding1, eol1)
-doc2 = DocDiff::Document.new(file2_content, encoding2, eol2)
-
-output = docdiff.run(doc1, doc2,
-  {:resolution => docdiff.config[:resolution],
-    :format     => docdiff.config[:format],
-    :digest     => docdiff.config[:digest],
-    :display    => docdiff.config[:display]})
-docdiff.print_or_write_to_pager(output, docdiff.config[:pager])
+DocDiff::CLI.run

data/doc/news.md

@@ -1,5 +1,14 @@
 # News
 
+### 0.6.5 (2025-12-29)
+
+* User-visible changes:
+  - Fixed label option not accumulating correctly.
+  - Fixed CRLF bug ([#57](https://github.com/hisashim/docdiff/issues/57)), where CRLFs in the input text are gobbled and not printed in the output when using `tty`, `wdiff`, and `user` formats. This problem seems to have existed since 0.3.
+* Developer-related changes:
+  - Moved CLI-related stuff from `bin/docdiff` to `lib/docdiff/cli.rb`.
+  - Miscellaneous fixes and refactoring.
+
 ### 0.6.4 (2025-12-13)
 
 * User-visible changes:

data/docdiff.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 3.0'
+  s.add_development_dependency "test-unit", "~> 3"
 end

data/lib/doc_diff.rb

@@ -4,10 +4,10 @@
 require 'docdiff/difference'
 require 'docdiff/document'
 require 'docdiff/view'
+require 'docdiff/cli'
 
 class DocDiff
 
-  AppVersion = Docdiff::VERSION
   Author = "Copyright (C) 2002-2011 Hisashi MORITA.\n" +
            "diff library originates from Ruby/CVS by TANAKA Akira.\n"
   License = "This software is licensed under so-called modified BSD license.\n" +
@@ -21,34 +21,22 @@ class DocDiff
     else
       File.join(ENV['HOME'], ".config", "docdiff", "docdiff.conf")
     end
+  DEFAULT_CONFIG = {
+    :resolution    => "word",
+    :encoding      => "auto",
+    :eol           => "auto",
+    :format        => "html",
+    :cache         => true,
+    :digest        => false,
+    :pager         => nil,
+    :verbose       => false
+  }
 
-  def initialize()
-    @config = {}
+  def initialize(config: {})
+    @config = config
   end
   attr_accessor :config
 
-  def DocDiff.parse_config_file_content(content)
-    result = {}
-    return result if content.size <= 0
-    lines = content.dup.split(/\r\n|\r|\n/).compact
-    lines.collect!{|line| line.sub(/#.*$/, '')}
-    lines.collect!{|line| line.strip}
-    lines.delete_if{|line| line == ""}
-    lines.each{|line|
-      raise 'line does not include " = ".' unless /[\s]+=[\s]+/.match line
-      name_src, value_src = line.split(/[\s]+=[\s]+/)
-      raise "Invalid name: #{name_src.inspect}" if (/\s/.match name_src)
-      raise "Invalid value: #{value_src.inspect}" unless value_src.kind_of?(String)
-      name  = name_src.intern
-      value = value_src
-      value = true if ['on','yes','true'].include? value_src.downcase
-      value = false if ['off','no','false'].include? value_src.downcase
-      value = value_src.to_i if /^[0-9]+$/.match value_src
-      result[name] = value
-    }
-    result
-  end
-
   def compare_by_line(doc1, doc2)
     Difference.new(doc1.split_to_line, doc2.split_to_line)
   end
@@ -162,26 +150,4 @@ class DocDiff
     end
     result.join
   end
-
-  def process_config_file(filename)
-    file_content = nil
-    begin
-      File.open(filename, "r"){|f| file_content = f.read}
-    rescue Errno::ENOENT
-      message = "config file not found so not read."
-    ensure
-      if file_content != nil
-        self.config.update(DocDiff.parse_config_file_content(file_content))
-      end
-    end
-    message
-  end
-
-  def print_or_write_to_pager(content, pager)
-    if STDOUT.tty? && pager.is_a?(String) && !pager.empty?
-      IO.popen(pager, "w"){|f| f.print content}
-    else
-      print content
-    end
-  end
 end  # class DocDiff

data/lib/docdiff/cli.rb

@@ -0,0 +1,281 @@
+require 'optparse'
+
+class DocDiff
+  module CLI
+    def self.parse_options!(args, base_options: {})
+      o = base_options.dup
+
+      option_parser = OptionParser.new do |parser|
+        parser.on(
+          '--resolution=RESOLUTION',
+          resolutions = ['line', 'word', 'char'],
+          'specify resolution (granularity)',
+          "#{resolutions.join('|')} (default: word)"
+        ){|s| o[:resolution] = (s || "word")}
+        parser.on('--line', 'same as --resolution=line'){o[:resolution] = "line"}
+        parser.on('--word', 'same as --resolution=word'){o[:resolution] = "word"}
+        parser.on('--char', 'same as --resolution=char'){o[:resolution] = "char"}
+
+        parser.on(
+          '--encoding=ENCODING',
+          encodings = ['ASCII', 'EUC-JP', 'Shift_JIS', 'CP932', 'UTF-8', 'auto'],
+          "specify character encoding",
+          "#{encodings.join('|')} (default: auto)",
+          "(try ASCII for single byte encodings such as ISO-8859)"
+        ){|s| o[:encoding] = (s || "auto")}
+        parser.on('--ascii', 'same as --encoding=ASCII'){o[:encoding] = "ASCII"}
+        parser.on('--iso8859', 'same as --encoding=ASCII'){o[:encoding] = "ASCII"}
+        parser.on('--iso8859x', 'same as --encoding=ASCII (deprecated)'){o[:encoding] = "ASCII"}
+        parser.on('--eucjp', 'same as --encoding=EUC-JP'){o[:encoding] = "EUC-JP"}
+        parser.on('--sjis', 'same as --encoding=Shift_JIS'){o[:encoding] = "Shift_JIS"}
+        parser.on('--cp932', 'same as --encoding=CP932'){o[:encoding] = "CP932"}
+        parser.on('--utf8', 'same as --encoding=UTF-8'){o[:encoding] = "UTF-8"}
+
+        parser.on(
+          '--eol=EOL',
+          eols = ['CR','LF','CRLF','auto'],
+          'specify end-of-line character',
+          "#{eols.join('|')} (default: auto)",
+        ){|s| o[:eol] = (s || "auto")}
+        parser.on('--cr', 'same as --eol=CR'){o[:eol] = "CR"}
+        parser.on('--lf', 'same as --eol=LF'){o[:eol] = "LF"}
+        parser.on('--crlf', 'same as --eol=CRLF'){o[:eol] = "CRLF"}
+
+        parser.on(
+          '--format=FORMAT',
+          formats = ['tty', 'manued', 'html', 'wdiff', 'stat', 'user'],
+          'specify output format',
+          "#{formats.join('|')} (default: html) (stat is deprecated)",
+          '(user tags can be defined in config file)'
+        ){|s| o[:format] = (s || "manued")}
+        parser.on('--tty', 'same as --format=tty'){o[:format] = "tty"}
+        parser.on('--manued', 'same as --format=manued'){o[:format] = "manued"}
+        parser.on('--html', 'same as --format=html'){o[:format] = "html"}
+        parser.on('--wdiff', 'same as --format=wdiff'){o[:format] = "wdiff"}
+        parser.on('--stat', 'same as --format=stat (not implemented) (deprecated)'){o[:format] = "stat"}
+
+        parser.on(
+          '--label LABEL', '-L LABEL',
+          'use label instead of file name (not implemented; exists for compatibility with diff)'
+        ){|s| o[:label] ||= []; o[:label] << s}
+
+        parser.on('--digest', 'digest output, do not show all'){o[:digest] = true}
+        parser.on('--summary', 'same as --digest'){o[:digest] = true}
+
+        parser.on(
+          '--display=DISPLAY',
+          display_types = ['inline', 'block', 'multi'],
+          'specify presentation type (effective only with digest; experimental feature)',
+          "#{display_types.join('|')} (default: inline) (multi is deprecated)",
+        ){|s| o[:display] ||= s.downcase}
+
+        parser.on('--cache', 'use file cache (not implemented) (deprecated)'){o[:cache] = true}
+        parser.on(
+          '--pager=PAGER', String,
+          'specify pager (if available, $DOCDIFF_PAGER is used by default)'
+        ){|s| o[:pager] = s}
+        parser.on('--no-pager', 'do not use pager'){o[:pager] = false}
+        parser.on('--config-file=FILE', String, 'specify config file to read'){|s| o[:config_file] = s}
+        parser.on('--no-config-file', 'do not read config files'){o[:no_config_file] = true}
+        parser.on('--verbose', 'run verbosely (not well-supported) (deprecated)'){o[:verbose] = true}
+
+        parser.on('--help', 'show this message'){puts parser; exit(0)}
+        parser.on('--version', 'show version'){puts Docdiff::VERSION; exit(0)}
+        parser.on('--license', 'show license (deprecated)'){puts DocDiff::License; exit(0)}
+        parser.on('--author', 'show author(s) (deprecated)'){puts DocDiff::Author; exit(0)}
+
+        parser.on_tail(
+          "When invoked as worddiff or chardiff, resolution will be set accordingly.",
+          "Config files: /etc/docdiff/docdiff.conf, ~/.config/docdiff/docdiff.conf (or ~/etc/docdiff/docdiff.conf (deprecated))"
+        )
+      end
+
+      option_parser.parse!(args)
+      o
+    end
+
+    def self.parse_config_file_content(content)
+      result = {}
+      return result if content.size <= 0
+      lines = content.dup.split(/\r\n|\r|\n/).compact
+      lines.collect!{|line| line.sub(/#.*$/, '')}
+      lines.collect!{|line| line.strip}
+      lines.delete_if{|line| line == ""}
+      lines.each{|line|
+        raise 'line does not include " = ".' unless /[\s]+=[\s]+/.match line
+        name_src, value_src = line.split(/[\s]+=[\s]+/)
+        raise "Invalid name: #{name_src.inspect}" if (/\s/.match name_src)
+        raise "Invalid value: #{value_src.inspect}" unless value_src.kind_of?(String)
+        name  = name_src.intern
+        value = value_src
+        value = true if ['on','yes','true'].include? value_src.downcase
+        value = false if ['off','no','false'].include? value_src.downcase
+        value = value_src.to_i if /^[0-9]+$/.match value_src
+        result[name] = value
+      }
+      result
+    end
+
+    def self.read_config_from_file(filename)
+      content = nil
+      begin
+        File.open(filename, "r"){|f| content = f.read}
+      rescue => exception
+        raise exception
+      ensure
+        message =
+          case exception
+          in Errno::ENOENT
+            "config file not found: #{filename.inspect}"
+          in Errno::EACCES
+            "permission denied for reading: #{filename.inspect}"
+          else
+            "something unexpected happened: #{filename.inspect}"
+          end
+        if content
+          config = parse_config_file_content(content)
+        else
+          message = "config file empty: #{filename.inspect}"
+        end
+      end
+      [config, message]
+    end
+
+    def self.print_or_write_to_pager(content, pager)
+      if STDOUT.tty? && pager.is_a?(String) && !pager.empty?
+        IO.popen(pager, "w"){|f| f.print content}
+      else
+        print content
+      end
+    end
+
+    def self.run
+      command_line_config = parse_options!(ARGV)
+
+      system_config =
+        unless command_line_config[:no_config_file]
+          possible_system_config_file_names = [
+            DocDiff::SystemConfigFileName,
+          ]
+          existing_system_config_file_names =
+            possible_system_config_file_names.select{|fn| File.exist? fn}
+          if existing_system_config_file_names.size >= 2
+            raise <<~EOS
+              More than one system config file found, using the first one: \
+              #{existing_system_config_file_names.inspect}
+            EOS
+          end
+          filename = existing_system_config_file_names.first
+          config, message = read_config_from_file(filename)
+          STDERR.print message if command_line_config[:verbose]
+          config
+        end
+
+      user_config =
+        unless command_line_config[:no_config_file]
+          possible_user_config_file_names = [
+            DocDiff::UserConfigFileName,
+            DocDiff::AltUserConfigFileName,
+            DocDiff::XDGUserConfigFileName,
+          ]
+          existing_user_config_file_names =
+            possible_user_config_file_names.select{|fn| File.exist? fn}
+          if existing_user_config_file_names.size >= 2
+            raise <<~EOS
+              Only one user config file can be used at the same time. \
+              Keep one and remove or rename the others: \
+              #{existing_user_config_file_names.inspect}
+            EOS
+          end
+          filename = existing_user_config_file_names.first
+          config, message = read_config_from_file(filename)
+          STDERR.print message if command_line_config[:verbose]
+          config
+        end
+
+      config_from_specified_file =
+        if filename = command_line_config[:config_file]
+          config, message = read_config_from_file(filename)
+          STDERR.print message if command_line_config[:verbose] == true
+          config
+        end
+
+      config_from_program_name =
+        case File.basename($PROGRAM_NAME, ".*")
+        when "worddiff" then {:resolution => "word"}
+        when "chardiff" then {:resolution => "char"}
+        end
+
+      config_from_env_vars = {}
+      if (pager = ENV['DOCDIFF_PAGER']) && !pager.empty?
+        config_from_env_vars[:pager] = pager
+      end
+
+      config_in_effect = DocDiff::DEFAULT_CONFIG.dup
+      config_in_effect.merge!(config_from_program_name) if config_from_program_name
+      config_in_effect.merge!(system_config) if system_config
+      config_in_effect.merge!(user_config) if user_config
+      config_in_effect.merge!(config_from_env_vars) if config_from_env_vars
+      config_in_effect.merge!(config_from_specified_file) if config_from_specified_file
+      config_in_effect.merge!(command_line_config) if command_line_config
+
+      docdiff = DocDiff.new(config: config_in_effect)
+
+      file1_content = nil
+      file2_content = nil
+      raise "Try `#{File.basename($0)} --help' for more information." if ARGV[0].nil?
+      raise "Specify at least 2 target files." unless ARGV[0] && ARGV[1]
+      ARGV[0] = "/dev/stdin" if ARGV[0] == "-"
+      ARGV[1] = "/dev/stdin" if ARGV[1] == "-"
+      raise "No such file: #{ARGV[0]}." unless FileTest.exist?(ARGV[0])
+      raise "No such file: #{ARGV[1]}." unless FileTest.exist?(ARGV[1])
+      raise "#{ARGV[0]} is not readable." unless FileTest.readable?(ARGV[0])
+      raise "#{ARGV[1]} is not readable." unless FileTest.readable?(ARGV[1])
+      File.open(ARGV[0], "r"){|f| file1_content = f.read}
+      File.open(ARGV[1], "r"){|f| file2_content = f.read}
+
+      doc1 = nil
+      doc2 = nil
+
+      encoding1 = docdiff.config[:encoding]
+      encoding2 = docdiff.config[:encoding]
+      eol1 = docdiff.config[:eol]
+      eol2 = docdiff.config[:eol]
+
+      if docdiff.config[:encoding] == "auto"
+        encoding1 = DocDiff::CharString.guess_encoding(file1_content)
+        encoding2 = DocDiff::CharString.guess_encoding(file2_content)
+        case
+        when (encoding1 == "UNKNOWN" or encoding2 == "UNKNOWN")
+          raise "Document encoding unknown (#{encoding1}, #{encoding2})."
+        when encoding1 != encoding2
+          raise "Document encoding mismatch (#{encoding1}, #{encoding2})."
+        end
+      end
+
+      if docdiff.config[:eol] == "auto"
+        eol1 = DocDiff::CharString.guess_eol(file1_content)
+        eol2 = DocDiff::CharString.guess_eol(file2_content)
+        case
+        when (eol1.nil? or eol2.nil?)
+          raise "Document eol is nil (#{eol1.inspect}, #{eol2.inspect}).  The document might be empty."
+        when (eol1 == 'UNKNOWN' or eol2 == 'UNKNOWN')
+          raise "Document eol unknown (#{eol1.inspect}, #{eol2.inspect})."
+        when (eol1 != eol2)
+          raise "Document eol mismatch (#{eol1}, #{eol2})."
+        end
+      end
+
+      doc1 = DocDiff::Document.new(file1_content, encoding1, eol1)
+      doc2 = DocDiff::Document.new(file2_content, encoding2, eol2)
+
+      output = docdiff.run(doc1, doc2,
+        {:resolution => docdiff.config[:resolution],
+         :format     => docdiff.config[:format],
+         :digest     => docdiff.config[:digest],
+         :display    => docdiff.config[:display]})
+
+      print_or_write_to_pager(output, docdiff.config[:pager])
+    end
+  end
+end

data/lib/docdiff/version.rb

@@ -1,3 +1,3 @@
 module Docdiff
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/docdiff/view.rb

@@ -47,10 +47,22 @@ class View
   end
 
   def escape_inside(str, tags)
-    str.gsub(tags[:inside_escape_pat]){|m| tags[:inside_escape_dic][m]}
+    str.gsub(tags[:inside_escape_pat]){|m|
+      if replacement = tags[:inside_escape_dic][m]
+        replacement
+      else
+        m
+      end
+    }
   end
   def escape_outside(str, tags)
-    str.gsub(tags[:outside_escape_pat]){|m| tags[:outside_escape_dic][m]}
+    str.gsub(tags[:outside_escape_pat]){|m|
+      if replacement = tags[:outside_escape_dic][m]
+        replacement
+      else
+        m
+      end
+    }
   end
 
   def apply_style(tags, headfoot = true)
@@ -212,7 +224,7 @@ class View
     []
   end
   TTYEscapeDic = {'ThisRandomString' => 'ThisRandomString'}
-  TTYEscapePat = /(\r\n|#{TTYEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
+  TTYEscapePat = /(#{TTYEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
   def tty_tags()
     {:outside_escape_dic  => TTYEscapeDic,
      :outside_escape_pat  => TTYEscapePat,
@@ -277,7 +289,7 @@ class View
   end
   HTMLEscapeDic = {'<'=>'&lt;', '>'=>'&gt;', '&'=>'&amp;', '  '=>'&nbsp;&nbsp;',
                    "\r\n" => "<br />\r\n", "\r" => "<br />\r", "\n" => "<br />\n"}
-  HTMLEscapePat = /(\r\n|#{HTMLEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
+  HTMLEscapePat = /(#{HTMLEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
   def html_tags()
     {:outside_escape_dic  => HTMLEscapeDic,
      :outside_escape_pat  => HTMLEscapePat,
@@ -387,7 +399,7 @@ class View
     []
   end
   WDIFFEscapeDic = {'ThisRandomString' => 'ThisRandomString'}
-  WDIFFEscapePat = /(\r\n|#{WDIFFEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
+  WDIFFEscapePat = /(#{WDIFFEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
   def wdiff_tags()
     {:outside_escape_dic  => WDIFFEscapeDic,
      :outside_escape_pat  => WDIFFEscapePat,
@@ -431,7 +443,7 @@ class View
   def user_header(); []; end
   def user_footer(); []; end
   UserEscapeDic = {'ThisRandomString' => 'ThisRandomString'}
-  UserEscapePat = /(\r\n|#{UserEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
+  UserEscapePat = /(#{UserEscapeDic.keys.collect{|k|Regexp.quote(k)}.join('|')})/m
   def user_tags()
     {:outside_escape_dic  => UserEscapeDic,
      :outside_escape_pat  => UserEscapePat,

data/test/cli_test.rb

@@ -0,0 +1,312 @@
+#!/usr/bin/ruby
+# -*- coding: utf-8; -*-
+
+require 'test/unit'
+require 'nkf'
+require 'docdiff/cli'
+
+class TC_CLI < Test::Unit::TestCase
+  def test_parse_options!()
+    args = [
+      "--resolution=line",
+      "--char",
+      "--encoding=ASCII",
+      "--eucjp",
+      "--eol=CR",
+      "--crlf",
+      "--format=manued",
+      "--wdiff",
+      "--label=old",
+      "--label=new",
+      "--digest",
+      "--display=block",
+      "--pager='less --raw-control-chars'",
+      "--no-config-file",
+      "--config-file=./docdiff.conf",
+      "file1",
+      "file2",
+    ]
+    expected = {
+      :resolution => "char",
+      :encoding => "EUC-JP",
+      :eol => "CRLF",
+      :format => "wdiff",
+      :digest => true,
+      :label => ["old", "new"],
+      :display => "block",
+      :pager => "'less --raw-control-chars'",
+      :no_config_file => true,
+      :config_file => "./docdiff.conf",
+    }
+    assert_equal(expected, DocDiff::CLI.parse_options!(args, base_options: {}))
+  end
+
+  def test_parse_config_file_content()
+    content = ["# comment line\n",
+               " # comment line with leading space\n",
+               "foo1 = bar\n",
+               "foo2 = bar baz \n",
+               " foo3  =  123 # comment\n",
+               "foo4 = no    \n",
+               "foo1 = tRue\n",
+               "\n",
+               "",
+               nil].join
+    expected = {:foo1=>true, :foo2=>"bar baz", :foo3=>123, :foo4=>false}
+    assert_equal(expected, DocDiff::CLI.parse_config_file_content(content))
+  end
+
+  def test_read_config_from_file()
+    filename = File.join(File.dirname(__FILE__), "fixture/simple.conf")
+    expected = {:foo1 => true, :foo2 => "bar baz", :foo3 => 123, :foo4 => false}
+    config, _message = DocDiff::CLI.read_config_from_file(filename)
+    assert_equal(expected, config)
+  end
+
+  def test_read_config_from_file_raises_exception()
+    assert_raise(Errno::ENOENT) do
+      config, message = DocDiff::CLI.read_config_from_file("no/such/file")
+    end
+  end
+
+  def test_cli_resolution_line()
+    expected = <<~EOS.chomp
+      [-Hello, my name is Watanabe.
+      I am just another Ruby porter.
+      -]{+Hello, my name is matz.
+      It's me who has created Ruby.  I am a Ruby hacker.
+      +}
+    EOS
+    cmd = "ruby -I lib bin/docdiff --resolution=line --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_resolution_word()
+    expected = <<~EOS
+      Hello, my name is [-Watanabe.-]{+matz.+}
+      {+It's me who has created Ruby.  +}I am [-just another -]{+a +}Ruby [-porter.-]{+hacker.+}
+    EOS
+    cmd = "ruby -I lib bin/docdiff --resolution=word --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_resolution_char()
+    expected = <<~EOS
+      Hello, my name is [-W-]{+m+}at[-anabe-]{+z+}.
+      {+It's me who has created Ruby.  +}I am [-just -]a[-nother-] Ruby [-port-]{+hack+}er.
+    EOS
+    cmd = "ruby -I lib bin/docdiff --resolution=char --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_encoding_ascii()
+    expected = <<~EOS
+      Hello, my name is [-Watanabe.-]{+matz.+}
+      {+It's me who has created Ruby.  +}I am [-just another -]{+a +}Ruby [-porter.-]{+hacker.+}
+    EOS
+    cmd = "ruby -I lib bin/docdiff --encoding=ASCII --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_encoding_euc_jp()
+    expected = NKF.nkf("--ic=UTF-8 --oc=EUC-JP", <<~EOS)
+      [-こんにちは-]{+こんばんは+}、私の[-名前はわたなべです-]{+名前はまつもとです+}。
+      {+Rubyを作ったのは私です。+}私は[-Just Another -]Ruby [-Porter-]{+Hacker+}です。
+    EOS
+    cmd = "ruby --external-encoding EUC-JP -I lib bin/docdiff --encoding=EUC-JP --format=wdiff" +
+      " test/fixture/01_ja_eucjp_lf.txt test/fixture/02_ja_eucjp_lf.txt"
+    actual = `#{cmd}`.force_encoding("EUC-JP")
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_encoding_shift_jis()
+    expected_utf8_cr =
+      "[-こんにちは-]{+こんばんは+}、私の[-名前はわたなべです-]{+名前はまつもとです+}。\r" +
+      "{+Rubyを作ったのは私です。+}私は[-Just Another -]Ruby [-Porter-]{+Hacker+}です。\r"
+    expected = NKF.nkf("--ic=UTF-8 --oc=Shift_JIS", expected_utf8_cr)
+    cmd = "ruby --external-encoding Shift_JIS -I lib bin/docdiff --encoding=Shift_JIS --format=wdiff" +
+      " test/fixture/01_ja_sjis_cr.txt test/fixture/02_ja_sjis_cr.txt"
+    actual = `#{cmd}`.force_encoding("Shift_JIS")
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_encoding_utf_8()
+    expected = <<~EOS
+      [-こんにちは-]{+こんばんは+}、私の[-名前はわたなべです-]{+名前はまつもとです+}。
+      {+Rubyを作ったのは私です。+}私は[-Just Another -]Ruby [-Porter-]{+Hacker+}です。
+    EOS
+    cmd = "ruby -I lib bin/docdiff --encoding=UTF-8 --format=wdiff" +
+      " test/fixture/01_ja_utf8_lf.txt test/fixture/02_ja_utf8_lf.txt"
+    actual = `#{cmd}`.force_encoding("UTF-8")
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_eol_cr()
+    expected =
+      "Hello, my name is [-Watanabe.-]{+matz.+}\r" +
+      "{+It's me who has created Ruby.  +}I am [-just another -]{+a +}Ruby [-porter.-]{+hacker.+}\r"
+    cmd = "ruby -I lib bin/docdiff --eol=CR --format=wdiff" +
+      " test/fixture/01_en_ascii_cr.txt test/fixture/02_en_ascii_cr.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_eol_lf()
+    expected =
+      "Hello, my name is [-Watanabe.-]{+matz.+}\n" +
+      "{+It's me who has created Ruby.  +}I am [-just another -]{+a +}Ruby [-porter.-]{+hacker.+}\n"
+    cmd = "ruby -I lib bin/docdiff --eol=LF --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_eol_crlf()
+    expected =
+      "Hello, my name is [-Watanabe.-]{+matz.+}\r\n" +
+      "{+It's me who has created Ruby.  +}I am [-just another -]{+a +}Ruby [-porter.-]{+hacker.+}\r\n"
+    cmd = "ruby -I lib bin/docdiff --eol=CRLF --format=wdiff" +
+      " test/fixture/01_en_ascii_crlf.txt test/fixture/02_en_ascii_crlf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_format_html()
+    expected = <<~EOS
+      <span class="common">Hello, my name is </span>\
+      <span class="before-change"><del>Watanabe.</del></span>\
+      <span class="after-change"><ins>matz.</ins></span>\
+      <span class="common"><br />
+    EOS
+    cmd = "ruby -I lib bin/docdiff --format=html" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.scan(/^.*?$\n/m)[-4]
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_format_manued()
+    expected = "Hello, my name is [Watanabe./matz.]\n"
+    cmd = "ruby -I lib bin/docdiff --format=manued" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.scan(/^.*?$\n/m)[-2]
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_format_tty()
+    expected = "Hello, my name is \e[7;4;33mWatanabe.\e[0m\e[7;1;32mmatz.\e[0m\n"
+    cmd = "ruby -I lib bin/docdiff --format=tty" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.scan(/^.*?$\n/m).first
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_format_wdiff()
+    expected = "Hello, my name is [-Watanabe.-]{+matz.+}\n"
+    cmd = "ruby -I lib bin/docdiff --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.scan(/^.*?$\n/m).first
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_digest()
+    expected = <<~EOS
+      ----
+      1,1
+      Hello, my name is [-Watanabe.-]{+matz.+}
+
+      ----
+      (2),2
+
+      {+It's me who has created Ruby.  +}I am 
+      ----
+      2,2
+      I am [-just another -]{+a +}Ruby 
+      ----
+      2,2
+      Ruby [-porter.-]{+hacker.+}
+
+      ----
+    EOS
+    cmd = "ruby -I lib bin/docdiff --digest --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.force_encoding("UTF-8")
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_display_inline()
+    expected = <<~EOS
+      ----
+      1,1
+      Hello, my name is [-Watanabe.-]{+matz.+}
+
+      ----
+      (2),2
+
+      {+It's me who has created Ruby.  +}I am 
+      ----
+      2,2
+      I am [-just another -]{+a +}Ruby 
+      ----
+      2,2
+      Ruby [-porter.-]{+hacker.+}
+
+      ----
+    EOS
+    cmd = "ruby -I lib bin/docdiff --digest --display=inline --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.force_encoding("UTF-8")
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_display_block()
+    expected = <<~EOS
+      ----
+      1,1
+      Hello, my name is [-Watanabe.-]
+
+      Hello, my name is {+matz.+}
+
+      ----
+      (2),2
+
+      I am 
+
+      {+It's me who has created Ruby.  +}I am 
+      ----
+      2,2
+      I am [-just another -]Ruby 
+      I am {+a +}Ruby 
+      ----
+      2,2
+      Ruby [-porter.-]
+
+      Ruby {+hacker.+}
+
+      ----
+    EOS
+    cmd = "ruby -I lib bin/docdiff --digest --display=block --format=wdiff" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`.force_encoding("UTF-8")
+    assert_equal(expected, actual)
+  end
+
+  def test_cli_config_file_format_wdiff()
+    config_file_name = File.join(File.dirname(__FILE__), "fixture/format_wdiff.conf")
+    expected = <<~EOS
+      Hello, my name is [-Watanabe.-]{+matz.+}
+      {+It's me who has created Ruby.  +}I am [-just another -]{+a +}Ruby [-porter.-]{+hacker.+}
+    EOS
+    cmd = "ruby -I lib bin/docdiff --config-file=#{config_file_name}" +
+      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
+    actual = `#{cmd}`
+    assert_equal(expected, actual)
+  end
+end

data/test/docdiff_test.rb

@@ -117,22 +117,6 @@ class TC_DocDiff < Test::Unit::TestCase
     assert_equal(expected, docdiff.run(doc1, doc2, {:resolution => "char", :format => "manued", :digest => false}))
   end
 
-  def test_parse_config_file_content()
-    content = ["# comment line\n",
-               " # comment line with leading space\n",
-               "foo1 = bar\n",
-               "foo2 = bar baz \n",
-               " foo3  =  123 # comment\n",
-               "foo4 = no    \n",
-               "foo1 = tRue\n",
-               "\n",
-               "",
-               nil].join
-    expected = {:foo1=>true, :foo2=>"bar baz", :foo3=>123, :foo4=>false}
-    assert_equal(expected,
-                 DocDiff.parse_config_file_content(content))
-  end
-
   def test_run_line_user()
     doc1 = Document.new("foo bar\nbaz", 'US-ASCII', 'LF')
     doc2 = Document.new("foo beer\nbaz", 'US-ASCII', 'LF')
@@ -187,13 +171,6 @@ class TC_DocDiff < Test::Unit::TestCase
     expected = "<=>foo </=><=>b</=><!->a</!-><!+>ee</!+><=>r</=><=>\n</=><=>baz</=>"
     assert_equal(expected, docdiff.run(doc1, doc2, {:resolution => "char", :format => "user", :digest => false}))
   end
-  def test_cli()
-    expected = "Hello, my name is [-Watanabe.-]{+matz.+}\n"
-    cmd = "ruby -I lib bin/docdiff --wdiff" +
-      " test/fixture/01_en_ascii_lf.txt test/fixture/02_en_ascii_lf.txt"
-    actual = `#{cmd}`.scan(/^.*?$\n/m).first
-    assert_equal(expected, actual)
-  end
 
   def teardown()
     #

data/test/fixture/format_wdiff.conf

@@ -0,0 +1 @@
+format = wdiff

data/test/fixture/simple.conf

@@ -0,0 +1,9 @@
+# comment line
+ # comment line with leading space
+foo1 = bar
+foo2 = bar baz 
+ foo3  =  123 # comment
+foo4 = no    
+
+  
+foo1 = tRue

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: docdiff
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Hisashi Morita
 bindir: bin
 cert_chain: []
-date: 2025-12-13 00:00:00.000000000 Z
-dependencies: []
+date: 2025-12-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: |-
   DocDiff compares two text files and shows the
                        difference. It can compare files word by word,
@@ -56,6 +70,7 @@ files:
 - lib/doc_diff.rb
 - lib/docdiff.rb
 - lib/docdiff/charstring.rb
+- lib/docdiff/cli.rb
 - lib/docdiff/diff.rb
 - lib/docdiff/diff/contours.rb
 - lib/docdiff/diff/editscript.rb
@@ -73,6 +88,7 @@ files:
 - lib/docdiff/version.rb
 - lib/docdiff/view.rb
 - test/charstring_test.rb
+- test/cli_test.rb
 - test/diff_test.rb
 - test/difference_test.rb
 - test/docdiff_test.rb
@@ -93,8 +109,10 @@ files:
 - test/fixture/02_ja_sjis_crlf.txt
 - test/fixture/02_ja_utf8_crlf.txt
 - test/fixture/02_ja_utf8_lf.txt
+- test/fixture/format_wdiff.conf
 - test/fixture/humpty_dumpty01_ascii_lf.txt
 - test/fixture/humpty_dumpty02_ascii_lf.txt
+- test/fixture/simple.conf
 - test/test_helper.rb
 - test/view_test.rb
 homepage: https://github.com/hisashim/docdiff