looksee 3.1.0-universal-java-1.8 → 4.0.0-universal-java-1.8

data/spec/looksee/lookup_path_spec.rb

@@ -11,8 +11,20 @@ describe Looksee::LookupPath do
       temporary_class(:C) { include M }
       @object = Object.new
       Looksee.adapter.ancestors[@object] = [C, M]
-      Looksee.adapter.set_methods(M, [:public1, :public2], [:protected1, :protected2], [:private1, :private2], [:undefined1, :undefined2])
-      Looksee.adapter.set_methods(C, [:public1, :public2], [:protected1, :protected2], [:private1, :private2], [:undefined1, :undefined2])
+      add_methods(
+        M,
+        public: [:pub1, :pub2],
+        protected: [:pro1, :pro2],
+        private: [:pri1, :pri2],
+        undefined: [:und1, :und2],
+      )
+      add_methods(
+        C,
+        public: [:pub1, :pub2],
+        protected: [:pro1, :pro2],
+        private: [:pri1, :pri2],
+        undefined: [:und1, :und2],
+      )
       @lookup_path = Looksee::LookupPath.new(@object)
     end
 
@@ -22,22 +34,22 @@ describe Looksee::LookupPath do
 
     it "should include methods of all visibilities, including overridden ones" do
       @lookup_path.entries[0].methods.should == {
-        'public1'    => :public   , 'public2'    => :public,
-        'protected1' => :protected, 'protected2' => :protected,
-        'private1'   => :private  , 'private2'   => :private,
-        'undefined1' => :undefined, 'undefined2' => :undefined,
+        'pub1' => :public, 'pub2' => :public,
+        'pro1' => :protected, 'pro2' => :protected,
+        'pri1' => :private, 'pri2' => :private,
+        'und1' => :undefined, 'und2' => :undefined,
       }
       @lookup_path.entries[1].methods.should == {
-        'public1'    => :public   , 'public2'    => :public,
-        'protected1' => :protected, 'protected2' => :protected,
-        'private1'   => :private  , 'private2'   => :private,
-        'undefined1' => :undefined, 'undefined2' => :undefined,
+        'pub1' => :public, 'pub2' => :public,
+        'pro1' => :protected, 'pro2' => :protected,
+        'pri1' => :private, 'pri2' => :private,
+        'und1' => :undefined, 'und2' => :undefined,
       }
     end
 
     it "should know which methods have been overridden" do
-      @lookup_path.entries[0].overridden?('public1').should == false
-      @lookup_path.entries[1].overridden?('public1').should == true
+      @lookup_path.entries[0].overridden?('pub1').should == false
+      @lookup_path.entries[1].overridden?('pub1').should == true
     end
   end
 
@@ -52,7 +64,7 @@ describe Looksee::LookupPath do
       lookup_path = Looksee::LookupPath.new(@object)
       method = lookup_path.find('f')
       method.owner.should == C
-      method.name.should == (RUBY_VERSION < "1.9.0" ? 'f' : :f)
+      method.name.should == :f
     end
 
     it "should find methods in included modules" do
@@ -60,7 +72,7 @@ describe Looksee::LookupPath do
       lookup_path = Looksee::LookupPath.new(@object)
       method = lookup_path.find('g')
       method.owner.should == M
-      method.name.should == (RUBY_VERSION < "1.9.0" ? 'g' : :g)
+      method.name.should == :g
     end
 
     it "should return nil if the method does not exist" do
@@ -68,19 +80,20 @@ describe Looksee::LookupPath do
       lookup_path.find('g').should be_nil
     end
 
-    it "should return nil if the method has been undefined" do
-      C.send(:undef_method, :f)
-      lookup_path = Looksee::LookupPath.new(@object)
-      lookup_path.find('f').should be_nil
+    unless RUBY_VERSION >= '2.3.0'
+      it "should return nil if the method has been undefined" do
+        add_methods(C, undefined: [:f])
+        lookup_path = Looksee::LookupPath.new(@object)
+        lookup_path.find('f').should be_nil
+      end
     end
   end
 
   describe Looksee::LookupPath::Entry do
     it "should iterate over methods in alphabetical order" do
       temporary_class(:C)
