docdiff 0.5.0 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 75d0326eaf0ebe880d161beb18ccf549b7965ac0e31131b5ed860b942616d66c
+  data.tar.gz: c30d0a6a0a5cb1520d91ebdae8a0997b3ac364072c212a2be5f651b94f7b458b
+SHA512:
+  metadata.gz: 970b172f3c9e00967a7cb79113367b7036cf900afdf122f25fc36224dc31550626d7f6f8408ad12ff7fff58e0b91d2ff730b26d58f7603d040a8302d399d78b1
+  data.tar.gz: ac729648506f82b4a462d3657247dce15579a26aa247f9166408f8da9b40ff9567df8dc66f1d56fb4f215c82ffcaaac4940cfdd368adb49b57f05f5ff679e4c0

data/.travis.yml

@@ -1,7 +1,9 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
   - ruby-head
 
 script: rake test

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :darwin do
   gem 'rb-fsevent'

data/Makefile

@@ -1,19 +1,21 @@
+# Warning: this Makefile is obsolete, use Rakefile instead
+
 PRODUCT = docdiff
-VERSION = 0.4.0
+VERSION = $(shell $(RUBY) -r./lib/docdiff/version.rb -e 'Docdiff::VERSION.display')
 RUBY = ruby
 TAR_XVCS = tar --exclude=.svn --exclude=.git
 
 DOCS   = ChangeLog readme.en.html readme.ja.html \
          index.en.html index.ja.html
 DOCSRC = readme.html index.html img sample
