mvz-live_ast 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53bc1d58d2c1645ff3d34a4f5f6df3e34a8fb352
-  data.tar.gz: 6e52ea854d98d13be30b16bd6e3e2acb9933b9ba
+  metadata.gz: 472b7811ce8f32d847e2dc967886bc0372a933f8
+  data.tar.gz: 2452449770fda858623be66f038b76857b660473
 SHA512:
-  metadata.gz: 139a51f52879ec099027541c3826d807eafff81b0e2d06352d7c62ba5d971c143608224213e7fa2a6f1273a5b4eff5d4c2456c7c56e2614714489d9ffc44e5d0
-  data.tar.gz: 9c7397ca3f90654b71cc0ef9c904f7432e5548a249a1c69200eda4f17e8ade860fd0c4f1ac59cac8c0f93d6ddfe1d268986468220f31cdfe422bb4674fc14461
+  metadata.gz: 7f5de1c4c34338e0ece217cea927e9fcde1ae26e6626f9d34624c98de5045456485b2fd54738bf2b2ec4d1248b12a9a458d70193015049d432644376eb1854e3
+  data.tar.gz: fc475c11107bc9bef4d8957cc59e82826717c2482bb4e6e7c3feb7ede7586d12e135b950d260cd74745391428e4f73263273ab8a26c9323b6f2a59e99ae7cf6c

data/CHANGES.rdoc

@@ -1,6 +1,12 @@
 
 = live_ast Changes
 
+== Version 1.2.0
+
+* Drop support for Rubies below 2.1
+* Handle multi-line definitions in IRB correctly
+* Tighten and update dependencies
+
 == Version 1.1.3
 
 * Keep ASTs in the cache when they are fetched, allowing aliased methods to

data/README.rdoc

@@ -25,11 +25,11 @@ Live abstract syntax trees of methods and procs. Fork of +live_ast+
 
   f = lambda { "foo" }
   p f.to_ast
-  # => s(:iter, s(:call, nil, :lambda), s(:args), s(:str, "foo"))
+  # => s(:iter, s(:call, nil, :lambda), 0, s(:str, "foo"))
 
   def query(&block)
     p block.to_ast
-    # => s(:iter, s(:call, nil, :query), s(:args), s(:str, "bar"))
+    # => s(:iter, s(:call, nil, :query), 0, s(:str, "bar"))
   end
 
   query do
@@ -40,7 +40,7 @@ Live abstract syntax trees of methods and procs. Fork of +live_ast+
 
   u = ast_eval "lambda { 'dynamic3' }", binding
   p u.to_ast
-  # => s(:iter, s(:call, nil, :lambda), s(:args), s(:str, "dynamic3"))
+  # => s(:iter, s(:call, nil, :lambda), 0, s(:str, "dynamic3"))
 
   ast_eval "def v ; 'dynamic4' ; end", binding
   p method(:v).to_ast
@@ -52,7 +52,7 @@ Live abstract syntax trees of methods and procs. Fork of +live_ast+
 
   f = eval "lambda { 'dynamic1' }"
   p f.to_ast
-  # => s(:iter, s(:call, nil, :lambda), s(:args), s(:str, "dynamic1"))
+  # => s(:iter, s(:call, nil, :lambda), 0, s(:str, "dynamic1"))
 
   eval "def g ; 'dynamic2' ; end"
   p method(:g).to_ast
@@ -80,7 +80,7 @@ sexps used by tools such as <code>ruby2ruby</code>.
 
 LiveAST is thread-safe.
 
-Ruby 1.9.2 or higher is required.
+Ruby 2.1.0 or higher is required.
 
 == Links
 
@@ -124,7 +124,7 @@ semantics as +eval+ except that the binding argument is required.
 
   u = ast_eval "lambda { 'dynamic3' }", binding
   p u.to_ast
-  # => s(:iter, s(:call, nil, :lambda), s(:args), s(:str, "dynamic3"))
+  # => s(:iter, s(:call, nil, :lambda), 0, s(:str, "dynamic3"))
   
 == Full Integration
 
@@ -146,7 +146,7 @@ below for details).
 
   f = eval "lambda { 'dynamic1' }"
   p f.to_ast
-  # => s(:iter, s(:call, nil, :lambda), s(:args), s(:str, "dynamic1"))
+  # => s(:iter, s(:call, nil, :lambda), 0, s(:str, "dynamic1"))
 
 Since LiveAST itself is pure ruby, any platforms supported by
 +binding_of_caller+ should work with <code>live_ast/full</code>.
@@ -277,12 +277,12 @@ The following alternative interface is available.
   # => s(:defn, :f, s(:args), s(:str, "A#f"))
 
   p LiveAST.ast(lambda { })