-      @object = C.new
-      Looksee.adapter.stub(internal_public_instance_methods: [:a, :c, :b])
-      @lookup_path = Looksee::LookupPath.new(@object)
+      add_methods(C, public: [:a, :c, :b])
+      @lookup_path = Looksee::LookupPath.new(C.new)
       @lookup_path.entries.first.map{|name, visibility| name}.should == ['a', 'b', 'c']
     end
   end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $:.unshift File.expand_path('..', File.dirname(__FILE__))
 ENV['LOOKSEE_METHOD'] = nil
 
 require 'rspec'
+require 'pry' unless ENV['CI']
+
 require 'looksee'
 
 require 'rbconfig'

data/spec/support/temporary_classes.rb

@@ -47,10 +47,6 @@ module TemporaryClasses
   #
   # +methods+ is a hash of visibilities to names.
   #
-  # As Ruby's reflection on singleton classes of classes isn't quite
-  # adequate, you need to provide a :class_singleton option when such
-  # a class is given.
-  #
   # e.g.:
   #
   #   replace_methods MyClass, :public => [:a, :b]
@@ -63,16 +59,16 @@ module TemporaryClasses
           send visibility, name
         end
       end
-    end
-  end
-
-  private  # ---------------------------------------------------------
 
-  def all_instance_methods(mod)
-    names =
-      mod.public_instance_methods(false) +
-      mod.protected_instance_methods(false) +
-      mod.private_instance_methods(false)
-    names.map{|name| name.to_sym}  # they're strings in ruby <1.9
+      if (methods = options[:undefined])
+        Array(methods).each do |name|
+          define_method(name){} unless method_defined?(name)
+          undef_method(name)
+        end
+        if Looksee.adapter.is_a?(TestAdapter)
+          Looksee.adapter.set_undefined_methods(mod, methods)
+        end
+      end
+    end
   end
 end

data/spec/support/test_adapter.rb

@@ -10,74 +10,23 @@ class TestAdapter < Looksee::Adapter::Base
     ancestors[object]
   end
 
-  def internal_public_instance_methods(mod)
-    public_methods[mod]
-  end
-
-  def internal_protected_instance_methods(mod)
-    protected_methods[mod]
-  end
-
-  def internal_private_instance_methods(mod)
-    private_methods[mod]
-  end
-
   def internal_undefined_instance_methods(mod)
     undefined_methods[mod]
   end
 
-  def included_class?(object)
-    NATIVE_ADAPTER.included_class?(object)
-  end
-
-  def singleton_class?(object)
-    NATIVE_ADAPTER.singleton_class?(object)
-  end
-
   def singleton_instance(object)
     NATIVE_ADAPTER.singleton_instance(object)
   end
 
-  def module_name(object)
-    NATIVE_ADAPTER.module_name(object)
-  end
-
-  def set_methods(mod, public, protected, private, undefined)
-    self.public_methods[mod] = public
-    self.protected_methods[mod] = protected
-    self.private_methods[mod] = private
-    self.undefined_methods[mod] = undefined
-  end
-
-  def source_location(method)
-    source_locations[[method.owner.name.to_s, method.name.to_s]]
-  end
-
-  def set_source_location(mod, method, location)
-    source_locations[[mod.name.to_s, method.to_s]] = location
+  def set_undefined_methods(mod, names)
+    self.undefined_methods[mod] = names
   end
 
   def ancestors
     @ancestors ||= Hash.new { |h, k| h[k] = [] }
   end
 
-  def public_methods
-    @public_methods ||= Hash.new { |h, k| h[k] = [] }
-  end
-
-  def protected_methods
-    @protected_methods ||= Hash.new { |h, k| h[k] = [] }
-  end
-
-  def private_methods
-    @private_methods ||= Hash.new { |h, k| h[k] = [] }
-  end
-
   def undefined_methods
     @undefined_methods ||= Hash.new { |h, k| h[k] = [] }
   end
-
-  def source_locations
-    @source_locations ||= {}
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: looksee
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: universal-java-1.8
 authors:
 - George Ogata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -25,33 +25,13 @@ files:
 - README.markdown
 - Rakefile
 - ext/extconf.rb
