dietrb 0.4.2 → 0.4.3

data/Rakefile

@@ -13,7 +13,7 @@ end
 
 desc "Run dietrb with ruby19"
 task :run do
-  sh "ruby19 -Ilib ./bin/dietrb -r irb/ext/completion -r irb/ext/colorize -r pp"
+  sh "ruby19 -Ilib ./bin/dietrb -r irb/ext/colorize -r pp"
 end
 
 desc "AOT compile for MacRuby"
@@ -42,7 +42,7 @@ begin
     gemspec.authors = ["Eloy Duran"]
     
     gemspec.required_ruby_version = ::Gem::Requirement.new("~> 1.9")
-    gemspec.files.reject! { |file| file =~ /^extensions/ }
+    gemspec.files.reject! { |file| file =~ /^(extensions|\.gitignore)/ }
   end
 rescue LoadError
 end

data/TODO

@@ -1,7 +1,5 @@
-* Add history manager support
-* Add colored output, possibly based on the Wirble code
+* Configurable history file? (:HISTORY_FILE) Configurable number of saved history lines? (:SAVE_HISTORY)
 * Make sure the following formatters work: hirb, awesome_print, and looksee
 * Make sure the majority of the utils in utility_belt work
 * Possibly add copy-paste support as an ext
-* Make sure ported/used code is attributed and contact authors about Ruby license
 * Decide whether or not we need more control for colorizing which could be done with Ripper::SexpBuilder

data/dietrb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dietrb}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]
-  s.date = %q{2010-05-02}
+  s.date = %q{2010-05-30}
   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}
@@ -20,15 +20,16 @@ Gem::Specification.new do |s|
      "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
+    "LICENSE",
      "README.rdoc",
      "Rakefile",
      "TODO",
      "bin/dietrb",
      "dietrb.gemspec",
      "lib/irb.rb",
+     "lib/irb/completion.rb",
      "lib/irb/context.rb",
+     "lib/irb/deprecated.rb",
      "lib/irb/ext/colorize.rb",
      "lib/irb/ext/completion.rb",
      "lib/irb/ext/history.rb",
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
      "spec/context_spec.rb",
      "spec/formatter_spec.rb",
      "spec/history_spec.rb",
+     "spec/regression/context_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
      "spec/context_spec.rb",
      "spec/formatter_spec.rb",
      "spec/history_spec.rb",
+     "spec/regression/context_spec.rb",
      "spec/source_spec.rb",
      "spec/spec_helper.rb"
   ]

data/lib/irb.rb

@@ -1,8 +1,17 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 require 'irb/context'
 require 'irb/source'
 require 'irb/version'
 
+require 'irb/deprecated'
+
 require 'irb/ext/history'
