rib 1.2.5 → 1.2.6

data/test/core/test_squeeze_history.rb

@@ -2,14 +2,14 @@
 require 'rib/test'
 require 'rib/core/squeeze_history'
 
-shared :squeeze_history do
-  should 'after_loop saves squeezed history' do
+copy :squeeze_history do
+  would 'after_loop saves squeezed history' do
     @shell.history.push(*@input)
     @shell.after_loop
     File.read(@history).should.eq %w[foo bar foo bar].join("\n") + "\n"
   end
 
-  should 'loop_once squeeze history' do
+  would 'loop_once squeeze history' do
     times = @input.size
     stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'").last }
     stub(@shell).print_result{}.with_any_args
@@ -17,7 +17,7 @@ shared :squeeze_history do
     @shell.history.to_a.should.eq %w[foo bar foo bar].map{ |i| "'#{i}'" }
   end
 
-  should 'be disabled if disabled' do
+  would 'be disabled if disabled' do
     Rib::SqueezeHistory.disable do
       times = @input.size
       input = @input.dup
@@ -30,7 +30,7 @@ shared :squeeze_history do
 end
 
 describe Rib::SqueezeHistory do
-  behaves_like :rib
+  paste :rib
 
   before do
     @history = "/tmp/test_rib_#{rand}"
@@ -44,6 +44,6 @@ describe Rib::SqueezeHistory do
   end
 
   test_for Rib::History, Rib::SqueezeHistory do
-    behaves_like :squeeze_history
+    paste :squeeze_history
   end
 end

data/test/core/test_underscore.rb

@@ -2,8 +2,8 @@
 require 'rib/test'
 require 'rib/core/underscore'
 
-shared :underscore do
-  should 'set _' do
+copy :underscore do
+  would 'set _' do
     setup
     mock(@shell).get_input{'_'}
     mock(@shell).get_input{'10**2'}
@@ -13,7 +13,7 @@ shared :underscore do
     @shell.loop_once.should.eq [100, nil]
   end
 
-  should 'not set _ if already there' do
+  would 'not set _ if already there' do
     bound = Object.new
     def bound._
       'hey'
@@ -27,7 +27,7 @@ shared :underscore do
     @shell.loop_once.should.eq ['hey', nil]
   end
 
-  should 'set __' do
+  would 'set __' do
     setup
     stub(@shell).puts{}.with_any_args
     mock(@shell).get_input{'XD'}
@@ -38,7 +38,7 @@ shared :underscore do
 end
 
 describe Rib::Underscore do