-- ext/mri/1.9.2/debug.h
-- ext/mri/1.9.2/id.h
-- ext/mri/1.9.2/method.h
-- ext/mri/1.9.2/node.h
-- ext/mri/1.9.2/thread_pthread.h
-- ext/mri/1.9.2/vm_core.h
-- ext/mri/1.9.2/vm_opts.h
-- ext/mri/1.9.3/atomic.h
-- ext/mri/1.9.3/debug.h
-- ext/mri/1.9.3/id.h
-- ext/mri/1.9.3/internal.h
-- ext/mri/1.9.3/internal_falcon.h
-- ext/mri/1.9.3/method.h
-- ext/mri/1.9.3/node.h
-- ext/mri/1.9.3/thread_pthread.h
-- ext/mri/1.9.3/vm_core.h
-- ext/mri/1.9.3/vm_opts.h
-- ext/mri/2.0.0/internal.h
-- ext/mri/2.0.0/method.h
 - ext/mri/2.1.0/internal.h
 - ext/mri/2.1.0/method.h
 - ext/mri/2.2.0/internal.h
 - ext/mri/2.2.0/method.h
-- ext/mri/env-1.8.h
-- ext/mri/eval_c-1.8.h
+- ext/mri/2.3.0/internal.h
+- ext/mri/2.3.0/method.h
 - ext/mri/mri.c
-- ext/mri/node-1.9.h
 - ext/rbx/rbx.c
 - lib/looksee.rb
 - lib/looksee/JRuby.jar
@@ -65,7 +45,6 @@ files:
 - lib/looksee/help.rb
 - lib/looksee/inspector.rb
 - lib/looksee/lookup_path.rb
-- lib/looksee/rbx.bundle
 - lib/looksee/version.rb
 - spec/looksee/adapter_spec.rb
 - spec/looksee/clean_spec.rb
@@ -88,17 +67,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key:
 specification_version: 3
 summary: Supercharged method introspection in IRB.

data/ext/mri/1.9.2/debug.h

@@ -1,36 +0,0 @@
-/**********************************************************************
-
-  debug.h - YARV Debug function interface
-
-  $Author: akr $
-  created at: 04/08/25 02:33:49 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_DEBUG_H
-#define RUBY_DEBUG_H
-
-#include "ruby/ruby.h"
-#include "node.h"
-
-#define dpv(h,v) ruby_debug_print_value(-1, 0, h, v)
-#define dp(v)    ruby_debug_print_value(-1, 0, "", v)
-#define dpi(i)   ruby_debug_print_id(-1, 0, "", i)
-#define dpn(n)   ruby_debug_print_node(-1, 0, "", n)
-
-#define bp()     ruby_debug_breakpoint()
-
-VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
-ID    ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
-NODE *ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node);
-int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
-void  ruby_debug_breakpoint(void);
-void  ruby_debug_gc_check_func(void);
-
-#ifdef RUBY_DEBUG_ENV
-void ruby_set_debug_option(const char *str);
-#endif
-
-#endif /* RUBY_DEBUG_H */

data/ext/mri/1.9.2/id.h

