olddoc 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a44d529fe75a289b3e6113bf1f1fe050378b781aba22b2a826ac3c0135787167
-  data.tar.gz: eeab92ed0e26b4bed344f0cd53b969d3750931bb8b1f5b8c3ddef4afdbabdbf8
+  metadata.gz: 4378b26df172806c7c5ea499ed5250d8e3f2e8147ff3827fcc23cdfc3ef63ff5
+  data.tar.gz: 3e35631b9f3624335d0d980573957f412ceb579c08d14e2c5d63a1efa841b38b
 SHA512:
-  metadata.gz: 4dc0a7947a22a8f936431f16c847fb7b2e3028213c899c1cade312bd5e6de605bc91c6edc35356ea3b188013832cf75d6df9d76a79be364adf678c0e0098018a
-  data.tar.gz: af930fa4642bf710abe506978cc2a2da1ec3c5c9287e382a5ef039bd81cdbb36359074f35a0952c5b033408e7e1972c679551f0900cb1121f52cf82ccdc12b0a
+  metadata.gz: 99dad6459056957449f10a32f353da293f28ba92045eb74fc117f0517e88ea687b819e6a014c68fff13d3dc56097dfb1bda5d1969652635fc5ecee0765776f2e
+  data.tar.gz: 127c6789a525ba7d8a171a71fe58b8f0ef7356cc47c05c455a103ff433b506e3125405d6918258a8db6c8d52f40d244e2929b97cf3cac08cbe1df6ab5b426a9e

data/GIT-VERSION-GEN

@@ -5,7 +5,7 @@
 CONSTANT = "Olddoc::VERSION"
 RVF = "lib/olddoc/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.7.1"
+DEF_VER = "v1.8.0"
 vn = DEF_VER.dup
 
 # First see if there is a version file (included in release tarballs),

data/bin/olddoc

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2015, all contributors <olddoc-public@80x24.org>
+# Copyright (C) 2015,2019 all contributors <olddoc-public@80x24.org>
 $stderr.sync = $stdout.sync = true
 tasks = %w(prepare merge)
 usage = "Usage: #{File.basename($0)} [#{tasks.join('|')}]"
@@ -10,6 +10,8 @@ when "prepare"
   Olddoc::Prepare.new(opts).run
 when "merge"
   Olddoc::Merge.new(opts).run
+when "man2html"
+  Olddoc::Man2HTML.new(opts).run(ARGV[1..-1])
 else
   warn "#{$0.inspect} #{ARGV.inspect} not understood"
   abort usage

data/lib/olddoc.rb

@@ -8,6 +8,7 @@ module Olddoc # :nodoc:
   autoload :NewsRdoc, 'olddoc/news_rdoc'
   autoload :Prepare, 'olddoc/prepare'
   autoload :Readme, 'olddoc/readme'
+  autoload :Man2HTML, 'olddoc/man2html'
 
   def self.config(path = ".olddoc.yml")
     File.readable?(path) and return YAML.load(File.read(path))

data/lib/olddoc/man2html.rb

