looksee 1.0.0-universal-java-1.6 → 1.0.1-universal-java-1.6

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 1.0.1 2011-03-15
+
+ * Fix bug exception when trying to edit a primitive method on MRI.
+ * Allow customizing the method names added to every object. Either:
+   * Call Looksee(:ls => new_name, :edit => new_name)
+   * Set LOOKSEE_METHODS='ls=new_name edit=new_name' in your environment.
+
 == 1.0.0 2011-03-09
 
  * New API.

data/Rakefile

@@ -1,10 +1,9 @@
 require 'ritual'
 
-case (Object.const_defined?(:RUBY_ENGINE) ? RUBY_ENGINE : 'ruby')
-when 'ruby'
-  extension :mri
-when 'rbx'
-  extension :rbx
-when 'jruby'
+ruby_engine = (Object.const_defined?(:RUBY_ENGINE) ? RUBY_ENGINE : 'ruby')
+if ruby_engine == 'jruby'
   extension :jruby, :type => :jruby
+else
+  name = ruby_engine == 'ruby' ? 'mri' : ruby_engine
+  extension :build_as => "ext/#{name}", :install_as => "lib/looksee/#{name}"
 end

data/ext/extconf.rb

@@ -1,4 +1,4 @@
-ruby_engine = Object.const_defined?(:RUBY_ENGINE) ? RUBY_ENGINE : 'mri'
+ruby_engine = Object.const_defined?(:RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
 extension = ruby_engine == 'ruby' ? 'mri' : ruby_engine
 
 require 'mkmf'

data/ext/mri/mri.c

@@ -236,7 +236,7 @@ VALUE Looksee_source_location(VALUE self, VALUE unbound_method) {
     }
     break;
   default:
-    rb_raise(rb_eRuntimeError, "[LOOKSEE BUG] unexpected NODE type: %d", nd_type(method->body));
+    return Qnil;
   }
   VALUE file = rb_str_new2(node->nd_file);
   VALUE line = INT2NUM(nd_line(node));

data/lib/looksee/core_ext.rb

@@ -53,6 +53,26 @@ module Looksee
     def edit(name)
       Editor.new(Looksee.editor).edit(self, name)
     end
+
+    def self.rename(renamings)  # :nodoc:
+      renamings.each do |old_name, new_name|
+        alias_method new_name, old_name
+        remove_method old_name
+      end
+    end
+  end
+
+  #
+  # Rename the methods added to every object. Example:
+  #
+  #     rename :ls => :_ls, :edit => :_edit
+  #
+  def self.rename(renamings)
+    ObjectMixin.rename(renamings)
+  end
+
+  (ENV['LOOKSEE_METHODS'] || '').scan(/([\w_]+)=([\w_]+)/) do
+    rename $1.to_sym => $2.to_sym
   end
 
   Object.send :include, ObjectMixin

data/lib/looksee/version.rb

@@ -1,5 +1,5 @@
 module Looksee
-  VERSION = [1, 0, 0]
+  VERSION = [1, 0, 1]
 
   class << VERSION
     include Comparable

data/spec/adapter_spec.rb

@@ -439,7 +439,7 @@ describe "Looksee.adapter" do
     end
 
     after do
-      FileUtils.rm_rf @tmp
+      FileUtils.rm_rf @tmp if @tmp
       Object.send(:remove_const, :C) if Object.const_defined?(:C)
     end
 
@@ -531,6 +531,11 @@ describe "Looksee.adapter" do
       @adapter.source_location(method).should == [path, 2]
     end
 
+    it "should return nil for primitive methods (MRI CBODY)" do
+      method = Object.instance_method(:__id__)
+      @adapter.source_location(method).should == nil
+    end
+
     it "should raise a TypeError if the argument is not an UnboundMethod" do
       path = load_source <<-EOS.demargin
         |class C

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV['LOOKSEE_METHODS'] = nil
+
 require 'rspec'
 require 'mocha'
 require 'looksee'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 0
-  version: 1.0.0
+    - 1
+  version: 1.0.1
 platform: universal-java-1.6
 authors: 
   - George Ogata
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -05:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -22,13 +22,13 @@ dependencies:
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
             segments: 
               - 0
               - 2
-              - 0
-            version: 0.2.0
+              - 1
+            version: 0.2.1
     type: :development
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -36,13 +36,13 @@ dependencies:
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
             segments: 
               - 2
+              - 5
               - 0
-              - 0
-            version: 2.0.0
+            version: 2.5.0
     type: :development
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -91,7 +91,6 @@ files:
   - lib/looksee/inspector.rb
   - lib/looksee/jruby.jar
   - lib/looksee/lookup_path.rb
-  - lib/looksee/rbx.bundle
   - lib/looksee/shortcuts.rb
   - lib/looksee/version.rb
   - lib/looksee/wirble_compatibility.rb