@@ -1,170 +0,0 @@
-/* DO NOT EDIT THIS FILE DIRECTLY */
-/**********************************************************************
-
-  id.h -
-
-  $Author: akr $
-  created at: Sun Oct 19 21:12:51 2008
-
-  Copyright (C) 2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_ID_H
-#define RUBY_ID_H
-
-#define ID_SCOPE_SHIFT 3
-#define ID_SCOPE_MASK 0x07
-#define ID_LOCAL      0x00
-#define ID_INSTANCE   0x01
-#define ID_GLOBAL     0x03
-#define ID_ATTRSET    0x04
-#define ID_CONST      0x05
-#define ID_CLASS      0x06
-#define ID_JUNK       0x07
-#define ID_INTERNAL   ID_JUNK
-
-#ifdef USE_PARSE_H
-#include "parse.h"
-#endif
-
-#define symIFUNC ID2SYM(idIFUNC)
-#define symCFUNC ID2SYM(idCFUNC)
-
-#if !defined tLAST_TOKEN && defined YYTOKENTYPE
-#define tLAST_TOKEN tLAST_TOKEN
-#endif
-
-enum ruby_method_ids {
-#ifndef tLAST_TOKEN
-    tUPLUS = 321,
-    tUMINUS = 322,
-    tPOW = 323,
-    tCMP = 324,
-    tEQ = 325,
-    tEQQ = 326,
-    tNEQ = 327,
-    tGEQ = 328,
-    tLEQ = 329,
-    tANDOP = 330,
-    tOROP = 331,
-    tMATCH = 332,
-    tNMATCH = 333,
-    tDOT2 = 334,
-    tDOT3 = 335,
-    tAREF = 336,
-    tASET = 337,
-    tLSHFT = 338,
-    tRSHFT = 339,
-    tLAMBDA = 352,
-    idNULL = 365,
-    idRespond_to = 366,
-    idIFUNC = 367,
-    idCFUNC = 368,
-    id_core_set_method_alias = 369,
-    id_core_set_variable_alias = 370,
-    id_core_undef_method = 371,
-    id_core_define_method = 372,
-    id_core_define_singleton_method = 373,
-    id_core_set_postexe = 374,
-    tLAST_TOKEN = 375,
-#endif
-    idDot2 = tDOT2,
-    idDot3 = tDOT3,
-    idUPlus = tUPLUS,
-    idUMinus = tUMINUS,
-    idPow = tPOW,
-    idCmp = tCMP,
-    idPLUS = '+',
-    idMINUS = '-',
-    idMULT = '*',
-    idDIV = '/',
-    idMOD = '%',
-    idLT = '<',
-    idLTLT = tLSHFT,
-    idLE = tLEQ,
-    idGT = '>',
-    idGE = tGEQ,
-    idEq = tEQ,
-    idEqq = tEQQ,
-    idNeq = tNEQ,
-    idNot = '!',
-    idBackquote = '`',
-    idEqTilde = tMATCH,
-    idNeqTilde = tNMATCH,
-    idAREF = tAREF,
-    idASET = tASET,
-    idLAST_TOKEN = tLAST_TOKEN >> ID_SCOPE_SHIFT,
-    tIntern,
-    tMethodMissing,
-    tLength,
-    tSize,
-    tGets,
-    tSucc,
-    tEach,
-    tLambda,
-    tSend,
-    t__send__,
-    tInitialize,
-#if SUPPORT_JOKE
-    tBitblt,
-    tAnswer,
-#endif
-    tLAST_ID,
-#define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
-#if SUPPORT_JOKE
-    TOKEN2ID(Bitblt),
-    TOKEN2ID(Answer),
-#endif
-    TOKEN2ID(Intern),
-    TOKEN2ID(MethodMissing),
-    TOKEN2ID(Length),
-    TOKEN2ID(Size),
-    TOKEN2ID(Gets),
-    TOKEN2ID(Succ),
-    TOKEN2ID(Each),
-    TOKEN2ID(Lambda),
-    TOKEN2ID(Send),
-    TOKEN2ID(__send__),
-    TOKEN2ID(Initialize)
-};
-
-#ifdef tLAST_TOKEN
-struct ruby_method_ids_check {
-#define ruby_method_id_check_for(name, value) \
-    int checking_for_##name[name == value ? 1 : -1]
-ruby_method_id_check_for(tUPLUS, 321);
-ruby_method_id_check_for(tUMINUS, 322);
-ruby_method_id_check_for(tPOW, 323);
-ruby_method_id_check_for(tCMP, 324);
-ruby_method_id_check_for(tEQ, 325);
-ruby_method_id_check_for(tEQQ, 326);
-ruby_method_id_check_for(tNEQ, 327);
-ruby_method_id_check_for(tGEQ, 328);
-ruby_method_id_check_for(tLEQ, 329);
-ruby_method_id_check_for(tANDOP, 330);
-ruby_method_id_check_for(tOROP, 331);
-ruby_method_id_check_for(tMATCH, 332);
-ruby_method_id_check_for(tNMATCH, 333);
-ruby_method_id_check_for(tDOT2, 334);
-ruby_method_id_check_for(tDOT3, 335);
-ruby_method_id_check_for(tAREF, 336);
-ruby_method_id_check_for(tASET, 337);
-ruby_method_id_check_for(tLSHFT, 338);
-ruby_method_id_check_for(tRSHFT, 339);
-ruby_method_id_check_for(tLAMBDA, 352);
-ruby_method_id_check_for(idNULL, 365);
-ruby_method_id_check_for(idRespond_to, 366);
-ruby_method_id_check_for(idIFUNC, 367);
-ruby_method_id_check_for(idCFUNC, 368);
-ruby_method_id_check_for(id_core_set_method_alias, 369);
-ruby_method_id_check_for(id_core_set_variable_alias, 370);
-ruby_method_id_check_for(id_core_undef_method, 371);
-ruby_method_id_check_for(id_core_define_method, 372);
-ruby_method_id_check_for(id_core_define_singleton_method, 373);
-ruby_method_id_check_for(id_core_set_postexe, 374);
-ruby_method_id_check_for(tLAST_TOKEN, 375);
-};
-#endif
-
-#endif /* RUBY_ID_H */