+require 'irb/ext/completion'
 
 if !ENV['SPECCING'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "macruby"
   require 'irb/ext/macruby'

data/lib/irb/completion.rb

@@ -0,0 +1 @@
+IRB.deprecated "The file `irb/completion' has moved to `irb/ext/ecompletion' and is loaded by default.", caller

data/lib/irb/context.rb

@@ -1,3 +1,9 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 require 'irb/formatter'
 require 'readline'
 
@@ -28,6 +34,7 @@ module IRB
       @line    = 1
       clear_buffer
       
+      @underscore_assigner = __evaluate__("_ = nil; proc { |val| _ = val }")
       @processors = self.class.processors.map { |processor| processor.new(self) }
     end
     
@@ -36,7 +43,8 @@ module IRB
     end
     
     def evaluate(source)
-      result = __evaluate__("_ = (#{source})", '(irb)', @line - @source.buffer.size + 1)
+      result = __evaluate__(source.to_s, '(irb)', @line - @source.buffer.size + 1)
+      store_result(result)
       puts formatter.result(result)
       result
     rescue Exception => e
@@ -102,6 +110,10 @@ module IRB
     def clear_buffer
       @source = Source.new
     end
+    
+    def store_result(result)
+      @underscore_assigner.call(result)
+    end
   end
 end
 

data/lib/irb/deprecated.rb

@@ -0,0 +1,43 @@
+module IRB
+  def self.deprecated(message, caller)
+    caller = caller.first.split(':')[0..-2].join(':')
+    warn "[!] Deprecation warning from #{caller}: #{message}"
+  end
+  
+  def self.deprecated_feature(old_feature, new_feature, caller)
+    deprecated "Usage of #{old_feature} will be deprecated, #{new_feature}", caller
+  end
+  
+  def self.conf
+    @conf ||= DeprecatedConf.new
+  end
+  
+  class DeprecatedConf
+    DEFAULT_MESSAGE = "please create a patch/ticket"
+    
+    def deprecated_conf(key, message, caller)
+      message ||= DEFAULT_MESSAGE
+      IRB.deprecated_feature("IRB.conf[:#{key}]", message, caller)
+    end
+    
+    def [](key)
+      IRB.deprecated("Usage of the IRB.conf hash for configuration is, currently, not supported", caller)
+      nil
+    end
+    
+    def []=(key, value)
+      message = nil
+      case key
+      when :PROMPT_MODE
+        message = "use `IRB.formatter.prompt = :#{value.downcase}'"
+        IRB.formatter.prompt = "#{value.to_s.downcase}".to_sym
+      when :USE_READLINE
+        message = "for now DietRB only has a readline module"
+      when :SAVE_HISTORY
+        message = "history is always saved"
+      end
+      deprecated_conf key, message, caller
+      value
+    end
+  end
+end

data/lib/irb/ext/colorize.rb

@@ -1,6 +1,14 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+#
+# Portions Copyright (C) 2006-2010 Paul Duncan <pabs@pablotron.org> (Wirble)
+# Portions Copyright (C) 2009-2010 Jens Wille <jens.wille@gmail.com> (Wirble)
+# Portions Copyright (C) 2006-2010 Giles Bowkett (light background color scheme)
+
 module IRB
-  # This code is based upon Wirble (http://pablotron.org/software/wirble/) by
-  # Paul Duncan and Jens Wille.
   class ColoredFormatter < Formatter
     TYPE_ALIASES = {
       :on_comma           => :comma,

data/lib/irb/ext/completion.rb

@@ -1,3 +1,9 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 require 'ripper'
 
 module IRB

data/lib/irb/ext/history.rb

@@ -1,6 +1,12 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+#
+# Portions Copyright (C) 2006-2010 Ben Bleything <ben@bleything.net> (Kernel#history & Kernel#history!)
+
 module IRB
-  # The util methods, history and history!, were taken from Ben Bleything's
-  # command_history.rb in utility_belt.
   class History
     class << self
       attr_accessor :file, :max_entries_in_overview

data/lib/irb/ext/macruby.rb

@@ -1,3 +1,9 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 framework 'AppKit'
 
 module IRB

data/lib/irb/formatter.rb

@@ -1,3 +1,9 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 module IRB
   class << self
     attr_accessor :formatter

data/lib/irb/source.rb

@@ -1,3 +1,9 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 require 'ripper'
 
 module IRB

data/lib/irb/version.rb

@@ -1,8 +1,14 @@
+# MacRuby implementation of IRB.
+#
+# This file is covered by the Ruby license. See COPYING for more details.
+# 
+# Copyright (C) 2009-2010, Eloy Duran <eloy.de.enige@gmail.com>
+
 module IRB
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 2
+    TINY  = 3
     
     STRING = [MAJOR, MINOR, TINY].join('.')
     DESCRIPTION = "#{STRING} (DietRB)"

data/spec/context_spec.rb

@@ -81,6 +81,7 @@ describe "IRB::Context, when evaluating source" do
     @context = IRB::Context.new(main)
     def @context.printed;      @printed ||= ''          end
     def @context.puts(string); printed << "#{string}\n" end
+    IRB.formatter = IRB::Formatter.new
   end
   
   it "evaluates code with the object's binding" do

data/spec/formatter_spec.rb

@@ -57,7 +57,7 @@ describe "IRB::Formatter" do
   it "prints the result with object#pretty_inspect, if it responds to it" do
     object = Object.new
     def object.pretty_inspect; "foo"; end
-    @formatter.result(object).should == "foo"
+    @formatter.result(object).should == "=> foo"
   end
   
   it "prints that a syntax error occurred on the last line and reset the buffer to the previous line" do

data/spec/regression/context_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+main = self
+
+describe "IRB::Context, when evaluating source" do
+  before do
+    @context = IRB::Context.new(main)
+    def @context.printed;      @printed ||= ''          end
+    def @context.puts(string); printed << "#{string}\n" end
+  end
+  
+  it "does not assign the result to the `_' variable in one go, so it doesn't show up in a syntax error" do
+    @context.evaluate("'banana;")
+    @context.printed.should.not.include "_ = ('banana;)"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dietrb
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Eloy Duran
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +02:00
+date: 2010-05-30 00:00:00 +02:00
 default_executable: dietrb
 dependencies: []
 
@@ -24,7 +24,6 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -32,7 +31,9 @@ files:
 - bin/dietrb
 - dietrb.gemspec
 - lib/irb.rb
+- lib/irb/completion.rb
 - lib/irb/context.rb
+- lib/irb/deprecated.rb
 - lib/irb/ext/colorize.rb
 - lib/irb/ext/completion.rb
 - lib/irb/ext/history.rb
@@ -45,6 +46,7 @@ files:
 - spec/context_spec.rb
 - spec/formatter_spec.rb
 - spec/history_spec.rb
+- spec/regression/context_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -81,5 +83,6 @@ test_files:
 - spec/context_spec.rb
 - spec/formatter_spec.rb
 - spec/history_spec.rb
+- spec/regression/context_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1 +0,0 @@
-pkg