-  # => s(:iter, s(:call, nil, :lambda), s(:args))
+  # => s(:iter, s(:call, nil, :lambda), 0)
 
   f = LiveAST.eval("lambda { }", binding)
 
   p LiveAST.ast(f) 
-  # => s(:iter, s(:call, nil, :lambda), s(:args))
+  # => s(:iter, s(:call, nil, :lambda), 0)
   
   ast_eval  # => raises NameError
 

data/lib/live_ast/base.rb

@@ -9,16 +9,16 @@ require 'live_ast/error'
 require 'live_ast/irb_spy' if defined?(IRB)
 
 module LiveAST
-  NATIVE_EVAL = Kernel.method(:eval)  #:nodoc:
+  NATIVE_EVAL = Kernel.method(:eval) #:nodoc:
 
   class << self
-    attr_writer :parser  #:nodoc:
+    attr_writer :parser #:nodoc:
 
-    def parser  #:nodoc:
-      @parser ||= (
+    def parser #:nodoc:
+      @parser ||= begin
         require 'live_ast/ruby_parser'
         LiveAST::RubyParser
-      )
+      end
     end
 
     #
@@ -26,7 +26,7 @@ module LiveAST
     #
     # Equivalent to <code>obj.to_ast</code>.
     #
-    def ast(obj)  #:nodoc:
+    def ast(obj) #:nodoc:
       case obj
       when Method, UnboundMethod
         Linker.find_method_ast(obj.owner, obj.name, *obj.source_location)
@@ -50,7 +50,7 @@ module LiveAST
     #
     # Equivalent to <code>Kernel#ast_eval</code>.
     #
-    def eval(*args)  #:nodoc:
+    def eval(*args) #:nodoc:
       Evaler.eval(args[0], *args)
     end
 
@@ -59,14 +59,14 @@ module LiveAST
     #
     # Equivalent to <code>Kernel#ast_load</code>.
     #
-    def load(file, wrap = false)  #:nodoc:
+    def load(file, wrap = false) #:nodoc:
       Loader.load(file, wrap)
     end
 
     #
     # strip the revision token from a string
     #
