dietrb 0.4.5 → 0.4.6

data/Rakefile

@@ -1,34 +1,52 @@
+def ruby_bin
+  require 'rbconfig'
+  File.join(Config::CONFIG['prefix'], 'bin', Config::CONFIG['ruby_install_name'])
+end
+
 task :default => :run
 
-desc "Run the specs"
+desc "Run the specs (run it with a rake installed on the Ruby version you want to run the specs on)"
 task :spec do
-  # sh "macbacon #{FileList['spec/**/*_spec.rb'].join(' ')}"
-  bacon = `which bacon19 || which bacon`.chomp
-  sh "#{bacon} #{FileList['spec/**/*_spec.rb'].join(' ')}"
-end
-
-desc "Run specs with Kicker"
-task :kick do
-  sh "kicker -e 'rake spec' lib spec"
+  sh "#{ruby_bin} -r #{FileList['./spec/**/*_spec.rb'].join(' -r ')} -e ''"
 end
 
-desc "Run dietrb with ruby19"
+desc "Run dietrb"
 task :run do
-  ruby = `which ruby19 || which ruby`.chomp
-  sh "#{ruby} -Ilib ./bin/dietrb -r irb/ext/colorize -r pp"
+  sh "#{ruby_bin} -I lib ./bin/dietrb -r irb/ext/colorize -r pp"
 end
 
-desc "AOT compile for MacRuby"
-task :macruby_compile do
-  FileList["lib/**/*.rb"].each do |source|
-    sh "macrubyc --arch i386 --arch x86_64 -C '#{source}' -o '#{source}o'"
+namespace :macruby do
+  desc "AOT compile for MacRuby"
+  task :compile do
+    FileList["lib/**/*.rb"].each do |source|
+      sh "macrubyc --arch i386 --arch x86_64 -C '#{source}' -o '#{source}o'"
+    end
   end
-end
-
-desc "Clean MacRuby binaries"
-task :clean do
-  FileList["lib/**/*.rbo"].each do |bin|
-    rm bin
+  
+  desc "Clean MacRuby binaries"
+  task :clean do
+    FileList["lib/**/*.rbo"].each do |bin|
+      rm bin
+    end
+  end
+  
+  desc "Merge source into the MacRuby repo"
+  task :merge do
+    if (repo = ENV['macruby_repo']) && File.exist?(repo)
+      bin = File.join(repo, 'bin/irb')
+      lib = File.join(repo, 'lib')
+      
+      rm_f bin
+      rm_f File.join(lib, 'irb.rb')
+      rm_rf File.join(lib, 'irb')
+      
+      cp 'bin/dietrb', bin
+      cp 'lib/irb.rb', lib
+      cp_r 'lib/irb', lib
+    else
+      puts "[!] Set the `macruby_repo' env variable to point to the MacRuby repo checkout"
+      exit 1
+    end
   end
 end
 

data/bin/dietrb

@@ -14,6 +14,7 @@ unless ARGV.empty?
     opt.on("-r load-lib",     "Loads the given library (same as `ruby -r')") { |lib| require lib }
     opt.on("-d",              "Set $DEBUG to true (same as `ruby -d')") { $DEBUG = true }
     opt.on("-I path",         "Add path to $LOAD_PATH") { |path| $LOAD_PATH.unshift(path) }
+    opt.on("--noinspect",     "Don't use inspect for output") { IRB.formatter.inspect = false }
     opt.on("--simple-prompt", "Simple prompt mode") { IRB.formatter.prompt = :simple }
     opt.on("--noprompt",      "No prompt mode") { IRB.formatter.prompt = nil }
     opt.on("-v", "--version", "Print the version of #{bin}") do

data/dietrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dietrb}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]
-  s.date = %q{2010-05-30}
+  s.date = %q{2010-06-24}
   s.default_executable = %q{dietrb}
   s.description = %q{IRB on a diet, for MacRuby / Ruby 1.9}
   s.email = %q{eloy.de.enige@gmail.com}

data/lib/irb.rb

@@ -13,9 +13,9 @@ require 'irb/deprecated'
 require 'irb/ext/history'
 require 'irb/ext/completion'
 
-if !ENV['SPECCING'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "macruby"
-  require 'irb/ext/macruby'
-end
+# if !ENV['SPECCING'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "macruby"
+#   require 'irb/ext/macruby'
+# end
 
 module IRB
   class << self

data/lib/irb/formatter.rb

@@ -17,11 +17,13 @@ module IRB
     SYNTAX_ERROR   = "SyntaxError: compile error\n(irb):%d: %s"
     SOURCE_ROOT    = /^#{File.expand_path('../../../', __FILE__)}/
     
-    attr_writer :prompt
-    attr_reader :filter_from_backtrace
+    attr_writer   :prompt
+    attr_accessor :inspect
+    attr_reader   :filter_from_backtrace
     
     def initialize
-      @prompt = :default
+      @prompt  = :default
+      @inspect = true
       @filter_from_backtrace = [SOURCE_ROOT]
     end
     
@@ -35,7 +37,13 @@ module IRB
     end
     
     def inspect_object(object)
-      object.respond_to?(:pretty_inspect) ? object.pretty_inspect : object.inspect
+      if @inspect
+        object.respond_to?(:pretty_inspect) ? object.pretty_inspect : object.inspect
+      else
+        address = object.__id__ * 2
+        address += 0x100000000 if address < 0
+        "#<#{object.class}:0x%x>" % address
+      end
     end
     
     def result(object)

data/lib/irb/version.rb

@@ -8,9 +8,9 @@ module IRB
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 5
+    TINY  = 6
     
     STRING = [MAJOR, MINOR, TINY].join('.')
     DESCRIPTION = "#{STRING} (DietRB)"
   end
-end
+end

data/spec/formatter_spec.rb

@@ -60,6 +60,17 @@ describe "IRB::Formatter" do
     @formatter.result(object).should == "=> foo"
   end
   
+  it "prints only the class name and memory address in `no inspect' mode" do
+    @formatter.inspect = false
+    
+    object = Object.new
+    def object.inspect; @inspected = true; "Never called!"; end
+    def object.__id__; 2158110700; end
+    
+    @formatter.result(object).should == "=> #<Object:0x101444fd8>"
+    object.instance_variable_get(:@inspected).should.not == true
+  end
+  
   it "prints that a syntax error occurred on the last line and reset the buffer to the previous line" do
     @formatter.syntax_error(2, "syntax error, unexpected '}'").should ==
       "SyntaxError: compile error\n(irb):2: syntax error, unexpected '}'"

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'bacon'
 
+Bacon.summary_on_exit
+
 ENV['SPECCING'] = 'true'
 
 ROOT = File.expand_path('../../', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dietrb
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +02:00
+date: 2010-06-24 00:00:00 +02:00
 default_executable: dietrb
 dependencies: []