rib 1.1.0 → 1.1.1

data/.travis.yml

@@ -1,8 +1,11 @@
 before_install: 'git submodule update --init'
 script: 'ruby -r bundler/setup -S rake test'
 
+env:
+  - 'RBXOPT=-X19'
+
 rvm:
   - 1.9.2
   - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
+  - rbx-head
+  - jruby-head

data/CHANGES.md

@@ -1,5 +1,15 @@
 # CHANGES
 
+## Rib 1.1.1 -- 2013-01-25
+
+* Fixed some multiline issue with Rubinius and JRuby.
+* Properly indent for multiline prompt.
+* Removed ripl compatibility layer.
+* Only retry 5 times upon failures. This prevents from infinite retries.
+* Don't retry on quiting.
+* Added a half-baked debugger support. Try it with:
+  `require 'rib/extra/debugger'; Rib.debug`
+
 ## Rib 1.1.0 -- 2012-07-18
 
 * Support for Ruby 1.8 is dropped.

data/lib/rib/api.rb

@@ -1,8 +1,6 @@
 
 module Rib; end
 module Rib::API
-  extend self
-
   # Called before shell starts looping
   def before_loop
     self
@@ -25,6 +23,10 @@ module Rib::API
   def eval_binding ; config[:binding]       ; end
   # The line number for next evaluation
   def line         ; config[:line]          ; end
+  # The object for the current binding
+  def bound_object
+    config[:bound_object] ||= eval_binding.eval('self', __FILE__, __LINE__)
+  end
 
   # Main loop
   def in_loop

data/lib/rib/core/multiline.rb

@@ -43,12 +43,15 @@ module Rib::Multiline
                       # mri and rubinius
                       "syntax error, unexpected \\$end"    ,
                       # rubinius
+                      "expecting \\$end"                   ,
                       "expecting '.+'( or '.+')*"          ,
                       "missing '.+' for '.+' started on line \\d+"].join('|'))
     when 'jruby'; Regexp.new(
                     [ # string or regexp
                       "unterminated \\w+ meets end of file",
                       # jruby
+                      "syntax error, unexpected" \
+                      " t(UPLUS|UMINUS|STAR|REGEXP_BEG|AMPER)",
                       "syntax error, unexpected end-of-file"]      .join('|'))
     end
 
@@ -84,7 +87,8 @@ module Rib::Multiline
     if multiline_buffer.empty?
       super
     else
-      "#{' '*(config[:prompt].size-2)}| "
+      mprompt = multiline_prompt[0, config[:prompt].size]
+      "#{' '*(config[:prompt].size-mprompt.size)}#{mprompt}"
     end
   end
 
@@ -105,6 +109,9 @@ module Rib::Multiline
     err.is_a?(SyntaxError) && err.message =~ ERROR_REGEXP
   end
 
+  def multiline_prompt
+    config[:multiline_prompt] ||= '| '
+  end
 
 
   private

data/lib/rib/core/strip_backtrace.rb

@@ -10,7 +10,12 @@ module Rib::StripBacktrace
   # strip backtrace until rib
   def format_error err
     return super if StripBacktrace.disabled?
-    message, backtrace = get_error(err, strip_backtrace(err))
+    backtrace = if err.kind_of?(SyntaxError)
+                  []
+                else
+                  err.backtrace
+                end
+    message, backtrace = get_error(err, strip_backtrace(backtrace))
     "#{message}\n  #{backtrace.join("\n  ")}"
   end
 
@@ -23,9 +28,9 @@ module Rib::StripBacktrace
 
 
 
-  private
-  def strip_backtrace err
-    strip_home_backtrace(strip_cwd_backtrace(strip_lib_backtrace(err)))
+  module_function
+  def strip_backtrace backtrace
+    strip_home_backtrace(strip_cwd_backtrace(strip_lib_backtrace(backtrace)))
   end
 
   def strip_home_backtrace backtrace
@@ -36,10 +41,8 @@ module Rib::StripBacktrace
     backtrace.map{ |path| path.sub(Dir.pwd, '.') }
   end
 
