pygments.rb 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3593fa0f51b043d8ffa0c2d91fef900f0d650d6e8c8787e32276a54682990089
-  data.tar.gz: 1ff949d4aaaf38d6baa557e01150a1c9838e42aca0eb99a0eb391c9a89924b8d
+  metadata.gz: 171add681ed69631367cfa8cfed81fc99a9410743ba0236506e773d154fbc10f
+  data.tar.gz: c229e0b38f14de10bc909c0a4b6ec565d097545c639c3d5efa363cc40cbc54b5
 SHA512:
-  metadata.gz: 9f6d6dfb5b4808dcd265206b30b19e8a865e3b53d3161ad891de99340a1903474eca425bdc92f6eba9116322d2ee96fc436a5931dacdf262e85f489385ac5068
-  data.tar.gz: a3f5aa3cda14507d939db624d6dbd1a0fd585ab1923d9aa87e367851cf0e5dd269cffa209ca28e511927ad018e27e9e1bc1008c7e4d2791cc532cbd5279b7ae7
+  metadata.gz: 55f6e366bc0339454833035d851c300b376d12c5d7cf8144a640559d0157fc9c163a5094bd4b4399e686b909647827b76a8a18af63b4013a86298b4dc2a57969
+  data.tar.gz: 1fd392a704bfb84d798ef822a799b8a8b8b56ac656afd43efa8aa3bb31edbdd634a3ed9dc3ec18572e0ea254ae952920bbee579af14fb176440c4753de51be25

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.9' ]
-        platform: [ ubuntu-latest, macos-latest, windows-latest ]
+        ruby: [ 'jruby-9.2', '2.3', '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/CHANGELOG.adoc

@@ -5,6 +5,15 @@
 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.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])
