brakeman 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d543d5a5e76202e3cbb7f0f13223d9daebb01d
-  data.tar.gz: 73e5ff727f9e70a6ccb4fc91af914af8be9eebcf
+  metadata.gz: 9c676c07132a5e5df3d4cf679ecc55ee25d27f8f
+  data.tar.gz: 637b645d451d50af8b7538962dfd807b6c8e71ef
 SHA512:
-  metadata.gz: e23e2501bb5382d83fd15119f963bce6bc4201d11b6f97e62f16388fca71dafddc1555fcc598ba7e9719cf26584c23db4093cc080c4588128c8f229b5916c8da
-  data.tar.gz: e8453f2c7cbcb4ca6c5421b06faef218df4166302a0fceafdc0a45a41c30f582d58f352850b76a4010b5af1d832591b553d55e2f2a606580aeae11de7c3ad7fe
+  metadata.gz: cdcdfec84f0d1de46bb4b15ca356107eb64252b00462dc38a123582dacb528ed05a5d1097958ff49700be1b6ab41cfe952a59835840e924b9430c225d14ffa2d
+  data.tar.gz: 40ee357bdc5b71bac031cdc694819be263e79b21855f632aa1f8183e7d9276b1197fe9e6f928a67b3f4ba9535c8f4492dd7ff11af7fd2cf9a47442238b468290

data/CHANGES

@@ -1,3 +1,18 @@
+# 3.5.0
+
+* Allow `-t None`
+* Fail on invalid checks specified by `-x` or `-t`
+* Avoid warning about all, first, or last after Rails 4.0
+* Avoid warning about models in SQLi
+* Lower confidence of SQLi when maybe not on models
+* Warn about SQLi even potentially on non-models
+* Report check name in JSON and plain reports
+* Treat templates without `.html` as HTML anyway
+* Add `--ensure-latest` option (tamgrosser / Michael Grosser)
+* Add `--no-summary` to hide summaries in HTML/text reports
+* Handle `included` block in concerns
+* Process concerns before controllers
+
 # 3.4.1
 
 * Show action help at start of interactive ignore

data/README.md

@@ -36,7 +36,9 @@ Outside of Rails root:
 
 # Compatibility
 
-Brakeman works with Rails 2.x, 3.x, and 4.x.
+Brakeman should work with any version of Rails from 2.3.x to 5.x.
+
+Brakeman can analyze code written with Ruby 1.8 syntax and newer, but requires at least Ruby 1.9.3 to run.
 
 # Basic Options
 
@@ -101,7 +103,7 @@ To create and manage this file, use:
 
 # Warning information
 
-See [WARNING\_TYPES](WARNING_TYPES) for more information on the warnings reported by this tool.
+See [warning\_types](docs/warning_types) for more information on the warnings reported by this tool.
 
 # Warning context
 

data/bin/brakeman

@@ -57,6 +57,13 @@ if options[:quiet].nil?
 end
 
 begin
+  if options[:ensure_latest]
+    if error = Brakeman.ensure_latest
+      warn error
+      exit Brakeman::Not_Latest_Version_Exit_Code
+    end
+  end
+
   if options[:previous_results_json]
     require 'json'
     vulns = Brakeman.compare options.merge(:quiet => options[:quiet])
@@ -84,6 +91,9 @@ begin
     end
   end
 rescue Brakeman::NoApplication => e
-  $stderr.puts e.message
+  warn e.message
   exit Brakeman::No_App_Found_Exit_Code
+rescue Brakeman::MissingChecksError => e
+  warn e.message
+  exit Brakeman::Missing_Checks_Exit_Code
 end

data/bundle/load.rb

@@ -1,15 +1,15 @@
 path = File.expand_path('../..', __FILE__)