-TESTS  = testcharstring.rb testdiff.rb testdifference.rb \
-         testdocdiff.rb testdocument.rb testview.rb
-DIST   = Makefile devutil docdiff docdiff.conf.example docdiff.rb \
+TESTS  = test/*_test.rb
+DIST   = Makefile devutil lib docdiff.conf.example bin/docdiff \
          docdiff.gemspec \
          docdiffwebui.html docdiffwebui.cgi \
          $(DOCSRC) $(DOCS) $(TESTS)
-TESTLOGS = testdocdiff.log testcharstring.log testdocument.log \
-         testdiff.log testdifference.log testview.log testviewdiff.log
+TESTLOGS = $(foreach t,\
+                     $(wildcard test/*_test.rb),\
+                     $(t:test/%_test.rb=%_test.log)) \
 
 WWWUSER = hisashim,docdiff
 WWWSITE = web.sourceforge.net
@@ -28,22 +30,16 @@ all:	$(DOCS)
 
 testall:
 	$(MAKE) test RUBY=ruby1.9.1
-	$(MAKE) test RUBY=ruby1.8
 
 test: $(TESTLOGS)
 
-test%.log:
-	$(RUBY) -I. test/test$*.rb | tee $@
+%_test.log:
+	$(RUBY) -I./lib test/$*_test.rb | tee $@
 
 docs:	$(DOCS)
 
 ChangeLog:
-# For real ChangeLog style, try http://arthurdejong.org/svn2cl/
-	if [ -d .svn ] ; then \
-	  svn log -rHEAD:0 -v > ChangeLog ; \
-	else \
-	  git svn log > ChangeLog ; \
-	fi
+	devutil/changelog.sh > $@
 
 readme.%.html: readme.html
 	$(RUBY) -Ku langfilter.rb --$* $< > $@
@@ -54,13 +50,13 @@ install: $(DIST)
 	@if [ ! -d $(DESTDIR)$(PREFIX)/bin ]; then \
 	  mkdir -p $(DESTDIR)$(PREFIX)/bin; \
 	fi
-	cp -Ppv docdiff.rb $(DESTDIR)$(PREFIX)/bin/docdiff
+	cp -Ppv bin/docdiff $(DESTDIR)$(PREFIX)/bin/
 	chmod +x $(DESTDIR)$(PREFIX)/bin/docdiff
 
-	@if [ ! -d $(datadir)$(PRODUCT) ]; then \
-	  mkdir -p $(datadir)$(PRODUCT); \
+	@if [ ! -d $(datadir)/$(PRODUCT) ]; then \
+	  mkdir -p $(datadir)/$(PRODUCT); \
 	fi
-	($(TAR_XVCS) -cf - docdiff) | (cd $(datadir)$(PRODUCT) && tar -xpf -)
+	(cd lib && $(TAR_XVCS) -cf - *) | (cd $(datadir)/$(PRODUCT) && tar -xpf -)
 
 	@if [ ! -d $(DESTDIR)/etc/$(PRODUCT) ]; then \
 	  mkdir -p $(DESTDIR)/etc/$(PRODUCT); \

data/Rakefile

@@ -1,17 +1,52 @@
+require 'rake/clean'
+require 'rake/testtask'
 require 'bundler/gem_tasks'
 
-require 'rake/testtask'
+RUBY    = ENV['RUBY'] ||= 'ruby'
+DOCS   = FileList['ChangeLog', 'readme.en.html', 'readme.ja.html',
+                  'index.en.html', 'index.ja.html']
+DOCSRC = FileList['readme.html', 'index.html', 'img', 'sample']
+TESTS  = FileList['test/*_test.rb']
+TESTLOGS = Dir.glob('test/*_test.rb').map{|f|
+  File.basename(f).ext('log')
+}
+
+WWWUSER     = ENV['WWWUSER']     ||= 'hisashim,docdiff'
+WWWSITE     = ENV['WWWSITE']     ||= 'web.sourceforge.net'
+WWWSITEPATH = ENV['WWWSITEPATH'] ||= 'htdocs/'
+WWWDRYRUN   = ENV['WWWDRYRUN']   ||= '--dry-run'
+
 Rake::TestTask.new do |t|
-  t.test_files = FileList["test/test*.rb"]
+  t.test_files = TESTS
   t.verbose = true
 end
 
-if RUBY_VERSION < '1.9'
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.test_files = FileList['test/test*.rb']
-    t.output_dir = 'coverage'
-    t.rcov_opts = ["--exclude /gems/*"]
-    t.verbose = true
-  end
+task :default => :test
+
+desc "generate documents"
+task :docs => DOCS
+
+file 'ChangeLog' do |t|
+  sh "devutil/changelog.sh > #{t.name}"
 end
+
+rule(/.*\.(?:en|ja)\.html/ => proc{|tn| tn.gsub(/\.(?:en|ja)/, '')}) do |t|
+  sh "#{RUBY} -E UTF-8 langfilter.rb" +
+    " --#{t.name.gsub(/.*?\.(en|ja)\.html/){$1}}" +
+    " #{t.prerequisites.first} > #{t.name}"
+end
+
+desc "force to rsync web contents"
+task :wwwupload do |t|
+  sh "rake www WWWDRYRUN="
+end
+
+desc "rsync web contents"
+task :www => DOCSRC + DOCS do |t|
+  sh "rsync #{WWWDRYRUN} -auv -e ssh --delete" +
+    " --exclude='.svn' --exclude='.git'" +
+    t.prerequisites.join(' ') +
+    " #{WWWUSER}@#{WWWSITE}:#{WWWSITEPATH}"
+end
+
+CLEAN.include(DOCS, TESTLOGS)

data/bin/docdiff

@@ -1,11 +1,8 @@
 #!/usr/bin/env ruby
 # DocDiff: word/character-oriented text comparison utility
 # Copyright (C) 2002-2011 Hisashi MORITA
-# Requirements: Ruby (>= 1.8)
+# Requirements: Ruby (>= 2.0)
 require 'docdiff'
-require 'docdiff/difference'
-require 'docdiff/document'
-require 'docdiff/view'
 require 'optparse'
 
 # do_config_stuff
@@ -40,7 +37,7 @@ ARGV.options {|o|
   o.def_option('--char', 'set resolution to char'){clo[:resolution] = "char"}
 
   o.def_option('--encoding=ENCODING',
-    possible_encodings = ['ASCII','EUC-JP','Shift_JIS','UTF-8','auto'],
+    possible_encodings = ['ASCII','EUC-JP','Shift_JIS','CP932','UTF-8','auto'],
     'specify character encoding',
     possible_encodings.join('|'), "(default is auto. try ASCII for single byte encodings such as ISO-8859-X)"
     ){|s| clo[:encoding] = (s || "auto")}
@@ -48,6 +45,7 @@ ARGV.options {|o|
   o.def_option('--iso8859x', 'same as --encoding=ASCII'){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',
@@ -86,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)}
@@ -119,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
@@ -129,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}
 
@@ -145,8 +157,8 @@ eol1 = docdiff.config[:eol]
 eol2 = docdiff.config[:eol]
 
 if docdiff.config[:encoding] == "auto"
-  encoding1 = CharString.guess_encoding(file1_content)
-  encoding2 = CharString.guess_encoding(file2_content)
+  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})."
@@ -156,8 +168,8 @@ if docdiff.config[:encoding] == "auto"
 end
 
 if docdiff.config[:eol] == "auto"
-  eol1 = CharString.guess_eol(file1_content)
-  eol2 = CharString.guess_eol(file2_content)
+  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."
@@ -168,8 +180,8 @@ if docdiff.config[:eol] == "auto"
   end
 end
 
-doc1 = Document.new(file1_content, encoding1, eol1)
-doc2 = Document.new(file2_content, encoding2, eol2)
+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],

data/devutil/Rakefile

@@ -0,0 +1,9 @@
+require 'rake/clean'
+
+file 'JIS0208.TXT' do |t|
+  sh 'curl -O ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT'
+end
+
+task :default => 'JIS0208.TXT'
+
+CLOBBER.include('JIS0208.TXT')

data/devutil/changelog.sh

@@ -0,0 +1,40 @@
+#!/bin/sh
+# ChangeLog Generator
+# Copyright 2011 Hisashi Morita
+# License: Public Domain
+#
+# Usage:
+#   changelog.sh [WORKING_DIR] > ChangeLog
+
+if [ "$1" ]; then
+  WD="$1"
+else
+  WD="."
+fi
+
+# Subversion
+which svn >/dev/null
+if [ x"$?" = x0 ]; then
+  (svn info "${WD}" >/dev/null 2>&1) && SVN=TRUE
+  if [ x"${SVN}" = xTRUE ]; then
+    (cd "${WD}"; svn log -rBASE:0 -v)
+  fi
+fi
+
+# Git
+which git >/dev/null
+if [ x"$?" = x0 ]; then
+  (cd "${WD}" && git status --porcelain >/dev/null 2>&1) && GIT=TRUE
+  if [ x"${GIT}" = xTRUE ]; then
+    (cd "${WD}"; git log | cat)
+  fi
+fi
+
+# Mercurial
+which hg >/dev/null
+if [ x"$?" = x0 ]; then
+  (hg status "${WD}" >/dev/null 2>&1) && HG=TRUE
+  if [ x"${HG}" = xTRUE ]; then
+    (cd "${WD}"; hg log --rev tip:0)
+  fi
+fi

data/docdiff.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
 require "docdiff/version"
 
 Gem::Specification.new do |s|
   s.name        = "docdiff"
   s.version     = Docdiff::VERSION
+  s.license     = "BSD-3-Clause"
   s.authors     = ["Hisashi Morita"]
-  s.email       = ["hisashim at users.sourceforge.net"]
-  s.homepage    = "http://docdiff.sourceforge.net"
+  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
                      difference. It can compare files word by word,
                      character by character, or line by line. It has
                      several output formats such as HTML, tty, Manued,
                      or user-defined markup.}
-  s.rubyforge_project = "docdiff"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/docdiffwebui.cgi

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # DocDiff Web UI (CGI)
 # 2005-10-08.. Hisashi Morita
-# requirement: Ruby 1.8+ (for timeout.rb)
+# requirement: Ruby 2.0+ (for timeout.rb)
 
 require 'cgi'
 require 'tempfile'

data/langfilter.rb

@@ -2,13 +2,9 @@
 # language filter
 # usage: langfilter.rb --en <infile >outfile
 
-def ruby_m17n?
-  return true if "".respond_to? :encoding
-end
-
 lang_to_include = ARGV.shift.gsub(/-+/, "")
 lang_to_exclude = {"en"=>"ja", "ja"=>"en"}[lang_to_include]
 re = /<([a-z]+) +(?:(?:lang|title)="#{lang_to_exclude}").*?>.*?<\/\1>[\r\n]?/m
 
-ARGF.set_encoding("UTF-8") if ruby_m17n?
+ARGF.set_encoding("UTF-8")
 ARGF.read.gsub(re, "").display

data/lib/doc_diff.rb

@@ -1,6 +1,10 @@
 # DocDiff: word/character-oriented text comparison utility
 # Copyright (C) 2002-2011 Hisashi MORITA
-# Requirements: Ruby (>= 1.8)
+# Requirements: Ruby (>= 2.0)
+require 'docdiff/difference'
+require 'docdiff/document'
+require 'docdiff/view'
+
 class DocDiff
 
   AppVersion = Docdiff::VERSION