brakeman 4.5.1 → 4.7.1

data/bundle/ruby/{2.5.0/gems/ruby_parser-3.13.1 → 2.6.0/gems/ruby_parser-3.14.0}/tools/munge.rb

@@ -151,7 +151,7 @@ ARGF.each_line do |line|
     next if last_token == token
     puts "next token is %p (%p)" % [token, last_token]
     last_token = token
-  when /^Next token is token (\S+)/ then
+  when /^Next token is token ("[^"]+"|\S+)/ then
     token = munge $1
     next if last_token == token
     puts "next token is %p (%p)" % [token, last_token]

data/bundle/ruby/{2.5.0/gems/ruby_parser-3.13.1 → 2.6.0/gems/ruby_parser-3.14.0}/tools/ripper.rb

@@ -11,14 +11,25 @@ if ARGV.empty? then
   ARGV << "-"
 end
 
+class MySexpBuilder < Ripper::SexpBuilderPP
+  def on_parse_error msg
+    Kernel.warn msg
+  end
+end
+
 ARGV.each do |path|
   src = path == "-" ? $stdin.read : File.read(path)
-  rip = Ripper::SexpBuilderPP.new src
+  rip = MySexpBuilder.new src
   rip.yydebug = $d
 
   sexp = rip.parse
 
-  puts "accept" unless rip.error?
+  if rip.error? then
+    warn "skipping"
+    next
+  end
+
+  puts "accept"
 
   if $p then
     pp sexp

data/bundle/ruby/{2.5.0/gems/sexp_processor-4.12.0 → 2.6.0/gems/sexp_processor-4.13.0}/History.rdoc

@@ -1,3 +1,28 @@
+=== 4.13.0 / 2019-09-24
+
+* 4 minor enhancements:
+
+  * Added Sexp.q (query) and deprecated Sexp.s to distinguish better and match inspect output.
+  * Extended Sexp::Matcher::Parser to allow `not?` patterns.
+  * Extended Sexp::Matcher::Parser to cover more method names.
+  * Split out all pattern-oriented code to sexp_matcher.rb.
+
+* 1 bug fix:
+
+  * Fixed bug w/ ruby's Array#eql? and #hash not looking at ivars.
+
+=== 4.12.1 / 2019-06-03
+
+* 1 minor enhancement:
+
+  * Sexp#line now raises if setting w/ non-integer (eg nil).
+
+* 3 bug fixes:
+
+  * Fixed pt_testcase.rb for block args w/ trailing commas.
+  * Fixed pt_testcase.rb for stabby proc sexps.
+  * Simple fixes for STRICT_SEXP=1.
+
 === 4.12.0 / 2019-03-12
 
 * 3 bug fixes:

data/bundle/ruby/{2.5.0/gems/sexp_processor-4.12.0 → 2.6.0/gems/sexp_processor-4.13.0}/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 lib/composite_sexp_processor.rb
 lib/pt_testcase.rb
 lib/sexp.rb
+lib/sexp_matcher.rb
 lib/sexp_processor.rb
 lib/strict_sexp.rb
 lib/unique.rb

data/bundle/ruby/{2.5.0/gems/sexp_processor-4.12.0 → 2.6.0/gems/sexp_processor-4.13.0}/lib/pt_testcase.rb

@@ -363,26 +363,26 @@ class ParseTreeTestCase < Minitest::Test
   ###
   # 1.9 specific tests
 