-  def strip_lib_backtrace err
-    return [] if err.kind_of?(SyntaxError)
-    err.backtrace[
-      0..
-      err.backtrace.rindex{ |l| l =~ /\(#{name}\):\d+:in `.+?'/ } || -1]
+  def strip_lib_backtrace backtrace
+    backtrace[
+      0..backtrace.rindex{ |l| l =~ /\(#{name}\):\d+:in `.+?'/ } || -1]
   end
 end

data/lib/rib/core/underscore.rb

@@ -29,12 +29,6 @@ module Rib::Underscore
     super
   end
 
-  # --------------- Plugin API ---------------
-
-  def bound_object
-    config[:bound_object] ||= eval_binding.eval('self', __FILE__, __LINE__)
-  end
-
 
 
   private

data/lib/rib/debug.rb

@@ -2,3 +2,4 @@
 require 'rib/config'
 require 'rib/more/anchor'
 Rib::Anchor.disable
+Rib::Debugger.disable if Rib.const_defined?(:Debugger)

data/lib/rib/extra/debugger.rb

@@ -0,0 +1,146 @@
+
+require 'rib/more/anchor'
+
+module Rib::Debugger
+  extend Rib::Plugin
+  Shell.use(self)
+
+  ExcludedCommands = %w[irb quit exit backtrace eval p pp ps]
+   WrappedCommands = %w[help where edit reload]
+
+  # --------------- Rib API ---------------
+
+  def before_loop
+    return super if Debugger.disabled?
+    ::Debugger.handler = self
+    bound_object.extend(Imp)
+    @debugger_state ||= config[:debugger_state]
+    @debugger_watch ||= config[:debugger_watch]
+    bound_object.display(debugger_watch.shift) until debugger_watch.empty?
+    super
+  end
+
+  # --------------- Plugin API ---------------
+
+  def debugger_watch
+    @debugger_watch ||= []
+  end
+
+  def debugger_state
+    @debugger_state ||= config[:debugger_state] ||
+      ::Debugger::CommandProcessor::State.new{ |s|
+        commands = ::Debugger::Command.commands.select{ |cmd|
+          cmd.event                                                      &&
+          (!config[:debugger_context].dead? || cmd.allow_in_post_mortem) &&
+          !ExcludedCommands.include?([cmd.help_command].flatten.first)
+        }
+
+        s.context = config[:debugger_context]
+        s.file    = config[:debugger_file]
+        s.line    = config[:debugger_line]
+        s.binding = config[:debugger_context].frame_binding(0)
+        s.display = []
+        s.interface = ::Debugger::LocalInterface.new
+        s.commands  = commands
+      }
+  end
+
+  # Callback for the debugger
+  def at_line context, file, line
+    return if Debugger.disabled?
+    path = "#{file}:#{line}:in #{caller[1][/`.+?'/]}"
+    msg0 = if Rib.const_defined?(:StripBacktrace) && StripBacktrace.enabled?
+             StripBacktrace.strip_backtrace([path])
+           else
+             [path]
+           end
+    msg1 = if Rib.const_defined?(:Color) && Color.enabled?
+             Color.colorize_backtrace(msg0)
+           else
+             [msg0].flatten
+           end
+
+    Rib.say(msg1.first)
+
+    if @debugger_state
+      @debugger_state.context = context
+      @debugger_state.file    = file
+      @debugger_state.line    = line
+    end
+    Rib::Anchor.enable
+    Rib.anchor(context.frame_binding(0), :prompt_anchor => false,
+      :debugger_context => context,
+      :debugger_file    => file   ,
+      :debugger_line    => line   ,
+      :debugger_state   => @debugger_state,
+      :debugger_watch   => @debugger_watch)
+    ::Debugger.stop
+  rescue Exception => e
+    Rib.warn("Error while calling at_line:\n  #{format_error(e)}")
+  end
+
+  module Imp
+    def debug
+      return if Rib::Debugger.disabled?
+      ::Debugger.handler = Rib.shell
+      ::Debugger.start
+      ::Debugger.current_context.stop_frame = 0
+    end
+
+    # You can `Rib.watch` a number of expressions before calling `Rib.debug`
+    def watch *strs
+      Rib.shell.debugger_watch.concat(strs)
+    end
+
+    def step times=1
+      ::Debugger.current_context.step(times)
+      display
+      throw :rib_exit, Rib::Skip
+    end
+
+    WrappedCommands.each{ |cmd|
+      module_eval <<-RUBY
+        def #{cmd} *args
+          debugger_execute('#{cmd}', args)
+        end
+      RUBY
+    }
+
+    def display *args
+      if args.empty?
+        debugger_execute('display', args, 'Display')
+      else
+        debugger_execute('display', args, 'AddDisplay')
+      end
+    end
+    alias_method :disp, :display
+
+    def list *args
+      debugger_execute('list', args, 'List', Rib.shell.debugger_state.dup)
+    end
+    alias_method :ls, :list
+
+    def debugger_execute command, args=[], name=command.capitalize,
+                         state=Rib.shell.debugger_state
+      const = "#{name}Command"
+      arg = if args.empty? then '' else " #{args.join(' ')}" end
+      cmd = ::Debugger.const_get(const).new(state)
+      cmd.match("#{command}#{arg}\n")
+      cmd.execute
+      Rib::Skip
+    end
+  end
+
+  Rib.extend(Imp)
+end
+
+begin
+  Rib.silence{ require 'debugger' }
+  require 'rib/patch/debugger'
+rescue LoadError => e
+  Rib.warn("Error: #{e}"                                      ,
+           "Please install debugger to use debugger plugin:\n",
+           "    gem install debugger\n"                       ,
+           "Or add debugger to Gemfile if that's the case")
+  Rib::Debugger.disable
+end

data/lib/rib/patch/debugger.rb

@@ -0,0 +1,13 @@
+
+# never make those convenient methods public!
+Kernel.module_eval{ private :debugger }
+
+# remove alias 'backtrace'
+class ::Debugger::WhereCommand
+  def self.help_command
+    'where'
+  end
+end
+
+# please have a more consistent name
+::Debugger::EditCommand = ::Debugger::Edit

data/lib/rib/runner.rb

@@ -76,13 +76,22 @@ module Rib::Runner
     loop
   end
 
-  def loop
+  def loop retry_times=5
     Rib.shell.loop
-  rescue Exception
-    Rib.warn("Relaunching a new shell...")
-    Rib.shells.pop
-    Rib.shells << Rib::Shell.new(Rib.config)
-    retry
+  rescue Exception => e
+    if retry_times <= 0
+      Rib.warn("Error: #{e}. Too many retries, give up.")
+    elsif Rib.shells.last.running?
+      Rib.warn("Error: #{e}. Relaunching a new shell... ##{retry_times}")
+      Rib.warn("Backtrace: #{e.backtrace}") if $VERBOSE
+      Rib.shells.pop
+      Rib.shells << Rib::Shell.new(Rib.config)
+      retry_times -= 1
+      retry
+    else
+      Rib.warn("Error: #{e}. Closing.")
+      Rib.warn("Backtrace: #{e.backtrace}") if $VERBOSE
+    end
   end
 
   def parse argv

data/lib/rib/test/multiline.rb

@@ -39,6 +39,15 @@ shared :multiline do
     setup_shell
   end
 
+  should 'work with no prompt' do
+    @shell.config[:prompt] = ''
+    check <<-RUBY
+      def f
+        0
+      end
+    RUBY
+  end
+
   should 'def f' do
     check <<-RUBY
       def f

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/rib.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-07-18"
+  s.date = "2013-01-25"
   s.description = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell\n\nRib is based on the design of [ripl][] and the work of [ripl-rc][], some of\nthe features are also inspired by [pry][]. The aim of Rib is to be fully\nfeatured and yet very easy to opt-out or opt-in other features. It shall\nbe simple, lightweight and modular so that everyone could customize Rib.\n\n[ripl]: https://github.com/cldwalker/ripl\n[ripl-rc]: https://github.com/godfat/ripl-rc\n[pry]: https://github.com/pry/pry"
   s.email = ["godfat (XD) godfat.org"]
   s.executables = [
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
   "lib/rib/core/underscore.rb",
   "lib/rib/debug.rb",
   "lib/rib/extra/autoindent.rb",
+  "lib/rib/extra/debugger.rb",
   "lib/rib/extra/hirb.rb",
   "lib/rib/more.rb",
   "lib/rib/more/anchor.rb",
@@ -56,8 +57,8 @@ Gem::Specification.new do |s|
   "lib/rib/more/edit.rb",
   "lib/rib/more/multiline_history.rb",
   "lib/rib/more/multiline_history_file.rb",
+  "lib/rib/patch/debugger.rb",
   "lib/rib/plugin.rb",
-  "lib/rib/ripl.rb",
   "lib/rib/runner.rb",
   "lib/rib/shell.rb",
   "lib/rib/test.rb",
@@ -80,7 +81,7 @@ Gem::Specification.new do |s|
   "test/test_shell.rb"]
   s.homepage = "https://github.com/godfat/rib"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
 
@@ -72,6 +72,7 @@ files:
 - lib/rib/core/underscore.rb
 - lib/rib/debug.rb
 - lib/rib/extra/autoindent.rb
+- lib/rib/extra/debugger.rb
 - lib/rib/extra/hirb.rb
 - lib/rib/more.rb
 - lib/rib/more/anchor.rb
@@ -79,8 +80,8 @@ files:
 - lib/rib/more/edit.rb
 - lib/rib/more/multiline_history.rb
 - lib/rib/more/multiline_history_file.rb
+- lib/rib/patch/debugger.rb
 - lib/rib/plugin.rb
-- lib/rib/ripl.rb
 - lib/rib/runner.rb
 - lib/rib/shell.rb
 - lib/rib/test.rb
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -137,4 +138,3 @@ test_files:
 - test/test_api.rb
 - test/test_plugin.rb
 - test/test_shell.rb
-has_rdoc: 

data/lib/rib/ripl.rb

@@ -1,3 +0,0 @@
-
-Ripl = Rib
-Ripl::Shell.singleton_class.send(:public, :include)