brakeman 5.2.1 → 6.1.2

data/bundle/ruby/{2.7.0/gems/ruby_parser-3.18.1 → 3.3.0/gems/ruby_parser-3.20.3}/lib/ruby_parser_extras.rb

@@ -18,7 +18,7 @@ class Sexp
   end
 
   ##
-  # Returns the maximum line number of the children of self.
+  # Returns the minimum line number of the children of self.
 
   def line_min
     @line_min ||= [self.deep_each.map(&:line).min, self.line].compact.min
@@ -30,9 +30,9 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.18.1"
+  VERSION = "3.20.3"
 
-  attr_accessor :lexer, :in_def, :in_single, :file
+  attr_accessor :lexer, :in_def, :in_single, :file, :in_argdef
   attr_accessor :in_kwarg
   attr_reader :env, :comments
 
@@ -122,6 +122,7 @@ module RubyParserStuff
     self.lexer = RubyLexer.new v && v.to_i
     self.lexer.parser = self
     self.in_kwarg = false
+    self.in_argdef = false
 
     @env = RubyParserStuff::Environment.new
     @comments = []
@@ -153,6 +154,7 @@ module RubyParserStuff
       result.line lexer.lineno
     else
       result.line ss.first.line
+      result.line_max = ss.first.line_max
     end
 
     args.each do |arg|
@@ -218,11 +220,15 @@ module RubyParserStuff
     self.args args
   end
 
+  def attrset_id? id
+    id =~ /^\[\]=$|^\w+=$/
+  end
+
   def endless_method_name defn_or_defs
     name = defn_or_defs[1]
     name = defn_or_defs[2] unless Symbol === name
 
-    if name.end_with? "=" then
+    if attrset_id? name then
       yyerror "setter method cannot be defined in an endless method definition"
     end
 
@@ -326,9 +332,8 @@ module RubyParserStuff
     end
 
     args.each do |arg|
-      if arg.instance_of? Array and arg.size == 2 and arg.last.is_a? Numeric then
-        arg = arg.first
-      end
+      # ruby 3.0+ TODO: next if arg in [String, Integer] # eg ["(", 1]
+      next if arg.class == Array && arg.map(&:class) == [String, Integer]
 
       case arg
       when Sexp then
@@ -467,7 +472,7 @@ module RubyParserStuff
         end
       else
         warn "unprocessed: %p" % [s]
-      end.map { |l| whitespace_width l.chomp }
+      end.map { |l| whitespace_width l }
     }.compact.min
   end
 
@@ -727,6 +732,13 @@ module RubyParserStuff
     result
   end
 
+  def ary_to_pat ary
+    pat = ary.dup
+    pat.sexp_type = :array_TAIL
+
+    new_array_pattern nil, nil, pat, ary.line
+  end
+
   def new_array_pattern const, pre_arg, arypat, loc
     result = s(:array_pat, const).line loc
     result << pre_arg if pre_arg
@@ -783,6 +795,7 @@ module RubyParserStuff
     case lhs.sexp_type
     when :lasgn, :iasgn, :cdecl, :cvdecl, :gasgn, :cvasgn, :attrasgn, :safe_attrasgn then
       lhs << rhs
+      lhs.line_max = rhs.line_max
     when :const then
       lhs.sexp_type = :cdecl
       lhs << rhs
@@ -812,10 +825,10 @@ module RubyParserStuff
   end
 
   def new_begin val
-    _, lineno, body, _ = val
+    (_, line), _, body, _ = val
 
     result = body ? s(:begin, body) : s(:nil)
-    result.line lineno
+    result.line line
 
     result
   end
@@ -874,12 +887,13 @@ module RubyParserStuff
     # TODO: need a test with f(&b) to produce block_pass
     # TODO: need a test with f(&b) { } to produce warning
 
-    if args
+    if args then
       if ARG_TYPES[args.sexp_type] then
         result.concat args.sexp_body
       else
         result << args
       end
+      result.line_max = args.line_max
     end
 
     # line = result.grep(Sexp).map(&:line).compact.min
@@ -915,8 +929,7 @@ module RubyParserStuff
   end
 
   def new_class val
-    # TODO: get line from class keyword
-    line, path, superclass, body = val[1], val[2], val[3], val[5]
+    (_, line), path, superclass, _, body, (_, line_max) = val
 
     path = path.first if path.instance_of? Array
 
@@ -931,6 +944,7 @@ module RubyParserStuff
     end
 
     result.line = line
+    result.line_max = line_max
     result.comments = self.comments.pop
     result
   end