+$:.unshift "#{path}/bundle/ruby/2.3.0/gems/sass-3.4.23/lib"
+$:.unshift "#{path}/bundle/ruby/2.3.0/gems/sass-3.4.23/vendor/listen/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/haml-4.0.7/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/highline-1.7.8/lib"
-$:.unshift "#{path}/bundle/ruby/2.3.0/gems/ruby_parser-3.8.3/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/terminal-table-1.7.3/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/temple-0.7.7/lib"
-$:.unshift "#{path}/bundle/ruby/2.3.0/gems/unicode-display_width-1.1.1/lib"
+$:.unshift "#{path}/bundle/ruby/2.3.0/gems/ruby2ruby-2.3.2/lib"
+$:.unshift "#{path}/bundle/ruby/2.3.0/gems/tilt-2.0.6/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/sexp_processor-4.7.0/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/slim-3.0.7/lib"
-$:.unshift "#{path}/bundle/ruby/2.3.0/gems/ruby2ruby-2.3.1/lib"
-$:.unshift "#{path}/bundle/ruby/2.3.0/gems/sass-3.4.22/lib"
-$:.unshift "#{path}/bundle/ruby/2.3.0/gems/sass-3.4.22/vendor/listen/lib"
+$:.unshift "#{path}/bundle/ruby/2.3.0/gems/ruby_parser-3.8.4/lib"
+$:.unshift "#{path}/bundle/ruby/2.3.0/gems/unicode-display_width-1.1.3/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/erubis-2.7.0/lib"
 $:.unshift "#{path}/bundle/ruby/2.3.0/gems/safe_yaml-1.0.4/lib"
-$:.unshift "#{path}/bundle/ruby/2.3.0/gems/tilt-2.0.5/lib"

data/bundle/ruby/2.3.0/gems/{ruby2ruby-2.3.1 → ruby2ruby-2.3.2}/History.txt

@@ -1,3 +1,13 @@
+=== 2.3.2 / 2016-11-30
+
+* 5 bug fixes:
+
+  * FINALLY fixed a problem with escaping in dstrs. (nex3)
+  * Fix using match3 on LHS of call. (eqv)
+  * Fixed handling defn that starts w/ begin+rescue+other stuff. (eqv)
+  * Fixed return expressions with complex RHS. (eqv)
+  * Tweaked sexp_processor dependency to ~> 4.6 to sync them better
+
 === 2.3.1 / 2016-10-09
 
 * 1 minor enhancement:

data/bundle/ruby/2.3.0/gems/{ruby2ruby-2.3.1 → ruby2ruby-2.3.2}/Rakefile

@@ -15,7 +15,7 @@ Hoe.spec 'ruby2ruby' do
 
   license "MIT"
 
-  dependency "sexp_processor", "~> 4.0"
+  dependency "sexp_processor", "~> 4.6"
   dependency "ruby_parser",    "~> 3.1"
 end
 

data/bundle/ruby/2.3.0/gems/{ruby2ruby-2.3.1 → ruby2ruby-2.3.2}/lib/ruby2ruby.rb

@@ -31,7 +31,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.3.1" # :nodoc:
+  VERSION = "2.3.2" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -50,6 +50,7 @@ class Ruby2Ruby < SexpProcessor
                   :flip3,
                   :lasgn,
                   :masgn,
+                  :match3,
                   :attrasgn,
                   :op_asgn1,
                   :op_asgn2,
@@ -407,11 +408,13 @@ class Ruby2Ruby < SexpProcessor
       body << process(exp.shift)
     end
 
+    simple = body.size <= 1
+
     body << "# do nothing" if body.empty?
     body = body.join("\n")
     body = body.lines.to_a[1..-2].join("\n") if
-      body =~ /^\Abegin/ && body =~ /^end\z/
-    body = indent(body) unless body =~ /(^|\n)rescue/
+      simple && body =~ /^\Abegin/ && body =~ /^end\z/
+    body = indent(body) unless simple && body =~ /(^|\n)rescue/
 
     return "#{comm}def #{name}#{args}\n#{body}\nend".gsub(/\n\s*\n+/, "\n")
   end
@@ -839,12 +842,14 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_return(exp) # :nodoc:
-    # HACK return "return" + (exp.empty? ? "" : " #{process exp.shift}")
-
     if exp.empty? then
-      return "return"
+      "return"
     else