-    def strip_token(file)  #:nodoc:
+    def strip_token(file) #:nodoc:
       file.sub(/#{Regexp.quote Linker::REVISION_TOKEN}[a-z]+/, "")
     end
   end

data/lib/live_ast/common.rb

@@ -8,11 +8,7 @@ module LiveAST
     rescue NameError
       thing = arg.nil? ? nil : arg.class
 
-      message = if RUBY_VERSION < "2.0.0"
-                  "can't convert #{thing.inspect} into String"
-                else
-                  "no implicit conversion of #{thing.inspect} into String"
-                end
+      message = "no implicit conversion of #{thing.inspect} into String"
       raise TypeError, message
     end
 
@@ -21,17 +17,18 @@ module LiveAST
 
       range = 0 if range == (0..0)
 
-      raise ArgumentError,
-        "wrong number of arguments (#{args.size} for #{range})"
+      message = if RUBY_VERSION < "2.3.0"
+                  "wrong number of arguments (#{args.size} for #{range})"
+                else
+                  "wrong number of arguments (given #{args.size}, expected #{range})"
+                end
+      raise ArgumentError, message
     end
 
     def check_is_binding(obj)
       return if obj.is_a? Binding
-      message = if RUBY_VERSION < "2.1.0"
-                  "wrong argument type #{obj.class} (expected Binding)"
-                else
-                  "wrong argument type #{obj.class} (expected binding)"
-                end
+
+      message = "wrong argument type #{obj.class} (expected binding)"
       raise TypeError, message
     end
 

data/lib/live_ast/error.rb

@@ -1,5 +1,5 @@
 module LiveAST
-  class MultipleDefinitionsOnSameLineError < ScriptError
+  class MultipleDefinitionsOnSameLineError < RuntimeError
     def message
       "AST requested for a method or block that shares a line " \
         "with another method or block."

data/lib/live_ast/evaler.rb

@@ -9,7 +9,7 @@ module LiveAST
         file, line = location_for_eval(bind, *rest)
         file = LiveAST.strip_token(file)
 
-        key, _ = Linker.new_cache_synced(parser_source, file, line, false)
+        key, = Linker.new_cache_synced(parser_source, file, line, false)
 
         begin
           NATIVE_EVAL.call(evaler_source, bind, key, line)

data/lib/live_ast/irb_spy.rb

@@ -7,20 +7,23 @@ module LiveAST
       attr_writer :history
 
       def code_at(line)
-        unless @history
-          raise NotImplementedError,
-            "LiveAST cannot access history for this IRB input method"
+        code = ""
+        checked_history[line..-1].each do |code_line|
+          code << code_line << "\n"
+          return code if can_parse code
         end
-        grow = 0
-        begin
-          code = @history[line..(line + grow)].join
-          LiveAST.parser.new.parse(code) or raise "#{LiveAST.parser} error"
-        rescue
-          grow += 1
-          retry if line + grow < @history.size
-          raise
-        end
-        code
+      end
+
+      def can_parse(code)
+        LiveAST.parser.new.parse(code)
+      rescue StandardError
+        false
+      end
+
+      def checked_history
+        return @history if @history
+        raise NotImplementedError,
+          "LiveAST cannot access history for this IRB input method"
       end
     end
   end

data/lib/live_ast/linker.rb

@@ -41,7 +41,7 @@ module LiveAST
   end
 
   module Linker
-    REVISION_TOKEN = "|ast@"
+    REVISION_TOKEN = "|ast@".freeze
 
     @caches = {}
     @counter = "a"

data/lib/live_ast/loader.rb

@@ -18,15 +18,12 @@ module LiveAST
       end
 
       def header_footer(wrap)
-        if wrap
-          return "class << Object.new;", ";end", true
-        else
-          locals = NATIVE_EVAL.call("local_variables", TOPLEVEL_BINDING)
+        return "class << Object.new;", ";end", true if wrap
+        locals = NATIVE_EVAL.call("local_variables", TOPLEVEL_BINDING)
 
-          params = locals.empty? ? "" : ("|;" + locals.join(",") + "|")
+        params = locals.empty? ? "" : ("|;" + locals.join(",") + "|")
 
-          return "lambda do #{params}", ";end.call", locals.empty?
-        end
+        return "lambda do #{params}", ";end.call", locals.empty?
       end
 
       def suppress_warnings

data/lib/live_ast/reader.rb

@@ -1,4 +1,5 @@
 # encoding: us-ascii
+
 module LiveAST
   module Reader
     UTF8_BOM = /\A\xef\xbb\xbf/

data/lib/live_ast/replace_eval.rb

@@ -32,31 +32,10 @@ module LiveAST
       private
 
       def handle_args(args)
-        if RUBY_VERSION < '2.0.0'
-          handle_args_pre_20(args)
-        else
-          handle_args_20(args)
-        end
-      end
-
-      def handle_args_20(args)
         LiveAST::Common.check_arity(args, 1..3)
         args[0] = Common.arg_to_str(args[0])
         args[1] = Common.arg_to_str(args[1]) if args.length > 1
       end
-
-      def handle_args_pre_20(args)
-        raise ArgumentError, "block not supplied" if args.empty?
-
-        args[0] = Common.arg_to_str(args[0])
-
-        unless (1..3).include? args.size
-          raise ArgumentError,
-            "wrong number of arguments: instance_eval(src) or instance_eval{..}"
-        end
-
-        args[1] = Common.arg_to_str(args[1]) if args.length > 1
-      end
     end
   end
 
@@ -67,23 +46,24 @@ end
 # Override for Kernel#eval and Kernel.eval
 module Kernel
   class << self
-    alias_method :live_ast_original_singleton_eval, :eval
+    alias live_ast_original_singleton_eval eval
   end
 
-  alias_method :live_ast_original_eval, :eval
+  alias live_ast_original_eval eval
 
   def eval(*args)
     LiveAST::Common.check_arity(args, 1..4)
     LiveAST.eval(
       args[0],
       args[1] || binding.of_caller(1),
-      *LiveAST::Common.location_for_eval(*args[1..3]))
+      *LiveAST::Common.location_for_eval(*args[1..3])
+    )
   end
 end
 
 # Override for Binding#eval
 class Binding
-  alias_method :live_ast_original_binding_eval, :eval
+  alias live_ast_original_binding_eval eval
 
   def eval(*args)
     LiveAST.eval(args[0], self, *args[1..-1])
@@ -92,21 +72,24 @@ end
 
 # Override for BasicObject#instance_eval
 class BasicObject
-  alias_method :live_ast_original_instance_eval, :instance_eval
+  alias live_ast_original_instance_eval instance_eval
 
   def instance_eval(*args, &block)
     if block
       live_ast_original_instance_eval(*args, &block)
     else
       ::LiveAST::ReplaceEval.
-        module_or_instance_eval(:instance, self, ::Kernel.binding.of_caller(1), args)
+        module_or_instance_eval(:instance,
+                                self,
+                                ::Kernel.binding.of_caller(1),
+                                args)
     end
   end
 end
 
 # Overrides for Module#module_eval and Module#class_eval
 class Module