-  add_19edgecases("lambda { || (x + 1) }",
+  add_19edgecases("-> () { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args),
                     s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
                   "stabby_args"                   => "->() { (x + 1) }",
                   "stabby_args_doend"             => "->() do (x + 1) end")
 
-  add_19edgecases("lambda { (x + 1) }",
+  add_19edgecases("-> { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     0,
                     s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
                   "stabby_args_0_no_parens"       => "-> { (x + 1) }",
                   "stabby_args_0_no_parens_doend" => "-> do (x + 1) end",
                   "stabby_args_0_spacebar_broken" => "->{x+1}") # I hate you
 
-  add_19edgecases("lambda { |x, y| (x + y) }",
+  add_19edgecases("-> (x, y) { (x + y) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args, :x, :y),
                     s(:call, s(:lvar, :x), :+, s(:lvar, :y))),
                   "stabby_args_2"                 => "->(x, y) { (x + y) }",
@@ -390,9 +390,9 @@ class ParseTreeTestCase < Minitest::Test
                   "stabby_args_2_no_parens"       => "-> x, y { (x + y) }",
                   "stabby_args_2_no_parens_doend" => "-> x, y do (x + y) end")
 
-  add_19edgecases("lambda { |x| (x + 1) }",
+  add_19edgecases("-> (x) { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args, :x),
                     s(:call, s(:lvar, :x), :+, s(:lit, 1))),
                   "stabby_args_1"                 => "->(x) { (x + 1) }",
@@ -2080,17 +2080,15 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "lambda { |a,| a }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :lambda),
-                                s(:args, :a),
-                                s(:lvar, :a)),
-            "Ruby2Ruby"    => "lambda { |a| a }")
+                                s(:args, :a, nil),
+                                s(:lvar, :a)))
 
   add_tests("lambda_args_norm_comma2",
-            "Ruby"         => "lambda { |a,b,| a }",
+            "Ruby"         => "lambda { |a, b,| a }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :lambda),
-                                s(:args, :a, :b),
-                                s(:lvar, :a)),
-            "Ruby2Ruby"    => "lambda { |a, b| a }")
+                                s(:args, :a, :b, nil),
+                                s(:lvar, :a)))
 
   add_tests("lambda_args_norm_star",
             "Ruby"         => "lambda { |a, *star| star }",

data/bundle/ruby/2.6.0/gems/sexp_processor-4.13.0/lib/sexp.rb

@@ -0,0 +1,381 @@
+$TESTING ||= false # unless defined $TESTING
+
+##
+# Sexps are the basic storage mechanism of SexpProcessor.  Sexps have
+# a +type+ (to be renamed +node_type+) which is the first element of
+# the Sexp. The type is used by SexpProcessor to determine whom to
+# dispatch the Sexp to for processing.
+
+class Sexp < Array # ZenTest FULL
+  ##
+  # A setter for the line this sexp was found on. Usually set by ruby_parser.
+
+  attr_writer :line
+
+  ##
+  # Accessors for the file. Usually set by ruby_parser.
+
+  attr_accessor :file
+
+  ##
+  # Optional comments above/aside this sexp. Usually set by ruby_parser.
+
+  attr_accessor :comments
+
+  @@array_types = [ :array, :args ] # TODO: remove
+
+  ##
+  # Create a new Sexp containing +args+.
+
+  def initialize *args
+    super(args)
+  end
+
+  ##
+  # Creates a new Sexp from Array +a+.
+
+  def self.from_array a
+    ary = Array === a ? a : [a]
+
+    self.new.concat(ary.map { |x|
+               case x
+               when Sexp
+                 x
+               when Array
+                 self.from_array(x)
+               else
+                 x
+               end
+             })
+  end
+
+  ##
+  # Creates a new sexp with the new contents of +body+, but with the
+  # same +file+, +line+, and +comment+ as self.
+
+  def new(*body)
+    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.comments = self.comments if self.comments
+    r
+  end
+
+  def map &blk # :nodoc:
+    self.new.concat(super(&blk)) # ensures a sexp from map
+  end
+
+  def == obj # :nodoc:
+    obj.class == self.class and super # only because of a bug in ruby
+  end
+
+  def eql? o
+    self.class == o.class && super
+  end
+
+  def hash
+    [self.class, *self].hash
+  end
+
+  ##
+  # Returns true if the node_type is +array+ or +args+.
+  #
+  # REFACTOR: to TypedSexp - we only care when we have units.
+
+  def array_type?
+    warn "DEPRECATED: please file an issue if you actually use this. from #{caller.first}"
+    type = self.sexp_type
+    @@array_types.include? type
+  end
+
+  def compact # :nodoc:
+    self.delete_if(&:nil?)
+  end
+
+  ##
+  # Recursively enumerates the sexp yielding to +block+ for every element.
+  #
+  # Returning :skip will stop traversing that subtree:
+  #
+  #   sexp.deep_each do |s|
+  #     next :skip if s.sexp_type == :if
+  #     # ...
+  #   end
+
+  def deep_each &block
+    return enum_for(:deep_each) unless block_given?
+
+    self.each_sexp do |sexp|
+      next if block[sexp] == :skip
+      sexp.deep_each(&block)
+    end
+  end
+
+  ##
+  # Return the maximum depth of the sexp. One-based.
+
+  def depth
+    1 + (each_sexp.map(&:depth).max || 0)
+  end
+
+  ##
+  # Enumeratates the sexp yielding to +b+ when the node_type == +t+.
+
+  def each_of_type t, &b
+    return enum_for(:each_of_type) unless block_given?
+
+    each_sexp do | sexp |
+      sexp.each_of_type(t, &b)
+      yield sexp if sexp.sexp_type == t
+    end
+  end
+
+  ##
+  # Recursively enumerates all sub-sexps skipping non-Sexp elements.
+
+  def each_sexp
+    return enum_for(:each_sexp) unless block_given?
+
+    self.each do |sexp|
+      next unless Sexp === sexp
+
+      yield sexp
+    end
+  end
+
+  ##
+  # Replaces all elements whose node_type is +from+ with +to+. Used
+  # only for the most trivial of rewrites.
+
+  def find_and_replace_all from, to
+    each_with_index do | elem, index |
+      if Sexp === elem then
+        elem.find_and_replace_all(from, to)
+      elsif elem == from
+        self[index] = to
+      end
+    end
+  end
+
+  ##
+  # Replaces all Sexps matching +pattern+ with Sexp +repl+.
+
+  def gsub pattern, repl
+    return repl if pattern == self
+
+    new = self.map { |subset|
+      case subset
+      when Sexp then
+        if Matcher === pattern && pattern.satisfy?(subset) then # TODO: make === be satisfy? maybe?
+          repl.dup rescue repl
+        else
+          subset.gsub pattern, repl
+        end
+      else
+        subset
+      end
+    }
+
+    Sexp.from_array new
+  end
+
+  def inspect # :nodoc:
+    sexp_str = self.map(&:inspect).join ", "
+    if ENV["VERBOSE"] && line then
+      "s(#{sexp_str}).line(#{line})"
+    else
+      "s(#{sexp_str})"
+    end
+  end
+
+  def find_node name, delete = false # :nodoc:
+    matches = find_nodes name
+
+    case matches.size
+    when 0 then
+      nil
+    when 1 then
+      match = matches.first
+      delete match if delete
+      match
+    else
+      raise NoMethodError, "multiple nodes for #{name} were found in #{inspect}"
+    end
+  end
+
+  ##
+  # Find every node with type +name+.
+
+  def find_nodes name
+    each_sexp.find_all { |sexp| sexp.sexp_type == name }
+  end
+
+  UNASSIGNED = Object.new
+
+  ##
+  # If passed a line number, sets the line and returns self. Otherwise
+  # returns the line number. This allows you to do message cascades
+  # and still get the sexp back.
+
+  def line n = UNASSIGNED
+    if n != UNASSIGNED then
+      raise ArgumentError, "setting %p.line %p" % [self, n] unless Integer === n
+      @line = n
+      self
+    else
+      @line ||= nil
+    end
+  end
+
+  ##
+  # Returns the maximum line number of the children of self.
+
+  def line_max
+    @line_max ||= self.deep_each.map(&:line).max
+  end
+
+  ##
+  # Returns the size of the sexp, flattened.
+
+  def mass
+    @mass ||= inject(1) { |t, s| Sexp === s ? t + s.mass : t }
+  end
+
+  ##
+  # Returns the node named +node+, deleting it if +delete+ is true.
+
+  def method_missing meth, delete = false
+    r = find_node meth, delete
+    if ENV["DEBUG"] then
+      if r.nil? then
+        warn "%p.method_missing(%p) => nil from %s" % [self, meth, caller.first]
+      elsif ENV["VERBOSE"]
+        warn "%p.method_missing(%p) from %s" % [self, meth, caller.first]
+      end
+    end
+    r
+  end
+
+  def respond_to? msg, private = false # :nodoc:
+    # why do I need this? Because ruby 2.0 is broken. That's why.
+    super
+  end
+
+  def pretty_print q # :nodoc:
+    nnd = ")"
+    nnd << ".line(#{line})" if line && ENV["VERBOSE"]
+
+    q.group(1, "s(", nnd) do
+      q.seplist(self) {|v| q.pp v }
+    end
+  end
+
+  ##
+  # Returns the node type of the Sexp.
+
+  def sexp_type
+    first
+  end
+
+  ##
+  # Sets the node type of the Sexp.
+
+  def sexp_type= v
+    self[0] = v
+  end
+
+  ##
+  # Returns the Sexp body (starting at +from+, defaulting to 1), ie
+  # the values without the node type.
+
+  def sexp_body from = 1
+    self.new.concat(self[from..-1] || [])
+  end
+
+  ##
+  # Returns the Sexp body, ie the values without the node type.
+
+  def sexp_body= v
+    self[1..-1] = v
+  end
+
+  alias :head :sexp_type
+  alias :rest :sexp_body
+
+  ##
+  # If run with debug, Sexp will raise if you shift on an empty
+  # Sexp. Helps with debugging.
+
+  def shift
+    raise "I'm empty" if self.empty?
+    super
+  end if ($DEBUG or $TESTING)
+
+  ##
+  # Returns the bare bones structure of the sexp.
+  # s(:a, :b, s(:c, :d), :e) => s(:a, s(:c))
+
+  def structure
+    if Array === self.sexp_type then
+      warn "NOTE: form s(s(:subsexp)).structure is deprecated. Removing in 5.0"
+      s(:bogus, *self).structure # TODO: remove >= 4.2.0
+    else
+      s(self.sexp_type, *each_sexp.map(&:structure))
+    end
+  end
+
+  ##
+  # Replaces the Sexp matching +pattern+ with +repl+.
+
+  def sub pattern, repl
+    return repl.dup if pattern == self
+    return repl.dup if Matcher === pattern && pattern.satisfy?(self)
+
+    done = false
+
+    new = self.map do |subset|
+      if done then
+        subset
+      else
+        case subset
+        when Sexp then
+          if pattern == subset then
+            done = true
+            repl.dup rescue repl
+          elsif Matcher === pattern && pattern.satisfy?(subset) then
+            done = true
+            repl.dup rescue repl
+          else
+            subset.sub pattern, repl
+          end
+        else
+          subset
+        end
+      end
+    end
+
+    Sexp.from_array new
+  end
+
+  def to_a # :nodoc:
+    self.map { |o| Sexp === o ? o.to_a : o }
+  end
+
+  alias to_s inspect # :nodoc:
+end
+
+##
+# This is a very important shortcut to make using Sexps much more awesome.
+#
+# In its normal form +s(...)+, creates a Sexp instance. If passed a
+# block, it creates a Sexp::Matcher using the factory methods on Sexp.
+#
+# See Matcher and other factory class methods on Sexp.
+
+def s *args, &blk
+  return Sexp.class_eval(&blk) if blk
+  Sexp.new(*args)
+end
+
+require "sexp_matcher" unless defined? Sexp::Matcher
+require "strict_sexp" if ENV["STRICT_SEXP"].to_i > 0