-      return "return #{process exp.shift}"
+      rhs = exp.shift
+      rhs_type = rhs.sexp_type
+      rhs = process rhs
+      rhs = "(#{rhs})" if ASSIGN_NODES.include? rhs_type
+      "return #{rhs}"
     end
   end
 
@@ -1066,12 +1071,12 @@ class Ruby2Ruby < SexpProcessor
   # Utility method to escape something interpolated.
 
   def dthing_escape type, lit
-    lit = lit.gsub(/\n/, '\n')
+    # TODO: this needs more testing
     case type
     when :dregx then
       lit.gsub(/(\A|[^\\])\//, '\1\/')
     when :dstr, :dsym then
-      lit.gsub(/"/, '\"')
+      lit.dump[1..-2]
     when :dxstr then
       lit.gsub(/`/, '\`')
     else

data/bundle/ruby/2.3.0/gems/{ruby2ruby-2.3.1 → ruby2ruby-2.3.2}/test/test_ruby2ruby.rb

@@ -83,56 +83,56 @@ class TestRuby2Ruby < R2RTestCase
   def test_hash_parens_str
     inn = s(:hash, s(:lit, :k), s(:str, "banana"))
     out = '{ :k => "banana" }'
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_hash_parens_lit
     inn = s(:hash, s(:lit, :k), s(:lit, 0.07))
     out = "{ :k => 0.07 }"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_hash_parens_bool
     inn = s(:hash, s(:lit, :k), s(:true))
     out = "{ :k => true }"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_hash_parens_nil
     inn = s(:hash, s(:lit, :k), s(:nil))
     out = "{ :k => nil }"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_hash_parens_lvar
     inn = s(:hash, s(:lit, :k), s(:lvar, :x))
     out = "{ :k => x }"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_hash_parens_call
     inn = s(:hash, s(:lit, :k), s(:call, nil, :foo, s(:lit, :bar)))
     out = "{ :k => foo(:bar) }"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_hash_parens_iter
     iter = s(:iter, s(:call, nil, :foo), 0, s(:str, "bar"))
     inn = s(:hash, s(:lit, :k), iter)
     out = '{ :k => (foo { "bar" }) }'
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_and_alias
     inn = s(:and, s(:true), s(:alias, s(:lit, :a), s(:lit, :b)))
     out = "true and (alias :a :b)"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_reader_diff
     inn = s(:defn, :same, s(:args), s(:ivar, :@diff))
     out = "def same\n  @diff\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_reader_same
@@ -140,13 +140,13 @@ class TestRuby2Ruby < R2RTestCase
 
     inn = s(:defn, :same, s(:args), s(:ivar, :@same))
     out = "attr_reader :same"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_reader_double
     inn = s(:defn, :same, s(:args), s(:ivar, :@same), s(:ivar, :@diff))
     out = "def same\n  @same\n  @diff\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_reader_same_name_diff_body
@@ -154,26 +154,126 @@ class TestRuby2Ruby < R2RTestCase
 
     inn = s(:defn, :same, s(:args), s(:not, s(:ivar, :@same)))
     out = "def same\n  (not @same)\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_writer_diff
     inn = s(:defn, :same=, s(:args, :o), s(:iasgn, :@diff, s(:lvar, :o)))
     out = "def same=(o)\n  @diff = o\nend"
-    util_compare inn, out
+    assert_parse inn, out
+  end
+
+  def assert_str exp, src
+    assert_equal s(:str, exp), RubyParser.new.process(src)
+  end
+
+  def assert_dstr exp, int, src
+    assert_equal s(:dstr, exp, s(:evstr, int).compact), RubyParser.new.process(src)
+  end
+
+  def assert_r2r exp, sexp
+    assert_equal exp, Ruby2Ruby.new.process(sexp)
+  end
+
+  def assert_rt src, exp=src.dup
+    assert_equal exp, Ruby2Ruby.new.process(RubyParser.new.parse(src))
+  end
+
+  def test_bug_033
+    # gentle reminder to keep some sanity
+    #
+    # Use %q("...") for raw input strings
+    # Use %q(...) for raw output to avoid double-\'s
+    # Use %(...) for output strings
+    #
+    # don't use '...' at all
+    # only use  "..." within sexps
+
+    # "\t"
+    assert_str %(\t),     %q("\t")
+    assert_r2r %q("\\t"), s(:str, "\t")
+    assert_rt  %q("\t")
+
+    # "\\t"
+    assert_str %(\t),     %q("\\t")
+    assert_r2r %q("\\t"), s(:str, "\t")
+    assert_rt  %q("\\t")
+
+    # "\\\\t"
+    assert_str %(\\t),      %q("\\\\t")
+    assert_r2r %q("\\\\t"), s(:str, "\\t")
+    assert_rt  %q("\\\\t")
+
+    # "\t#{}"
+    assert_dstr %(\t), nil,  %q("\t#{}")
+    assert_r2r  %q("\t#{}"), s(:dstr, "\t", s(:evstr))
+    assert_rt   %q("\t#{}")
+
+    # "\\t#{}"
+    assert_dstr %(\t), nil,   %q("\\t#{}")
+    assert_r2r  %q("\\t#{}"), s(:dstr, "\t", s(:evstr))
+    assert_rt   %q("\\t#{}")
+
+    # "\\\\t#{}"
+    assert_dstr %(\\t), nil,    %q("\\\\t#{}")
+    assert_r2r  %q("\\\\t#{}"), s(:dstr, "\\t", s(:evstr))
+    assert_rt   %q("\\\\t#{}")
+  end
+
+  def test_bug_043
+    inn = s(:defn, :check, s(:args),
+            s(:rescue,
+              s(:call, nil, :foo),
+              s(:resbody, s(:array), s(:call, nil, :bar), s(:call, nil, :bar))),
+            s(:call, nil, :bar),
+            s(:if,
+              s(:call, nil, :foo),
+              s(:return, s(:call, nil, :bar)),
+              s(:call, nil, :bar)))
+
+    out = "def check\n  begin\n    foo\n  rescue\n    bar\n    bar\n  end\n  bar\n  if foo then\n    return bar\n  else\n    bar\n  end\nend"
+
+    assert_parse inn, out
+  end
+
+  def test_bug_044
+    inn = s(:if,
+            s(:call,
+              s(:match3, s(:lit, /a/), s(:call, nil, :foo)),
+              :or,
+              s(:call, nil, :bar)),
+            s(:call, nil, :puts, s(:call, nil, :bar)),
+            nil)
+    out = "puts(bar) if (foo =~ /a/).or(bar)"
+
+    assert_parse inn, out
+  end
+
+  def test_bug_045
+    # return foo.baaaaaaar ? ::B.newsss(true) : ::B.newadsfasdfasdfasdfasdsssss(false)
+
+    inn = s(:return,
+            s(:if,
+              s(:call, s(:call, nil, :foo), :baaaaaaar),
+              s(:call, s(:colon3, :B), :newsss, s(:true)),
+              s(:call, s(:colon3, :B), :newadsfasdfasdfasdfasdsssss, s(:false))))
+
+    out = "return (if foo.baaaaaaar then\n  ::B.newsss(true)\nelse\n  ::B.newadsfasdfasdfasdfasdsssss(false)\nend)"
+
+    assert_parse inn, out
   end
 
   def test_attr_writer_double
     inn = s(:defn, :same=, s(:args, :o),
             s(:iasgn, :@same, s(:lvar, :o)), s(:iasgn, :@diff, s(:lvar, :o)))
     out = "def same=(o)\n  @same = o\n  @diff = o\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_writer_same_name_diff_body
     inn = s(:defn, :same=, s(:args, :o), s(:iasgn, :@same, s(:lit, 42)))
     out = "def same=(o)\n  @same = 42\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_attr_writer_same
@@ -181,7 +281,7 @@ class TestRuby2Ruby < R2RTestCase
 
     inn = s(:defn, :same=, s(:args, :o), s(:iasgn, :@same , s(:lvar, :o)))
     out = "attr_writer :same"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_dregx_slash
@@ -189,32 +289,32 @@ class TestRuby2Ruby < R2RTestCase
 
     inn = util_thingy(:dregx)
     out = '/a"b#{(1 + 1)}c"d\/e/'
-    util_compare inn, out, /a"b2c"d\/e/
+    assert_parse inn, out, /a"b2c"d\/e/
   end
 
   def test_dstr_quote
     inn = util_thingy(:dstr)
     out = '"a\"b#{(1 + 1)}c\"d/e"'
-    util_compare inn, out, 'a"b2c"d/e'
+    assert_parse inn, out, 'a"b2c"d/e'
   end
 
   def test_dsym_quote
     inn = util_thingy(:dsym)
     out = ':"a\"b#{(1 + 1)}c\"d/e"'
-    util_compare inn, out, :'a"b2c"d/e'
+    assert_parse inn, out, :'a"b2c"d/e'
   end
 
   def test_lit_regexp_slash
     do_not_check_sexp! # dunno why on this one
 
-    util_compare s(:lit, /blah\/blah/), '/blah\/blah/', /blah\/blah/
+    assert_parse s(:lit, /blah\/blah/), '/blah\/blah/', /blah\/blah/
   end
 
   def test_call_kwsplat
     inn = s(:call, nil, :test_splat, s(:hash, s(:kwsplat, s(:call, nil, :testing))))
     out = "test_splat(**testing)"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_arg_assoc_kwsplat
@@ -223,14 +323,14 @@ class TestRuby2Ruby < R2RTestCase
            s(:hash, s(:lit, :kw), s(:lit, 2), s(:kwsplat, s(:lit, 3))))
     out = "f(1, :kw => 2, **3)"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_kwsplat_x
     inn = s(:call, nil, :a, s(:hash, s(:kwsplat, s(:lit, 1))))
     out = "a(**1)"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_defn_kwargs
@@ -239,7 +339,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:nil))
     out = "def initialize(arg, keyword: nil, **args)\n  # do nothing\nend"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_defn_kwargs2
@@ -251,20 +351,20 @@ class TestRuby2Ruby < R2RTestCase
             s(:nil))
     out = "def initialize(arg, kw1: nil, kw2: nil, **args)\n  # do nothing\nend"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_self_index
-    util_compare s(:call, nil, :[], s(:lit, 42)), "self[42]"
+    assert_parse s(:call, nil, :[], s(:lit, 42)), "self[42]"
   end
 
   def test_call_self_index_equals
-    util_compare(s(:attrasgn, s(:self), :[]=, s(:lit, 42), s(:lit, 24)),
+    assert_parse(s(:attrasgn, s(:self), :[]=, s(:lit, 42), s(:lit, 24)),
                  "self[42] = 24")
   end
 
   def test_call_self_index_equals_array
-    util_compare(s(:attrasgn, s(:self), :[]=, s(:lit, 1), s(:lit, 2), s(:lit, 3)),
+    assert_parse(s(:attrasgn, s(:self), :[]=, s(:lit, 1), s(:lit, 2), s(:lit, 3)),
                  "self[1, 2] = 3")
   end
 
@@ -274,7 +374,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:call, nil, :b))
     out = "method({ :a => 1 }, b)"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_arglist_hash_first_last
@@ -284,7 +384,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:hash, s(:lit, :c), s(:lit, 1)))
     out = "method({ :a => 1 }, b, :c => 1)"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_arglist_hash_last
@@ -293,7 +393,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:hash, s(:lit, :a), s(:lit, 1)))
     out = "method(b, :a => 1)"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_arglist_if
@@ -306,7 +406,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:call, nil, :d)))
 
     out = "(a + (b ? (c) : (d)))"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_defn_kwsplat
@@ -337,7 +437,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:evstr, s(:lvar, :b))))
     out = 'nil.x { |(a, b)| "#{a}=#{b}" }'
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_masgn_wtf
@@ -357,7 +457,7 @@ class TestRuby2Ruby < R2RTestCase
 
     out = "k, v = *line.split(/\\=/, 2)\nself[k] = v.strip\n"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_masgn_splat_wtf
@@ -369,14 +469,14 @@ class TestRuby2Ruby < R2RTestCase
                 :split,
                 s(:lit, /\=/), s(:lit, 2))))
     out = 'k, v = *line.split(/\\=/, 2)'
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_match3_asgn
     inn = s(:match3, s(:lit, //), s(:lasgn, :y, s(:call, nil, :x)))
     out = "(y = x) =~ //"
     # "y = x =~ //", which matches on x and assigns to y (not what sexp says).
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_safe_attrasgn
@@ -387,7 +487,7 @@ class TestRuby2Ruby < R2RTestCase
 
     out = "x&.y = 1"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_safe_call
@@ -399,7 +499,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:lit, 1))
 
     out ="x&.y&.z(1)"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_safe_call_binary
@@ -409,7 +509,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:lit, 1))
 
     out = "x&.>(1)"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_safe_op_asgn
@@ -420,7 +520,7 @@ class TestRuby2Ruby < R2RTestCase
             :+)
 
     out = "x&.y += z(1)"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_safe_op_asgn2
@@ -431,7 +531,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:lit, 1))
 
     out = "x&.y ||= 1"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_splat_call
@@ -443,7 +543,7 @@ class TestRuby2Ruby < R2RTestCase
                 s(:lit, /\=/), s(:lit, 2))))
 
     out = 'x(*line.split(/\=/, 2))'
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_resbody_block
@@ -455,7 +555,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:call, nil, :x3)))
 
     out = "begin\n  x1\nrescue\n  x2\n  x3\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_resbody_short_with_begin_end
@@ -464,7 +564,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:call, nil, :blah),
             s(:resbody, s(:array), s(:array)))
     out = "blah rescue []"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_resbody_short_with_begin_end_multiple
@@ -475,7 +575,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:call, nil, :log),
               s(:call, nil, :raise)))
     out = "begin\n  blah\nrescue\n  log\n  raise\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_resbody_short_with_defn_multiple
@@ -489,7 +589,7 @@ class TestRuby2Ruby < R2RTestCase
                 s(:call, nil, :log),
                 s(:call, nil, :raise))))
     out = "def foo\n  a = 1\nrescue\n  log\n  raise\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_regexp_options
@@ -501,7 +601,7 @@ class TestRuby2Ruby < R2RTestCase
               4),
             s(:str, "a"))
     out = '"a" =~ /abc#{x}def/m'
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_resbody_short_with_rescue_args
@@ -509,7 +609,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:call, nil, :blah),
             s(:resbody, s(:array, s(:const, :A), s(:const, :B)), s(:array)))
     out = "begin\n  blah\nrescue A, B\n  []\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_binary_call_with_hash_arg
@@ -525,7 +625,7 @@ class TestRuby2Ruby < R2RTestCase
 
     out = "(args << { :key => 24 }) if 42"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_binary_operators
@@ -533,7 +633,7 @@ class TestRuby2Ruby < R2RTestCase
     Ruby2Ruby::BINARY.each do |op|
       inn = s(:call, s(:lit, 1), op, s(:lit, 2))
       out = "(1 #{op} 2)"
-      util_compare inn, out
+      assert_parse inn, out
     end
   end
 
@@ -541,20 +641,20 @@ class TestRuby2Ruby < R2RTestCase
     Ruby2Ruby::BINARY.each do |op|
       inn = s(:call, s(:lvar, :x), op, s(:lit, 2), s(:lit, 3))
       out = "x.#{op}(2, 3)"
-      util_compare inn, out
+      assert_parse inn, out
     end
   end
 
   def test_call_empty_hash
     inn = s(:call, nil, :foo, s(:hash))
     out = "foo({})"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_if_empty
     inn = s(:if, s(:call, nil, :x), nil, nil)
     out = "if x then\n  # do nothing\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_interpolation_and_escapes
@@ -565,60 +665,60 @@ class TestRuby2Ruby < R2RTestCase
               s(:str, "m"),
               s(:evstr, s(:call, nil, :message)),
               s(:str, "\e[0m   ")))
-    out = "log_entry = \"  \e[#\{message_color}m#\{message}\e[0m   \""
+    out = "log_entry = \"  \\e[#\{message_color}m#\{message}\\e[0m   \""
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_class_comments
     inn = s(:class, :Z, nil)
     inn.comments = "# x\n# y\n"
     out = "# x\n# y\nclass Z\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_module_comments
     inn = s(:module, :Z)
     inn.comments = "# x\n# y\n"
     out = "# x\n# y\nmodule Z\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_method_comments
     inn = s(:defn, :z, s(:args), s(:nil))
     inn.comments = "# x\n# y\n"
     out = "# x\n# y\ndef z\n  # do nothing\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_basic_ensure
     inn = s(:ensure, s(:lit, 1), s(:lit, 2))
     out = "begin\n  1\nensure\n  2\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_nested_ensure
     inn = s(:ensure, s(:lit, 1), s(:ensure, s(:lit, 2), s(:lit, 3)))
     out = "begin\n  1\nensure\n  begin\n    2\n  ensure\n    3\n  end\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_nested_rescue
     inn = s(:ensure, s(:lit, 1), s(:rescue, s(:lit, 2), s(:resbody, s(:array), s(:lit, 3))))
     out = "begin\n  1\nensure\n  2 rescue 3\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_nested_rescue_exception
     inn = s(:ensure, s(:lit, 1), s(:rescue, s(:lit, 2), s(:resbody, s(:array, s(:const, :Exception)), s(:lit, 3))))
     out = "begin\n  1\nensure\n  begin\n    2\n  rescue Exception\n    3\n  end\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_nested_rescue_exception2
     inn = s(:ensure, s(:rescue, s(:lit, 2), s(:resbody, s(:array, s(:const, :Exception)), s(:lit, 3))), s(:lit, 1))
     out = "begin\n  2\nrescue Exception\n  3\nensure\n  1\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_op_asgn
@@ -629,7 +729,7 @@ class TestRuby2Ruby < R2RTestCase
             :+)
 
     out = "x.y += z(1)"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_rescue_block
@@ -639,7 +739,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:call, nil, :beta),
               s(:call, nil, :gamma)))
     out = "begin\n  alpha\nrescue\n  beta\n  gamma\nend"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_array_adds_parens_around_rescue
@@ -648,7 +748,7 @@ class TestRuby2Ruby < R2RTestCase
             s(:rescue, s(:call, nil, :b), s(:resbody, s(:array), s(:call, nil, :c))))
     out = "[a, (b rescue c)]"
 
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_call_arglist_rescue
@@ -659,7 +759,7 @@ class TestRuby2Ruby < R2RTestCase
               s(:call, nil, :a),
               s(:resbody, s(:array), s(:call, nil, :b))))
     out = "method((a rescue b))"
-    util_compare inn, out
+    assert_parse inn, out
   end
 
   def test_unless_vs_if_not
@@ -667,14 +767,14 @@ class TestRuby2Ruby < R2RTestCase
     rb2 = "a if (not b)"
     rb3 = "a if ! b"
 
-    util_compare Ruby18Parser.new.parse(rb1), rb1
-    util_compare Ruby19Parser.new.parse(rb1), rb1
+    assert_parse Ruby18Parser.new.parse(rb1), rb1
+    assert_parse Ruby19Parser.new.parse(rb1), rb1
 
-    util_compare Ruby18Parser.new.parse(rb2), rb1
-    util_compare Ruby19Parser.new.parse(rb2), rb2
+    assert_parse Ruby18Parser.new.parse(rb2), rb1
+    assert_parse Ruby19Parser.new.parse(rb2), rb2
 
-    util_compare Ruby18Parser.new.parse(rb3), rb1
-    util_compare Ruby19Parser.new.parse(rb3), rb2
+    assert_parse Ruby18Parser.new.parse(rb3), rb1
+    assert_parse Ruby19Parser.new.parse(rb3), rb2
   end
 
   def assert_parse sexp, expected_ruby, expected_eval = nil
@@ -684,7 +784,6 @@ class TestRuby2Ruby < R2RTestCase
     assert_equal expected_ruby, @processor.process(sexp), "sexp -> ruby"
     assert_equal expected_eval, eval(expected_ruby) if expected_eval
   end
-  alias util_compare assert_parse
 
   def util_thingy(type)
     s(type,