@@ -959,13 +973,14 @@ module RubyParserStuff
   end
 
   def new_defn val
-    _, (name, line), in_def, args, body, _ = val
+    _, (name, line), in_def, args, body, (_, line_max) = val
 
     body ||= s(:nil).line line
 
     args.line line
 
     result = s(:defn, name.to_sym, args).line line
+    result.line_max = line_max
 
     if body.sexp_type == :block then
       result.push(*body.sexp_body)
@@ -978,14 +993,58 @@ module RubyParserStuff
     [result, in_def]
   end
 
+  def new_endless_defn val
+    (name, line, in_def), args, _, body, _, resbody = val
+
+    result =
+      if resbody then
+        s(:defn, name, args,
+          new_rescue(body,
+                     new_resbody(s(:array).line(line),
+                                 resbody))).line line
+      else
+        s(:defn, name, args, body).line line
+      end
+
+    local_pop in_def
+    endless_method_name result
+
+    result.comments = self.comments.pop
+
+    result
+  end
+
+  def new_endless_defs val
+    (recv, (name, line, in_def)), args, _, body, _, resbody = val
+
+    result =
+      if resbody then
+        s(:defs, recv, name, args,
+          new_rescue(body,
+                     new_resbody(s(:array).line(line),
+                                 resbody))).line line
+      else
+        s(:defs, recv, name, args, body).line(line)
+      end
+
+    self.in_single -= 1
+    local_pop in_def
+    endless_method_name result
+
+    result.comments = self.comments.pop
+
+    result
+  end
+
   def new_defs val
-    _, recv, (name, line), in_def, args, body, _ = val
+    _, recv, (name, line), in_def, args, body, (_, line_max) = val
 
     body ||= s(:nil).line line
 
     args.line line
 
     result = s(:defs, recv, name.to_sym, args).line line
+    result.line_max = line_max
 
     # TODO: remove_begin
     # TODO: reduce_nodes
@@ -1019,9 +1078,9 @@ module RubyParserStuff
     lhs_id = "*#{lhs_id}".to_sym
     rhs_id = "*#{rhs_id}".to_sym
 
-    mid.sexp_type = :array_pat # HACK?
+    raise "BAD?" unless mid.sexp_type == :array_TAIL
 
-    s(:find_pat_TAIL, lhs_id, mid, rhs_id).line line
+    s(:find_pat_TAIL, lhs_id, *mid.sexp_body, rhs_id).line line
   end
 
   def new_for expr, var, body
@@ -1150,12 +1209,12 @@ module RubyParserStuff
   end
 
   def new_module val
-    # TODO: get line from module keyword
-    line, path, body = val[1], val[2], val[4]
+    (_, line_min), path, _, body, (_, line_max) = val
 
     path = path.first if path.instance_of? Array
 
-    result = s(:module, path).line line
+    result = s(:module, path).line line_min
+    result.line_max = line_max
 
     if body then # REFACTOR?
       if body.sexp_type == :block then
@@ -1237,9 +1296,10 @@ module RubyParserStuff
   end
 
   def new_regexp val
-    (_, line), node, (options, _) = val
+    (_, line), node, (options, line_max) = val
 
     node ||= s(:str, "").line line
