looksee 3.1.1 → 4.0.0

data/spec/looksee/editor_spec.rb

@@ -99,7 +99,7 @@ describe Looksee::Editor do
     end
 
     it "should raise NoSourceLocationError and not run the editor if no source location is available" do
-      Looksee.adapter.stub(source_location: nil)
+      UnboundMethod.any_instance.stub(source_location: nil)
       expect { editor.edit(object, :f) }.to raise_error(Looksee::NoSourceLocationError)
       editor_invocation.should be_nil
     end

data/spec/looksee/inspector_spec.rb

@@ -17,8 +17,8 @@ describe Looksee::Inspector do
 
     describe "output width" do
       before do
-        Looksee.adapter.public_methods[C] = ['aa', 'bb', 'cc', 'dd', 'ee', 'ff', 'gg', 'hh', 'ii', 'jj']
-        Looksee.adapter.public_methods[M] = ['aaa', 'bbb', 'ccc', 'ddd', 'eee', 'fff', 'ggg', 'hhh']
+        add_methods C, public: ['aa', 'bb', 'cc', 'dd', 'ee', 'ff', 'gg', 'hh', 'ii', 'jj']
+        add_methods M, public: ['aaa', 'bbb', 'ccc', 'ddd', 'eee', 'fff', 'ggg', 'hhh']
         @lookup_path = Looksee::LookupPath.new(@object)
       end
 
@@ -67,78 +67,78 @@ describe Looksee::Inspector do
     end
 
     it "should not show any blank lines if a module has no methods" do
-      Looksee.adapter.public_methods[M] = [:public1, :public2]
+      add_methods M, public: [:pub1, :pub2]
       lookup_path = Looksee::LookupPath.new(@object)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |M
-        |  public1  public2
+        |  pub1  pub2
         |C
       EOS
     end
 
     it "should show singleton classes as class names in brackets" do
       Looksee.adapter.ancestors[C] = [C.singleton_class]
-      Looksee.adapter.public_methods[C.singleton_class] = [:public1, :public2]
+      add_methods C.singleton_class, public: [:pub1, :pub2]
       lookup_path = Looksee::LookupPath.new(C)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |[C]
-        |  public1  public2
+        |  pub1  pub2
       EOS
     end
 
     it "should handle singleton classes of singleton classes correctly" do
       Looksee.adapter.ancestors[C.singleton_class] = [C.singleton_class.singleton_class]
-      Looksee.adapter.public_methods[C.singleton_class.singleton_class] = [:public1, :public2]
+      add_methods C.singleton_class.singleton_class, public: [:pub1, :pub2]
       lookup_path = Looksee::LookupPath.new(C.singleton_class)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |[[C]]
-        |  public1  public2
+        |  pub1  pub2
       EOS
     end
 
     it "should only show methods of the selected visibilities" do
       temporary_class :E
-      Looksee.adapter.set_methods(E, [:public], [:protected], [:private], [:undefined])
+      add_methods(E, public: [:pub], protected: [:pro], private: [:pri], undefined: [:und])
       Looksee.adapter.ancestors[@object] = [E]
       lookup_path = Looksee::LookupPath.new(@object)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:protected])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |E
-        |  protected
+        |  pro
       EOS
     end
 
     it "should show overridden methods if selected" do
-      Looksee.adapter.set_methods(C, [:public], [:protected], [:private], [:undefined])
-      Looksee.adapter.set_methods(M, [:public], [:protected], [:private], [:undefined])
+      add_methods(C, public: [:pub], protected: [:pro], private: [:pri], undefined: [:und])
+      add_methods(M, public: [:pub], protected: [:pro], private: [:pri], undefined: [:und])
       lookup_path = Looksee::LookupPath.new(@object)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public, :overridden])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |M
-        |  public
+        |  pub
         |C
-        |  public
+        |  pub
       EOS
     end
 
     it "should not show overridden methods if not selected" do
-      Looksee.adapter.set_methods(C, [:public], [:protected], [:private], [:undefined])
-      Looksee.adapter.set_methods(M, [:public], [:protected], [:private], [:undefined])
+      add_methods(C, public: [:pub], protected: [:pro], private: [:pri], undefined: [:und])
+      add_methods(M, public: [:pub], protected: [:pro], private: [:pri], undefined: [:und])
       lookup_path = Looksee::LookupPath.new(@object)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public, :nooverridden])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |M
         |C
-        |  public
+        |  pub
       EOS
     end
 
     it "should only show methods that match the given filters, if any are given" do
-      Looksee.adapter.public_methods[C] = [:ab, :ax, :ba, :xa]
-      Looksee.adapter.public_methods[M] = [:ab, :ax, :ba, :xa]
+      add_methods C, public: [:ab, :ax, :ba, :xa]
+      add_methods M, public: [:ab, :ax, :ba, :xa]
       lookup_path = Looksee::LookupPath.new(@object)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public, :overridden], :filters => [/^a/, 'b'])
       inspector.inspect.should == <<-EOS.demargin.chomp
@@ -167,12 +167,12 @@ describe Looksee::Inspector do
       temporary_class :C
       c = C.new
       Looksee.adapter.ancestors[c] = [C]
-      Looksee.adapter.set_methods(C, [:public], [:protected], [:private], [:undefined])
+      add_methods(C, public: [:pub], protected: [:pro], private: [:pri], undefined: [:und])
       lookup_path = Looksee::LookupPath.new(c)
       inspector = Looksee::Inspector.new(lookup_path, :visibilities => [:public, :protected, :private, :undefined, :overridden])
       inspector.inspect.should == <<-EOS.demargin.chomp
         |\`C\'
-        |  <private>  [protected]  {public}  ~undefined~
+        |  <pri>  [pro]  {pub}  ~und~
       EOS
     end
   end

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.1
+  version: 4.0.0
 platform: ruby
 authors:
 - George Ogata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -26,35 +26,16 @@ 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
 - lib/looksee/adapter.rb
 - lib/looksee/adapter/base.rb
 - lib/looksee/adapter/rubinius.rb
@@ -65,7 +46,6 @@ files:
 - lib/looksee/help.rb
 - lib/looksee/inspector.rb
 - lib/looksee/lookup_path.rb
-- lib/looksee/mri.bundle
 - lib/looksee/version.rb
 - spec/looksee/adapter_spec.rb
 - spec/looksee/clean_spec.rb
@@ -90,10 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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 */