mvz-live_ast 1.1.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53bc1d58d2c1645ff3d34a4f5f6df3e34a8fb352
-  data.tar.gz: 6e52ea854d98d13be30b16bd6e3e2acb9933b9ba
+SHA256:
+  metadata.gz: e96ab3dab36ef2a9b745f3a878b71b79bb8b8ecfd870b0c8ad29dcef5520a943
+  data.tar.gz: b8b7f606c175caff1522b70db8287392160d8352e44f57fca8e6709011599bd5
 SHA512:
-  metadata.gz: 139a51f52879ec099027541c3826d807eafff81b0e2d06352d7c62ba5d971c143608224213e7fa2a6f1273a5b4eff5d4c2456c7c56e2614714489d9ffc44e5d0
-  data.tar.gz: 9c7397ca3f90654b71cc0ef9c904f7432e5548a249a1c69200eda4f17e8ade860fd0c4f1ac59cac8c0f93d6ddfe1d268986468220f31cdfe422bb4674fc14461
+  metadata.gz: ac889c697aa0c722078437135a3c57db7b05126178920e1224e4728616ab38cabbcb682d6eae3194a9361f2032400a6b55d2e89726f95abe006fa33d9e8c6ef9
+  data.tar.gz: ecc774511be6e4bb0d89559c8e6186ec766aa30ad31376f6e310ef5e9d0e116f603b648ce1a8f8a722116daadc1150913bdcbb977ed653c2784b0e84525c59c7

data/CHANGES.rdoc

@@ -1,6 +1,32 @@
-
 = 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
+
+== Version 1.3.1
+
+* Loosen dependency on ruby_parser
+
+== Version 1.3.0
+
+* Drop support for Rubies below 2.3
+* Update dependencies
+
+== 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.3.0 or higher is required.
 
 == Links
 
@@ -124,13 +124,13 @@ 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
 
 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+,
 
@@ -146,10 +146,10 @@ 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>.
++bindings+ should work with <code>live_ast/full</code>.
 
 == Limitations
 
@@ -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/Rakefile

@@ -1,50 +1,52 @@
-require 'rake/clean'
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'rdoc/task'
+# frozen_string_literal: true
+
+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]
@@ -57,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,4 +1,6 @@
-require 'live_ast/base'
-require 'live_ast/to_ast'
-require 'live_ast/ast_eval'
-require 'live_ast/replace_load'
+# frozen_string_literal: true
+
+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,4 +1,6 @@
-require 'live_ast/base'
+# frozen_string_literal: true
+
+require "live_ast/base"
 
 module Kernel
   private

data/lib/live_ast/ast_load.rb

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

data/lib/live_ast/base.rb

@@ -1,24 +1,27 @@
-require 'thread'
+# frozen_string_literal: true
 
-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 "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)
 
 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 ||= (
-        require 'live_ast/ruby_parser'
-        LiveAST::RubyParser
-      )
+    def parser #:nodoc:
+      @parser ||=
+        begin
+          require "live_ast/ruby_parser"
+          LiveAST::RubyParser
+        end
     end
 
     #
@@ -26,7 +29,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 +53,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 +62,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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module LiveAST
   module Common
@@ -8,11 +9,16 @@ 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
+
+    def arg_to_str2(arg)
+      arg.to_str
+    rescue NameError
+      thing = arg.nil? ? nil : arg.class
+
+      message = "wrong argument type #{thing.inspect} (expected String)"
       raise TypeError, message
     end
 
@@ -21,17 +27,14 @@ module LiveAST
 
       range = 0 if range == (0..0)
 
-      raise ArgumentError,
-        "wrong number of arguments (#{args.size} for #{range})"
+      message = "wrong number of arguments (given #{args.size}, expected #{range})"
+      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
 
@@ -41,7 +44,7 @@ module LiveAST
       if bind
         case location.size
         when 0
-          NATIVE_EVAL.call("[__FILE__, __LINE__]", bind)
+          bind.source_location
         when 1
           [location.first, 1]
         else

data/lib/live_ast/error.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LiveAST
   module Evaler
     class << self
@@ -9,13 +11,13 @@ 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)
-        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,2 +1,4 @@
-require 'live_ast'
-require 'live_ast/replace_eval'
+# frozen_string_literal: true
+
+require "live_ast"
+require "live_ast/replace_eval"

data/lib/live_ast/irb_spy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module LiveAST
   @history = nil
@@ -7,20 +8,24 @@ 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..].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
@@ -28,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