ronn-ng 0.10.1.pre4 → 0.10.1.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24e763c319198b0faa02cb53f80eb6b296eba031e622257bdff747e4f5f80b96
-  data.tar.gz: 9ea2a36ecda90be6b1405c66aff2c683999bc9bc2f91d711e8b31f7f8975fd3b
+  metadata.gz: 9505d966f681ed78efa33c1fcef840066c560b9ba763e05bff0c3ff567e6fce7
+  data.tar.gz: dd026bd76f479eab06f15dec890aa9e659d9bd7cc43e333ca4c48424a56317ca
 SHA512:
-  metadata.gz: bca753a51a57dc4a627a60640bf1e3ab3ba319f63968725b426b25feccf783cafc8747901f23622be530592786979569b81695cc9202a2c0cc722d14f4df85c8
-  data.tar.gz: a64bff17c7bbdc669828a713430af19bfc49f29fe25d7088b48f5aa86b6f66a9a3a65722b8a7bf8438cf92fb51effd473045a5b286f94b453e70307826b8ed1b
+  metadata.gz: fce7a366f7e13dcf9e0baae53c75813f26c61950bf68bc353392baf82eba5797707a3ef3353ba070e31fdd8cb47c001f3d4eb0b3005b3b9e91e6587497b92ed6
+  data.tar.gz: 604b73cf59fb339641289056d9358b57c7db79f1a1eb56ad4fa9a6b65ebadd24ddc976769ded142a07c7a2fc5217450a1a4cb4abebc6d3dce9113dc1c825ea99

data/CHANGELOG.md

@@ -13,6 +13,7 @@ Note: 0.10.1 is the first 0.10.x release, because Ronn-NG 0.10.0 does not exist.
 * doc: Reformat Changelog to match common gem and keep-a-changelog conventions
   * NOTE: Renamed `CHANGES` to `CHANGELOG.md`. Packagers will need to update specs.
 * Bump Ruby to 2.7, gem deps to latest minor versions
+* Tweak `ronn --version` output: remove GitHub URL and format it "ronn <ver> (Ronn-NG)"
 
 ### Bug Fixes
 

data/Rakefile

@@ -7,13 +7,14 @@ ROOTDIR = File.expand_path(__dir__).sub(/#{Dir.pwd}(?=\/)/, '.')
 LIBDIR = "#{ROOTDIR}/lib".freeze
 BINDIR = "#{ROOTDIR}/bin".freeze
 
+desc 'Set up environment'
 task :environment do
   $LOAD_PATH.unshift ROOTDIR unless $LOAD_PATH.include?(ROOTDIR)
   $LOAD_PATH.unshift LIBDIR unless $LOAD_PATH.include?(LIBDIR)
   require_library 'nokogiri'
   require_library 'kramdown'
   ENV['RUBYLIB'] = $LOAD_PATH.join(':')
-  ENV['PATH'] = "#{BINDIR}:#{ENV['PATH']}"
+  ENV['PATH'] = "#{BINDIR}:#{ENV.fetch('PATH', nil)}"
 end
 
 desc 'Run tests'
@@ -66,11 +67,12 @@ end
 # PACKAGING ============================================================
 
 # Rev Ronn::VERSION
+desc 'Bump package version'
 task :rev do
   rev = ENV['REV'] || `git describe --tags`.chomp
   data = File.read('lib/ronn.rb')
   data.gsub!(/^( *)REV *=.*/, "\\1REV = '#{rev.sub(/\Av/, '')}'.freeze")
-  File.open('lib/ronn.rb', 'wb') { |fd| fd.write(data) }
+  File.binwrite('lib/ronn.rb', data)
   puts "revision: #{rev}"
   puts "version:  #{`ruby -Ilib -rronn -e 'puts Ronn::VERSION'`}"
 end
@@ -120,14 +122,16 @@ file 'ronn-ng.gemspec' => FileList['{lib,test,bin}/**', 'Rakefile'] do |f|
   files = `git ls-files`
           .split("\n")
           .sort
-          .reject { |file| file =~ /^\./ }
-          .reject { |file| file =~ /^doc/ }
+          .grep_v(/^\./)
+          # .reject { |file| file =~ /^\./ }
+          .grep_v(/^doc/)
+          # .reject { |file| file =~ /^doc/ }
           .map { |file| "    #{file}" }
           .join("\n")
   # piece file back together and write...
   manifest = "  s.files = %w[\n#{files}\n  ]\n"
   spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(f.name, 'w') { |io| io.write(spec) }
+  File.write(f.name, spec)
   puts "updated #{f.name}"
 end
 
@@ -145,6 +149,7 @@ rescue LoadError => e
 end
 
 # make .wrong test files right
+desc 'Mark *.wrong test files as right'
 task :right do
   Dir['test/*.wrong'].each do |file|
     dest = file.sub(/\.wrong$/, '')

data/bin/ronn

@@ -47,7 +47,7 @@ Encoding.default_external = Encoding::UTF_8
 def usage
   puts File.readlines(__FILE__)
            .grep(/^# \/.*/)
-           .map { |line| line.chomp[4..-1] }
+           .map { |line| line.chomp[4..] }
            .join("\n")
 end
 
@@ -94,7 +94,7 @@ output_dir = nil
 # Environment variables
 
 %w[manual organization date].each do |attribute|
-  value = ENV["RONN_#{attribute.upcase}"]
+  value = ENV.fetch("RONN_#{attribute.upcase}", nil)
   next if value.nil? || value.empty?
 
   options[attribute] = value
@@ -135,11 +135,10 @@ ARGV.options do |argv|
   argv.on('-v', '--version')  do
     require 'ronn'
     if Ronn.release?
-      printf "Ronn-NG v%s\n", Ronn::VERSION
+      printf "ronn v%s (Ronn-NG)\n", Ronn::VERSION
     else
-      printf "Ronn-NG v%s (%s)\n", Ronn::VERSION, Ronn::REV
+      printf "ronn v%s (rev %s) (Ronn-NG)\n", Ronn::VERSION, Ronn::REV
     end
-    printf "http://github.com/apjanke/ronn-ng/tree/%s\n", Ronn.revision
     exit 0
   end
   argv.on_tail('--help') { usage; exit 0 }

data/lib/ronn/document.rb

@@ -258,7 +258,7 @@ module Ronn
     # Convert the document to HTML and return the result as a string.
     # The returned string is a complete HTML document.
     def to_html
-      layout = ENV['RONN_LAYOUT']
+      layout = ENV.fetch('RONN_LAYOUT', nil)
       layout_path = nil
       if layout
         layout_path = File.expand_path(layout)
@@ -438,7 +438,7 @@ module Ronn
           "<h1>#{title}</h1>"
         elsif name
           "<h2>NAME</h2>\n" \
-            "<p class='man-name'>\n  <code>#{name}</code>" +
+          "<p class='man-name'>\n  <code>#{name}</code>" +
             (tagline ? " - <span class='man-whatis'>#{tagline}</span>\n" : "\n") +
             "</p>\n"
         end

data/lib/ronn/roff.rb

@@ -142,7 +142,7 @@ module Ronn
           # HACK: strip an initial \n to avoid extra spacing
           if node.children && node.children[0].text?
             text = node.children[0].to_s
-            node.children[0].replace(text[1..-1]) if text.start_with? "\n"
+            node.children[0].replace(text[1..]) if text.start_with? "\n"
           end
           inline_filter(node.children)
           macro 'fi'
@@ -356,15 +356,15 @@ module Ronn
     end
 
     def quote(text)
-      "\"#{text.gsub(/"/, '\\"')}\""
+      "\"#{text.gsub('"', '\\"')}\""
     end
 
     # write text to output buffer
     def write(text)
       return if text.nil? || text.empty?
       # lines cannot start with a '.' or "'". insert zero-width character before.
