pygments.rb 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 494fdb817ce25f9a10420c22c8dce5c725b157da060f61bad53527af80bb1dff
-  data.tar.gz: 5bb0321b93ea7bac8ee0675803a5bbeee4b74b3784deb0302e50bde0d4dd53e6
+  metadata.gz: 06ee50536364c613df97577b86bb28e455c9e53357777f3a3b345740a68d2360
+  data.tar.gz: def24e3a74fb3f257cdec0c29bc8a511f67db9e077a595ff6c00ff8ee9a79428
 SHA512:
-  metadata.gz: 363d098055a9887fa9146a2aef00cc5d04929328a55a6c63fca726a34a9b6a4f32d3c4d8f2ba9cf071db23d978fb30868fd6c5d02e2027b1f5bf5529a3394298
-  data.tar.gz: a80e5d794c22e8d700995346c113877b4a8440253d2482578c3393f54f4ffe57f8fcb076731f63a96d1706de19fbeb7c81d42130f9cfbe87c1e06a9783821e8c
+  metadata.gz: 1e8bcb9c40aced27415227b43b978fd475c6b1c7d6825c294cb5b09bcf9991f2ec77eb5f8fb221fd9f7b5a78f26b07a319ef1af253aea6ad25669544d76ae5d3
+  data.tar.gz: f1b7d381a6244ffca240919bb81a527b373b73689ea31d04fac7153d20dd68b9ce79d8acbb09f3ad9d1ccf816c1be83b85e6777e889192d94394c6464a193298

data/.github/workflows/ci.yml

@@ -6,10 +6,10 @@ on:
   pull_request:
 jobs:
   rubocop:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -20,21 +20,26 @@ jobs:
   build:
     strategy:
       matrix:
-        ruby: [ 'jruby-9.2', '2.3', '3.0' ]
-        python: [ '3.5', '3.10' ]
-        platform: [ ubuntu-latest, macos-latest, windows-latest ]
+        ruby: [ 'jruby-9.2', '2.5', '3.1' ]
+        python: [ '3.6', '3.11' ]
+        platform: [ ubuntu-20.04, macos-latest, windows-2019 ]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: Run Tests
         run: bundle exec rake test
+    env:
+      # Workaround JVM bug that causes JRuby to fail: https://bugs.openjdk.org/browse/JDK-8285445
+      # See https://github.com/ruby/setup-ruby/issues/339
+      # See https://github.com/jruby/jruby/issues/7182#issuecomment-1111610677
+      JAVA_OPTS: -Djdk.io.File.enableADS=true

data/.github/workflows/release.yml

@@ -4,18 +4,18 @@ on:
     tags: [ '*' ]
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Build
         run: bundle exec rake build
       - name: Publish to RubyGems.org

data/.rubocop.yml

@@ -1,3 +1,8 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.5
+Gemspec/RequireMFA:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/BlockLength:
@@ -10,6 +15,8 @@ Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false
 Style/StructInheritance:
   Enabled: false
 Style/Documentation:

data/CHANGELOG.adoc

@@ -5,6 +5,14 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.4.0
+
+* Update Pygments to 2.15.1
+
+== 2.3.1 (2022-12-04) - @slonopotamus
+
+* Fix bogus search for Python executable ({uri-repo})/issues/242[#242])
+
 == 2.3.0 (2022-01-05) - @slonopotamus
 
 * Add `Pygments.pygments_version` method to query underlying Pygments version ({uri-repo}/issues/226[#226])

data/README.adoc

@@ -22,8 +22,8 @@ If a Python process dies, a new one will be spawned on the next pygments.rb requ
 
 == System Requirements
 
-- Python >= 3.5
-- Ruby >= 2.3
+- Python >= 3.6
+- Ruby >= 2.5
 
 == Installation
 

data/bench.rb

@@ -9,7 +9,7 @@ num = ARGV[0] ? ARGV[0].to_i : 10
 # we can also repeat the code itself
 repeats = ARGV[1] ? ARGV[1].to_i : 1
 
-code = File.open('test/test_pygments.rb').read.to_s * repeats
+code = File.read('test/test_pygments.rb') * repeats
 
 puts "Benchmarking....\n"
 puts "Size: #{code.bytesize} bytes\n"

data/lib/pygments/popen.rb

@@ -17,7 +17,7 @@ module Pygments
     # Python process that talks to the Pygments library. We'll talk back and
     # forth across this pipe.
     def start(pygments_path = File.join(__dir__, '..', '..', 'vendor', 'pygments-main'))
-      @log = Logger.new(ENV['MENTOS_LOG'] || File::NULL)
+      @log = Logger.new(ENV.fetch('MENTOS_LOG', File::NULL))
       @log.level = Logger::INFO
       @log.datetime_format = '%Y-%m-%d %H:%M '
 
@@ -39,9 +39,7 @@ module Pygments
       @python_binary ||= find_python_binary
     end
 
-    def python_binary=(python_bin)
-      @python_bin = python_bin
-    end
+    attr_writer :python_binary
 
     # Stop the child process by issuing a kill -9.
     #
@@ -197,7 +195,11 @@ module Pygments
 
     # Detect a suitable Python binary to use.
     def find_python_binary
-      return %w[py python3 python].first { |py| !which(py).nil? } if Gem.win_platform?
+      if Gem.win_platform?
+        return %w[py -3] if which('py')
+
+        return [%w[python3 python].find { |py| !which(py).nil? }]
+      end
 
       # On non-Windows platforms, we simply rely on shebang
       []
@@ -274,7 +276,7 @@ module Pygments
             raise Errno::EPIPE, %(Failed to read response from Python process on a mentos #{method} call)
           end
 
-          header_len = header_len_bytes.unpack('N')[0]
+          header_len = header_len_bytes.unpack1('N')
           @log.info "Size in: #{header_len}"
           header = @out.read(header_len)
 
@@ -321,11 +323,7 @@ module Pygments
     def get_timeout(timeout)
       return timeout unless timeout.nil?
 
-      begin
-        Integer(ENV['MENTOS_TIMEOUT'])
-      rescue TypeError
-        0
-      end
+      Integer(ENV.fetch('MENTOS_TIMEOUT', 0))
     end
 
     # Based on the header we receive, determine if we need

data/lib/pygments/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pygments
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/pygments.rb.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
     'source_code_uri' => s.homepage
   }
 
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rubocop', '~> 0.81.0'
+  s.add_development_dependency 'rubocop', '~> 1.28.2'
   s.add_development_dependency 'test-unit', '~> 3.5.0'
 
   s.files = `git ls-files -z`.split("\0").reject { |f| File.symlink?(f) }

data/test/test_pygments.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'test/unit'
-require File.join(File.dirname(__FILE__), '..', '/lib/pygments.rb')
+require 'pygments'
 ENV['mentos-test'] = 'yes'
 
 P = Pygments
@@ -20,14 +20,6 @@ class PygmentsHighlightTest < Test::Unit::TestCase
     assert_equal '<div class', code[0..9]
   end
 
-  def test_full_html_highlight
-    code = P.highlight(RUBY_CODE)
-    assert_match '<span class="ch">#!/usr/bin/ruby</span>', code
-    assert_equal %(<div class="highlight"><pre><span></span><span class="ch">#!/usr/bin/ruby</span>
-<span class="nb">puts</span> <span class="s1">&#39;foo&#39;</span>
-</pre></div>), code
-  end
-
   def test_highlight_works_with_larger_files
     code = P.highlight(TEST_CODE)
     assert_match 'Main loop, waiting for inputs on stdin', code
@@ -71,11 +63,6 @@ class PygmentsHighlightTest < Test::Unit::TestCase
     assert_match 'ø..ø', code
   end
 
-  def test_highlight_formatter_bbcode
-    code = P.highlight(RUBY_CODE, formatter: 'bbcode')
-    assert_match 'color=#408080][i]#!/usr/bin/ruby[/i]', code
-  end
-
   def test_highlight_formatter_terminal
     code = P.highlight(RUBY_CODE, formatter: 'terminal')
     assert_match '39;49;00m', code
@@ -182,8 +169,6 @@ class PygmentsLexerClassTest < Test::Unit::TestCase
     assert_equal P::Lexer['Ruby'], P::Lexer.find_by_extname('.rb')
     assert_equal P::Lexer['PHP'], P::Lexer.find_by_extname('.php4')
     assert_equal P::Lexer['PHP'], P::Lexer.find_by_extname('.php5')
-    assert_equal P::Lexer['Groff'], P::Lexer.find_by_extname('.1')
-    assert_equal P::Lexer['Groff'], P::Lexer.find_by_extname('.3')
     assert_equal P::Lexer['C'], P::Lexer.find_by_extname('.c')
     assert_equal P::Lexer['Python'], P::Lexer.find_by_extname('.py')
     assert_equal P::Lexer['Java'], P::Lexer.find_by_extname('.java')
@@ -215,10 +200,6 @@ class PygmentsCssTest < Test::Unit::TestCase
     assert_match(/^\.mycode \.codeerr \{/, P.css('.mycode', classprefix: 'code'))
   end
 
-  def test_css_default
-    assert_match '.c { color: #408080; font-style: italic }', P.css
-  end
-
   def test_css_colorful
     assert_match '.c { color: #888888 }', P.css(style: 'colorful')
   end

data/vendor/pygments-main/{Pygments-2.10.0.dist-info → Pygments-2.15.1.dist-info}/AUTHORS

@@ -6,15 +6,18 @@ Major developers are Tim Hatch <tim@timhatch.com> and Armin Ronacher
 Other contributors, listed alphabetically, are:
 
 * Sam Aaron -- Ioke lexer
+* Jean Abou Samra -- LilyPond lexer
 * João Abecasis -- JSLT lexer
 * Ali Afshar -- image formatter
 * Thomas Aglassinger -- Easytrieve, JCL, Rexx, Transact-SQL and VBScript
   lexers
+* Maxence Ahlouche -- PostgreSQL Explain lexer
 * Muthiah Annamalai -- Ezhil lexer
 * Kumar Appaiah -- Debian control lexer
 * Andreas Amann -- AppleScript lexer
 * Timothy Armstrong -- Dart lexer fixes
 * Jeffrey Arnold -- R/S, Rd, BUGS, Jags, and Stan lexers
+* Eiríkr Åsheim -- Uxntal lexer
 * Jeremy Ashkenas -- CoffeeScript lexer
 * José Joaquín Atria -- Praat lexer
 * Stefan Matthias Aust -- Smalltalk lexer
@@ -49,6 +52,7 @@ Other contributors, listed alphabetically, are:
 * Pete Curry -- bugfixes
 * Bryan Davis -- EBNF lexer
 * Bruno Deferrari -- Shen lexer
+* Walter Dörwald -- UL4 lexer
 * Luke Drummond -- Meson lexer
 * Giedrius Dubinskas -- HTML formatter improvements
 * Owen Durni -- Haxe lexer
@@ -117,6 +121,7 @@ Other contributors, listed alphabetically, are:
 * Gerwin Klein -- Isabelle lexer
 * Eric Knibbe -- Lasso lexer
 * Stepan Koltsov -- Clay lexer
+* Oliver Kopp - Friendly grayscale style
 * Adam Koprowski -- Opa lexer
 * Benjamin Kowarsch -- Modula-2 lexer
 * Domen Kožar -- Nix lexer
@@ -132,18 +137,21 @@ Other contributors, listed alphabetically, are:
 * Sylvestre Ledru -- Scilab lexer
 * Chee Sing Lee -- Flatline lexer
 * Mark Lee -- Vala lexer
+* Pete Lomax -- Phix lexer
 * Valentin Lorentz -- C++ lexer improvements
 * Ben Mabey -- Gherkin lexer
 * Angus MacArthur -- QML lexer
 * Louis Mandel -- X10 lexer
 * Louis Marchand -- Eiffel lexer
 * Simone Margaritelli -- Hybris lexer
+* Tim Martin - World of Warcraft TOC lexer
 * Kirk McDonald -- D lexer
 * Gordon McGregor -- SystemVerilog lexer
 * Stephen McKamey -- Duel/JBST lexer
 * Brian McKenna -- F# lexer
 * Charles McLaughlin -- Puppet lexer
-* Kurt McKee -- Tera Term macro lexer, PostgreSQL updates, MySQL overhaul
+* Kurt McKee -- Tera Term macro lexer, PostgreSQL updates, MySQL overhaul, JSON lexer
+* Joe Eli McIlvain -- Savi lexer
 * Lukas Meuser -- BBCode formatter, Lua lexer
 * Cat Miller -- Pig lexer
 * Paul Miller -- LiveScript lexer
@@ -155,7 +163,9 @@ Other contributors, listed alphabetically, are:
 * Paulo Moura -- Logtalk lexer
 * Mher Movsisyan -- DTD lexer
 * Dejan Muhamedagic -- Crmsh lexer
+* Adrien Nayrat -- PostgreSQL Explain lexer
 * Ana Nelson -- Ragel, ANTLR, R console lexers
+* David Neto, Google LLC -- WebGPU Shading Language lexer
 * Kurt Neufeld -- Markdown lexer
 * Nam T. Nguyen -- Monokai style
 * Jesper Noehr -- HTML formatter "anchorlinenos"
@@ -173,6 +183,7 @@ Other contributors, listed alphabetically, are:
 * Clément Prévost -- UrbiScript lexer
 * Tanner Prynn -- cmdline -x option and loading lexers from files
 * Oleh Prypin -- Crystal lexer (based on Ruby lexer)
+* Nick Psaris -- K and Q lexers
 * Xidorn Quan -- Web IDL lexer
 * Elias Rabel -- Fortran fixed form lexer
 * raichoo -- Idris lexer
@@ -182,6 +193,7 @@ Other contributors, listed alphabetically, are:
 * Justin Reidy -- MXML lexer
 * Norman Richards -- JSON lexer
 * Corey Richardson -- Rust lexer updates
+* Fabrizio Riguzzi -- cplint leder
 * Lubomir Rintel -- GoodData MAQL and CL lexers
 * Andre Roberge -- Tango style
 * Georg Rollinger -- HSAIL lexer
@@ -193,6 +205,7 @@ Other contributors, listed alphabetically, are:
 * Matteo Sasso -- Common Lisp lexer
 * Joe Schafer -- Ada lexer
 * Max Schillinger -- TiddlyWiki5 lexer
+* Andrew Schmidt -- X++ lexer
 * Ken Schutte -- Matlab lexers
 * René Schwaiger -- Rainbow Dash style
 * Sebastian Schweizer -- Whiley lexer
@@ -218,7 +231,9 @@ Other contributors, listed alphabetically, are:
 * Jeremy Thurgood -- Erlang, Squid config lexers
 * Brian Tiffin -- OpenCOBOL lexer
 * Bob Tolbert -- Hy lexer
+* Doug Torrance -- Macaulay2 lexer
 * Matthias Trute -- Forth lexer
+* Tuoa Spi T4 -- Bdd lexer
 * Erick Tryzelaar -- Felix lexer
 * Alexander Udalov -- Kotlin lexer improvements
 * Thomas Van Doren -- Chapel lexer
@@ -246,5 +261,10 @@ Other contributors, listed alphabetically, are:
 * Fabian Neumann -- CDDL lexer
 * Thomas Duboucher -- CDDL lexer
 * Philipp Imhof -- Pango Markup formatter
+* Thomas Voss -- Sed lexer
+* Martin Fischer -- WCAG contrast testing
+* Marc Auberer -- Spice lexer
+* Amr Hesham -- Carbon lexer
+* diskdance -- Wikitext lexer
 
 Many thanks for all contributions!

data/vendor/pygments-main/{Pygments-2.10.0.dist-info → Pygments-2.15.1.dist-info}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2021 by the respective authors (see AUTHORS file).
+Copyright (c) 2006-2022 by the respective authors (see AUTHORS file).
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/vendor/pygments-main/{Pygments-2.10.0.dist-info → Pygments-2.15.1.dist-info}/METADATA

@@ -1,13 +1,17 @@
 Metadata-Version: 2.1
 Name: Pygments
-Version: 2.10.0
+Version: 2.15.1
 Summary: Pygments is a syntax highlighting package written in Python.
-Home-page: https://pygments.org/
-Author: Georg Brandl
-Author-email: georg@python.org
-License: BSD License
+Author-email: Georg Brandl <georg@python.org>
+Maintainer: Matthäus G. Chajdas
+Maintainer-email: Georg Brandl <georg@python.org>, Jean Abou Samra <jean@abou-samra.fr>
+License: BSD-2-Clause
+Project-URL: Homepage, https://pygments.org
+Project-URL: Documentation, https://pygments.org/docs
+Project-URL: Source, https://github.com/pygments/pygments
+Project-URL: Bug Tracker, https://github.com/pygments/pygments/issues
+Project-URL: Changelog, https://github.com/pygments/pygments/blob/master/CHANGES
 Keywords: syntax highlighting
-Platform: any
 Classifier: Development Status :: 6 - Mature
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: End Users/Desktop
@@ -16,16 +20,21 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Text Processing :: Filters
 Classifier: Topic :: Utilities
-Requires-Python: >=3.5
+Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+License-File: AUTHORS
+Provides-Extra: plugins
+Requires-Dist: importlib-metadata ; (python_version < "3.8") and extra == 'plugins'
 
 Pygments
 ~~~~~~~~
@@ -43,6 +52,5 @@ are:
   formats that PIL supports and ANSI sequences
 * it is usable as a command-line tool and as a library
 
-Copyright 2006-2021 by the Pygments team, see ``AUTHORS``.
+Copyright 2006-2023 by the Pygments team, see ``AUTHORS``.
 Licensed under the BSD, see ``LICENSE`` for details.
-