gitlab-markup 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c52ae95d2514cc219cc5919e4583fc00b6c8dbc6027f0e380cae3f558015476
-  data.tar.gz: 000ba88ab9db05ab50553bf7f7402852fb211f3a6348eae8adc08e79a8aa4e5c
+  metadata.gz: 88d9c1213bd85e97379757f6c6175797dbdbd08e4556af4bdce30ee1a0ba3b12
+  data.tar.gz: 0e7c30ed327a2b67b1acfae30825fa296258fcd667685d802e825b626e513692
 SHA512:
-  metadata.gz: f6a065ecd8fa42bb85e7cc2fdef4f267f016b3653acba151fc13a6b17962d556360c966f68764ebebece92ed6ba8b65d52a7c9d91506c381ef75e475f37b69f2
-  data.tar.gz: a59b2b12227465cd94eb3d7996536b75d9e48c02a68563ae3eb7d826981ae068bc8cc954d976d054b0a29c4c0e1fd1060965df70d6b893abe706012e88e287cb
+  metadata.gz: bcf5fd0070cb797b347af706122617cebbb2509170dcdbc3aaf9c443f1a4c167044a87778e53fea10a7048d6624af7acc530f1ca37e88e93e4b6e0913c37b486
+  data.tar.gz: 48003af3cedd6635b86513751c02c9566d2c530c1d96a1583e6cab7c45e1321b40dd779c01bcf7c399430a4e473567456b7d018c4c030451f68315918eccc946

data/.gitlab-ci.yml

@@ -26,9 +26,11 @@ workflow:
       - vendor/ruby
   before_script:
     - apt update
-    - apt install python3 python3-pip git build-essential -y
+    - apt install python3 python3-pip python3-venv git build-essential -y
     - apt remove python -y
-    - pip3 install "docutils==$DOCUTILS_VERSION"
+    - python3 -m venv /tmp/venv
+    - source /tmp/venv/bin/activate
+    - pip3 install docutils==$DOCUTILS_VERSION
     - bundle install --jobs $(nproc)
   script:
     - echo "Testing without posix-spawn..."
@@ -41,37 +43,13 @@ workflow:
     - bundle install
     - bundle exec rake test
 
-.docutils-016:
-  variables:
-    DOCUTILS_VERSION: "0.16"
-
-.docutils-019:
-    variables:
-      DOCUTILS_VERSION: "0.19"
-
-ruby-27-du16:
-  image: ruby:2.7
-  extends:
-    - .docutils-016
-    - .specs
-
-ruby-30-du16:
-  image: ruby:3.0
-  extends:
-    - .docutils-016
-    - .specs
-
-ruby-27-du19:
-  image: ruby:2.7
-  extends:
-    - .docutils-019
-    - .specs
-
-ruby-30-du19:
-  image: ruby:3.0
-  extends:
-    - .docutils-019
-    - .specs
+ruby-docutils-spec:
+  image: ruby:$RUBY_VERSION
+  extends: .specs
+  parallel:
+    matrix:
+      - RUBY_VERSION: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        DOCUTILS_VERSION: ['0.21.2']
 
 # Dependency Scanning
 gemnasium-dependency_scanning:

data/CODEOWNERS

@@ -0,0 +1,2 @@
+[Maintainers]
+* @brodock @digitalmoksha @cwoolley-gitlab @smcgivern @rymai @marin @stanhu

data/CONTRIBUTING.md

@@ -8,10 +8,10 @@ This library's only job is to decide which markup format to use and call out to
 
 ## Developer Certificate of Origin + License
 
-By contributing to GitLab B.V., You accept and agree to the following terms and
-conditions for Your present and future Contributions submitted to GitLab B.V.
-Except for the license granted herein to GitLab B.V. and recipients of software
-distributed by GitLab B.V., You reserve all right, title, and interest in and to
+By contributing to GitLab Inc., You accept and agree to the following terms and
+conditions for Your present and future Contributions submitted to GitLab Inc.
+Except for the license granted herein to GitLab Inc. and recipients of software
+distributed by GitLab Inc., You reserve all right, title, and interest in and to
 Your Contributions. All Contributions are subject to the following DCO + License
 terms.
 

data/Gemfile

@@ -4,9 +4,9 @@ gemspec
 gem "redcarpet", :platforms => :ruby
 gem "kramdown", :platforms => :jruby
 gem "RedCloth"
-gem "rdoc", "~>3.6"
+gem "rdoc", "~> 6.12"
 gem "org-ruby", "~> 0.9"
 gem "creole", "~>0.5.0"
 gem "wikicloth", "=0.8.1", :platforms => :ruby
-gem "asciidoctor", "= 1.5.2"
+gem "asciidoctor", "~> 2.0"
 gem "rake"

data/HISTORY.md

@@ -1,8 +1,17 @@
+# History
+
+## 2.0.0 (2025-02-26)
+
+* [Add support for docutils 0.21.2, remove support for 0.16/0.19](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/50)
+
+## 1.10.0 (2025-02-25)
+
+* [Add support for Ruby 3.3, and 3.4, remove support for 2.7](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/49)
+
 ## 1.9.0 (2023-01-11)
 
 * [Add support for docutils 0.19, remove support for 0.14/0.15](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/42)
 
