olddoc 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ed269def320cfe052cabbe1ccaf952cb67ea35f218f71c697e64602e53160a
-  data.tar.gz: a08e13570e7b1c29314d9d9d1a84dfef34eaa3b142d770037acc92a6261e2176
+  metadata.gz: b153359b84321c4656018665d07338bbac666d12f905c45db9be3fc9c4944fd4
+  data.tar.gz: 47a8e3dabb100a59c5f3a3b28e646906ad0fb67467f66a8b71d8d09ed3463d70
 SHA512:
-  metadata.gz: 1b8668a99554c443cedf069975c1bcdec7e8ebdc56d5527f799400b93c7e27008d11c007e281fe1d5f638aff19fffbdd0b475130fa3d1b2d28a2b3153cc27b4f
-  data.tar.gz: 23a4fa35c6a4b1f099917db814312a15af705c9f24fe5211a152ba7b72da6a66ed4111fedc1ed69735d4b564f1f62b5a700c6d9af78cb4ed9e0deaf879a3154c
+  metadata.gz: d38527a6d8c1c8919b7c38e91a4aeaab3872d130d464df377a96e6ef0ed159c21c12b5e0cc9621ca2b0e578c7f7ba16df51826e8671988861338d9810f560f6e
+  data.tar.gz: a308d13fb8bea2bd1849b357fa776ec834ea2932a0eaddfc1d4ceb8d7f6cc2b27ff022b6ef4f88b76acd4858b75774e969a3f4d7c4b36b7aac358fe9c8892789

data/.olddoc.yml

@@ -1,6 +1,6 @@
 ---
 cgit_url: https://80x24.org/olddoc.git
-git_url: git://80x24.org/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
@@ -8,4 +8,4 @@ merge_html:
   olddoc_1: Documentation/olddoc.1.html
   olddoc_5: Documentation/olddoc.5.html
 public_email: olddoc-public@80x24.org
-source_code: git clone git://80x24.org/olddoc
+source_code: git clone https://80x24.org/olddoc.git

data/GIT-VERSION-GEN

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# Copyright (C) 2016 all contributors <olddoc-public@80x24.org>
+# Copyright (C) 2016-2019 all contributors <olddoc-public@80x24.org>
 # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # frozen_string_literal: true
 CONSTANT = "Olddoc::VERSION"
 RVF = "lib/olddoc/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.5.1"
+DEF_VER = "v1.6.0"
 vn = DEF_VER.dup
 
 # First see if there is a version file (included in release tarballs),

data/README

@@ -52,7 +52,7 @@ such as pandoc(1).  This requries an appropriately configured
 
 == Source code
 
-	git clone git://80x24.org/olddoc
+	git clone https://80x24.org/olddoc.git
 
 Please use git-format-patch(1) and git-send-email(1) distributed with
 the git(7) suite for generating and sending patches.  Please format

data/lib/oldweb.rb

@@ -73,7 +73,19 @@ class Oldweb
     noindex = @old_cfg['noindex'] and noindex.each { |k| ni[k] = true }
     @old_cfg['noindex'] = ni
 
-    if cgit_url = @old_cfg['cgit_url']
+    cgit_url = @old_cfg['cgit_url']
+    source = @old_cfg['source_code'] ||= []
+    if source.empty?
+      if cgit_url
+        source << "git clone #{cgit_url}"
+      end
+      git_url = @old_cfg['git_url']
+      if git_url && git_url != cgit_url
+        source << "git clone #{git_url}"
+      end
+    end
+
+    if cgit_url
       cgit_url += '/tree/%s' # path name
       tag = @git_tag and cgit_url << "id=#{URI.escape(tag)}"
       cgit_url << '#n%d' # lineno
@@ -269,7 +281,11 @@ class Oldweb
       erbout = "_erbout_#{file_var}"
     end
 
-    template = klass.new(template, nil, '<>', erbout)
+    if ERB.instance_method(:initialize).parameters.assoc(:key)
+      template = klass.new(template, trim_mode: '<>', eoutvar: erbout)
+    else
+      template = klass.new(template, nil, '<>', erbout)
+    end
     @template_cache[file] = template
   end
 

data/lib/oldweb/_tail.rhtml

@@ -22,8 +22,11 @@ href="mailto:<%= private_email %>"><%= private_email %></a><%
   end
 
 if url_or_cmd = source_code.shift
+  url_or_cmd = url_or_cmd.sub(%r{\b(https?://\S+)}, "<a\nhref='\\1'>\\1</a>")
 %>
 source code: <%= url_or_cmd %>
-<% source_code.each do |x| %><%= "\t#{x}" %><% end
+<% source_code.each do |x| %><%=
+  %Q{\t#{x.sub(%r{\b(https?://\S+)}, %Q{<a\nhref='\\1'>\\1</a>})}}
+%><% end
 end
 %></pre><% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olddoc
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - olddoc hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -104,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: old-fashioned Ruby documentation generator