-  alias_method :live_ast_original_module_eval, :module_eval
+  alias live_ast_original_module_eval module_eval
 
   def module_eval(*args, &block)
     if block
@@ -118,5 +101,5 @@ class Module
   end
 
   remove_method :class_eval
-  alias_method :class_eval, :module_eval
+  alias class_eval module_eval
 end

data/lib/live_ast/replace_load.rb

@@ -1,7 +1,7 @@
 require 'live_ast/base'
 
 module Kernel
-  alias_method :live_ast_original_load, :load
+  alias live_ast_original_load load
 
   def load(file, wrap = false)
     LiveAST.load(file, wrap)

data/lib/live_ast/replace_raise.rb

@@ -3,7 +3,7 @@ require 'live_ast/base'
 module Kernel
   private
 
-  alias_method :live_ast_original_raise, :raise
+  alias live_ast_original_raise raise
 
   def raise(*args)
     ex = begin

data/lib/live_ast/ruby_parser.rb

@@ -15,11 +15,10 @@ module LiveAST
       @defs
     end
 
+    STOREABLE_SEXP_TYPES = [:defn, :defs, :iter].freeze
+
     def process(sexp)
-      case sexp.first
-      when :defn, :defs, :iter
-        store_sexp(sexp, sexp.line)
-      end
+      store_sexp(sexp, sexp.line) if STOREABLE_SEXP_TYPES.include? sexp.first
 
       sexp.each do |elem|
         process(elem) if elem.is_a? Sexp

data/lib/live_ast/ruby_parser/test.rb

@@ -134,7 +134,7 @@ module LiveAST
       #   foo { "bar" }
       #
       def no_arg_block(name, ret)
-        s(:iter, s(:call, nil, name), s(:args), s(:str, ret))
+        s(:iter, s(:call, nil, name), 0, s(:str, ret))
       end
 
       #
@@ -173,8 +173,8 @@ module LiveAST
       def nested_lambdas(str)
         s(:iter,
           s(:call, nil, :lambda),
-          s(:args),
-          s(:iter, s(:call, nil, :lambda), s(:args), s(:str, str)))
+          0,
+          s(:iter, s(:call, nil, :lambda), 0, s(:str, str)))
       end
 
       # nested_defs(:f, :g, "foo") returns the ast of
@@ -193,7 +193,7 @@ module LiveAST
           s(:args),
           s(:iter,
             s(:call, s(:const, :Class), :new),
-            s(:args),
+            0,
             s(:defn, v, s(:args), s(:str, str))))
       end
     end

data/lib/live_ast/to_ruby.rb

@@ -2,7 +2,7 @@ require 'live_ast/base'
 
 [Method, UnboundMethod, Proc].each do |klass|
   klass.class_eval do
-    def to_ruby  #:nodoc:
+    def to_ruby #:nodoc:
       LiveAST.parser::Unparser.unparse(LiveAST.ast(self))
     end
   end

data/lib/live_ast/version.rb

@@ -1,3 +1,3 @@
 module LiveAST
-  VERSION = "1.1.3"
+  VERSION = "1.2.0".freeze
 end

data/test/alias_test.rb

@@ -21,4 +21,3 @@ class AliasTest < RegularTest
     assert_equal expected, A.new.method(:g).to_ast
   end
 end
-

data/test/ast_load/ast_load_test.rb

@@ -14,7 +14,7 @@ class AstLoadTest < BaseTest
   end
 
   def noninvasive_ast_reload