-
 ## 1.8.1 (2022-09-16)
 
 * [Fix compatibility with Busybox timeout](https://gitlab.com/gitlab-org/gitlab-markup/-/merge_requests/37)

data/README.md

@@ -19,21 +19,21 @@ Markups
 The following markups are supported.  The dependencies listed are required if
 you wish to run the library. You can also run `script/bootstrap` to fetch them all (Python 3 required).
 
-* [.markdown, .mdown, .mkdn, .md](http://daringfireball.net/projects/markdown/) -- `gem install redcarpet` (https://github.com/vmg/redcarpet)
+* [.markdown, .mdown, .mkdn, .md](http://daringfireball.net/projects/markdown/) -- `gem install redcarpet` (<https://github.com/vmg/redcarpet>)
 * [.textile](http://www.textism.com/tools/textile/) -- `gem install RedCloth`
-* [.rdoc](https://ruby.github.io/rdoc/) -- `gem install rdoc -v 3.6.1`
+* [.rdoc](https://ruby.github.io/rdoc/) -- `gem install rdoc -v 6.12`
 * [.org](http://orgmode.org/) -- `gem install org-ruby`
 * [.creole](http://wikicreole.org/) -- `gem install creole`
 * [.mediawiki, .wiki](http://www.mediawiki.org/wiki/Help:Formatting) -- `gem install wikicloth`
 * [.rst](https://docutils.sourceforge.io/rst.html) -- `pip install docutils`
-* [.asciidoc, .adoc, .asc](http://asciidoc.org/) -- `gem install asciidoctor` (http://asciidoctor.org)
+* [.asciidoc, .adoc, .asc](http://asciidoc.org/) -- `gem install asciidoctor` (<http://asciidoctor.org>)
 * [.pod](http://search.cpan.org/dist/perl/pod/perlpod.pod) -- `Pod::Simple::HTML`
   comes with Perl >= 5.10. Lower versions should install [Pod::Simple](http://search.cpan.org/~dwheeler/Pod-Simple-3.28/lib/Pod/Simple.pod) from CPAN.
 
 Installation
 -----------
 
-Ruby 2.6+ is highly recommended (Ruby 2.5 is still supported).
+Ruby 3.1+ is highly recommended (Ruby 3.0 is still supported).
 
 ```shell
 gem install gitlab-markup

data/gitlab-markup.gemspec

@@ -23,8 +23,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'activesupport', '~> 4.0'
   s.add_development_dependency 'html-pipeline', '~> 1.0'
+  s.add_development_dependency 'logger', '~> 1.6.6'
   s.add_development_dependency 'minitest', '~> 5.4.3'
+  s.add_development_dependency 'mutex_m', '~> 0.3.0'
   s.add_development_dependency 'nokogiri', '~> 1.13.8'
   s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
-  s.add_development_dependency 'sanitize', '~> 5.1.0'
+  s.add_development_dependency 'rdoc', '~> 6.12'
+  s.add_development_dependency 'sanitize', '~> 6.0.0'
 end

data/lib/github-markup.rb

@@ -1,6 +1,6 @@
 module GitHub
   module Markup
-    VERSION = '1.9.0'
+    VERSION = '2.0.0'
     Version = VERSION
   end
 end

data/test/markups/README.rst.html

@@ -2,7 +2,7 @@
 <h2>Subtitle</h2>
 <p>Example text.</p>
 <div>
-<p>Table of Contents</p>
+<p><a href="#top">Table of Contents</a></p>
 <ul>
 <li><a href="#header-2">Header 2</a></li>
 <li><a href="#field-list">Field list</a></li>
@@ -91,7 +91,8 @@ Things that are Awesome (on a scale of 1-11)
 </tr>
 </tbody>
 </table>
-<a href="https://scan.coverity.com/projects/621"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
+<a href="https://scan.coverity.com/projects/621">
+<img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
 </a>
 <img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/621/badge.svg">
 <a name="field-list"></a>
@@ -120,9 +121,7 @@ but no problem!</td>
 </tr>
 </tbody>
 </table>
-
 <p><a href="mailto:someone@somewhere.org">someone@somewhere.org</a></p>
-
 <p>Press <kbd>Ctrl+C</kbd> to quit</p>
 <pre>
 <code lang="plantuml">Bob -&gt; Alice: hello

data/test/markups/README.toc.rst.html

@@ -1,5 +1,5 @@
 <div>
-<p>Contents</p>
+<p><a href="#top">Contents</a></p>
 <ul>
 <li>
 <a href="#introduction">1   Introduction</a><ul>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-markup
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Wanstrath
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.4.3
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +107,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.12'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.0.0
 description: This gem is used by GitLab to render any non Markdown markup
 email: chris@ozmm.org
 executables:
@@ -105,6 +146,7 @@ files:
 - ".gitlab-ci.yml"
 - ".kick"
 - ".travis.yml"
+- CODEOWNERS
 - CONTRIBUTING.md
 - Gemfile
 - HISTORY.md
@@ -165,7 +207,6 @@ metadata:
   bug_tracker_uri: https://gitlab.com/gitlab-org/gitlab-markup/issues
   changelog_uri: https://gitlab.com/gitlab-org/gitlab-markup/blob/master/HISTORY.md
   source_code_uri: https://gitlab.com/gitlab-org/gitlab-markup
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Fork from github-markup GitLab uses to render non markdown content
 test_files: