mvz-live_ast 1.3.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14243cf3ff6a019d43ede0de0ff3ef18e66a7b3dd67b90b4ff9962c94f67d050
-  data.tar.gz: 428709d2937e21ffec0dca92b93af53717275d1817709796628db2f3d11ff9b4
+  metadata.gz: e96ab3dab36ef2a9b745f3a878b71b79bb8b8ecfd870b0c8ad29dcef5520a943
+  data.tar.gz: b8b7f606c175caff1522b70db8287392160d8352e44f57fca8e6709011599bd5
 SHA512:
-  metadata.gz: 5e4534a5bee591b83ff08f21d8b80e906838bf1934698da9652024918d85d9f415fe492291eca81f164165f61900d96155e8b3e0ac1c70c8859de6751e46122e
-  data.tar.gz: d787544a791a87615fb1754a67481743c3c7f85cb71b5a747895056c4d2b5b398708c66d8fe2031251a0c17aa9533f6352d5684743c09f3c7328de63ff30a37e
+  metadata.gz: ac889c697aa0c722078437135a3c57db7b05126178920e1224e4728616ab38cabbcb682d6eae3194a9361f2032400a6b55d2e89726f95abe006fa33d9e8c6ef9
+  data.tar.gz: ecc774511be6e4bb0d89559c8e6186ec766aa30ad31376f6e310ef5e9d0e116f603b648ce1a8f8a722116daadc1150913bdcbb977ed653c2784b0e84525c59c7

data/CHANGES.rdoc

@@ -1,6 +1,13 @@
-
 = live_ast Changes
 
+== Version 2.0.0
+
+* Breaking change: Use bindings gem instead of binding_of_caller.
+  If you've been using the full integration mode, you will have to replace
+  binding_of_caller with bindings.
+* Add support for Ruby 3.0
+* Drop support for Ruby 2.3, 2.4 and 2.5
+
 == Version 1.3.2
 
 * Add support for Ruby 2.6

data/README.rdoc

@@ -129,8 +129,8 @@ semantics as +eval+ except that the binding argument is required.
 == Full Integration
 
 In order for LiveAST to be transparent to the user, +eval+ must be
-replaced. This is accomplished with the help of the +binding_of_caller+ gem
-(https://github.com/banister/binding_of_caller).
+replaced. This is accomplished with the help of the +bindings+ gem
+(https://github.com/shreeve/bindings).
 
 To replace +eval+,
 
@@ -149,7 +149,7 @@ below for details).
   # => 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>.
++bindings+ should work with <code>live_ast/full</code>.
 
 == Limitations
 

data/Rakefile

@@ -1,52 +1,52 @@
 # frozen_string_literal: true
 
-require 'rake/clean'
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'rdoc/task'
+require "rake/clean"
+require "bundler/gem_tasks"
+require "rake/testtask"
+require "rdoc/task"
 
 namespace :test do
-  desc 'run tests'
+  desc "run tests"
   Rake::TestTask.new(:main) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/*_test.rb']
+    t.test_files = FileList["test/*_test.rb"]
   end
 
   Rake::TestTask.new(:base) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/base/*_test.rb']
+    t.test_files = FileList["test/base/*_test.rb"]
   end
 
   Rake::TestTask.new(:ast_load) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/ast_load/*_test.rb']
+    t.test_files = FileList["test/ast_load/*_test.rb"]
   end
 
   Rake::TestTask.new(:ast_eval) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/ast_eval/*_test.rb']
+    t.test_files = FileList["test/ast_eval/*_test.rb"]
   end
 
   Rake::TestTask.new(:to_ast) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/to_ast/*_test.rb']
+    t.test_files = FileList["test/to_ast/*_test.rb"]
   end
 
   Rake::TestTask.new(:to_ruby) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/to_ruby/*_test.rb']
+    t.test_files = FileList["test/to_ruby/*_test.rb"]
   end
 
   Rake::TestTask.new(:full) do |t|
-    t.libs = ['lib']
+    t.libs = ["lib"]
     t.ruby_opts += ["-w -Itest"]
-    t.test_files = FileList['test/full/*_test.rb']
+    t.test_files = FileList["test/full/*_test.rb"]
   end
 
   task all: [:main, :base, :ast_load, :to_ast, :to_ruby, :full]
@@ -59,4 +59,4 @@ RDoc::Task.new(:rdoc) do |t|
   t.rdoc_files.include("README.rdoc", "CHANGES.rdoc", "lib")
 end
 
-task default: 'test:all'
+task default: "test:all"

data/lib/live_ast.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
-require 'live_ast/to_ast'
-require 'live_ast/ast_eval'
-require 'live_ast/replace_load'
+require "live_ast/base"
+require "live_ast/to_ast"
+require "live_ast/ast_eval"
+require "live_ast/replace_load"

data/lib/live_ast/ast_eval.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
+require "live_ast/base"
 
 module Kernel
   private

data/lib/live_ast/ast_load.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
+require "live_ast/base"
 
 module Kernel
   private

data/lib/live_ast/base.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'thread'
+require "thread"
 
-require 'live_ast/common'
-require 'live_ast/reader'
-require 'live_ast/evaler'
-require 'live_ast/linker'
-require 'live_ast/loader'
-require 'live_ast/error'
-require 'live_ast/irb_spy' if defined?(IRB)
+require "live_ast/common"
+require "live_ast/reader"
+require "live_ast/evaler"
+require "live_ast/linker"
+require "live_ast/loader"
+require "live_ast/error"
+require "live_ast/irb_spy" if defined?(IRB)
 
 module LiveAST
   NATIVE_EVAL = Kernel.method(:eval) #:nodoc:
@@ -17,10 +17,11 @@ module LiveAST
     attr_writer :parser #:nodoc:
 
     def parser #:nodoc:
-      @parser ||= begin
-        require 'live_ast/ruby_parser'
-        LiveAST::RubyParser
-      end
+      @parser ||=
+        begin
+          require "live_ast/ruby_parser"
+          LiveAST::RubyParser
+        end
     end
 
     #

data/lib/live_ast/common.rb

@@ -18,11 +18,7 @@ module LiveAST
     rescue NameError
       thing = arg.nil? ? nil : arg.class
 
-      message = if RUBY_VERSION >= "2.6.0"
-                  "wrong argument type #{thing.inspect} (expected String)"
-                else
-                  "no implicit conversion of #{thing.inspect} into String"
-                end
+      message = "wrong argument type #{thing.inspect} (expected String)"
       raise TypeError, message
     end
 
@@ -48,11 +44,7 @@ module LiveAST
       if bind
         case location.size
         when 0
-          if RUBY_VERSION < "2.6.0"
-            NATIVE_EVAL.call("[__FILE__, __LINE__]", bind)
-          else
-            bind.source_location
-          end
+          bind.source_location
         when 1
           [location.first, 1]
         else

data/lib/live_ast/evaler.rb

@@ -15,9 +15,9 @@ module LiveAST
 
         begin
           NATIVE_EVAL.call(evaler_source, bind, key, line)
-        rescue Exception => ex
-          ex.backtrace.map! { |s| LiveAST.strip_token s }
-          raise ex
+        rescue Exception => e
+          e.backtrace.map! { |s| LiveAST.strip_token s }
+          raise e
         end
       end
 

data/lib/live_ast/full.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require 'live_ast'
-require 'live_ast/replace_eval'
+require "live_ast"
+require "live_ast/replace_eval"

data/lib/live_ast/irb_spy.rb

@@ -8,8 +8,8 @@ module LiveAST
       attr_writer :history
 
       def code_at(line)
-        code = +''
-        checked_history[line..-1].each do |code_line|
+        code = +""
+        checked_history[line..].each do |code_line|
           code << code_line << "\n"
           return code if can_parse code
         end
@@ -25,7 +25,7 @@ module LiveAST
         return @history if @history
 
         raise NotImplementedError,
-          "LiveAST cannot access history for this IRB input method"
+              "LiveAST cannot access history for this IRB input method"
       end
     end
   end
@@ -33,7 +33,7 @@ end
 
 [
   defined?(IRB::StdioInputMethod) ? IRB::StdioInputMethod : nil,
-  defined?(IRB::ReadlineInputMethod) ? IRB::ReadlineInputMethod : nil,
+  defined?(IRB::ReadlineInputMethod) ? IRB::ReadlineInputMethod : nil
 ].compact.each do |klass|
   klass.module_eval do
     alias_method :live_ast_original_gets, :gets

data/lib/live_ast/loader.rb

@@ -10,7 +10,7 @@ module LiveAST
         header, footer, warnings_ok = header_footer(wrap)
 
         parser_src = Reader.read(file)
-        evaler_src = +'' << header << parser_src << footer
+        evaler_src = +"" << header << parser_src << footer
 
         run = lambda do
           Evaler.eval(parser_src, evaler_src, TOPLEVEL_BINDING, file, 1)
@@ -52,7 +52,7 @@ module LiveAST
         return file if File.file? file
 
         $LOAD_PATH.each do |path|
-          target = path + "/" + file
+          target = File.join(path, file)
           return target if File.file? target
         end
         nil

data/lib/live_ast/reader.rb

@@ -18,7 +18,7 @@ module LiveAST
     end
 
     def self.strip_special(encoding)
-      if encoding =~ /\Autf8-mac\Z/i
+      if /\Autf8-mac\Z/i.match?(encoding)
         "UTF8-MAC"
       else
         encoding.sub(/-(unix|dos|mac)\Z/i, "")

data/lib/live_ast/replace_eval.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
-require 'binding_of_caller'
+require "live_ast/base"
+require "bindings"
 
 module LiveAST
   module ReplaceEval
@@ -57,9 +57,8 @@ module Kernel
     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])
-    )
+      args[1] || Binding.of_caller(1),
+      *LiveAST::Common.location_for_eval(*args[1..3]))
   end
 end
 
@@ -68,7 +67,7 @@ class Binding
   alias live_ast_original_binding_eval eval
 
   def eval(*args)
-    LiveAST.eval(args[0], self, *args[1..-1])
+    LiveAST.eval(args[0], self, *args[1..])
   end
 end
 
@@ -80,11 +79,11 @@ class BasicObject
     if block
       live_ast_original_instance_eval(*args, &block)
     else
-      ::LiveAST::ReplaceEval.
-        module_or_instance_eval(:instance,
-                                self,
-                                ::Kernel.binding.of_caller(1),
-                                args)
+      ::LiveAST::ReplaceEval
+        .module_or_instance_eval(:instance,
+                                 self,
+                                 ::Binding.of_caller(1),
+                                 args)
     end
   end
 end
@@ -97,8 +96,8 @@ class Module
     if block
       live_ast_original_module_eval(*args, &block)
     else
-      LiveAST::ReplaceEval.
-        module_or_instance_eval(:module, self, binding.of_caller(1), args)
+      LiveAST::ReplaceEval
+        .module_or_instance_eval(:module, self, Binding.of_caller(1), args)
     end
   end
 

data/lib/live_ast/replace_load.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
+require "live_ast/base"
 
 module Kernel
   alias live_ast_original_load load

data/lib/live_ast/replace_raise.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
+require "live_ast/base"
 
 module Kernel
   private
@@ -10,8 +10,8 @@ module Kernel
   def raise(*args)
     ex = begin
            live_ast_original_raise(*args)
-         rescue Exception => t
-           t
+         rescue Exception => e
+           e
          end
     ex.backtrace.reject! { |line| line.index __FILE__ }
     ex.backtrace.map! { |line| LiveAST.strip_token line }

data/lib/live_ast/ruby_parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'ruby_parser'
-require 'live_ast/base'
+require "ruby_parser"
+require "live_ast/base"
 
 module LiveAST
   class RubyParser
@@ -33,7 +33,7 @@ module LiveAST
   end
 end
 
-LiveAST::RubyParser.autoload :Unparser, 'live_ast/ruby_parser/unparser'
-LiveAST::RubyParser.autoload :Test, 'live_ast/ruby_parser/test'
+LiveAST::RubyParser.autoload :Unparser, "live_ast/ruby_parser/unparser"
+LiveAST::RubyParser.autoload :Test, "live_ast/ruby_parser/test"
 
 LiveAST.parser = LiveAST::RubyParser

data/lib/live_ast/ruby_parser/test.rb

@@ -150,6 +150,18 @@ module LiveAST
           s(:call, s(:lvar, :x), op, s(:lvar, :y)))
       end
 
+      #
+      # binop_lambda(:+) returns the ast of
+      #
+      #   lambda { |x, y| x + y }
+      #
+      def binop_lambda(op)
+        s(:iter,
+          s(:lambda),
+          s(:args, :x, :y),
+          s(:call, s(:lvar, :x), op, s(:lvar, :y)))
+      end
+
       #
       # binop_proc_new(:*) returns the ast of
       #

data/lib/live_ast/ruby_parser/unparser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ruby2ruby'
+require "ruby2ruby"
 
 #
 # Used by +to_ruby+ in LiveAST.

data/lib/live_ast/to_ast.rb

@@ -1,28 +1,23 @@
 # frozen_string_literal: true
 
-require 'live_ast/base'
+require "live_ast/base"
 
-[Method, UnboundMethod].each do |klass|
-  klass.class_eval do
-    def to_ast #:nodoc:
+module LiveAST
+  module MethodToAST
+    # Extract the AST of this object.
+    def to_ast
       LiveAST::Linker.find_method_ast(owner, name, *source_location)
     end
   end
-end
 
-class Proc
-  # Extract the AST of this object.
-  def to_ast
-    LiveAST::Linker.find_proc_ast(self)
+  module ProcToAST
+    # Extract the AST of this object.
+    def to_ast
+      LiveAST::Linker.find_proc_ast(self)
+    end
   end
 end
 
-class Method
-  # :method: to_ast
-  # Extract the AST of this object.
-end
-
-class UnboundMethod
-  # :method: to_ast
-  # Extract the AST of this object.
-end
+Method.include LiveAST::MethodToAST
+UnboundMethod.include LiveAST::MethodToAST
+Proc.include LiveAST::ProcToAST