+* Update Pygments to 2.10.0 ({uri-repo}/issues/234[#234])
+
 == 2.2.0 (2021-03-18) - @slonopotamus
 
 * Add support for custom lexers ({uri-repo}/pull/187[#187])

data/README.adoc

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

data/bench.rb

@@ -12,8 +12,8 @@ repeats = ARGV[1] ? ARGV[1].to_i : 1
 code = File.open('test/test_pygments.rb').read.to_s * repeats
 
 puts "Benchmarking....\n"
-puts 'Size: ' + code.bytesize.to_s + " bytes\n"
-puts 'Iterations: ' + num.to_s + "\n"
+puts "Size: #{code.bytesize} bytes\n"
+puts "Iterations: #{num}\n"
 
 Benchmark.bm(40) do |x|
   x.report('pygments popen                             ') do

data/lib/pygments/lexer.rb

@@ -133,7 +133,7 @@ module Pygments
       @mimetypes_index = {}
       @raw_lexers = Pygments.lexers!
 
-      @raw_lexers.values.each do |hash|
+      @raw_lexers.each_value do |hash|
         lexer = Lexer.new(hash[:name], hash[:aliases], hash[:filenames], hash[:mimetypes])
 
         @lexers << lexer

data/lib/pygments/mentos.py

@@ -163,17 +163,19 @@ class Mentos(object):
                 fmt = pygments.formatters.get_formatter_by_name(args[0], **kwargs)
                 res = fmt.get_style_defs(args[1])
 
-            elif method == 'lexer_name_for':
+            elif method == 'lexer_names_for':
                 lexer = self.return_lexer(None, args, kwargs, text)
 
                 if lexer:
-                    # We don't want the Lexer itself, just the name.
-                    # Take the first alias.
-                    res = lexer.aliases[0]
+                    # We don't want the Lexer itself, just aliases.
+                    res = json.dumps(list(lexer.aliases))
 
                 else:
                     _write_error("No lexer")
 
+            elif method == 'version':
+                res = json.dumps([pygments.__version__])
+
             else:
                 _write_error("Invalid method " + method)
 

data/lib/pygments/popen.rb

@@ -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.
     #
@@ -88,6 +86,13 @@ module Pygments
       raise MentosError, 'EPERM checking if child process is alive.'
     end
 
+    # Public: Returns version of underlying Pygments library
+    #
+    # @return [Integer]
+    def pygments_version
+      mentos(:version)[0]
+    end
+
     # Public: Get an array of available Pygments formatters
     #
     # @return [Array<String>] an array of formatters
@@ -138,8 +143,8 @@ module Pygments
       mentos(:css, ['html', klass], opts)
     end
 
-    # @return [String, nil] the name of a lexer.
-    def lexer_name_for(*args)
+    # @return [[String], nil] aliases of a lexer.
+    def lexer_names_for(*args)
       # Pop off the last arg if it's a hash, which becomes our opts
       opts = if args.last.is_a?(Hash)
                args.pop
@@ -149,7 +154,7 @@ module Pygments
 
       code = (args.pop if args.last.is_a?(String))
 
-      mentos(:lexer_name_for, args, opts, code)
+      mentos(:lexer_names_for, args, opts, code)
     end
 
     # Public: Highlight code.
@@ -190,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
       []
@@ -336,9 +345,9 @@ module Pygments
       # Read more bytes (the actual response body)
       res = @out.read(bytes.to_i)
 
-      if header[:method] == 'highlight'
+      if header[:method] == 'highlight' && res.nil?
         # Make sure we have a result back; else consider this an error.
-        raise MentosError, 'No highlight result back from mentos.' if res.nil?
+        raise MentosError, 'No highlight result back from mentos.'
       end
 
       res
@@ -346,8 +355,8 @@ module Pygments
 
     # @return Ruby objects for the methods that want them, text otherwise.
     def return_result(res, method)
-      res = JSON.parse(res, symbolize_names: true) unless %i[lexer_name_for highlight css].include?(method)
-      res = res.rstrip if res.class == String
+      res = JSON.parse(res, symbolize_names: true) unless %i[highlight css].include?(method)
+      res = res.rstrip if res.instance_of?(String)
       res
     end
 

data/lib/pygments/version.rb

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

data/lib/pygments.rb

@@ -18,14 +18,20 @@ module Pygments
         Thread.current.thread_variable_set(:pygments_engine, Pygments::Popen.new)
     end
 
+    def lexer_name_for(*args)
+      names = engine.lexer_names_for(*args)
+      names&.[](0)
+    end
+
     def_delegators :engine,
                    :formatters,
                    :lexers!,
                    :filters,
                    :styles,
                    :css,
-                   :lexer_name_for,
+                   :lexer_names_for,
                    :highlight,
-                   :start
+                   :start,
+                   :pygments_version
   end
 end

data/pygments.rb.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
 
   s.metadata = {
     'homepage_uri' => s.homepage,
-    'bug_tracker_uri' => s.homepage + '/issues',
-    'changelog_uri' => s.homepage + '/blob/master/CHANGELOG.adoc',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/' + s.name,
+    'bug_tracker_uri' => "#{s.homepage}/issues",
+    'changelog_uri' => "#{s.homepage}/blob/master/CHANGELOG.adoc",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}",
     'source_code_uri' => s.homepage
   }
 
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake', '~> 13.0.0'
   s.add_development_dependency 'rubocop', '~> 0.81.0'
-  s.add_development_dependency 'test-unit', '~> 3.4.0'
+  s.add_development_dependency 'test-unit', '~> 3.5.0'
 
   s.files = `git ls-files -z`.split("\0").reject { |f| File.symlink?(f) }
 end

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
@@ -92,12 +92,12 @@ class PygmentsHighlightTest < Test::Unit::TestCase
   end
 
   def test_highlight_works_with_multiple_newlines
-    code = P.highlight(RUBY_CODE_TRAILING_NEWLINE + "derp\n\n")
+    code = P.highlight("#{RUBY_CODE_TRAILING_NEWLINE}derp\n\n")
     assert_match '<span class="ch">#!/usr/bin/ruby</span>', code
   end
 
   def test_highlight_works_with_trailing_cr
-    code = P.highlight(RUBY_CODE_TRAILING_NEWLINE + "\r")
+    code = P.highlight("#{RUBY_CODE_TRAILING_NEWLINE}\r")
     assert_match '<span class="ch">#!/usr/bin/ruby</span>', code
   end
 
@@ -106,6 +106,12 @@ class PygmentsHighlightTest < Test::Unit::TestCase
     assert_match '>importr</span>', code
   end
 
+  def test_version
+    version_str = P.pygments_version
+    # This will throw "Malformed version number string" ArgumentError if version_str is not a valid version string
+    Gem::Version.new(version_str)
+  end
+
   def test_highlight_on_multi_threads
     omit 'We do not actually support multithreading'
 
@@ -121,27 +127,27 @@ class PygmentsLexerTest < Test::Unit::TestCase
   RUBY_CODE = "#!/usr/bin/ruby\nputs 'foo'"
 
   def test_lexer_by_mimetype
-    assert_equal 'rb', P.lexer_name_for(mimetype: 'text/x-ruby')
+    assert_includes P.lexer_names_for(mimetype: 'text/x-ruby'), 'rb'
     assert_equal 'json', P.lexer_name_for(mimetype: 'application/json')
   end
 
   def test_lexer_by_filename
-    assert_equal 'rb', P.lexer_name_for(filename: 'test.rb')
+    assert_includes P.lexer_names_for(filename: 'test.rb'), 'rb'
     assert_equal 'scala', P.lexer_name_for(filename: 'test.scala')
   end
 
   def test_lexer_by_name
-    assert_equal 'rb', P.lexer_name_for(lexer: 'ruby')
+    assert_includes P.lexer_names_for(lexer: 'ruby'), 'rb'
     assert_equal 'python', P.lexer_name_for(lexer: 'python')
     assert_equal 'c', P.lexer_name_for(lexer: 'c')
   end
 
   def test_lexer_by_filename_and_content
-    assert_equal 'rb', P.lexer_name_for(RUBY_CODE, filename: 'test.rb')
+    assert_includes P.lexer_names_for(RUBY_CODE, filename: 'test.rb'), 'rb'
   end
 
   def test_lexer_by_content
-    assert_equal 'rb', P.lexer_name_for(RUBY_CODE)
+    assert_includes P.lexer_names_for(RUBY_CODE), 'rb'
   end
 
   def test_lexer_by_nothing

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

@@ -6,6 +6,7 @@ Major developers are Tim Hatch <tim@timhatch.com> and Armin Ronacher
 Other contributors, listed alphabetically, are:
 
 * Sam Aaron -- Ioke lexer
+* João Abecasis -- JSLT lexer
 * Ali Afshar -- image formatter
 * Thomas Aglassinger -- Easytrieve, JCL, Rexx, Transact-SQL and VBScript
   lexers
@@ -32,7 +33,7 @@ Other contributors, listed alphabetically, are:
 * Sébastien Bigaret -- QVT Operational lexer
 * Jarrett Billingsley -- MiniD lexer
 * Adam Blinkinsop -- Haskell, Redcode lexers
-* Stéphane Blondon -- SGF and Sieve lexers
+* Stéphane Blondon -- Procfile, SGF and Sieve lexers
 * Frits van Bommel -- assembler lexers
 * Pierre Bourdon -- bugfixes
 * Martijn Braam -- Kernel log lexer, BARE lexer
@@ -48,6 +49,7 @@ Other contributors, listed alphabetically, are:
 * Pete Curry -- bugfixes
 * Bryan Davis -- EBNF lexer
 * Bruno Deferrari -- Shen lexer
+* Luke Drummond -- Meson lexer
 * Giedrius Dubinskas -- HTML formatter improvements
 * Owen Durni -- Haxe lexer
 * Alexander Dutton, Oxford University Computing Services -- SPARQL lexer
@@ -97,6 +99,7 @@ Other contributors, listed alphabetically, are:
 * Doug Hogan -- Mscgen lexer
 * Ben Hollis -- Mason lexer
 * Max Horn -- GAP lexer
+* Fred Hornsey -- OMG IDL Lexer
 * Alastair Houghton -- Lexer inheritance facility
 * Tim Howard -- BlitzMax lexer
 * Dustin Howett -- Logos lexer
@@ -200,6 +203,7 @@ Other contributors, listed alphabetically, are:
 * Robert Simmons -- Standard ML lexer
 * Kirill Simonov -- YAML lexer
 * Corbin Simpson -- Monte lexer
+* Ville Skyttä -- ASCII armored lexer
 * Alexander Smishlajev -- Visual FoxPro lexer
 * Steve Spigarelli -- XQuery lexer
 * Jerome St-Louis -- eC lexer
@@ -208,6 +212,7 @@ Other contributors, listed alphabetically, are:
 * Tom Stuart -- Treetop lexer
 * Colin Sullivan -- SuperCollider lexer
 * Ben Swift -- Extempore lexer
+* tatt61880 -- Kuin lexer
 * Edoardo Tenani -- Arduino lexer
 * Tiberius Teng -- default style overhaul
 * Jeremy Thurgood -- Erlang, Squid config lexers
@@ -223,6 +228,7 @@ Other contributors, listed alphabetically, are:
 * Matthias Vallentin -- Bro lexer
 * Benoît Vinot -- AMPL lexer
 * Linh Vu Hong -- RSL lexer
+* Immanuel Washington -- Smithy lexer
 * Nathan Weizenbaum -- Haml and Sass lexers
 * Nathan Whetsell -- Csound lexers
 * Dietmar Winkler -- Modelica lexer
@@ -239,5 +245,6 @@ Other contributors, listed alphabetically, are:
 * 15b3 -- Image Formatter improvements
 * Fabian Neumann -- CDDL lexer
 * Thomas Duboucher -- CDDL lexer
+* Philipp Imhof -- Pango Markup formatter
 
 Many thanks for all contributions!

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Pygments
-Version: 2.8.1
+Version: 2.10.0
 Summary: Pygments is a syntax highlighting package written in Python.
 Home-page: https://pygments.org/
 Author: Georg Brandl