@@ -0,0 +1,149 @@
+# Copyright (C) 2019 all contributors <olddoc-public@80x24.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
+# frozen_string_literal: true
+require 'digest'
+require 'optparse'
+
+# linkifier for manpages rendered to a terminal.  man2html(1) and
+# groff generate too much style
+
+class Olddoc::Man2HTML # :nodoc:
+  SALT = rand
+  LINK_RE = %r{([\('!])?\b((?:ftps?|https?|nntps?|gopher)://
+     [\@:\w\.-]+(?:/
+     (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*)
+     (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?
+     (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
+     )?
+    )}xi
+
+  PAIRS = {
+  "(" => %r/(\)[\.,;\+]?)\z/, # Markdown (,), Ruby (+) (, for arrays)
+  "'" => %r/('[\.,;\+]?)\z/, # Perl / Ruby
+  "!" => %r/(![\.,;\+]?)\z/, # Perl / Ruby
+  }
+
+  def initialize(opts) # :nodoc:
+  end
+
+  def run(argv) # :nodoc:
+    out = $stdout
+    OptionParser.new("", 24, '  ') do |opts|
+      opts.on('-o', '--output PATH', 'output to given file') { |path|
+        out = File.open(path, 'w')
+      }
+      opts.parse!(argv)
+    end
+    argv[0] or abort 'manpage required'
+    cols = '72'
+    env = ENV.to_hash
+    env.merge!({ 'COLUMNS' => cols, 'MANWIDTH' => cols, 'TERM' => 'dumb' })
+
+    # note: I don't care for the styles groff and man2html throw
+    # on us, I just want indented and wrapped text with <a hrefs>
+    # for URLs.
+
+    # try man-db options, first:
+    str = IO.popen(env, ['man', '--nh', '--nj', *argv], &:read)
+
+    if str.empty? || !$?.success?
+      str = IO.popen(env, ['man', *argv], &:read)
+    end
+    if $?.success?
+      sections = '[A-Z][A-Z ]+'
+      str = str.split(/^(#{sections})$/mo)
+
+      str = str.map! do |s|
+        case s
+        when /\A(#{sections})$/o
+          # this is to be compatible with HTML fragments pandoc used
+          sec = $1
+          anchor = sec.downcase.tr(' ', '-')
+          "<h1\nid=#{anchor.encode(xml: :attr)}>#{sec}</h1>"
+        else
+          state = linkify_1(s)
+          s.encode!(xml: :text)
+          linkify_2(state, s)
+          s.rstrip!
+          s.empty? ? '' : "<pre>#{s}</pre>"
+        end
+      end.join
+
+      out.print(str)
+
+      # use mtime of the original source
+      if out.respond_to?(:path)
+        path = out.path
+        out.close
+        stat = src_input_stat(argv)
+        File.utime(stat.atime, stat.mtime, path) if stat
+      end
+    end
+  end
+
+  def src_input_stat(argv)
+    argv.reverse_each do |f|
+      next unless File.file?(f)
+      return File.stat(f)
+    end
+
+    argv.reverse_each do |f|
+      path = IO.popen(%W(man -w #{f}), &:read)
+      path.chomp!
+      next unless File.file?(path)
+      return File.stat(path)
+    end
+    nil
+  end
+
+  def linkify_1(str) # :nodoc:
+    state = {}
+    str.gsub!(LINK_RE) do
+      head = $1 || ''
+      url = $2.dup
+      tail = ''.dup
+
+      # it's fairly common to end URLs in messages with
+      # '.', ',' or ';' to denote the end of a statement;
+      # assume the intent was to end the statement/sentence
+      # in English
+      if re = PAIRS[head]
+        url.sub!(re, '')
+        tail = $1
+      elsif url.sub!(/(\))?([\.,;])\z/, '')
+        tail = $2
+        # require ')' to be paired with '('
+        if $1  # ')'
+          if url.index('(').nil?
+            tail = ")#{tail}"
+          else
+            url += ')'
+          end
+        end
+      elsif url !~ /\(/ && url.sub!(/\)\z/, '')
+        tail = ')'
+      end
+
+      # salt this, as this could be exploited to show
+      # links in the HTML which don't show up in the raw mail.
+      key = Digest::MD5.hexdigest("#{url}#{SALT}").freeze
+      state[key] = url
+      "#{head}OLD-LINK-#{key}#{tail}"
+    end
+    state
+  end
+
+  def linkify_2(state, str) # :nodoc:
+    # Added "OLD-LINK-" prefix to avoid false-positives on git commits
+    str.gsub!(/\bOLD-LINK-([a-f0-9]{32})\b/) do
+      key = $1
+      url = state[key]
+      if url
+        %Q{<a\nhref=#{url.encode(xml: :attr)}>#{url.encode(xml: :text)}</a>}
+      else
+        # false positive or somebody tried to mess with us
+        key
+      end
+    end
+  end
+end

data/lib/oldweb.rb

@@ -5,7 +5,7 @@ require 'rdoc'
 require 'erb'
 require 'pathname'
 require 'yaml'
-require 'uri'
+require 'cgi'
 
 # oldweb is an \RDoc template and not intended as a programming API.
 # You may specify it as an \RDoc formatter:
@@ -87,7 +87,7 @@ class Oldweb
 
     if cgit_url
       cgit_url += '/tree/%s' # path name
-      tag = @git_tag and cgit_url << "id=#{URI.escape(tag)}"
+      tag = @git_tag and cgit_url << "id=#{CGI.escape(tag)}"
       cgit_url << '#n%d' # lineno
       @old_vcs_url = cgit_url
     end
@@ -297,7 +297,7 @@ class Oldweb
   def method_srclink(m) # :nodoc:
     url = @old_vcs_url or return ""
     line = m.line or return ""
-    path = URI.escape(m.file_name)
+    path = CGI.escape(m.file_name)
     %Q(<a href="#{url % [ path, line ]}">source</a>)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olddoc
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - olddoc hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-11 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -60,6 +60,7 @@ files:
 - lib/olddoc.rb
 - lib/olddoc/gemspec.rb
 - lib/olddoc/history.rb
+- lib/olddoc/man2html.rb
 - lib/olddoc/merge.rb
 - lib/olddoc/news_atom.rb
 - lib/olddoc/news_rdoc.rb