From 8a18397737779c414dd527e3097cf2700f15a9c4 Mon Sep 17 00:00:00 2001
From: Fuzzwah <fuzzwah@github.com>
Date: Wed, 28 Feb 2024 07:35:19 +0000
Subject: [PATCH] working pandoc

---
 Dockerfile                   |   5 ++-
 Gemfile                      |  15 +++----
 github-markup-4.0.3.gem      | Bin 6656 -> 0 bytes
 github-markup.gemspec        |  73 +++++++++++++++++------------------
 lib/github/markup/version.rb |   6 +++
 script/bootstrap             |   2 +-
 script/bootstrap.contrib     |   3 --
 script/cibuild               |   2 +-
 test/markup_test.rb          |   1 +
 9 files changed, 56 insertions(+), 51 deletions(-)
 delete mode 100644 github-markup-4.0.3.gem
 create mode 100644 lib/github/markup/version.rb

diff --git a/Dockerfile b/Dockerfile
index 375aa0d7..36bd5286 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,8 @@ RUN apt-get install -y \
     gcc \
     libxslt-dev \
     libxml2-dev \
-    zlib1g-dev
+    zlib1g-dev \
+    libidn11-dev
 
 ENV PATH $PATH:/opt/rakudo-pkg/bin
 RUN install-zef
@@ -58,7 +59,7 @@ RUN bundle config --global build.nokogiri --use-system-libraries
 WORKDIR /data/github-markup
 COPY github-markup.gemspec .
 COPY Gemfile .
-COPY lib/github-markup.rb lib/github-markup.rb
+ADD lib ./lib
 RUN bundle
 
 ENV LC_ALL en_US.UTF-8
diff --git a/Gemfile b/Gemfile
index 59bcee4d..efa4c1a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,11 +7,12 @@ gem "redcarpet", :platforms => :ruby
 gem "kramdown", :platforms => :jruby
 gem "RedCloth"
 gem "commonmarker", "= 1.0.4"
-gem "rdoc", "~>3.6"
-gem "org-ruby", "= 0.9.9"
-gem "creole", "~>0.3.6"
+gem 'rdoc', '~> 6.6', '>= 6.6.2'
+gem 'org-ruby', '~> 0.9.12'
+gem 'creole', '~> 0.5.0'
+gem 'idn-ruby', '~> 0.1.5'
+gem 'twitter-text', '~> 3.1'
 gem "wikicloth", "=0.8.3"
-gem "twitter-text", "~> 1.14"
-gem "asciidoctor", "~> 2.0.5"
-gem "rake", "~> 12"
-gem "pandoc-ruby", "= 2.1.10"
+gem 'asciidoctor', '~> 2.0', '>= 2.0.21'
+gem 'rake', '~> 13.1'
+gem 'pandoc-ruby', '~> 2.1', '>= 2.1.10'
diff --git a/github-markup-4.0.3.gem b/github-markup-4.0.3.gem
deleted file mode 100644
index c2ff9f9e313a42624af140ce887db6fa68b7aa08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6656
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

