brakeman 4.8.1 → 4.10.1

data/bundle/ruby/{2.4.0/gems/ruby_parser-3.14.2 → 2.7.0/gems/ruby_parser-3.15.0}/lib/ruby_parser_extras.rb

@@ -1,4 +1,5 @@
 # encoding: ASCII-8BIT
+# TODO: remove
 
 require "sexp"
 require "ruby_lexer"
@@ -28,7 +29,7 @@ class Sexp
 end
 
 module RubyParserStuff
-  VERSION = "3.14.2"
+  VERSION = "3.15.0"
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_accessor :in_kwarg
@@ -45,6 +46,11 @@ module RubyParserStuff
 
   attr_accessor :canonicalize_conditions
 
+  ##
+  # The last token type returned from #next_token
+
+  attr_accessor :last_token_type
+
   $good20 = []
 
   %w[
@@ -493,6 +499,8 @@ module RubyParserStuff
           str.encode! Encoding::UTF_8
           break
         end
+      rescue ArgumentError # unknown encoding name
+        # do nothing
       rescue Encoding::InvalidByteSequenceError
         # do nothing
       rescue Encoding::UndefinedConversionError
@@ -532,7 +540,7 @@ module RubyParserStuff
     header.map! { |s| s.force_encoding "ASCII-8BIT" } if has_enc
 
     first = header.first || ""
-    encoding, str = "utf-8", str[3..-1] if first =~ /\A\xEF\xBB\xBF/
+    encoding, str = "utf-8", str.b[3..-1] if first =~ /\A\xEF\xBB\xBF/
 
     encoding = $1.strip if header.find { |s|
       s[/^#.*?-\*-.*?coding:\s*([^ ;]+).*?-\*-/, 1] ||
@@ -592,7 +600,9 @@ module RubyParserStuff
     case ttype
     when :str then
       if htype == :str
-        head.last << tail.last
+        a, b = head.last, tail.last
+        b = b.dup.force_encoding a.encoding unless Encoding.compatible?(a, b)
+        a << b
       elsif htype == :dstr and head.size == 2 then
         head.last << tail.last
       else
@@ -696,6 +706,15 @@ module RubyParserStuff
     result
   end
 
+  def new_begin val
+    _, lineno, body, _ = val
+
+    result = body ? s(:begin, body) : s(:nil)
+    result.line lineno
+
+    result
+  end
+
   def new_body val
     body, resbody, elsebody, ensurebody = val
 
@@ -723,7 +742,10 @@ module RubyParserStuff
       result = block_append(result, elsebody)
     end
 
-    result = s(:ensure, result, ensurebody).compact.line result.line if ensurebody
+    if ensurebody
+      lineno = (result || ensurebody).line
+      result = s(:ensure, result, ensurebody).compact.line lineno
+    end
 
     result
   end
@@ -843,14 +865,17 @@ module RubyParserStuff
   end
 
   def new_defs val
-    recv, (name, _line), args, body = val[1], val[4], val[6], val[7]
-    line, _ = val[5]
+    _, recv, _, _, name, (_in_def, line), args, body, _ = val
+
     body ||= s(:nil).line line
 
     args.line line
 
     result = s(:defs, recv, name.to_sym, args)
 
+    # TODO: remove_begin
+    # TODO: reduce_nodes
+
     if body then
       if body.sexp_type == :block then
         result.push(*body.sexp_body)
@@ -875,7 +900,9 @@ module RubyParserStuff
   end
 
   def new_hash val
-    s(:hash, *val[2].values).line(val[1])
+    _, line, assocs = val
+
+    s(:hash).line(line).concat assocs.values
   end
 
   def new_if c, t, f
@@ -1134,6 +1161,7 @@ module RubyParserStuff
   def new_string val
     str, = val
     str.force_encoding("UTF-8")
+    # TODO: remove:
     str.force_encoding("ASCII-8BIT") unless str.valid_encoding?
     result = s(:str, str).line lexer.lineno
     self.lexer.fixup_lineno str.count("\n")
@@ -1228,20 +1256,23 @@ module RubyParserStuff
     result
   end
 
-  def new_xstring str
-    if str then
-      case str.sexp_type
+  def new_xstring val
+    _, node = val
+
+    node ||= s(:str, "").line lexer.lineno
+
+    if node then
+      case node.sexp_type
       when :str
-        str.sexp_type = :xstr
+        node.sexp_type = :xstr
       when :dstr
-        str.sexp_type = :dxstr
+        node.sexp_type = :dxstr
       else
-        str = s(:dxstr, "", str).line str.line
+        node = s(:dxstr, "", node).line node.line
       end
-      str
-    else
-      s(:xstr, "")
     end
+
+    node
   end
 
   def new_yield args = nil
@@ -1262,6 +1293,7 @@ module RubyParserStuff
     token = self.lexer.next_token
 
     if token and token.first != RubyLexer::EOF then
+      self.last_token_type = token
       return token
     else
       return [false, false]
@@ -1320,6 +1352,7 @@ module RubyParserStuff
     self.in_single = 0
     self.env.reset
     self.comments.clear
+    self.last_token_type = nil
   end
 
   def ret_args node

data/bundle/ruby/{2.4.0/gems/ruby_parser-3.14.2 → 2.7.0/gems/ruby_parser-3.15.0}/tools/munge.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -ws
+#!/usr/bin/env ruby -ws
 
 $v ||= false
 
@@ -118,6 +118,8 @@ def munge s
 
              /@(\d+)(\s+|$)/,       "",
              /\$?@(\d+) */,         "", # TODO: remove?
+
+             /_EXPR/,               "",
             ]
 
   renames.each_slice(2) do |(a, b)|
@@ -194,10 +196,13 @@ ARGF.each_line do |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
-    if $3 && $v then
-      puts "lex_state: #{$1.upcase} -> #{$2.upcase} at #{$3}"
+    a, b, c = $1.upcase, $2.upcase, $3
+    a.gsub! /EXPR_/, ""
+    b.gsub! /EXPR_/, ""
+    if c && $v then
+      puts "lex_state: #{a} -> #{b} at #{c}"
     else
-      puts "lex_state: #{$1.upcase} -> #{$2.upcase}"
+      puts "lex_state: #{a} -> #{b}"
     end
   when /debug|FUCK/ then
     puts line.chomp

data/bundle/ruby/{2.4.0/gems/sexp_processor-4.14.1 → 2.7.0/gems/sexp_processor-4.15.1}/History.rdoc

@@ -1,3 +1,15 @@
+=== 4.15.1 / 2020-08-31
+
+* 1 bug fix:
+
+  * Bumped ruby version to include 3.0 (trunk).
+
+=== 4.15.0 / 2020-06-09
+
+* 1 minor enhancement:
+
+  * Added `child` and `include` to Sexp::Matcher.parse language.
+
 === 4.14.1 / 2020-02-09
 
 * 2 bug fixes:

data/bundle/ruby/{2.4.0/gems/sexp_processor-4.14.1 → 2.7.0/gems/sexp_processor-4.15.1}/lib/pt_testcase.rb

@@ -77,7 +77,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19_20_21_22_23_24_25_26", hash # HACK?
+    add_tests "#{name}__19_20_21_22_23_24_25_26_27", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -102,7 +102,7 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
-  VER_RE = "(1[89]|2[0123456])"
+  VER_RE = "(1[89]|2[01234567])"
 
   def self.generate_test klass, node, data, input_name, output_name
     klass.send :define_method, "test_#{node}" do

data/bundle/ruby/{2.4.0/gems/sexp_processor-4.14.1 → 2.7.0/gems/sexp_processor-4.15.1}/lib/sexp_matcher.rb

@@ -455,7 +455,7 @@ class Sexp #:nodoc:
       #        | NAME:name                   => name.to_sym
       # UP_NAME: /[A-Z]\w*/
       #   NAME : /:?[\w?!=~-]+/
-      #    CMD : "t" | "k" | "m" | "atom" | "not?" | "-" | "any"
+      #    CMD : t | k | m | atom | not? | - | any | child | include
 
       def parse_sexp
         token = next_token
@@ -505,7 +505,7 @@ class Sexp #:nodoc:
       ##
       # A collection of allowed commands to convert into matchers.
 
-      ALLOWED = [:t, :m, :k, :atom, :not?, :-, :any].freeze
+      ALLOWED = [:t, :m, :k, :atom, :not?, :-, :any, :child, :include].freeze
 
       ##
       # Parses a balanced command. A command is denoted by square
@@ -760,11 +760,8 @@ class Sexp #:nodoc:
     # +child+.
 
     def satisfy? o
-      if child.satisfy? o
-        true
-      elsif o.kind_of? Sexp
-        o.search_each(child).any?
-      end
+      child.satisfy?(o) ||
+        (o.kind_of?(Sexp) && o.search_each(child).any?)
     end
 
     def == o # :nodoc:

data/bundle/ruby/{2.4.0/gems/sexp_processor-4.14.1 → 2.7.0/gems/sexp_processor-4.15.1}/lib/sexp_processor.rb

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

data/bundle/ruby/{2.4.0/gems/slim-4.0.1 → 2.7.0/gems/slim-4.1.0}/CHANGES

@@ -1,3 +1,7 @@
+4.1.0 (2020-05-07)
+  * Add support for Tailwind CSS - #841
+  * Update dependencies and testing
+  
 4.0.1 (2018-09-02)
 
   * Fix incompatibility issue with Slim Include plugin and new ability to specifiy attributes for embedded engines #819

data/bundle/ruby/{2.4.0/gems/slim-4.0.1 → 2.7.0/gems/slim-4.1.0}/Gemfile

@@ -7,6 +7,12 @@ group :test do
   gem 'rack-test'
 end
 
+group :perf do
+  gem 'benchmark-ips'
+  gem 'erubis'
+  gem 'haml'
+end
+
 if ENV['TRAVIS']
   gem 'rails-controller-testing'
 end
@@ -30,19 +36,12 @@ if ENV['RAILS']
   else
     gem 'rails', "= #{ENV['RAILS']}"
   end
-end
 
-#Choose minitest 4.7.x for sinatra < 1.4.6 or rails 3 and 4.0 otherwise go for newer version
-if (ENV['SINATRA'] && ENV['SINATRA'] < '1.4.6') || (ENV['RAILS'] && ENV['RAILS'].match(/^(3|4\.0)/))
-  gem 'minitest', '~> 4.7.4'
-else
-  gem 'minitest', '~> 5.1'
+  gem 'slim-rails', require: false
 end
 
-#Ruby >= 2.2.0 has removed test/unit from Stdlib
-if RUBY_VERSION >= '2.2.0'
-  gem 'test-unit', platforms: :mri
-end
+gem 'test-unit', '~> 3.3', '>= 3.3.5'
+gem 'minitest', '~> 5.14'
 
 if RUBY_ENGINE == 'rbx' && !ENV['TRAVIS']
   gem 'psych'
@@ -56,9 +55,9 @@ if ENV['SINATRA']
   end
 end
 
-gem 'rake', '>= 0.8.7'
-gem 'sass', '>= 3.1.0'
-gem 'kramdown'
+gem 'rake', '~> 13.0', '>= 13.0.1'
+gem 'sassc', '~> 2.2', '>= 2.2.1'
+gem 'kramdown', '~> 2.1'
 
 if ENV['TASK'] == 'bench'
   gem 'benchmark-ips'