+    node.line_max = line_max
 
     o, k = 0, nil
     options.split(//).uniq.each do |c| # FIX: this has a better home
@@ -1307,7 +1367,7 @@ module RubyParserStuff
   end
 
   def new_sclass val
-    recv, in_def, in_single, body = val[3], val[4], val[6], val[7]
+    (_, line), _, recv, in_def, _, in_single, body, _ = val
 
     result = s(:sclass, recv)
 
@@ -1319,7 +1379,7 @@ module RubyParserStuff
       end
     end
 
-    result.line = val[2]
+    result.line = line
     self.in_def = in_def
     self.in_single = in_single
     result
@@ -1604,7 +1664,7 @@ module RubyParserStuff
 
     if remove_width then
       line[idx..-1]
-    elsif line[idx].nil?
+    elsif line[idx] == "\n"
       nil
     else
       col
@@ -1613,6 +1673,12 @@ module RubyParserStuff
 
   alias remove_whitespace_width whitespace_width
 
+  def wrap type, node
+    value, line = node
+    value = value.to_sym if value.respond_to? :to_sym
+    s(type, value).line line
+  end
+
   class Keyword
     include RubyLexer::State::Values
 

data/bundle/ruby/{2.7.0/gems/ruby_parser-3.18.1 → 3.3.0/gems/ruby_parser-3.20.3}/tools/munge.rb

@@ -174,6 +174,10 @@ ARGF.each_line do |line|
     last_token = token
   when /^Reading a token: / then
     next # skip
+  when /^Reading a token$/ then # wtf?
+    next # skip
+  when /^(?:add_delayed_token|parser_dispatch)/ then # dunno what this is yet
+    next # skip
   when /^read\s+:(\w+)/ then # read    :tNL(tNL) nil
     token = munge $1
     next if last_token == token
@@ -212,7 +216,9 @@ ARGF.each_line do |line|
     reduce_line = nil
     stack.clear
   when /^reduce/ then # ruby_parser side
-    puts munge line.chomp
+    s = munge line.chomp
+    next if s =~ /reduce\s+(\w+) --> \1/
+    puts s
     puts
   when /^(\w+_stack)\.(\w+)/ then
     # TODO: make pretty, but still informative w/ line numbers etc
@@ -223,7 +229,7 @@ ARGF.each_line do |line|
     # puts line
     # TODO: make pretty, but still informative w/ line numbers etc
     puts line.gsub("true", "1").gsub("false", "0")
-  when /^lex_state: :?([\w|]+) -> :?([\w|]+)(?: (?:at|from) (.*))?/ then
+  when /^lex_state: :?([\w|()]+) -> :?([\w|]+)(?: (?:at|from) (.*))?/ then
     a, b, c = $1.upcase, $2.upcase, $3
     a.gsub!(/EXPR_/, "")
     b.gsub!(/EXPR_/, "")

data/bundle/ruby/{2.7.0/gems/ruby_parser-3.18.1 → 3.3.0/gems/ruby_parser-3.20.3}/tools/ripper.rb

@@ -21,18 +21,20 @@ end
 ARGV.each do |path|
   src = path == "-" ? $stdin.read : File.read(path)
 
-  sexp = if $b then
-           Ripper.sexp src
-         else
-           rip = MySexpBuilder.new src
-           rip.yydebug = $d
-           rip.parse
-
-           if rip.error? then
-             warn "skipping"
-             next
-           end
-         end
+  sexp = nil
+
+  if $b then
+    sexp = Ripper.sexp src
+  else
+    rip = MySexpBuilder.new src
+    rip.yydebug = $d
+    sexp = rip.parse
+
+    if rip.error? then
+      warn "skipping"
+      next
+    end
+  end
 
   puts "accept"
 

data/bundle/ruby/{2.7.0/gems/sexp_processor-4.16.0 → 3.3.0/gems/sexp_processor-4.17.1}/History.rdoc

@@ -1,3 +1,28 @@
+=== 4.17.1 / 2024-01-15
+
+* 1 minor enhancement:
+
+  * Added 3.3 to pt_testcase.rb
+
+=== 4.17.0 / 2023-05-03
+
+* 2 minor enhancements:
+
+  * Added Sexp#line_max=.
+  * Will load strict_sexp if $SP_DEBUG is set.
+
+* 3 bug fixes:
+
+  * Sexp#line_max lazy accessor now compacts.
+  * Sexp#new copies line_max if defined.
+  * strict_sexp.rb: #first can take an int arg. Fixed mutator wrappers to pass args.
+
+=== 4.16.1 / 2022-04-09
+
+* 1 minor enhancement:
+
+  * Reworked ParseTreeTestCase's notion of versions to make it easier to extend.
+
 === 4.16.0 / 2021-10-27
 
 * 4 minor enhancements:

data/bundle/ruby/{2.7.0/gems/sexp_processor-4.16.0 → 3.3.0/gems/sexp_processor-4.17.1}/lib/pt_testcase.rb

@@ -34,6 +34,12 @@ class Examples
 end
 
 class ParseTreeTestCase < Minitest::Test
+  all_versions  = %w[18 19 20 21 22 23 24 25 26 27 30 31 32 33]
+  most_versions = all_versions.drop(1)
+
+  TEST_SUFFIX = "_#{most_versions.join "_"}"
+  VER_RE      = /(#{Regexp.union(*all_versions)})/
+
   attr_accessor :processor # to be defined by subclass
 
   def setup
@@ -77,7 +83,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19_20_21_22_23_24_25_26_27_30", hash # HACK?
+    add_tests "#{name}_#{TEST_SUFFIX}", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -102,8 +108,6 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
-  VER_RE = "(1[89]|2[01234567]|3[0])"
-
   def self.generate_test klass, node, data, input_name, output_name
     klass.send :define_method, "test_#{node}" do
       flunk "Processor is nil" if processor.nil?
@@ -1068,7 +1072,7 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby2Ruby"    => "-(2 ** 31)")
 
   add_tests("case",
-            "Ruby"         => "var = 2\nresult = \"\"\ncase var\nwhen 1 then\n  puts(\"something\")\n  result = \"red\"\nwhen 2, 3 then\n  result = \"yellow\"\nwhen 4 then\n  # do nothing\nelse\n  result = \"green\"\nend\ncase result\nwhen \"red\" then\n  var = 1\nwhen \"yellow\" then\n  var = 2\nwhen \"green\" then\n  var = 3\nelse\n  # do nothing\nend\n",
+            "Ruby"         => "var = 2\nresult = \"\"\ncase var\nwhen 1 then\n  puts(\"something\")\n  result = \"red\"\nwhen 2, 3 then\n  result = \"yellow\"\nwhen 4 then\n  # do nothing\nelse\n  result = \"green\"\nend\ncase result\nwhen \"red\" then\n  var = 1\nwhen \"yellow\" then\n  var = 2\nwhen \"green\" then\n  var = 3\nend\n",
             "ParseTree"    => s(:block,
                                 s(:lasgn, :var, s(:lit, 2)),
                                 s(:lasgn, :result, s(:str, "")),
@@ -1120,7 +1124,7 @@ class ParseTreeTestCase < Minitest::Test
                                   s(:lasgn, :result, s(:lit, 7)))))
 
   add_tests("case_nested_inner_no_expr",
-            "Ruby"         => "case a\nwhen b then\n  case\n  when (d and e) then\n    f\n  else\n    # do nothing\n  end\nelse\n  # do nothing\nend",
+            "Ruby"         => "case a\nwhen b then\n  case\n  when (d and e) then\n    f\n  end\nend",
             "ParseTree"    => s(:case, s(:call, nil, :a),
                                 s(:when,
                                   s(:array, s(:call, nil, :b)),

data/bundle/ruby/{2.7.0/gems/sexp_processor-4.16.0 → 3.3.0/gems/sexp_processor-4.17.1}/lib/sexp.rb

@@ -12,6 +12,11 @@ class Sexp < Array # ZenTest FULL
 
   attr_writer :line
 
+  ##
+  # Set the maximum line number for this sexp. Often set by ruby_parser.
+
+  attr_writer :line_max
+
   ##
   # Accessors for the file. Usually set by ruby_parser.
 
@@ -59,6 +64,7 @@ class Sexp < Array # ZenTest FULL
     r = self.class.new._concat(body) # ensures a sexp from map
     r.file     = self.file     if self.file
     r.line     = self.line     if self.line
+    r.line_max = self.line_max if defined?(@line_max)
     r.comments = self.comments if self.comments
     r
   end
@@ -233,7 +239,7 @@ class Sexp < Array # ZenTest FULL
   # Returns the maximum line number of the children of self.
 
   def line_max
-    @line_max ||= self.deep_each.map(&:line).max
+    @line_max ||= self.deep_each.map(&:line).compact.max
   end
 
   ##
@@ -388,4 +394,4 @@ def s *args, &blk
 end
 
 require "sexp_matcher" unless defined? Sexp::Matcher
-require "strict_sexp" if ENV["STRICT_SEXP"].to_i > 0
+require "strict_sexp" if ENV["SP_DEBUG"] || ENV["STRICT_SEXP"].to_i > 0

data/bundle/ruby/{2.7.0/gems/sexp_processor-4.16.0 → 3.3.0/gems/sexp_processor-4.17.1}/lib/sexp_processor.rb

@@ -34,7 +34,7 @@ require "sexp"
 class SexpProcessor
 
   # duh
-  VERSION = "4.16.0"
+  VERSION = "4.17.1"
 
   ##
   # Automatically shifts off the Sexp type before handing the

data/bundle/ruby/{2.7.0/gems/sexp_processor-4.16.0 → 3.3.0/gems/sexp_processor-4.17.1}/lib/strict_sexp.rb

@@ -83,8 +83,9 @@ class Sexp
     self.safe_asgn i, v
   end
 
-  def first
-    raise "use sexp_type"
+  def first(n = nil)
+    raise "use sexp_type" unless n
+    super
   end
 
   nuke_method :collect!, 4
@@ -136,10 +137,10 @@ if ENV["SP_DEBUG"] && !ENV["STRICT_SEXP"] then
                  ]
 
     mutators.each do |method|
-      define_method method do |*|
+      define_method method do |*args|
         warn "Sexp modified by %p at %s" % [__method__, caller.first] if
-          $VERBOSE or (defined?(@hash) and @hash)
-        super
+          ENV["VERBOSE"] or (defined?(@hash) and @hash)
+        super(*args)
       end
     end
   end

data/bundle/ruby/{2.7.0/gems/tilt-2.0.10 → 3.3.0/gems/tilt-2.0.11}/lib/tilt/commonmarker.rb

@@ -9,21 +9,31 @@ module Tilt
       :smartypants => :SMART
     }
     PARSE_OPTIONS = [
+      :FOOTNOTES,
+      :LIBERAL_HTML_TAG,
       :SMART,
       :smartypants,
+      :STRIKETHROUGH_DOUBLE_TILDE,
+      :UNSAFE,
+      :VALIDATE_UTF8,
     ].freeze
     RENDER_OPTIONS = [
+      :FOOTNOTES,
+      :FULL_INFO_STRING,
       :GITHUB_PRE_LANG,
       :HARDBREAKS,
       :NOBREAKS,
-      :SAFE,
+      :SAFE, # Removed in v0.18.0 (2018-10-17)
       :SOURCEPOS,
+      :TABLE_PREFER_STYLE_ATTRIBUTES,
+      :UNSAFE,
     ].freeze
     EXTENSIONS = [
       :autolink,
       :strikethrough,
       :table,
       :tagfilter,
+      :tasklist,
     ].freeze
 
     def extensions

data/bundle/ruby/{2.7.0/gems/tilt-2.0.10 → 3.3.0/gems/tilt-2.0.11}/lib/tilt/csv.rb

@@ -50,7 +50,7 @@ module Tilt
 
     def precompiled_template(locals)
       <<-RUBY
-        #{@outvar} = #{self.class.engine}.generate(#{options}) do |csv|
+        #{@outvar} = #{self.class.engine}.generate(**#{options}) do |csv|
           #{data}
         end
       RUBY

data/bundle/ruby/{2.7.0/gems/tilt-2.0.10 → 3.3.0/gems/tilt-2.0.11}/lib/tilt/pandoc.rb

@@ -7,30 +7,38 @@ module Tilt
   class PandocTemplate < Template
     self.default_mime_type = 'text/html'
 
-    def tilt_to_pandoc_mapping
-      { :smartypants => :smart,
-        :escape_html => { :f => 'markdown-raw_html' },
-        :commonmark => { :f => 'commonmark' },
-        :markdown_strict => { :f => 'markdown_strict' }
-      }
-    end
-
     # turn options hash into an array
     # Map tilt options to pandoc options
     # Replace hash keys with value true with symbol for key
     # Remove hash keys with value false
     # Leave other hash keys untouched
     def pandoc_options
-      options.reduce([]) do |sum, (k,v)|
-        case v
-        when true
-          sum << (tilt_to_pandoc_mapping[k] || k)
-        when false
-          sum
+      result = []
+      from = "markdown"
+      smart_extension = "-smart"
+      options.each do |k,v|
+        case k
+        when :smartypants
+          smart_extension = "+smart" if v
+        when :escape_html
+          from = "markdown-raw_html" if v
+        when :commonmark
+          from = "commonmark" if v
+        when :markdown_strict
+          from = "markdown_strict" if v
         else
-          sum << { k => v }
+          case v
+          when true
+            result << k
+          when false
+            # do nothing
+          else
+            result << { k => v }
+          end
         end
       end
+      result << { :f => from + smart_extension }
+      result
     end
 
     def prepare

data/bundle/ruby/{2.7.0/gems/tilt-2.0.10 → 3.3.0/gems/tilt-2.0.11}/lib/tilt/redcarpet.rb

@@ -75,9 +75,12 @@ module Tilt
   end
 
   if defined? ::Redcarpet::Render and defined? ::Redcarpet::Markdown
-    RedcarpetTemplate = Redcarpet2Template
+    superclass = Redcarpet2Template
   else
-    RedcarpetTemplate = Redcarpet1Template
+    superclass = Redcarpet1Template
+  end
+
+  class RedcarpetTemplate < superclass
   end
 end
 

data/bundle/ruby/3.3.0/gems/tilt-2.0.11/lib/tilt/rst-pandoc.rb

@@ -0,0 +1,23 @@
+require 'tilt/template'
+require 'pandoc'
+
+module Tilt
+  # Pandoc reStructuredText implementation. See:
+  # http://pandoc.org/
+  class RstPandocTemplate < PandocTemplate
+    self.default_mime_type = 'text/html'
+
+    def prepare
+      @engine = PandocRuby.new(data, :f => "rst")
+      @output = nil
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= @engine.to_html.strip
+    end
+
+    def allows_script?
+      false
+    end
+  end
+end