mvz-live_ast 1.1.1 → 1.1.2

data/test/flush_cache_test.rb

@@ -15,8 +15,8 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
 
   def uncached_method_from_require
     klass = Class.new do
-      def f ; end
-      def g ; end
+      def f; end
+      def g; end
     end
 
     LiveAST.flush_cache
@@ -66,8 +66,8 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
 
   def lost_method_from_require
     klass = Class.new do
-      def f ; end
-      def g ; end
+      def f; end
+      def g; end
     end
 
     # check that previous flushing did not cause side effect
@@ -83,14 +83,14 @@ define_unsorted_test_case "FlushCacheTest", RegularTest do
         lambda { "bbb" },
       ]
     }, binding
-    
+
     a_ast = a.to_ast
     assert_equal no_arg_block(:lambda, "aaa"), a_ast
 
     LiveAST.flush_cache
 
     assert_equal a_ast.object_id, a.to_ast.object_id
-    
+
     assert_raises LiveAST::ASTNotFoundError do
       b.to_ast
     end

data/test/full/ast_reload_test.rb

@@ -0,0 +1,39 @@
+require 'main'
+
+class ASTReloadTest < ReplaceEvalTest
+  include FileUtils
+
+  def test_reloading
+    ast_reload
+  end
+
+  def ast_reload
+    code_1 = %{
+      class ASTReloadTest::C
+        def f
+          "first C#f"
+        end
+      end
+    }
+
+    code_2 = %{
+      class ASTReloadTest::C
+        def f
+          "second C#f"
+        end
+      end
+    }
+
+    temp_file code_1 do |file|
+      load file
+
+      LiveAST.ast(C.instance_method(:f))
+
+      write_file file, code_2
+      load file
+
+      assert_equal no_arg_def(:f, "second C#f"),
+                   LiveAST.ast(C.instance_method(:f))
+    end
+  end
+end

data/test/{replace_eval_test.rb → full/replace_eval_test.rb}

@@ -1,6 +1,6 @@
-require_relative 'main'
+require 'main'
 
-class ZZY_ReplaceEvalTest < ReplaceEvalTest
+class FullReplaceEvalTest < ReplaceEvalTest
   RESULT = {}
 
   def setup
@@ -34,7 +34,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
 
   def test_def_class
     DEFINE_B.call
-    assert_equal "ZZY_ReplaceEvalTest::B", B.name
+    assert_equal "FullReplaceEvalTest::B", B.name
     assert_equal binop_def(:f, :/), B.instance_method(:f).to_ast
   end
 
@@ -94,7 +94,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
         }
       end
     end
-  
+
     module S
       class T
         eval %{
@@ -105,7 +105,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
       end
     end
   end
-  
+
   def test_const_lookup_3
     DEFINE_QS.call
     Q::R.new.f
@@ -157,7 +157,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
     end
     assert_equal orig.message, live.message
 
-    [[nil], [Object.new], [3], [4,3,2], (1..10).to_a].each do |args|
+    [[nil], [Object.new], [3], [4, 3, 2], (1..10).to_a].each do |args|
       orig = assert_raises ArgumentError, TypeError do
         Object.new.live_ast_original_instance_eval(*args)
       end
@@ -169,12 +169,31 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
     end
   end
 
+  describe "instance_eval argument errors" do
+    before do
+      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) } }
+
+    describe "when the second argument is nil" do
+      let(:args) { ['1', nil] }
+      it "raises the same error as the original" do
+        assert_equal orig.message, live.message
+        assert_equal orig.class, live.class
+      end
+    end
+  end
+
   def test_instance_eval_arg_error_with_block
     orig = assert_raises ArgumentError do
-      Object.new.live_ast_original_instance_eval(3,4,5) { }
+      Object.new.live_ast_original_instance_eval(3, 4, 5) {}
     end
     live = assert_raises ArgumentError do
-      Object.new.instance_eval(3,4,5) { }
+      Object.new.instance_eval(3, 4, 5) {}
     end
     assert_equal orig.message, live.message
   end
@@ -223,7 +242,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
       self[:g] = lambda { "g" }
     }
     assert_equal y, live[:y]
-    
+
     assert_equal no_arg_block(:lambda, "g"), live[:g].to_ast
   end
 
@@ -309,7 +328,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
     unfixable do
       assert_equal orig, live
     end
