dietrb 0.4.4 → 0.4.5

data/README.rdoc

@@ -11,6 +11,14 @@ not grow too much more. For now my things to-do are .irbrc support, completion,
 and investigate what else people really really need. After that it's time to
 polish.
 
+= Important notice
+
+Since on Ruby 1.9 *all* latest gems are pushed onto the load path by default,
+installing the DietRB gem would break the existing IRB binary. Therefor, with
+the DietRB gem is installed, it will hijack the `irb' bin file.
+
+The original IRB will still work when you uninstall the DietRB gem, though.
+
 == Extensions
 
 * irb/ext/colorize.rb, adds support for colorizing the prompt and result. The

data/Rakefile

@@ -3,7 +3,8 @@ task :default => :run
 desc "Run the specs"
 task :spec do
   # sh "macbacon #{FileList['spec/**/*_spec.rb'].join(' ')}"
-  sh "bacon19 #{FileList['spec/**/*_spec.rb'].join(' ')}"
+  bacon = `which bacon19 || which bacon`.chomp
+  sh "#{bacon} #{FileList['spec/**/*_spec.rb'].join(' ')}"
 end
 
 desc "Run specs with Kicker"
@@ -13,7 +14,8 @@ end
 
 desc "Run dietrb with ruby19"
 task :run do
-  sh "ruby19 -Ilib ./bin/dietrb -r irb/ext/colorize -r pp"
+  ruby = `which ruby19 || which ruby`.chomp
+  sh "#{ruby} -Ilib ./bin/dietrb -r irb/ext/colorize -r pp"
 end
 
 desc "AOT compile for MacRuby"
@@ -45,4 +47,4 @@ begin
     gemspec.files.reject! { |file| file =~ /^(extensions|\.gitignore)/ }
   end
 rescue LoadError
-end
+end

data/bin/dietrb

@@ -5,9 +5,12 @@ require 'irb'
 unless ARGV.empty?
   require 'optparse'
   
+  ignore_irbrc = false
+  
   OptionParser.new do |opt|
     bin = File.basename($0)
     opt.banner = "Usage:  #{bin} [options] [programfile] [arguments]"
+    opt.on("-f",              "Ignore ~/.irbrc") { |ignore| ignore_irbrc = ignore  }
     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) }
@@ -20,8 +23,10 @@ unless ARGV.empty?
   end.parse!(ARGV)
 end
 
-irbrc = File.expand_path("~/.irbrc")
-load(irbrc) if File.exist?(irbrc)
+unless ignore_irbrc
+  irbrc = File.expand_path("~/.irbrc")
+  load(irbrc) if File.exist?(irbrc)
+end
 
 IRB.formatter.filter_from_backtrace << /^#{__FILE__}/
 

data/dietrb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dietrb}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran"]

data/lib/irb/context.rb

@@ -85,7 +85,7 @@ module IRB
     #   process_line("quit") # => false
     def process_line(line)
       @source << line
-      return false if @source.to_s == "quit"
+      return false if @source.terminate?
       
       if @source.syntax_error?
         puts formatter.syntax_error(@line, @source.syntax_error)
@@ -129,4 +129,4 @@ module Kernel
   end
   
   private :irb
-end
+end

data/lib/irb/source.rb

@@ -51,6 +51,11 @@ module IRB
     def syntax_error?
       reflect.syntax_error?
     end
+
+    # Reflects on the accumulated source to see if it contains a terminate signal.
+    def terminate?
+      reflect.terminate?
+    end
     
     # Reflects on the accumulated source and returns the actual syntax error
     # message if one occurs.
@@ -110,6 +115,20 @@ module IRB
       def syntax_error?
         !@syntax_error.nil?
       end
+
+      # Returns whether or not the source contains a call to toplevel
+      # quit or exit, namely if the current session should be terminated
+      #
+      # For example, this would terminate the session
+      #
+      #   def foo; end; quit
+      #
+      # This does not:
+      #
+      #   def foo; quit; end
+      def terminate?
+        !@terminate.nil?
+      end
       
       UNEXPECTED_END = "syntax error, unexpected $end"
       
@@ -120,6 +139,7 @@ module IRB
       end
       
       INCREASE_LEVEL_KEYWORDS = %w{ class module def begin if unless case while for do }
+      TERMINATE_KEYWORDS = %w{ exit quit }
       
       def on_kw(token) #:nodoc:
         case token
@@ -145,6 +165,14 @@ module IRB
         @level += 1
         super
       end
+
+      def on_ident(token) #:nodoc:
+        if @level == 0 && TERMINATE_KEYWORDS.include?(token)
+          @terminate = true
+        else
+          super
+        end
+      end
       
       def on_lbrace(token) #:nodoc:
         @level += 1
@@ -157,4 +185,4 @@ module IRB
       end
     end
   end
-end
+end

data/lib/irb/version.rb

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

data/lib/irb.rb

@@ -16,3 +16,17 @@ require 'irb/ext/completion'
 if !ENV['SPECCING'] && defined?(RUBY_ENGINE) && RUBY_ENGINE == "macruby"
   require 'irb/ext/macruby'
 end
+
+module IRB
+  class << self
+    # This is just here for so the ruby 1.9 IRB will seemingly work, but actually
+    # loads DietRB, how cunning...
+    #
+    # This will obviously be removed once we've conquered the world.
+    def start(*)
+      warn "[!] Note that you are now actually using DietRB (#{IRB::VERSION::STRING})\n"
+      load File.expand_path('../../bin/dietrb', __FILE__)
+    end
+    alias_method :setup, :start
+  end
+end

data/spec/context_spec.rb

@@ -241,4 +241,4 @@ describe "Kernel::irb" do
     irb(o)
     IRBRan.should == o
   end
-end
+end

data/spec/source_spec.rb

@@ -130,6 +130,16 @@ describe "IRB::Source::Reflector" do
     reflect("if true").should.not.be.code_block
     reflect("p :ok if true").should.be.code_block
   end
+
+  it "returns whether or not the current session should be terminated" do
+    reflect("exit").should.terminate
+    reflect("quit").should.terminate
+    reflect("def foo; end; exit").should.terminate
+    reflect("def foo; end; quit").should.terminate
+
+    reflect("def foo; exit; end").should.not.terminate
+    reflect("def foo; quit; end").should.not.terminate
+  end
   
   it "returns whether or not the source contains a syntax error, except a code block not ending" do
     reflect("def;").should.have.syntax_error
@@ -187,4 +197,4 @@ describe "IRB::Source::Reflector" do
       reflect("#{open}\n#{close}").level.should == 0
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dietrb
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Eloy Duran