-      text = text.gsub(/\n\\\./, "\n\\\\&\\.")
-      text = text.gsub(/\n'/, "\n\\&\\'")
+      text = text.gsub("\n\\.", "\n\\\\&\\.")
+      text = text.gsub("\n'", "\n\\&\\'")
       buf_ends_in_newline = @buf.last && @buf.last[-1] == "\n"
       @buf << '\&' if text[0, 2] == '\.' && buf_ends_in_newline
       @buf << '\&' if text[0, 1] == "'" && buf_ends_in_newline

data/lib/ronn/template.rb

@@ -13,7 +13,7 @@ module Ronn
     end
 
     def render(template = 'default')
-      super template[0, 1] == '/' ? File.read(template) : partial(template)
+      super(template[0, 1] == '/' ? File.read(template) : partial(template))
     end
 
     ##

data/lib/ronn.rb

@@ -40,6 +40,6 @@ module Ronn
   end
 
   # value generated by: rake rev
-  REV = '0.10.1.pre4'.freeze
+  REV = '0.10.1.pre6'.freeze
   VERSION = version
 end

data/man/ronn-format.7

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
-.\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre4
-.TH "RONN\-FORMAT" "7" "January 2024" "Ronn-NG 0.10.1.pre4" "Ronn Manual"
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre6
+.TH "RONN\-FORMAT" "7" "January 2024" "Ronn-NG 0.10.1.pre6" "Ronn Manual"
 .SH "NAME"
 \fBronn\-format\fR \- manual authoring format based on Markdown
 .SH "SYNOPSIS"

data/man/ronn.1

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.10.1
-.\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre4
-.TH "RONN" "1" "December 2023" "Ronn-NG 0.10.1.pre4" "Ronn Manual"
+.\" http://github.com/apjanke/ronn-ng/tree/0.10.1.pre6
+.TH "RONN" "1" "January 2024" "Ronn-NG 0.10.1.pre6" "Ronn Manual"
 .SH "NAME"
 \fBronn\fR \- convert markdown files to manpages
 .SH "SYNOPSIS"

data/ronn-ng.gemspec

@@ -1,10 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'ronn-ng'
-  s.version = '0.10.1.pre4'
-  # As of 2023-09, ronn-ng targets and is tested on Ruby 2.7 for deployment. It'll mostly
-  # work on lower versions, but in effect requires >= 2.7 because it needs nokogiri
-  # >= 1.14.3 for correct tag name handling, and that nokogiri requires Ruby 2.7.
-  s.required_ruby_version = '>= 2.4'
+  s.version = '0.10.1.pre6'
+  # We target Ruby 2.7+ for test & deploy, plus nokogiri 1.14.3+ need Ruby 2.7
+  s.required_ruby_version = '>= 2.7'
 
   s.summary     = 'Builds man pages from Markdown'
   s.description = 'Ronn-NG builds manuals in Unix man page and HTML format from Markdown. Ronn-NG is a modern, maintained fork of the original Ronn.'
@@ -15,9 +13,10 @@ Gem::Specification.new do |s|
   s.email       = 'floss@apjanke.net'
 
   s.metadata = {
-    'bug_tracker_uri'   => 'https://github.com/apjanke/ronn-ng/issues',
-    'source_code_uri'   => 'https://github.com/apjanke/ronn-ng',
-    'changelog_uri'     => 'https://github.com/apjanke/ronn-ng/blob/main/CHANGELOG.md'
+    'bug_tracker_uri'       => 'https://github.com/apjanke/ronn-ng/issues',
+    'source_code_uri'       => 'https://github.com/apjanke/ronn-ng',
+    'changelog_uri'         => 'https://github.com/apjanke/ronn-ng/blob/main/CHANGELOG.md',
+    'rubygems_mfa_required' => 'true'
   }
 
   # = MANIFEST =
@@ -58,22 +57,22 @@ Gem::Specification.new do |s|
   # = MANIFEST =
 
   s.executables = ['ronn']
-  s.test_files = s.files.select { |path| path =~ /^test\/.*_test.rb/ }
 
   s.extra_rdoc_files = %w[LICENSE.txt AUTHORS]
-  s.add_dependency 'kramdown',              '>= 2.1'
-  s.add_dependency 'kramdown-parser-gfm',   '>= 1.0.1'
-  s.add_dependency 'mustache',              '>= 0.7.0'
+  s.add_dependency 'kramdown',                 ['~> 2', '>= 2.1']
+  s.add_dependency 'kramdown-parser-gfm',      ['~> 1', '>= 1.0.1']
+  s.add_dependency 'mustache',                 ['~> 1']
   # nokogiri <= 1.14.2 mishandle tag names with ":" in them (see #102)
-  s.add_dependency 'nokogiri',              '>= 1.14.3'
-  # rack < 2.2.3.0 have security vulns
-  s.add_development_dependency 'rack',      '>= 2.2.3'
-  s.add_development_dependency 'rake',      '>= 13.0.3'
+  s.add_dependency 'nokogiri',                 ['~> 1', '>= 1.14.3']
+  # rack < 2.2.3 have security vulns
+  s.add_development_dependency 'rack',         ['~> 2', '>= 2.2.3']
+  s.add_development_dependency 'rake',         ['~> 13', '>= 13.0.3']
   # just a guess based on what I used to use
-  s.add_development_dependency 'rubocop',   '>= 1.25.1'
+  s.add_development_dependency 'rubocop',      ['~> 1', '>= 1.25.1']
+  s.add_development_dependency 'rubocop-rake', ['~> 0']
   # sinatra < 2.2.3 have security vulns
-  s.add_development_dependency 'sinatra',   '>= 2.2.3'
-  s.add_development_dependency 'test-unit', '>= 3.2.7'
+  s.add_development_dependency 'sinatra',      ['~> 2', '>= 2.2.3']
+  s.add_development_dependency 'test-unit',    ['~> 3', '>= 3.2.7']
 
   s.rdoc_options = ['--line-numbers', '--inline-source', '--title', 'Ronn']
   s.require_paths = %w[lib]

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: ronn-ng
 version: !ruby/object:Gem::Version
-  version: 0.10.1.pre4
+  version: 0.10.1.pre6
 platform: ruby
 authors:
 - Andrew Janke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-04 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
@@ -28,6 +34,9 @@ dependencies:
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
@@ -42,20 +54,23 @@ dependencies:
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.3
@@ -63,6 +78,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.14.3
@@ -70,6 +88,9 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
@@ -77,6 +98,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
@@ -84,6 +108,9 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.3
@@ -91,6 +118,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 13.0.3
@@ -98,6 +128,9 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.1
@@ -105,13 +138,33 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
@@ -119,6 +172,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.3
@@ -126,6 +182,9 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.7
@@ -133,6 +192,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.7
@@ -185,6 +247,7 @@ metadata:
   bug_tracker_uri: https://github.com/apjanke/ronn-ng/issues
   source_code_uri: https://github.com/apjanke/ronn-ng
   changelog_uri: https://github.com/apjanke/ronn-ng/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--line-numbers"
@@ -197,14 +260,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Builds man pages from Markdown