-    code_1 = %{
+    code1 = %{
       class AstLoadTest::B
         def f
           "first B#f"
@@ -22,7 +22,7 @@ class AstLoadTest < BaseTest
       end
     }
 
-    code_2 = %{
+    code2 = %{
       class AstLoadTest::B
         def f
           "second B#f"
@@ -30,12 +30,12 @@ class AstLoadTest < BaseTest
       end
     }
 
-    temp_file code_1 do |file|
+    temp_file code1 do |file|
       load file
 
       LiveAST.ast(B.instance_method(:f))
 
-      write_file file, code_2
+      write_file file, code2
       ast_load file
 
       assert_equal no_arg_def(:f, "second B#f"),

data/test/backtrace_test.rb

@@ -150,7 +150,7 @@ define_unsorted_test_case "BacktraceTest", RegularTest do
 
   def test_tokens_stripped
     lines = exception_backtrace do
-      ast_eval %{ ast_eval %{ ast_eval %{raise}, binding }, binding }, binding
+      ast_eval %{ ast_eval ' ast_eval "raise", binding ', binding }, binding
     end
     lines.each do |line|
       assert_nil line.index(LiveAST::Linker::REVISION_TOKEN)

data/test/base/reload_test.rb

@@ -8,7 +8,7 @@ class ReloadTest < BaseTest
   end
 
   def raw_reload
-    code_1 = %{
+    code1 = %{
       class ReloadTest::A
         def f
           "first A#f"
@@ -16,7 +16,7 @@ class ReloadTest < BaseTest
       end
     }
 
-    code_2 = %{
+    code2 = %{
       class ReloadTest::A
         def f
           "second A#f"
@@ -24,12 +24,12 @@ class ReloadTest < BaseTest
       end
     }
 
-    temp_file code_1 do |file|
+    temp_file code1 do |file|
       load file
 
       LiveAST.ast(A.instance_method(:f))
 
-      write_file file, code_2
+      write_file file, code2
       load file
 
       # forced a raw-reload inconsistency -- verify bogus

data/test/encoding_test.rb

@@ -1,29 +1,23 @@
 require_relative 'main'
 
 class AllEncodingTest < RegularTest
-  ENC_TESTS = Hash[*%w(
-    default US-ASCII
-    usascii US-ASCII
-    utf8 UTF-8
-    utf8unix UTF-8
-    utf8mac UTF-8
-    utf8mac_alt UTF8-MAC
-    utf8dos UTF-8
-    utf8bom UTF-8
-    utf8bom_only UTF-8
-    usascii_with_utf8bom US-ASCII
-    koi8_with_utf8bom KOI8-R
-    cp932 Windows-31J
-    eucjp EUC-JP
-    koi8 KOI8-R
-    koi8_shebang KOI8-R
-  )]
-
-  if RUBY_VERSION < '2.0.0'
-    ENC_TESTS['default'] = 'US-ASCII'
-  else
-    ENC_TESTS['default'] = 'UTF-8'
-  end
+  ENC_TESTS = {
+    default: "UTF-8",
+    usascii: "US-ASCII",
+    utf8: "UTF-8",
+    utf8unix: "UTF-8",
+    utf8mac: "UTF-8",
+    utf8mac_alt: "UTF8-MAC",
+    utf8dos: "UTF-8",
+    utf8bom: "UTF-8",
+    utf8bom_only: "UTF-8",
+    usascii_with_utf8bom: "US-ASCII",
+    koi8_with_utf8bom: "KOI8-R",
+    cp932: "Windows-31J",
+    eucjp: "EUC-JP",
+    koi8: "KOI8-R",
+    koi8_shebang: "KOI8-R"
+  }.freeze
 
   ENC_TESTS.each_pair do |abbr, name|
     define_method "test_#{abbr}" do

data/test/full/ast_reload_test.rb

@@ -8,7 +8,7 @@ class ASTReloadTest < ReplaceEvalTest
   end
 
   def ast_reload
-    code_1 = %{
+    code1 = %{
       class ASTReloadTest::C
         def f
           "first C#f"
@@ -16,7 +16,7 @@ class ASTReloadTest < ReplaceEvalTest
       end
     }
 
-    code_2 = %{
+    code2 = %{
       class ASTReloadTest::C
         def f
           "second C#f"
@@ -24,12 +24,12 @@ class ASTReloadTest < ReplaceEvalTest
       end
     }
 
-    temp_file code_1 do |file|
+    temp_file code1 do |file|
       load file
 
       LiveAST.ast(C.instance_method(:f))
 
-      write_file file, code_2
+      write_file file, code2
       load file
 
       assert_equal no_arg_def(:f, "second C#f"),

data/test/full/replace_eval_test.rb

@@ -174,10 +174,16 @@ class FullReplaceEvalTest < ReplaceEvalTest
       require 'live_ast/full'
     end
 
-    let(:orig) { assert_raises(ArgumentError, TypeError) {
-      Object.new.live_ast_original_instance_eval(*args) } }
-    let(:live) { assert_raises(ArgumentError, TypeError) {
-        Object.new.instance_eval(*args) } }
+    let(:orig) {
+      assert_raises(ArgumentError, TypeError) do
+        Object.new.live_ast_original_instance_eval(*args)
+      end
+    }
+    let(:live) {
+      assert_raises(ArgumentError, TypeError) do
+        Object.new.instance_eval(*args)
+      end
+    }
 
     describe "when the second argument is nil" do
       let(:args) { ['1', nil] }
@@ -354,7 +360,7 @@ class FullReplaceEvalTest < ReplaceEvalTest
 
     x = 5
     eval %{
-      assert_equal(3, eval(%{ eval("1 + 2") }))
+      assert_equal(3, eval(' eval("1 + 2") '))
       x = 6
     }
     assert_equal 6, x

data/test/irb_test.rb

@@ -1,4 +1,5 @@
 require_relative 'main'
+require 'live_ast/irb_spy'
 
 class IRBTest < RegularTest
   def with_module(parent, child)
@@ -10,16 +11,31 @@ class IRBTest < RegularTest
     end
   end
 
-  def test_irb
+  def setup
+    LiveAST::IRBSpy.history = [
+      nil,
+      "class Foo; def bar; 'bar'; end; end",
+      "class Bar",
+      "  def foo",
+      "    'foo'",
+      "  end",
+      "end"
+    ]
+  end
+
+  def test_single_line
+    with_module(Object, :IRB) do
+      expected = no_arg_def(:bar, "bar")
+      result = LiveAST::Linker.fetch_from_cache("(irb)", 1)
+      assert_equal expected, result
+    end
+  end
+
+  def test_multiple_lines
     with_module(Object, :IRB) do
-      with_module(LiveAST, :IRBSpy) do
-        LiveAST::IRBSpy.class_eval do
-          def self.code_at(_line)
-            "def f ; end"
-          end
-        end
-        LiveAST::Linker.fetch_from_cache("(irb)", 1)
-      end
+      expected = no_arg_def(:foo, "foo")
+      result = LiveAST::Linker.fetch_from_cache("(irb)", 3)
+      assert_equal expected, result
     end
   end
 end

data/test/load_path_test.rb

@@ -19,7 +19,7 @@ class LoadPathTest < BaseTest
   end
 
   def test_chdir
-    mkdir DATA_DIR, verbose: false rescue nil
+    mkdir DATA_DIR, verbose: false
     Dir.chdir(DATA_DIR) do
       check_load
       check_errors
@@ -27,32 +27,30 @@ class LoadPathTest < BaseTest
   end
 
   def check_load
-    code_1 = %{
+    code1 = %{
       def hello
         "password"
       end
     }
 
-    code_2 = %{
+    code2 = %{
       def goodbye
         "bubbleboy"
       end
     }
 
-    temp_file code_1, "foo.rb" do |path|
-      Object.send(:remove_method, :hello) rescue nil
+    temp_file code1, "foo.rb" do |path|
       load "foo.rb"
       assert_equal "password", hello
 
-      write_file path, code_2
+      write_file path, code2
 
-      Object.send(:remove_method, :goodbye) rescue nil
       LiveAST.load "foo.rb"
       assert_equal "bubbleboy", goodbye
     end
   ensure
-    Object.send(:remove_method, :hello) rescue nil
-    Object.send(:remove_method, :goodbye) rescue nil
+    Object.send(:remove_method, :hello)
+    Object.send(:remove_method, :goodbye)
   end
 
   def compare_load_errors(file)

data/test/main.rb

@@ -36,8 +36,8 @@ class JLMiniTest < MiniTest::Test
 
   def mu_pp(obj)
     delim("_") <<
-    obj.pretty_inspect.chomp <<
-    delim("=")
+      obj.pretty_inspect.chomp <<
+      delim("=")
   end
 
   def unfixable
@@ -49,7 +49,7 @@ class JLMiniTest < MiniTest::Test
   def assert_nothing_raised
     yield
     assert_nil nil
-  rescue => ex
+  rescue StandardError => ex
     raise MiniTest::Assertion,
       exception_details(ex, "Expected nothing raised, but got:")
   end
@@ -81,7 +81,7 @@ class BaseTest < JLMiniTest
       yield path
     ensure
       FileUtils.rm_f path
-      FileUtils.rmdir DATA_DIR rescue nil
+      FileUtils.rmdir DATA_DIR
     end
   end
 
@@ -99,8 +99,7 @@ class BaseTest < JLMiniTest
     e.backtrace
   end
 
-  def ignore(*_args)
-  end
+  def ignore(*_args); end
 end
 
 class RegularTest < BaseTest

data/test/rubyspec_test.rb

@@ -4,36 +4,38 @@ require_relative '../devel/levitate'
 #
 # Tests against rubyspec branch which discards '|ast@' tokens
 #
-class RubySpecTest < RegularTest
-  FILES = [
-    'core/basicobject/instance_eval_spec.rb',
-    'core/binding/eval_spec.rb',
-    'core/kernel/eval_spec.rb',
-    'core/kernel/instance_eval_spec.rb',
-    'core/module/class_eval_spec.rb',
-    'core/module/module_eval_spec.rb',
-  ]
+if ENV["LIVE_AST_RUBYSPEC_HOME"]
+  class RubySpecTest < RegularTest
+    FILES = [
+      'core/basicobject/instance_eval_spec.rb',
+      'core/binding/eval_spec.rb',
+      'core/kernel/eval_spec.rb',
+      'core/kernel/instance_eval_spec.rb',
+      'core/module/class_eval_spec.rb',
+      'core/module/module_eval_spec.rb',
+    ].freeze
 
-  def setup
-    super
-    puts "\n==== rubyspec"
-  end
+    def setup
+      super
+      puts "\n==== rubyspec"
+    end
 
-  FILES.each do |file|
-    mname = "test_" + file.gsub("/", "_").chop!.chop!.chop!
-    define_method mname do
-      Dir.chdir ENV["LIVE_AST_RUBYSPEC_HOME"] do
-        cmd =
-          ["mspec", "-t", Levitate.ruby_bin] +
+    FILES.each do |file|
+      mname = "test_" + file.tr("/", "_").chop!.chop!.chop!
+      define_method mname do
+        Dir.chdir ENV["LIVE_AST_RUBYSPEC_HOME"] do
+          cmd =
+            ["mspec", "-t", Levitate.ruby_bin] +
 
-          (["-T"] * Levitate.ruby_opts.size).
-          zip(Levitate.ruby_opts).
-          flatten +
+            (["-T"] * Levitate.ruby_opts.size).
+            zip(Levitate.ruby_opts).
+            flatten +
 
-          [file]
+            [file]
 
-        assert system(*cmd)
+          assert system(*cmd)
+        end
       end
     end
   end
-end if ENV["LIVE_AST_RUBYSPEC_HOME"]
+end

data/test/thread_test.rb

@@ -33,7 +33,7 @@ class ThreadTest < RegularTest
     sleep(0.2)
     stop = true
 
-    workers.each { |t| t.join }
+    workers.each(&:join)
 
     assert_equal num_threads, results.size
     results.each { |result|

data/test/to_ruby/to_ruby_test.rb

@@ -1,97 +1,99 @@
 require 'main'
 
-class ToRubyTest < RegularTest
-  def setup
-    super
-    require 'live_ast/to_ruby'
+if LiveAST.parser::Test.respond_to?(:unparser_matches_ruby2ruby?) &&
+   LiveAST.parser::Test.unparser_matches_ruby2ruby?
+  class ToRubyTest < RegularTest
+    def setup
+      super
+      require 'live_ast/to_ruby'
+    end
+
+    def test_lambda_0
+      src = %{lambda { "moo" }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_lambda_1
+      src = %{lambda { |x| (x ** 2) }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_lambda_2
+      src = %{lambda { |x, y| (x + y) }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_proc_0
+      src = %{proc { "moo" }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_proc_1
+      src = %{proc { |x| (x ** 2) }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_proc_2
+      src = %{proc { |x, y| (x * y) }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_block_0
+      src = %{return_block { "moo" }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_block_1
+      src = %{return_block { |x| (x ** 2) }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_block_2
+      src = %{return_block { |x, y| (x - y) }}
+      dst = ast_eval(src, binding).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_method_0
+      src = %{def f\n  "moo"\nend}
+      dst = Class.new do
+        ast_eval(src, binding)
+      end.instance_method(:f).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_method_1
+      src = %{def f(x)\n  (x ** 2)\nend}
+      dst = Class.new do
+        ast_eval(src, binding)
+      end.instance_method(:f).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_method_2
+      src = %{def f(x, y)\n  (x / y)\nend}
+      dst = Class.new do
+        ast_eval(src, binding)
+      end.instance_method(:f).to_ruby
+      assert_equal src, dst
+    end
+
+    def test_to_ast_after_to_ruby
+      src = %{lambda { "moo" }}
+      expected_ast = ast_eval(src, binding).to_ast
+
+      lmb = ast_eval(src, binding)
+      lmb.to_ruby
+
+      assert_equal expected_ast, lmb.to_ast
+    end
   end
-
-  def test_lambda_0
-    src = %{lambda { "moo" }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_lambda_1
-    src = %{lambda { |x| (x ** 2) }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_lambda_2
-    src = %{lambda { |x, y| (x + y) }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_proc_0
-    src = %{proc { "moo" }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_proc_1
-    src = %{proc { |x| (x ** 2) }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_proc_2
-    src = %{proc { |x, y| (x * y) }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_block_0
-    src = %{return_block { "moo" }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_block_1
-    src = %{return_block { |x| (x ** 2) }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_block_2
-    src = %{return_block { |x, y| (x - y) }}
-    dst = ast_eval(src, binding).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_method_0
-    src = %{def f\n  "moo"\nend}
-    dst = Class.new do
-      ast_eval(src, binding)
-    end.instance_method(:f).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_method_1
-    src = %{def f(x)\n  (x ** 2)\nend}
-    dst = Class.new do
-      ast_eval(src, binding)
-    end.instance_method(:f).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_method_2
-    src = %{def f(x, y)\n  (x / y)\nend}
-    dst = Class.new do
-      ast_eval(src, binding)
-    end.instance_method(:f).to_ruby
-    assert_equal src, dst
-  end
-
-  def test_to_ast_after_to_ruby
-    src = %{lambda { "moo" }}
-    expected_ast = ast_eval(src, binding).to_ast
-
-    lmb = ast_eval(src, binding)
-    lmb.to_ruby
-
-    assert_equal expected_ast, lmb.to_ast
-  end
-end if LiveAST.parser::Test.respond_to?(:unparser_matches_ruby2ruby?) &&
-       LiveAST.parser::Test.unparser_matches_ruby2ruby?
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvz-live_ast
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - James M. Lawrence
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
   name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -221,59 +221,58 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Live abstract syntax trees of methods and procs.
 test_files:
-- test/covert_define_method_test.rb
-- test/singleton_test.rb
-- test/to_ast/to_ast_feature_test.rb
-- test/irb_test.rb
+- test/readme_test.rb
+- test/rubyspec_test.rb
+- test/lambda_test.rb
+- test/redefine_method_test.rb
 - test/stdlib_test.rb
-- test/rubygems_test.rb
 - test/full/replace_eval_test.rb
 - test/full/ast_reload_test.rb
 - test/to_ruby/to_ruby_test.rb
 - test/to_ruby/to_ruby_feature_test.rb
-- test/flush_cache_test.rb
-- test/eval_test.rb
-- test/ast_eval/ast_eval_test.rb
-- test/readme_test.rb
-- test/def_test.rb
-- test/attr_test.rb
-- test/thread_test.rb
-- test/load_path_test.rb
-- test/ast_load/ast_load_test.rb
-- test/alias_test.rb
-- test/rubyspec_test.rb
-- test/redefine_method_test.rb
-- test/lambda_test.rb
-- test/error_test.rb
-- test/recursive_eval_test.rb
-- test/define_singleton_method_test.rb
-- test/encoding_test/utf8bom_only.rb
-- test/encoding_test/utf8unix.rb
-- test/encoding_test/eucjp.rb
-- test/encoding_test/usascii_with_utf8bom.rb
-- test/encoding_test/utf8bom.rb
+- test/to_ast/to_ast_feature_test.rb
 - test/encoding_test/utf8mac_alt.rb
-- test/encoding_test/default.rb
 - test/encoding_test/usascii.rb
-- test/encoding_test/cp932.rb
-- test/encoding_test/koi8_shebang.rb
-- test/encoding_test/utf8.rb
+- test/encoding_test/default.rb
+- test/encoding_test/utf8dos.rb
+- test/encoding_test/eucjp.rb
 - test/encoding_test/bad.rb
-- test/encoding_test/utf8mac.rb
 - test/encoding_test/koi8_with_utf8bom.rb
-- test/encoding_test/utf8dos.rb
+- test/encoding_test/utf8bom_only.rb
+- test/encoding_test/koi8_shebang.rb
+- test/encoding_test/utf8unix.rb
+- test/encoding_test/cp932.rb
+- test/encoding_test/utf8.rb
 - test/encoding_test/koi8.rb
+- test/encoding_test/utf8bom.rb
+- test/encoding_test/usascii_with_utf8bom.rb
+- test/encoding_test/utf8mac.rb
+- test/encoding_test.rb
+- test/alias_test.rb
+- test/rubygems_test.rb
+- test/define_singleton_method_test.rb
+- test/covert_define_method_test.rb
+- test/ast_load/ast_load_test.rb
+- test/backtrace_test.rb
 - test/load_test.rb
+- test/singleton_test.rb
+- test/recursive_eval_test.rb
+- test/base/reload_test.rb
+- test/base/noninvasive_test.rb
+- test/define_method_test.rb
+- test/eval_test.rb
+- test/attr_test.rb
+- test/irb_test.rb
+- test/load_path_test.rb
 - test/nested_test.rb
+- test/def_test.rb
+- test/thread_test.rb
+- test/flush_cache_test.rb
+- test/error_test.rb
+- test/ast_eval/ast_eval_test.rb
 - test/main.rb
-- test/define_method_test.rb
-- test/backtrace_test.rb
-- test/base/noninvasive_test.rb
-- test/base/reload_test.rb
-- test/encoding_test.rb
-has_rdoc: