docdiff 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8733587f13d662ca5c5fda60843298ef71ef798284d9f677d03378d8b5e0e29
-  data.tar.gz: f92804fdb17576aaded799010553a0d6685dbb8679e53cbf6cf15c4773af8ddf
+  metadata.gz: 75d0326eaf0ebe880d161beb18ccf549b7965ac0e31131b5ed860b942616d66c
+  data.tar.gz: c30d0a6a0a5cb1520d91ebdae8a0997b3ac364072c212a2be5f651b94f7b458b
 SHA512:
-  metadata.gz: 94af3213ec734c2b80ad72f70bb1d1312d14da7d15e77237f1824ade5d83f39d666bf8049dcb4c6a2898b402ab80b64c22184bb93359f23a8496f83d0e191f0b
-  data.tar.gz: dfd7a6f65ff88a556b5ccb5612daac005b3405cb0f36f64cc5f4914a061bdbd20c4ac4ab5610c657b9036f09485a18e912e527bc5c78b276d2a494bfc977455a
+  metadata.gz: 970b172f3c9e00967a7cb79113367b7036cf900afdf122f25fc36224dc31550626d7f6f8408ad12ff7fff58e0b91d2ff730b26d58f7603d040a8302d399d78b1
+  data.tar.gz: ac729648506f82b4a462d3657247dce15579a26aa247f9166408f8da9b40ff9567df8dc66f1d56fb4f215c82ffcaaac4940cfdd368adb49b57f05f5ff679e4c0

data/bin/docdiff