-  behaves_like :rib
+  paste :rib
 
   def setup bound=Object.new
     @shell = Rib::Shell.new(
@@ -47,6 +47,6 @@ describe Rib::Underscore do
   end
 
   test_for Rib::Underscore do
-    behaves_like :underscore
+    paste :underscore
   end
 end

data/test/extra/test_autoindent.rb

@@ -0,0 +1,141 @@
+
+require 'rib/test'
+require 'rib/extra/autoindent'
+
+describe Rib::Autoindent do
+  paste :rib
+
+  Rib::Multiline.enable
+  Rib::Autoindent.enable
+
+  autoindent = Class.new do
+    include Rib::Autoindent, Rib::Multiline, Rib::API
+    def config
+      {:line => 0, :binding => TOPLEVEL_BINDING, :prompt => '>> '}
+    end
+    def stack_size
+      autoindent_stack.size
+    end
+  end
+
+  before do
+    @indent = autoindent.new
+    mock(@indent).puts(match(/^\e/)).times(0)
+  end
+
+  def ri input, size
+    @indent.eval_input(input)
+    @indent.stack_size.should.eq size
+  end
+
+  def le input, size
+    mock(@indent).puts(match(/^\e/)){}
+    @indent.eval_input(input)
+    @indent.stack_size.should.eq size
+  end
+
+  would 'begin rescue else end' do
+    @indent.stack_size.should.eq 0
+    ri('begin'         , 1)
+    ri(  '1'           , 1)
+    le('rescue'        , 1)
+    ri(  '1'           , 1)
+    le('rescue=>e'     , 1)
+    le('rescue => e'   , 1)
+    le('rescue =>e'    , 1)
+    le('rescue E=>e '  , 1)
+    le('rescue E'      , 1)
+    le('rescue E => e ', 1)
+    le('rescue E=> e'  , 1)
+    le('rescue E =>e ' , 1)
+    le('else'          , 1)
+    le('end while nil' , 0)
+  end
+
+  would 'if elsif else end' do
+    ri('if true'       , 1)
+    ri(  'if false'    , 2)
+    ri(    '1'         , 2)
+    le(  'end'         , 1)
+    ri(  'if true'     , 2)
+    le(  'elsif true'  , 2)
+    ri(    '1'         , 2)
+    le(  'else'        , 2)
+    ri(    '1'         , 2)
+    le(  'end'         , 1)
+    ri(  'if 1'        , 2)
+    ri(    'if 2'      , 3)
+    le(    'end'       , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
+  would 'unless else end' do
+    ri('unless 1'      , 1)
+    ri(  'unless 1'    , 2)
+    ri(    '1'         , 2)
+    le(  'end '        , 1)
+    le('else'          , 1)
+    ri(  '1'           , 1)
+    le('end'           , 0)
+  end
+
+  would 'case when else end' do
+    ri('case 1'        , 1)
+    le('when 1'        , 1)
+    ri(  '1'           , 1)
+    le('when 2'        , 1)
+    ri('  if 1'        , 2)
+    le('  end'         , 1)
+    le('else'          , 1)
+    ri(  '1'           , 1)
+    le('end'           , 0)
+  end
+
+  would 'def end' do
+    ri('def f a'       , 1)
+    ri(  'if a'        , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
+  would 'class Object end' do
+    ri('class Object'  , 1)
+    ri(  'if true'     , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
+  would 'module Rib end' do
+    ri('module Rib'    , 1)
+    ri(  'module_function', 1)
+    ri(  'if true'     , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
+  would 'while end' do
+    ri('while false'   , 1)
+    ri(  'if true'     , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
+  would 'until end' do
+    ri('until true'    , 1)
+    ri(  'if true'     , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
+  would 'do end' do
+    ri("to_s''do"      , 1)
+    ri(  "to_s '' do"  , 2)
+    le(  'end'         , 1)
+    ri(  'to_s "" do'  , 2)
+    le(  'end'         , 1)
+    ri(  'to_s // do'  , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+end

data/test/more/test_color.rb

@@ -3,7 +3,7 @@ require 'rib/test'
 require 'rib/more/color'
 
 describe Rib::Color do
-  behaves_like :rib
+  paste :rib
 
   color = Class.new do
     include Rib::Color
@@ -12,7 +12,7 @@ describe Rib::Color do
     end
   end.new
 
-  should 'give correct color' do
+  would 'give correct color' do
     color.send(:format_color,
       [{0 => :a}, 'b', [nil, {false => Object}], {true => Exception.new}]).
         should.eq \
@@ -24,7 +24,7 @@ describe Rib::Color do
           "\e[0m\e[34m}\e[0m\e[34m]\e[0m"
   end
 
-  should 'inspect recursive array and hash just like built-in inspect' do
+  would 'inspect recursive array and hash just like built-in inspect' do
     a = []
     a << a
     h = {}
@@ -36,7 +36,7 @@ describe Rib::Color do
   end
 
   # regression test
-  should "colorize errors with `/' inside" do
+  would "colorize errors with `/' inside" do
     i = if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
           1
         else

data/test/more/test_multiline_history.rb

@@ -4,8 +4,8 @@ require 'rib/test/multiline'
 require 'rib/more/multiline_history'
 
 describe Rib::MultilineHistory do
-  behaves_like :rib
-  behaves_like :setup_multiline
+  paste :rib
+  paste :setup_multiline
 
   def check str, err=nil
     @shell.history.clear
@@ -37,6 +37,6 @@ describe Rib::MultilineHistory do
   end
 
   test_for Rib::History, Rib::Multiline, Rib::MultilineHistory do
-    behaves_like :multiline
+    paste :multiline
   end
 end

data/test/test_api.rb

@@ -3,10 +3,10 @@ require 'rib/test'
 require 'rib/shell'
 
 describe Rib::API do
-  behaves_like :rib
+  paste :rib
 
   Rib::API.instance_methods.delete_if{ |e| e[/=$/] }.each do |meth|
-    should "##{meth} be accessible to plugins" do
+    would "##{meth} be accessible to plugins" do
       mod = Module.new do
         define_method meth do
           "pong_#{meth}"

data/test/test_plugin.rb

@@ -3,7 +3,7 @@ require 'rib/test'
 require 'rib/all'
 
 describe Rib::Plugin do
-  behaves_like :rib
+  paste :rib
 
   before do
     @names = Dir[File.expand_path(
@@ -12,7 +12,7 @@ describe Rib::Plugin do
     @mods  = Rib.plugins
   end
 
-  should 'have shortcut methods' do
+  would 'have shortcut methods' do
     @names.each{ |name|
       %w[enable disable].each{ |meth|
         Rib.respond_to?("#{meth}_#{name}").should == true
@@ -23,7 +23,7 @@ describe Rib::Plugin do
     }
   end
 
-  should 'be the same as mod methods' do
+  would 'be the same as mod methods' do
     @mods.shuffle.take(@mods.size/2).each(&:disable)
     @names.each{ |name|
       %w[enabled? disabled?].each{ |meth|

data/test/test_runner.rb

@@ -3,7 +3,7 @@ require 'rib/test'
 require 'rib/runner'
 
 describe Rib::Runner do
-  behaves_like :rib
+  paste :rib
 
   before do
     Rib.disable_plugins
@@ -21,13 +21,13 @@ describe Rib::Runner do
     mock(@shell).puts{}
   end
 
-  should '-e' do
+  would '-e' do
      input('a')
     output('1')
     Rib::Runner.run(%w[-ea=1]).should.eq @shell
   end
 
-  should '-e nothing' do
+  would '-e nothing' do
      input
     output
     Rib::Runner.run(%w[-e]).should.eq @shell
@@ -44,11 +44,11 @@ describe Rib::Runner do
     Rib::Runner.run(argv).should.eq @shell
   end
 
-  should 'min -e' do
+  would 'min -e' do
     verify_app_e(%w[min -ea=1])
   end
 
-  should '-e min' do
+  would '-e min' do
     verify_app_e(%w[-ea=1 min])
   end
 end

data/test/test_shell.rb

@@ -3,7 +3,7 @@ require 'rib/test'
 require 'rib/shell'
 
 describe Rib::Shell do
-  behaves_like :rib
+  paste :rib
 
   before do
     Rib.disable_plugins
@@ -20,11 +20,11 @@ describe Rib::Shell do
       shell.loop
       true.should.eq true
     end
-    should 'exit'      do                               input('exit' ) end
-    should 'also exit' do                               input(' exit') end
-    should 'ctrl+d'    do mock(shell).puts{}         ; input(nil)     end
-    should ':q'        do shell.config[:exit] << ':q'; input(':q')    end
-    should '\q'        do shell.config[:exit] << '\q'; input('\q')    end
+    would 'exit'      do                               input('exit' ) end
+    would 'also exit' do                               input(' exit') end
+    would 'ctrl+d'    do mock(shell).puts{}         ; input(nil)     end
+    would ':q'        do shell.config[:exit] << ':q'; input(':q')    end
+    would '\q'        do shell.config[:exit] << '\q'; input('\q')    end
   end
 
   describe '#loop_once' do
@@ -38,34 +38,34 @@ describe Rib::Shell do
       true.should.eq true
     end
 
-    should 'handles ctrl+c' do
+    would 'handles ctrl+c' do
       mock(shell).handle_interrupt{}
       input{ raise Interrupt }
     end
 
-    should 'prints result' do
+    would 'prints result' do
       mock(shell).puts('=> "mm"'){}
       input('"m" * 2')
     end
 
-    should 'error in print_result' do
+    would 'error in print_result' do
       mock(Rib).warn(match(/Error while printing result.*BOOM/m)){}
       input('obj = Object.new; def obj.inspect; raise "BOOM"; end; obj')
     end
 
-    should 'not crash if user input is a blackhole' do
+    would 'not crash if user input is a blackhole' do
       mock(Rib).warn(match(/Error while printing result/)){}
       input('Rib::Blackhole')
     end
 
-    should 'print error from eval' do
+    would 'print error from eval' do
       mock(shell).puts(match(/RuntimeError/)){}
       input('raise "blah"')
     end
   end
 
   describe '#prompt' do
-    should 'be changeable' do
+    would 'be changeable' do
       shell.config[:prompt] = '> '
       shell.prompt.should.eq  '> '
     end
@@ -76,12 +76,12 @@ describe Rib::Shell do
       @line = shell.config[:line]
     end
 
-    should 'line' do
+    would 'line' do
       shell.eval_input('10 ** 2')
       shell.config[:line].should.eq @line + 1
     end
 
-    should 'print error and increments line' do
+    would 'print error and increments line' do
       result, err = shell.eval_input('{')
       result.should.eq nil
       err.should.kind_of?(SyntaxError)
@@ -89,22 +89,22 @@ describe Rib::Shell do
     end
   end
 
-  should 'call after_loop even if in_loop raises' do
+  would 'call after_loop even if in_loop raises' do
     mock(shell).loop_once{ raise 'boom' }
     mock(Rib).warn(is_a(String)){}
     mock(shell).after_loop{}
     lambda{shell.loop}.should.raise(RuntimeError)
   end
 
-  should 'have empty binding' do
-    shell.eval_input('local_variables').first.should.empty
+  would 'have empty binding' do
+    shell.eval_input('local_variables').first.should.empty?
   end
 
-  should 'not pollute main' do
+  would 'not pollute main' do
     shell.eval_input('main').first.should.eq 'rib'
   end
 
-  should 'warn on removing main' do
+  would 'warn on removing main' do
     TOPLEVEL_BINDING.eval <<-RUBY
       singleton_class.module_eval do
         def main; end
@@ -114,7 +114,7 @@ describe Rib::Shell do
     shell.eval_input('main').first.should.eq 'rib'
   end
 
-  should 'be main' do
+  would 'be main' do
     shell.eval_input('self.inspect').first.should.eq 'main'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -68,7 +68,6 @@ 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/extra/paging.rb
 - lib/rib/more.rb
@@ -77,7 +76,6 @@ 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/runner.rb
 - lib/rib/shell.rb
@@ -94,6 +92,7 @@ files:
 - test/core/test_readline.rb
 - test/core/test_squeeze_history.rb
 - test/core/test_underscore.rb
+- test/extra/test_autoindent.rb
 - test/more/test_color.rb
 - test/more/test_multiline_history.rb
 - test/test_api.rb
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -131,6 +130,7 @@ test_files:
 - test/core/test_readline.rb
 - test/core/test_squeeze_history.rb
 - test/core/test_underscore.rb
+- test/extra/test_autoindent.rb
 - test/more/test_color.rb
 - test/more/test_multiline_history.rb
 - test/test_api.rb

data/lib/rib/extra/debugger.rb

@@ -1,146 +0,0 @@
-
-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

@@ -1,13 +0,0 @@
-
-# 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