diff --git a/github-markup.gemspec b/github-markup.gemspec
index eb0c15d1..fd5ad570 100644
--- a/github-markup.gemspec
+++ b/github-markup.gemspec
@@ -1,39 +1,38 @@
-require File.expand_path("../lib/github-markup", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name          = "github-markup"
-  s.version       = GitHub::Markup::VERSION
-  s.summary       = "The code GitHub uses to render README.markup"
-  s.description   = <<~DESC
-    This gem is used by GitHub to render any fancy markup such as Markdown,
-    Textile, Org-Mode, etc. Fork it and add your own!
-  DESC
-  s.authors       = ["Chris Wanstrath"]
-  s.email         = "chris@ozmm.org"
-  github_link     = "https://github.com/github/markup"
-  s.homepage      = github_link
-  s.license       = "MIT"
-
-  s.metadata = {
-    "bug_tracker_uri" => "#{github_link}/issues",
-    "changelog_uri" => "#{github_link}/releases",
-    "documentation_uri" => github_link,
-    "homepage_uri" => s.homepage,
-    "source_code_uri" => github_link
+# frozen_string_literal: true
+
+require_relative "lib/github/markup/version"
+
+Gem::Specification.new do |spec|
+  spec.name        = "github-markup"
+  spec.version     = GitHub::Markup::VERSION
+  spec.homepage    = "https://github.com/github/markup"
+  spec.summary     = "The code GitHub uses to render README.markup"
+  spec.description = <<~DESC
+  This gem is used by GitHub to render any fancy markup such as Markdown,
+  Textile, Org-Mode, etc. Fork it and add your own!
+DESC
+  spec.authors      = ["Chris Wanstrath", "Rob Crouch"]
+  spec.license      = "MIT"
+
+  spec.metadata = {
+    "bug_tracker_uri"   => "https://github.com/github/markup/issues",
+    "source_code_uri"   => "https://github.com/github/markup"
   }
 
-  s.files         = `git ls-files`.split($\)
-  s.files        += Dir['vendor/**/*']
-  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = %w[lib]
-
-  s.add_development_dependency 'rake', '~> 12'
-  s.add_development_dependency 'activesupport', '~> 4.0'
-  s.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
-  s.add_development_dependency 'html-pipeline', '~> 1.0'
-  s.add_development_dependency 'sanitize', '>= 4.6.3'
-  s.add_development_dependency 'nokogiri', '~> 1.8.1'
-  s.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
-  s.add_development_dependency "github-linguist", ">= 7.1.3"
-end
+  spec.required_ruby_version = ">= 3.2.3"
+
+  spec.files         = Dir.glob("lib/**/*", File::FNM_DOTMATCH)
+  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+
+  spec.add_development_dependency 'rake', '~> 13.1'
+  spec.add_development_dependency 'activesupport', '~> 7.1', '>= 7.1.3.2'
+  spec.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
+  spec.add_development_dependency 'html-pipeline', '~> 1.0'
+  spec.add_development_dependency "sanitize", "~> 4.6", ">= 4.6.3"
+  spec.add_development_dependency 'nokogiri', '~> 1.8.1'
+  spec.add_development_dependency 'nokogiri-diff', '~> 0.2.0'
+  spec.add_development_dependency "github-linguist", "~> 7.1", ">= 7.1.3"
+
+
+end
\ No newline at end of file
diff --git a/lib/github/markup/version.rb b/lib/github/markup/version.rb
new file mode 100644
index 00000000..98a2d3e3
--- /dev/null
+++ b/lib/github/markup/version.rb
@@ -0,0 +1,6 @@
+module GitHub
+  module Markup
+    VERSION = '4.0.3'
+    Version = VERSION
+  end
+end
\ No newline at end of file
diff --git a/script/bootstrap b/script/bootstrap
index f89f3181..6b87f215 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -5,4 +5,4 @@ set -e
 cd $(dirname "$0")/..
 
 bundle install
-pip3 install docutils
+
diff --git a/script/bootstrap.contrib b/script/bootstrap.contrib
index 834b6b61..3c0a38bd 100755
--- a/script/bootstrap.contrib
+++ b/script/bootstrap.contrib
@@ -5,11 +5,8 @@ set -e
 cd $(dirname "$0")/..
 
 bundle install --path vendor/bundle
-virtualenv vendor/python && source vendor/python/bin/activate
-pip install docutils
 
 echo ""
 echo "*** DONE ***"
 echo ""
-echo "activate python environment with 'source vendor/python/bin/activate'"
 echo "run tests with 'bundle exec rake'"
diff --git a/script/cibuild b/script/cibuild
index 33251773..6d6fd2b5 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -10,7 +10,7 @@ export RUBY_HEAP_SLOTS_INCREMENT=400000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 
 export PATH="/usr/share/rbenv/shims:$PATH"
-export RBENV_VERSION="1.9.3"
+export RBENV_VERSION="3.3.0"
 
 # bootstrap gem environment changes
 echo "Bootstrapping gem environment ..."
diff --git a/test/markup_test.rb b/test/markup_test.rb
index 24e78000..bd296ff7 100644
--- a/test/markup_test.rb
+++ b/test/markup_test.rb
@@ -5,6 +5,7 @@
 require 'github/markup'
 require 'minitest/autorun'
 require 'html/pipeline'
+require 'sanitize'
 require 'nokogiri'
 require 'nokogiri/diff'