@@ -84,6 +84,8 @@ ARGV.options {|o|
   o.def_option('--cache', 'use file cache (not supported yet)'){clo[:cache] = true}
   o.def_option('--no-config-file',
     'do not read config files'){clo[:no_config_file] = true}
+  o.def_option('--config-file=FILE',
+    'specify config file to read'){|s| clo[:config_file] = s}
   o.def_option('--verbose', 'run verbosely (not supported yet)'){clo[:verbose] = true}
 
   o.def_option('--help', 'show this message'){puts o; exit(0)}
@@ -117,6 +119,16 @@ unless clo[:no_config_file] == true # process_commandline_option
     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.pring message
+  end
+end
 docdiff.config.update(clo)
 
 # config stuff done
@@ -127,10 +139,12 @@ 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 a file." unless FileTest.file?(ARGV[0])
-raise "#{ARGV[1]} is not a file." unless FileTest.file?(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}
 

data/docdiff.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Docdiff::VERSION
   s.license     = "BSD-3-Clause"
   s.authors     = ["Hisashi Morita"]
-  s.email       = ["hisashim at workbook.org"]
+  s.email       = ["hisashim@icloud.com"]
   s.homepage    = "https://github.com/hisashim/docdiff"
   s.summary     = %q{Word-by-word diff}
   s.description = %q{DocDiff compares two text files and shows the

data/lib/docdiff/charstring.rb

@@ -231,10 +231,11 @@ module CharString
   end
 
   def count_graph_line()
+    graph = (Encodings['UTF-8']::GRAPH +
+             Encodings['UTF-8']::JA_GRAPH).chars.uniq.join
+    re_graph = Regexp.new("[#{Regexp.quote(graph)}]", Regexp::MULTILINE)
     split_to_line.collect{|line|
-      line if Regexp.new("[#{Encodings['UTF-8']::GRAPH}" + 
-                         "#{Encodings['UTF-8']::JA_GRAPH}]", 
-                         Regexp::MULTILINE).match line.encode('UTF-8')
+      line if re_graph.match line.encode('UTF-8')
     }.compact.size
   end
 

data/lib/docdiff/diff/unidiff.rb

@@ -20,7 +20,6 @@ class Diff
     end
 
     def unidiff(out='', context_lines=3)
-      state = :common
       l1 = l2 = 1
       hunk = []
       hunk_l1 = hunk_l2 = 1

data/lib/docdiff/encoding/en_ascii.rb

@@ -1,6 +1,8 @@
 # English ASCII encoding module for CharString
 # 2003- Hisashi MORITA
 
+# frozen_string_literal: false
+
 class DocDiff
 module CharString
   module ASCII
@@ -14,50 +16,21 @@ module CharString
     SPACE =     "\x09\x0a\x0b\x0c\x0d\x20"
     BLANK =     "\x09\x20"
     DIGIT =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39"
-    ALPHA =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
-    ALNUM =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
-                "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
+    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
                 "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
+                "\x55\x56\x57\x58\x59\x5a"
+    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
+                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
+                "\x75\x76\x77\x78\x79\x7a"
+    ALPHA =     UPPER + LOWER
+    ALNUM =     DIGIT + ALPHA
     PUNCT =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
                 "\x2b\x2c\x2d\x2e\x2f\x3a\x3b\x3c\x3d\x3e" \
                 "\x3f\x40\x5b\x5c\x5d\x5e\x5f\x60\x7b\x7c" \
                 "\x7d\x7e"
-    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
-                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
-                "\x75\x76\x77\x78\x79\x7a"
-    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a"
-    PRINT =     "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29" \
-                "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33" \
-                "\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d" \
-                "\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47" \
-                "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51" \
-                "\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b" \
-                "\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65" \
-                "\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" \
-                "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79" \
-                "\x7a\x7b\x7c\x7d\x7e"
-    GRAPH =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
-                "\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34" \
-                "\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e" \
-                "\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48" \
-                "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52" \
-                "\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c" \
-                "\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66" \
-                "\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70" \
-                "\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a" \
-                "\x7b\x7c\x7d\x7e"
-    XDIGIT =    "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
+    GRAPH =     DIGIT + UPPER + LOWER + PUNCT
+    PRINT =     "\x20" + GRAPH
+    XDIGIT =    DIGIT +
                 "\x41\x42\x43\x44\x45\x46\x61\x62\x63\x64" \
                 "\x65\x66"
 

data/lib/docdiff/encoding/ja_eucjp.rb

@@ -1,6 +1,8 @@
 # Japanese EUC-JP encoding module for CharString
 # 2003- Hisashi MORITA
 
+# frozen_string_literal: false
+
 class DocDiff
 module CharString
   module EUC_JP
@@ -17,50 +19,21 @@ module CharString
     SPACE =     "\x09\x0a\x0b\x0c\x0d\x20"
     BLANK =     "\x09\x20"
     DIGIT =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39"
-    ALPHA =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
-    ALNUM =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
-                "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
+    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
                 "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
+                "\x55\x56\x57\x58\x59\x5a"
+    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
+                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
+                "\x75\x76\x77\x78\x79\x7a"
+    ALPHA =     UPPER + LOWER
+    ALNUM =     DIGIT + ALPHA
     PUNCT =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
                 "\x2b\x2c\x2d\x2e\x2f\x3a\x3b\x3c\x3d\x3e" \
                 "\x3f\x40\x5b\x5c\x5d\x5e\x5f\x60\x7b\x7c" \
                 "\x7d\x7e"
-    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
-                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
-                "\x75\x76\x77\x78\x79\x7a"
-    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a"
-    PRINT =     "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29" \
-                "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33" \
-                "\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d" \
-                "\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47" \
-                "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51" \
-                "\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b" \
-                "\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65" \
-                "\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" \
-                "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79" \
-                "\x7a\x7b\x7c\x7d\x7e"
-    GRAPH =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
-                "\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34" \
-                "\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e" \
-                "\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48" \
-                "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52" \
-                "\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c" \
-                "\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66" \
-                "\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70" \
-                "\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a" \
-                "\x7b\x7c\x7d\x7e"
-    XDIGIT =    "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
+    GRAPH =     DIGIT + UPPER + LOWER + PUNCT
+    PRINT =     "\x20" + GRAPH
+    XDIGIT =    DIGIT +
                 "\x41\x42\x43\x44\x45\x46\x61\x62\x63\x64" \
                 "\x65\x66"
     JA_SPACE =  "\xa1\xa1"

data/lib/docdiff/encoding/ja_sjis.rb

@@ -1,6 +1,8 @@
 # Japanese Shift_JIS encoding module for CharString
 # 2003- Hisashi MORITA
 
+# frozen_string_literal: false
+
 class DocDiff
 module CharString
   module Shift_JIS
@@ -17,50 +19,21 @@ module CharString
     SPACE =     "\x09\x0a\x0b\x0c\x0d\x20"
     BLANK =     "\x09\x20"
     DIGIT =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39"
-    ALPHA =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
-    ALNUM =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
-                "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
+    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
                 "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
+                "\x55\x56\x57\x58\x59\x5a"
+    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
+                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
+                "\x75\x76\x77\x78\x79\x7a"
+    ALPHA =     UPPER + LOWER
+    ALNUM =     DIGIT + ALPHA
     PUNCT =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
                 "\x2b\x2c\x2d\x2e\x2f\x3a\x3b\x3c\x3d\x3e" \
                 "\x3f\x40\x5b\x5c\x5d\x5e\x5f\x60\x7b\x7c" \
                 "\x7d\x7e"
-    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
-                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
-                "\x75\x76\x77\x78\x79\x7a"
-    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a"
-    PRINT =     "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29" \
-                "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33" \
-                "\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d" \
-                "\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47" \
-                "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51" \
-                "\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b" \
-                "\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65" \
-                "\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" \
-                "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79" \
-                "\x7a\x7b\x7c\x7d\x7e"
-    GRAPH =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
-                "\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34" \
-                "\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e" \
-                "\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48" \
-                "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52" \
-                "\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c" \
-                "\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66" \
-                "\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70" \
-                "\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a" \
-                "\x7b\x7c\x7d\x7e"
-    XDIGIT =    "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
+    GRAPH =     DIGIT + UPPER + LOWER + PUNCT
+    PRINT =     "\x20" + GRAPH
+    XDIGIT =    DIGIT +
                 "\x41\x42\x43\x44\x45\x46\x61\x62\x63\x64" \
                 "\x65\x66"
     JA_SPACE =  "\x81\x40"

data/lib/docdiff/encoding/ja_utf8.rb

@@ -2,6 +2,8 @@
 # Japanese UTF-8 encoding module for CharString
 # 2003- Hisashi MORITA
 
+# frozen_string_literal: false
+
 class DocDiff
 module CharString
   module UTF8
@@ -18,50 +20,21 @@ module CharString
     SPACE =     "\x09\x0a\x0b\x0c\x0d\x20"
     BLANK =     "\x09\x20"
     DIGIT =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39"
-    ALPHA =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
-    ALNUM =     "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
-                "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
+    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
                 "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a\x61\x62\x63\x64" \
-                "\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e" \
-                "\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78" \
-                "\x79\x7a"
+                "\x55\x56\x57\x58\x59\x5a"
+    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
+                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
+                "\x75\x76\x77\x78\x79\x7a"
+    ALPHA =     UPPER + LOWER
+    ALNUM =     DIGIT + ALPHA
     PUNCT =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
                 "\x2b\x2c\x2d\x2e\x2f\x3a\x3b\x3c\x3d\x3e" \
                 "\x3f\x40\x5b\x5c\x5d\x5e\x5f\x60\x7b\x7c" \
                 "\x7d\x7e"
-    LOWER =     "\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a" \
-                "\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74" \
-                "\x75\x76\x77\x78\x79\x7a"
-    UPPER =     "\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a" \
-                "\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54" \
-                "\x55\x56\x57\x58\x59\x5a"
-    PRINT =     "\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29" \
-                "\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33" \
-                "\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d" \
-                "\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47" \
-                "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51" \
-                "\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b" \
-                "\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65" \
-                "\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f" \
-                "\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79" \
-                "\x7a\x7b\x7c\x7d\x7e"
-    GRAPH =     "\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a" \
-                "\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34" \
-                "\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e" \
-                "\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48" \
-                "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52" \
-                "\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c" \
-                "\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66" \
-                "\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70" \
-                "\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a" \
-                "\x7b\x7c\x7d\x7e"
-    XDIGIT =    "\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39" \
+    GRAPH =     DIGIT + UPPER + LOWER + PUNCT
+    PRINT =     "\x20" + GRAPH
+    XDIGIT =    DIGIT +
                 "\x41\x42\x43\x44\x45\x46\x61\x62\x63\x64" \
                 "\x65\x66"
     JA_SPACE =  "\xe3\x80\x80"

data/lib/docdiff/version.rb

@@ -1,3 +1,3 @@
 module Docdiff
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/docdiff/view.rb

@@ -92,10 +92,18 @@ class View
   CONTEXT_PRE_LENGTH  = 32
   CONTEXT_POST_LENGTH = 32
   def apply_style_digest(tags, headfoot = true)
-    cxt_pre_pat  = Regexp.new('.{0,'+"#{CONTEXT_PRE_LENGTH}"+'}\Z',
-                              Regexp::MULTILINE, encname_for_regexp(@encoding))
-    cxt_post_pat = Regexp.new('\A.{0,'+"#{CONTEXT_POST_LENGTH}"+'}',
-                              Regexp::MULTILINE, encname_for_regexp(@encoding))
+    cxt_pre_pat =
+      if RUBY_VERSION >= "2.3.1"
+        Regexp.new('.{0,'+"#{CONTEXT_PRE_LENGTH}"+'}\Z', Regexp::MULTILINE)
+      else
+        Regexp.new('.{0,'+"#{CONTEXT_PRE_LENGTH}"+'}\Z', Regexp::MULTILINE, encname_for_regexp(@encoding))
+      end
+    cxt_post_pat =
+      if RUBY_VERSION >= "2.3.1"
+        Regexp.new('\A.{0,'+"#{CONTEXT_POST_LENGTH}"+'}', Regexp::MULTILINE)
+      else
+        Regexp.new('\A.{0,'+"#{CONTEXT_POST_LENGTH}"+'}', Regexp::MULTILINE, encname_for_regexp(@encoding))
+      end
     display = (tags and tags[:display]) || 'inline'
     result = []
     d1l = doc1_line_number = 1

data/readme.html

@@ -105,6 +105,17 @@
  <li></li>
 </ul></li>
  -->
+<li>0.6.2 (2025-11-28)<ul>
+  <li>User-visible changes:<ul>
+    <li>Add support for stdin (-) in command line arguments (thanks to tamo)</li>
+    <li>Add --config-file option (thanks to tamo)</li>
+    <li>Fix incompatibility with Ruby 3.4 Regexp (thanks to yoshuki)</li>
+    <li>Resolve frozen literal warnings introduced by Ruby 3.4.</li>
+  </ul></li>
+  <li>Developer-related changes:<ul>
+    <li>Update email address in .gemspec.</li>
+  </ul></li>
+</ul></li>
 <li>0.6.1 (2021-06-07)<ul>
   <li>Update information in .gemspec.</li>
 </ul></li>
@@ -235,7 +246,6 @@
  <li>Better auto-recognition of encodings and eols.</li>
  <li>Make CSS and tty escape sequence customizable in config files.</li>
  <li>Better multilingualization using Ruby 1.9 feature.</li>
- <li>Write "DocPatch".</li>
 </ul>
 
 <hr />
@@ -669,6 +679,13 @@ SUCH DAMAGE.
  <li>Hiroshi OHKUBO (bug report)</li>
  <li>Shugo MAEDA (bug report)</li>
  <li>Kazuhiko (patch)</li>
+ <li>Shintaro Kakutani (patches)</li>
+ <li>Masayoshi Takahashi (patches)</li>
+ <li>Masakazu Takahashi (patch)</li>
+ <li>Hibariya (bug report)</li>
+ <li>Hiroshi SHIBATA (patch)</li>
+ <li>Tamotsu Takahashi (patches)</li>
+ <li>MIKAMI Yoshiyuki (patch)</li>
 </ul>
 
 <hr />

data/readme.md

@@ -8,7 +8,6 @@
 * Better auto-recognition of encodings and eols.
 * Make CSS and tty escape sequence customizable in config files.
 * Better multilingualization using Ruby 1.9 feature.
-* Write "DocPatch".
 
 
 ## Description
@@ -149,6 +148,8 @@ See the following for detail.
 * Masakazu Takahashi (patch)
 * Hibariya (bug report)
 * Hiroshi SHIBATA (patch)
+* Tamotsu Takahashi (patches)
+* MIKAMI Yoshiyuki (patch)
 
 Excuse us this list is far from complete and fails to acknowledge many
 more who have helped us somehow. We really appreciate it.

data/test/charstring_test.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/ruby
 # -*- coding: euc-jp; -*-
+
+# frozen_string_literal: false
+
 require 'test/unit'
 require 'docdiff/charstring'
 require 'nkf'

data/test/docdiff_test.rb

@@ -1,10 +1,13 @@
 #!/usr/bin/ruby
 # -*- coding: us-ascii; -*-
+
+# frozen_string_literal: false
+
 require 'test/unit'
 require 'docdiff'
 require 'nkf'
 
-class TC_DocDiff_Document < Test::Unit::TestCase
+class TC_DocDiff < Test::Unit::TestCase
   Document = DocDiff::Document
 
   def setup()
@@ -126,7 +129,6 @@ class TC_DocDiff_Document < Test::Unit::TestCase
                "",
                nil].join
     expected = {:foo1=>true, :foo2=>"bar baz", :foo3=>123, :foo4=>false}
-    docdiff = DocDiff.new
     assert_equal(expected,
                  DocDiff.parse_config_file_content(content))
   end

data/test/document_test.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/ruby
 # -*- coding: euc-jp; -*-
+
+# frozen_string_literal: false
+
 require 'test/unit'
 require 'docdiff/document'
 require 'nkf'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: docdiff
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Hisashi Morita
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: |-
   DocDiff compares two text files and shows the
@@ -17,7 +16,7 @@ description: |-
                        several output formats such as HTML, tty, Manued,
                        or user-defined markup.
 email:
-- hisashim at workbook.org
+- hisashim@icloud.com
 executables:
 - docdiff
 extensions: []
@@ -70,7 +69,6 @@ files:
 - lib/docdiff/encoding/ja_utf8.rb
 - lib/docdiff/version.rb
 - lib/docdiff/view.rb
-- lib/viewdiff.rb
 - readme.html
 - readme.md
 - sample/01.en.ascii.cr
@@ -96,12 +94,10 @@ files:
 - test/document_test.rb
 - test/test_helper.rb
 - test/view_test.rb
-- test/viewdiff_test.rb
 homepage: https://github.com/hisashim/docdiff
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Word-by-word diff
 test_files: []