data/ext/mri/1.9.2/method.h

@@ -1,103 +0,0 @@
-/**********************************************************************
-
-  method.h -
-
-  $Author: ko1 $
-  created at: Wed Jul 15 20:02:33 2009
-
-  Copyright (C) 2009 Koichi Sasada
-
-**********************************************************************/
-#ifndef METHOD_H
-#define METHOD_H
-
-typedef enum {
-    NOEX_PUBLIC    = 0x00,
-    NOEX_NOSUPER   = 0x01,
-    NOEX_PRIVATE   = 0x02,
-    NOEX_PROTECTED = 0x04,
-    NOEX_MASK      = 0x06,
-    NOEX_BASIC     = 0x08,
-    NOEX_UNDEF     = NOEX_NOSUPER,
-    NOEX_MODFUNC   = 0x12,
-    NOEX_SUPER     = 0x20,
-    NOEX_VCALL     = 0x40,
-    NOEX_RESPONDS  = 0x80
-} rb_method_flag_t;
-
-#define NOEX_SAFE(n) ((int)((n) >> 8) & 0x0F)
-#define NOEX_WITH(n, s) ((s << 8) | (n) | (ruby_running ? 0 : NOEX_BASIC))
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, rb_safe_level())
-
-/* method data type */
-
-typedef enum {
-    VM_METHOD_TYPE_ISEQ,
-    VM_METHOD_TYPE_CFUNC,
-    VM_METHOD_TYPE_ATTRSET,
-    VM_METHOD_TYPE_IVAR,
-    VM_METHOD_TYPE_BMETHOD,
-    VM_METHOD_TYPE_ZSUPER,
-    VM_METHOD_TYPE_UNDEF,
-    VM_METHOD_TYPE_NOTIMPLEMENTED,
-    VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
-    VM_METHOD_TYPE_MISSING   /* wrapper for method_missing(id) */
-} rb_method_type_t;
-
-typedef struct rb_method_cfunc_struct {
-    VALUE (*func)(ANYARGS);
-    int argc;
-} rb_method_cfunc_t;
-
-typedef struct rb_method_attr_struct {
-    ID id;
-    VALUE location;
-} rb_method_attr_t;
-
-typedef struct rb_iseq_struct rb_iseq_t;
-
-typedef struct rb_method_definition_struct {
-    rb_method_type_t type; /* method type */
-    ID original_id;
-    union {
-	rb_iseq_t *iseq;            /* should be mark */
-	rb_method_cfunc_t cfunc;
-	rb_method_attr_t attr;
-	VALUE proc;                 /* should be mark */
-	enum method_optimized_type {
-	    OPTIMIZED_METHOD_TYPE_SEND,
-	    OPTIMIZED_METHOD_TYPE_CALL
-	} optimize_type;
-    } body;
-    int alias_count;
-} rb_method_definition_t;
-
-typedef struct rb_method_entry_struct {
-    rb_method_flag_t flag;
-    char mark;
-    rb_method_definition_t *def;
-    ID called_id;
-    VALUE klass;                    /* should be mark */
-} rb_method_entry_t;
-
-struct unlinked_method_entry_list_entry {
-    struct unlinked_method_entry_list_entry *next;
-    rb_method_entry_t *me;
-};
-
-#define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
-
-void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex);
-rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex);
-rb_method_entry_t *rb_method_entry(VALUE klass, ID id);
-
-rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, ID id);
-rb_method_entry_t *rb_method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *, rb_method_flag_t noex);
-
-int rb_method_entry_arity(const rb_method_entry_t *me);
-
-void rb_mark_method_entry(const rb_method_entry_t *me);
-void rb_free_method_entry(rb_method_entry_t *me);
-void rb_sweep_method_entry(void *vm);
-
-#endif /* METHOD_H */