-    
+
     live.first.sub!(/#{Regexp.quote LiveAST::Linker::REVISION_TOKEN}.*\Z/, "")
     assert_equal orig, live
     assert_equal ["test", 102], live
@@ -388,7 +407,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
   def test_basic_object
     ::BasicObject.new.instance_eval %{
       t = 33
-      ::ZZY_ReplaceEvalTest::RESULT[:bo_test] = t + 44
+      ::FullReplaceEvalTest::RESULT[:bo_test] = t + 44
     }
     assert_equal 77, RESULT[:bo_test]
   end
@@ -400,7 +419,7 @@ class ZZY_ReplaceEvalTest < ReplaceEvalTest
   end
 
   def test_instance_variables
-    assert_equal 99, Z.new.instance_eval{ @t }
+    assert_equal 99, Z.new.instance_eval { @t }
     assert_equal 99, Z.new.instance_eval("@t")
   end
 end

data/test/irb_test.rb

@@ -14,7 +14,7 @@ class IRBTest < RegularTest
     with_module(Object, :IRB) do
       with_module(LiveAST, :IRBSpy) do
         LiveAST::IRBSpy.class_eval do
-          def self.code_at(line)
+          def self.code_at(_line)
             "def f ; end"
           end
         end

data/test/lambda_test.rb

@@ -26,6 +26,13 @@ class LambdaTest < RegularTest
     assert_equal expected, a.to_ast
   end
 
+  def test_stabby_lambda
+    a = ->(x, y) { x - y }
+
+    expected = binop_block(:lambda, :-)
+    assert_equal expected, a.to_ast
+  end
+
   def test_proc
     a = proc { |x, y| x / y }
 

data/test/load_path_test.rb

@@ -1,8 +1,8 @@
 require_relative 'main'
 
-class AAA_LoadPathTest < BaseTest
+class LoadPathTest < BaseTest
   include FileUtils
-  
+
   def test_load_path
     $LOAD_PATH.unshift DATA_DIR
     begin
@@ -17,9 +17,9 @@ class AAA_LoadPathTest < BaseTest
       $LOAD_PATH.shift
     end
   end
-  
+
   def test_chdir
-    mkdir DATA_DIR, :verbose => false rescue nil
+    mkdir DATA_DIR, verbose: false rescue nil
     Dir.chdir(DATA_DIR) do
       check_load
       check_errors
@@ -43,9 +43,9 @@ class AAA_LoadPathTest < BaseTest
       Object.send(:remove_method, :hello) rescue nil
       load "foo.rb"
       assert_equal "password", hello
-      
+
       write_file path, code_2
-      
+
       Object.send(:remove_method, :goodbye) rescue nil
       LiveAST.load "foo.rb"
       assert_equal "bubbleboy", goodbye
@@ -63,13 +63,13 @@ class AAA_LoadPathTest < BaseTest
   end
 
   def check_errors
-    temp_file "# do nothing", "foo.rb" do |path|
+    temp_file "# do nothing", "foo.rb" do |_path|
       [
-       "foo",
-       "",
-       "/usr",
-       ".",
-       "..",
+        "foo",
+        "",
+        "/usr",
+        ".",
+        "..",
       ].each do |file|
         compare_load_errors(file)
       end

data/test/load_test.rb

@@ -1,14 +1,14 @@
 require_relative 'main'
 require_relative '../devel/levitate'
 
-class AAA_LoadFileTest < BaseTest
+class LoadFileTest < BaseTest
   class << self
     attr_accessor :flag
   end
 
   def test_a_no_locals_created
     code = %{
-      AAA_LoadFileTest.flag = :code_a
+      LoadFileTest.flag = :code_a
       FOO = 77
       x = 33
       y = 99
@@ -17,8 +17,8 @@ class AAA_LoadFileTest < BaseTest
     temp_file code do |file|
       ret = LiveAST.load file
       assert_equal true, ret
-      assert_equal :code_a, AAA_LoadFileTest.flag
-      
+      assert_equal :code_a, LoadFileTest.flag
+
       assert_raises NameError do
         eval("x", TOPLEVEL_BINDING)
       end
@@ -29,33 +29,33 @@ class AAA_LoadFileTest < BaseTest
 
   def test_b_no_locals_modified
     code = %{
-      AAA_LoadFileTest.flag = :code_b
+      LoadFileTest.flag = :code_b
       r = 55
     }
 
     temp_file code do |file|
       eval("r = 66", TOPLEVEL_BINDING)
-      
+
       ret = LiveAST.load file
       assert_equal true, ret
-      assert_equal :code_b, AAA_LoadFileTest.flag
-      
+      assert_equal :code_b, LoadFileTest.flag
+
       actual = eval("r", TOPLEVEL_BINDING)
       assert_equal 66, actual
     end
   end
-  
+
   def test_c_wrap
     code = %{
-      AAA_LoadFileTest.flag = :code_c
+      LoadFileTest.flag = :code_c
       ZOOM = 111
     }
 
     temp_file code do |file|
       ret = LiveAST.load file, true
       assert_equal true, ret
-      assert_equal :code_c, AAA_LoadFileTest.flag
-      
+      assert_equal :code_c, LoadFileTest.flag
+
       assert_raises NameError do
         ZOOM
       end
@@ -68,12 +68,12 @@ class AAA_LoadFileTest < BaseTest
 
   def test_d_empty_locals_list
     code = %{
-      AAA_LoadFileTest.from_d
+      LoadFileTest.from_d
     }
-    
+
     temp_file code do |file|
       LiveAST.load file
-      assert_equal :code_d, AAA_LoadFileTest.flag
+      assert_equal :code_d, LoadFileTest.flag
     end
   end
 
@@ -81,27 +81,27 @@ class AAA_LoadFileTest < BaseTest
     lib = File.expand_path(File.dirname(__FILE__) + "/../lib")
 
     [
-     # respects a loaded file setting $VERBOSE = true
-     [
-      "false",
-      "true",
-      lambda { |file|
-        Levitate.run file
-      }
-     ],
-
-     # unfixable: does not respect a loaded file setting $VERBOSE = nil
-     [
-      "true",
-      "false",
-      lambda { |file|
-        unfixable do
-          assert_nothing_raised do
-            Levitate.run file
+      # respects a loaded file setting $VERBOSE = true
+      [
+        "false",
+        "true",
+        lambda { |file|
+          Levitate.run file
+        }
+      ],
+
+      # unfixable: does not respect a loaded file setting $VERBOSE = nil
+      [
+        "true",
+        "false",
+        lambda { |file|
+          unfixable do
+            assert_nothing_raised do
+              Levitate.run file
+            end
           end
-        end
-      }
-     ]
+        }
+      ]
     ].each do |main_value, loaded_value, action|
       loaded_code = %{
         $VERBOSE = #{loaded_value}

data/test/main.rb

@@ -5,7 +5,6 @@ require 'pp'
 require 'find'
 require 'fileutils'
 
-require 'minitest/unit'
 require 'minitest/mock'
 require 'minitest/autorun'
 
@@ -19,10 +18,10 @@ def define_unsorted_test_case(name, superclass, &block)
   Object.const_set "#{letter}#{name}", klass
 end
 
-class JLMiniTest < MiniTest::Unit::TestCase
+class JLMiniTest < MiniTest::Test
   def self.test_methods
     default = super
-    onlies = default.select { |m| m =~ %r!__only\Z! }
+    onlies = default.select { |m| m =~ /__only\Z/ }
     if onlies.empty?
       default
     else
@@ -32,7 +31,7 @@ class JLMiniTest < MiniTest::Unit::TestCase
   end
 
   def delim(char)
-    "\n" << (char*72) << "\n"
+    "\n" << (char * 72) << "\n"
   end
 
   def mu_pp(obj)
@@ -42,11 +41,9 @@ class JLMiniTest < MiniTest::Unit::TestCase
   end
 
   def unfixable
-    begin
-      yield
-      raise "claimed to be unfixable, but assertion succeeded"
-    rescue MiniTest::Assertion
-    end
+    yield
+    raise "claimed to be unfixable, but assertion succeeded"
+  rescue MiniTest::Assertion
   end
 
   def assert_nothing_raised
@@ -54,13 +51,13 @@ class JLMiniTest < MiniTest::Unit::TestCase
     assert_nil nil
   rescue => ex
     raise MiniTest::Assertion,
-    exception_details(ex, "Expected nothing raised, but got:")
+      exception_details(ex, "Expected nothing raised, but got:")
   end
 
-  %w[
+  %w(
     empty equal in_delta in_epsilon includes instance_of
     kind_of match nil operator respond_to same
-  ].each { |name|
+  ).each { |name|
     alias_method "assert_not_#{name}", "refute_#{name}"
   }
 end
@@ -97,14 +94,12 @@ class BaseTest < JLMiniTest
   end
 
   def exception_backtrace
-    begin
-      yield
-    rescue Exception => e
-      e.backtrace
-    end
+    yield
+  rescue Exception => e
+    e.backtrace
   end
 
-  def ignore(*args)
+  def ignore(*_args)
   end
 end
 
@@ -122,18 +117,15 @@ class ReplaceEvalTest < BaseTest
            require 'live_ast/full'
            true
          rescue LoadError
-           if RUBY_ENGINE == "ruby"
-             raise "need: gem install boc"
-           end
+           raise "need: gem install binding_of_caller" if RUBY_ENGINE == "ruby"
            false
          end
 
-    unless ok
-      self.class.class_eval do
-        instance_methods(false).each do |m|
-          remove_method(m)
-          define_method(m) { }
-        end
+    return if ok
+    self.class.class_eval do
+      instance_methods(false).each do |m|
+        remove_method(m)
+        define_method(m) {}
       end
     end
   end