olddoc 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4378b26df172806c7c5ea499ed5250d8e3f2e8147ff3827fcc23cdfc3ef63ff5
-  data.tar.gz: 3e35631b9f3624335d0d980573957f412ceb579c08d14e2c5d63a1efa841b38b
+  metadata.gz: 1400bf9d3e94d012404961bf1f665ba6006eb0edc8bdc5e55c178ef068893828
+  data.tar.gz: a3c8a0d8e9642af7c00f92592c5d61e52a430a321b5e26aac604fac1f9b05b40
 SHA512:
-  metadata.gz: 99dad6459056957449f10a32f353da293f28ba92045eb74fc117f0517e88ea687b819e6a014c68fff13d3dc56097dfb1bda5d1969652635fc5ecee0765776f2e
-  data.tar.gz: 127c6789a525ba7d8a171a71fe58b8f0ef7356cc47c05c455a103ff433b506e3125405d6918258a8db6c8d52f40d244e2929b97cf3cac08cbe1df6ab5b426a9e
+  metadata.gz: a48ad6a40397a4fa28eccd7c1346f7eb65d8625e73c2be73585226fe7c6acf858e6175043fe93021f05bf8a2ff3b57cd3a0c9e9db584cc046bb680b64f41ba88
+  data.tar.gz: 10f049dc25df53ef808a9b8afe74f80889f61f116938c0573dab427299c622608e7b7aed775ad9e530421cc465647effe39d41f4fb03658e9a2759cbaf9e32b4

data/.olddoc.yml

@@ -1,9 +1,18 @@
 ---
-cgit_url: https://80x24.org/olddoc.git
+cgit_url:
+- https://80x24.org/olddoc.git
+- https://ou63pmih66umazou.onion/olddoc.git
 git_url: https://80x24.org/olddoc.git
 rdoc_url: https://80x24.org/olddoc/
-ml_url: https://80x24.org/olddoc-public/
-nntp_url: nntp://news.public-inbox.org/inbox.comp.lang.ruby.olddoc
+ml_url:
+- https://80x24.org/olddoc-public/
+- http://ou63pmih66umazou.onion/olddoc-public/
+nntp_url:
+- nntps://news.public-inbox.org/inbox.comp.lang.ruby.olddoc
+- nntp://ou63pmih66umazou.onion/inbox.comp.lang.ruby.olddoc
+imap_url:
+- imaps://news.public-inbox.org/inbox.comp.lang.ruby.olddoc.0
+- imap://ou63pmih66umazou.onion/inbox.comp.lang.ruby.olddoc.0
 merge_html:
   olddoc_1: Documentation/olddoc.1.html
   olddoc_5: Documentation/olddoc.5.html

data/Documentation/olddoc.5.pod

@@ -13,7 +13,7 @@ configuration to deal with.
 
 =head1 KEYS
 
-`rdoc_url`, `cgit_url`, and `nntp_url` should be obvious
+`rdoc_url`, `cgit_url`, `imap_url`, and `nntp_url` should be obvious
 
 `merge_html` is a key-value mapping of (empty) RDoc source files to an
 HTML file that will be merged into RDoc after-the-fact.  It is useful

data/GIT-VERSION-GEN

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

data/lib/olddoc/history.rb

@@ -9,7 +9,7 @@ module Olddoc::History # :nodoc:
 
   # returns a cgit URI for a given +tag_name+
   def tag_uri(tag_name)
-    uri = @cgit_uri.dup
+    uri = @cgit_uri[0].dup
     uri.path += "/tag/"
     uri.query = "id=#{tag_name}"
     uri

data/lib/olddoc/man2html.rb

@@ -9,7 +9,7 @@ require 'optparse'
 
 class Olddoc::Man2HTML # :nodoc:
   SALT = rand
-  LINK_RE = %r{([\('!])?\b((?:ftps?|https?|nntps?|gopher)://
+  LINK_RE = %r{([\('!])?\b((?:ftps?|https?|nntps?|gopher|imaps?)://
      [\@:\w\.-]+(?:/
      (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*)
      (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?

data/lib/olddoc/news_atom.rb

@@ -32,9 +32,9 @@ module Olddoc::NewsAtom # :nodoc:
   def news_atom_xml
     project_name, short_desc, _ = readme_metadata
     new_tags = tags[0,10]
-    atom_uri = @rdoc_uri.dup
+    atom_uri = @rdoc_uri[0].dup
     atom_uri.path += "NEWS.atom.xml"
-    news_uri = @rdoc_uri.dup
+    news_uri = @rdoc_uri[0].dup
     news_uri.path += "NEWS.html"
 
     dst = ''

data/lib/olddoc/prepare.rb

@@ -12,8 +12,8 @@ class Olddoc::Prepare # :nodoc:
     cgit_url = opts['cgit_url']
     rdoc_url && cgit_url or
       abort "rdoc_url and cgit_url required in .olddoc.yml for `prepare'"
-    @rdoc_uri = URI.parse(rdoc_url)
-    @cgit_uri = URI.parse(cgit_url)
+    @rdoc_uri = Array(rdoc_url).map { |u| URI.parse(u) }
+    @cgit_uri = Array(cgit_url).map { |u| URI.parse(u) }
     @name, @short_desc = readme_metadata
   end
 

data/lib/oldweb.rb

@@ -73,23 +73,23 @@ class Oldweb
     noindex = @old_cfg['noindex'] and noindex.each { |k| ni[k] = true }
     @old_cfg['noindex'] = ni
 
-    cgit_url = @old_cfg['cgit_url']
+    cgit_url = Array(@old_cfg['cgit_url'])
     source = @old_cfg['source_code'] ||= []
     if source.empty?
-      if cgit_url
-        source << "git clone #{cgit_url}"
-      end
+      source << "git clone #{cgit_url[0]}" if cgit_url[0]
       git_url = @old_cfg['git_url']
-      if git_url && git_url != cgit_url
+      if git_url && git_url != cgit_url[0]
         source << "git clone #{git_url}"
       end
     end
 
-    if cgit_url
-      cgit_url += '/tree/%s' # path name
-      tag = @git_tag and cgit_url << "id=#{CGI.escape(tag)}"
-      cgit_url << '#n%d' # lineno
-      @old_vcs_url = cgit_url
+    if cgit_url[0]
+      cgit_url.each do |u|
+        u += '/tree/%s' # path name
+        tag = @git_tag and u << "id=#{CGI.escape(tag)}"
+        u << '#n%d' # lineno
+      end
+      @old_vcs_url = cgit_url[0]
     end
     @oldweb_style = nil # used by dark216
   end

data/lib/oldweb/_tail.rhtml

@@ -2,7 +2,7 @@
 public_email = @old_cfg['public_email']
 private_email = @old_cfg['private_email']
 source_code = Array(@old_cfg['source_code']).dup
-archive_urls = Array(@old_cfg['ml_url']) + Array(@old_cfg['nntp_url'])
+archive_urls = Array(@old_cfg.values_at(*%W(ml_url nntp_url imap_url))).flatten
 if url = archive_urls.shift %><hr /><pre>
 mail archives: <a
 href="<%= url %>"><%= url %></a><%

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olddoc
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - olddoc hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc