rib 1.5.4 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5eff854fa46370d04aaf74853a185f40736e15d5
-  data.tar.gz: be5170caaaf53d847c0f04123f5df93bed5f1242
+SHA256:
+  metadata.gz: 62dad317e197fde4c11688f03c450205b2e47a7536175b9ec4fbd74bf1ba40e5
+  data.tar.gz: 59b8c6ac55c4fd1a95d640710e01930d8d68a636e61c86a5c2d63f0546c25123
 SHA512:
-  metadata.gz: 4c4c343ea687a0b0e6faa6ae43e807c03c00037562868b5319a72996ecaeb10968ac16094262839a864d78912b7af679c0e76eaff446b3d45a48eb14dda1e139
-  data.tar.gz: df8b8f84111fa7296be539be5fcc0397802507897eec7fe84acef900826fcf2fe30e122c9e5347078f822b2b922cc01bd0ccdcb24e78f5992e8f9ee1efcd2362
+  metadata.gz: cc4de9174c2a49db81d42ea3c91361c6f4a88435e9f169127914c94921fb7f3ddbc27673c8f5e7f70d31fbd25a163147e3dfe48c31bdeee34fcca0df38451a1a
+  data.tar.gz: b74d9fa8f2c8a63c92a44378e0db0a0848fd2275223fad29c885c48d67beb9b201fc24f25c639ee276e74337d195bf4e80fcc53dcf07fe42b6fc595df3cd5f3b

data/.gitlab-ci.yml

@@ -0,0 +1,40 @@
+
+stages:
+  - test
+
+.test:
+  stage: test
+  image: ruby:${RUBY_VERSION}-bullseye
+  variables:
+    GIT_DEPTH: "1"
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_PATHS: task
+    RUBYOPT: --enable-frozen-string-literal
+  before_script:
+    - bundle install --retry=3
+    - unset CI # Coverage doesn't work well with frozen literal
+  script:
+    - ruby -vr bundler/setup -S rake test
+
+ruby:3.0:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.0'
+
+ruby:3.1:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.1'
+
+ruby:3.2:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.2'
+
+jruby:latest:
+  extends:
+    - .test
+  image: jruby:latest

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "task"]
 	path = task
-	url = git://github.com/godfat/gemgem.git
+	url = https://github.com/godfat/gemgem.git

data/CHANGES.md

@@ -1,5 +1,35 @@
 # CHANGES
 
+## Rib 1.6.1 -- 2022-12-30
+
+### Bugs fixed
+
+* Fixed `rib rack` for constant resolution.
+
+### Enhancement
+
+* [more/color] Instead of using `$1` and `$2`, use `Regexp.last_match`.
+  It should be the same for MRI, but seems to be working better for JRuby.
+  Perhaps `$1` and `$2` is not thread local on JRuby?
+
+## Rib 1.6.0 -- 2018-06-20
+
+* [core/multiline] Support for JRuby 9.2.0.0 is fixed
+* [more/beep] It would now beep every single time when any evaluation took
+  longer than the threshold.
+* [more/color] Fix whenever the input is just `next` or `break`
+* [more/bottomup_backtrace] This would no longer format backtrace twice
+* [more/caller] It would now properly use the enabled plugins
+* [extra/autoindent] It would now indent with `ensure` for `begin` and `def`.
+  Thanks @MITSUBOSHI https://github.com/godfat/rib/pull/21 and
+  @alpaca-tc https://github.com/godfat/rib/pull/17
+* [extra/autoindent] It would now indent with `for`.
+  Thanks @MITSUBOSHI https://github.com/godfat/rib/pull/18
+* [extra/autoindent] It would now indent with `()` and `[]`.
+  Thanks @MITSUBOSHI https://github.com/godfat/rib/pull/20 and
+  https://github.com/godfat/rib/pull/19
+* [extra/byebug] This is now work-in-progress.
+
 ## Rib 1.5.4 -- 2017-10-23
 
 * Removed unnecessary method definition for `puts`

data/Gemfile

@@ -16,8 +16,3 @@ gem 'coveralls', :require => false if ENV['CI']
 platforms :ruby do
   gem 'readline_buffer'
 end
-
-platforms :rbx do
-  gem 'rubysl-singleton' # used in rake
-  gem 'rubysl-readline'  # we need readline extension
-end

data/README.md

@@ -1,4 +1,4 @@
-# Rib [![Build Status](https://secure.travis-ci.org/godfat/rib.png?branch=master)](http://travis-ci.org/godfat/rib) [![Coverage Status](https://coveralls.io/repos/github/godfat/rib/badge.png)](https://coveralls.io/github/godfat/rib) [![Join the chat at https://gitter.im/godfat/rib](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/godfat/rib)
+# Rib [![Pipeline status](https://gitlab.com/godfat/rib/badges/master/pipeline.svg)](https://gitlab.com/godfat/rib/-/pipelines)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -24,7 +24,7 @@ be simple, lightweight and modular so that everyone could customize Rib.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 * All gem dependencies are optional, but it's highly recommended to use
   Rib with [bond][] for tab completion.
 
@@ -132,6 +132,31 @@ file. To see a list of overridable API, please read [api.rb][]
 
 [api.rb]: https://github.com/godfat/rib/blob/master/lib/rib/api.rb
 
+#### Disable enabled plugins
+
+While it's convenient to just `require 'rib/all'`, you might not want to use
+all the plugins. No worries, you don't have to list everything in order to
+not use something. For example, you might not get used to `bottomup_backtrace`
+and don't want to use it. You could put this in your config:
+
+``` ruby
+require 'rib/all'
+
+Rib::BottomupBacktrace.disable
+```
+
+This could disable `bottomup_backtrace` so you get regular top-down backtrace
+with all other plugins. This is particularly useful whenever there's a bug
+in one of the plugins, and you might need to disable some plugins in order to
+debug. You could always enable it again with:
+
+``` ruby
+Rib::BottomupBacktrace.enable
+```
+
+You could do this any time, in the config, or in the shell session. No need to
+restart anything, because it takes effect immediately.
+
 #### Rib home and history file
 
 Rib home is used to store a config file and a history file, which is
@@ -313,15 +338,6 @@ or having conflicted semantics.
 
   Which would print the result with hirb.
 
-* `require 'rib/extra/debugger'` This plugin is depending on:
-
-  1. [debugger][]
-
-  Which introduces `Rib.debug`, which would do similar things as
-  `Rib.anchor` but only more powerful. However, this is not well
-  tested and might not work well. Please let me know if you have
-  any issue using it, thanks!
-
 * `require 'rib/extra/paging'` This plugin is depending on `less` and `tput`.
 
   Which would pass the result to `less` (or `$PAGER` if set) if
@@ -332,7 +348,6 @@ or having conflicted semantics.
 
 [readline_buffer]: https://github.com/godfat/readline_buffer
 [hirb]: https://github.com/cldwalker/hirb
-[debugger]: https://github.com/cldwalker/debugger
 
 ### As a debugging/interacting tool
 
@@ -454,15 +469,17 @@ simple, simpler than rib-rails.
 * ayaya (@ayamomiji)
 * Lin Jen-Shin (@godfat)
 * Mr. Big Cat (@miaout17)
+* @alpaca-tc
 * @bootleq
 * @lulalala
+* @MITSUBOSH
 * @tka
 
 ## LICENSE:
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2022, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/rib/api.rb

@@ -83,6 +83,10 @@ module Rib; module API
     end
   end
 
+  def puts str=''
+    super
+  end
+
   # Print result using #format_result
   def print_result result
     puts(format_result(result))

data/lib/rib/app/rack.rb

@@ -12,7 +12,7 @@ module Rib; module Rack
   def load_rack
     require 'rack'
     Rib.abort("Error: Cannot find config.ru") unless rack?
-    app, _ = Rack::Builder.parse_file(configru_path)
+    app, _ = ::Rack::Builder.parse_file(configru_path)
     self.app = app
     Rib.shell.eval_binding.eval('def app; Rib::Rack.app; end')
     Rib.say("Access your app via :app method")

data/lib/rib/core/multiline.rb

@@ -59,11 +59,13 @@ module Rib; module Multiline
                     [ # 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",
+                      "syntax error, unexpected end\\-of\\-file",
                       # jruby 9.0.4.0
-                      "formal argument must be local variable"    ].join('|'))
+                      "formal argument must be local variable",
+                      # jruby 9.2.0.0
+                      "syntax error, unexpected (#{RUBY20_IO.join('|')})",
+                      "syntax error, unexpected '\\W'"
+                                                                  ].join('|'))
     end
 
   # --------------- Rib API ---------------

data/lib/rib/extra/autoindent.rb

@@ -24,7 +24,11 @@ module Rib; module Autoindent
     # rescue E => e
     # rescue E=> e
     # rescue E =>e
-    /^begin$/          => /^(end)\b|^else$|^rescue *((\w+)? *(=> *\w+)?)?$/,
+    # ensure
+    /^begin$/ =>
+      /^(end)\b|^else$|^rescue *((\w+)? *(=> *\w+)?)?$|^ensure$/,
+    /^def\b/  =>
+      /^(end)\b|^else$|^rescue *((\w+)? *(=> *\w+)?)?$|^ensure$/,
     # elsif Expression
     # consider cases:
     # elsif(true)
@@ -34,10 +38,10 @@ module Rib; module Autoindent
     /^if\b/            => /^(end)\b|^else$|^elsif\b/,
     /^unless\b/        => /^(end)\b|^else$|^elsif\b/,
     /^case\b/          => /^(end)\b|^else$|when\b/  ,
-    /^def\b/           => /^(end)\b/                ,
     /^class\b/         => /^(end)\b/                ,
     /^module\b/        => /^(end)\b/                ,
     /^while\b/         => /^(end)\b/                ,
+    /^for\b/           => /^(end)\b/                ,
     /^until\b/         => /^(end)\b/                ,
     # consider cases:
     # 'do
@@ -52,6 +56,8 @@ module Rib; module Autoindent
     # begin
     /do( *\|.*\|)?$/ => /^(end)\b/                ,
     /\{( *\|.*\|)?$/ => /^(\})\B/                 ,
+    /\($/            => /^(\))\B/                 ,
+    /\[$/            => /^(\])\B/                 ,
     # those are too hard to deal with, so we use syntax error to double check
     # what about this then?
     # v = if true

data/lib/rib/extra/byebug.rb

@@ -0,0 +1,109 @@
+
+require 'rib/more/anchor'
+require 'byebug/core'
+
+# This is based on lib/byebug/processors/pry_processor.rb
+
+module Rib; module Byebug
+  extend Plugin
+  Shell.use(self)
+
+  def before_loop
+    return super if Rib::Byebug.disabled?
+
+    super
+    # ::Byebug::RibProcessor.start
+  end
+
+  module Imp
+    def byebug
+      return if Rib::Byebug.disabled?
+
+      ::Byebug::RibProcessor.start
+    end
+
+    def location
+      Rib.shell.config[:byebug].location
+    end
+
+    def step times=1
+      throw :rib_byebug, [:step, times]
+    end
+
+    def next lines=1
+      throw :rib_byebug, [:next, lines]
+    end
+
+    def finish
+      throw :rib_byebug, [:finish]
+    end
+  end
+
+  Rib.extend(Imp)
+end; end
+
+module Byebug
+  class RibProcessor < CommandProcessor
+    def self.start
+      Byebug.start
+      Setting[:autolist] = false
+      Context.processor = self
+      steps = caller.index{ |path| !path.start_with?(__FILE__) }
+      Byebug.current_context.step_out(steps + 2, true)
+    end
+
+    def at_line
+      resume_rib
+    end
+
+    def at_return(_return_value)
+      resume_rib
+    end
+
+    def at_end
+      resume_rib
+    end
+
+    def at_breakpoint(breakpoint)
+      raise NotImplementedError
+    end
+
+    def location
+      context.location
+    end
+
+    private
+
+    def print_location
+      shell = Rib.shell
+      shell.puts(shell.format_backtrace([location]).first)
+    end
+
+    def resume_rib
+      return if Rib.shell.running?
+
+      byebug_binding = frame._binding
+
+      print_location
+
+      action, *args = catch(:rib_byebug) do
+        allowing_other_threads do
+          Rib.anchor byebug_binding, :byebug => self
+        end
+      end
+
+      perform(action, args)
+    end
+
+    def perform action, args
+      case action
+      when :step
+        context.step_into(*args, frame.pos)
+      when :next
+        context.step_over(*args, frame.pos)
+      when :finish
+        context.step_out(1)
+      end
+    end
+  end
+end

data/lib/rib/more/beep.rb

@@ -7,12 +7,11 @@ module Rib; module Beep
 
   # --------------- Rib API ---------------
 
-  def before_loop
-    super
-    return self if Beep.disabled?
+  def loop_once
+    return super if Beep.disabled?
     beep if started_at && (Time.now - started_at) > beep_threshold
-    Beep.disable
-    self
+    config[:started_at] = Time.now
+    super
   end
 
   private

data/lib/rib/more/bottomup_backtrace.rb

@@ -10,7 +10,7 @@ module Rib; module BottomupBacktrace
   def format_error err
     return super if BottomupBacktrace.disabled?
     message, backtrace = get_error(err)
-    "  #{format_backtrace(backtrace).join("\n  ")}\n#{message}"
+    "  #{backtrace.join("\n  ")}\n#{message}"
   end
 
   def format_backtrace backtrace

data/lib/rib/more/caller.rb

@@ -9,7 +9,11 @@ module Rib; module Caller
     def caller *filters
       return if Rib::Caller.disabled?
 
-      backtrace = Rib.shell.format_backtrace(super().drop(1))
+      display_backtrace(super().drop(1), *filters)
+    end
+
+    def display_backtrace raw_backtrace, *filters
+      backtrace = Rib.shell.format_backtrace(raw_backtrace)
 
       lib = %r{\brib-#{Rib::VERSION}/lib/rib/}
       if backtrace.first =~ lib

data/lib/rib/more/color.rb

@@ -20,7 +20,7 @@ module Rib; module Color
   def get_error err
     return super if Color.disabled?
     message, backtrace = super
-    [format_color(err, message), format_backtrace(backtrace)]
+    [format_color(err, message), backtrace]
   end
 
   def warn message
@@ -87,7 +87,11 @@ module Rib; module Color
     backtrace.map{ |b|
       path, msgs = b.split(':', 2)
       dir, sep, file = path.rpartition('/')
-      msg = msgs.sub(/(\d+):/){red{$1}+':'}.sub(/`.+?'/){green{$&}}
+      msgs ||= (line - 1).to_s # msgs would be nil when input is next/break
+      msg = msgs.sub(/(\d+)(:?)/) do
+        m = Regexp.last_match
+        "#{red{m[1]}}#{m[2]}"
+      end.sub(/`.+?'/){green{Regexp.last_match[0]}}
 
       "#{dir+sep}#{yellow{file}}:#{msg}"
     }

data/lib/rib/test/multiline.rb

@@ -18,29 +18,29 @@ copy :setup_multiline do
     if err
       mock(shell).print_eval_error(is_a(err)){}
     else
-      mock(shell).print_result(yield){}
+      mock(shell).print_result(is_a(Object)){}
     end
     shell.loop_once
     ok
   end
 
   def check str, err=nil
+    yield if block_given?
+
     lines = str.split("\n")
     lines[0...-1].each{ |line|
       input(line)
       shell.loop_once
     }
-    input_done(lines.last, err) do
-      shell.eval_binding.eval(str)
-    end
+    input_done(lines.last, err)
   end
-end
 
-copy :multiline do
   before do
     stub_output
   end
+end
 
+copy :multiline do
   would 'work with no prompt' do
     shell.config[:prompt] = ''
     check <<~RUBY
@@ -137,9 +137,23 @@ copy :multiline do
   end
 
   would 'be hash treated as a block SyntaxError' do
-    check <<~RUBY, SyntaxError
+    code = <<~RUBY
       puts { :x => 10 }.class
     RUBY
+
+    if RUBY_VERSION >= '3.0.0'
+      check code do
+        stub(shell.config[:binding_object]).puts{}
+      end
+    else
+      check code, SyntaxError
+    end
+  end
+
+  would 'SyntaxError' do
+    check <<~RUBY, SyntaxError
+      s-y n
+    RUBY
   end
 
   would 'begin with SyntaxError' do
@@ -171,10 +185,16 @@ copy :multiline do
   end
 
   would 'binary operator /' do
-    check <<~RUBY
+    code = <<~RUBY
       1+1.to_i /
       1
     RUBY
+
+    if RUBY_VERSION >= '3.0.0'
+      check code.lines.first, SyntaxError
+    else
+      check code
+    end
   end
 
   would 'binary operator |' do

data/lib/rib/test.rb

@@ -20,14 +20,19 @@ copy :rib do
   end
 
   def new_shell opts={}
-    shell = Rib::Shell.new(opts)
-    yield(shell) if block_given?
-    shell.before_loop
+    binding_object = Object.new
+    result = Rib::Shell.new(
+      {:binding => binding_object.instance_eval{binding},
+       :binding_object => binding_object}.
+      merge(opts))
+    yield(result) if block_given?
+    result.before_loop
   end
 
   def stub_output
     stub(shell).print(is_a(String)){}
     stub(shell).puts(is_a(String)){}
+    stub(shell).puts{}
   end
 
   def readline?
@@ -51,9 +56,10 @@ copy :rib do
         Rib.disable_plugins(rest)
       end
 
-      yield
+      describe "enabling #{plugins}" do
+        block.call
 
-      case ENV['TEST_LEVEL']
+        case ENV['TEST_LEVEL']
         when '0'
         when '1'
           test_level1(rest, block)
@@ -63,13 +69,18 @@ copy :rib do
           test_level3(rest, block)
         else # test_level3 is too slow because of rr (i guess)
           test_level2(rest, block)
+        end
       end
     end
 
     def test_level1 rest, block
       rest.each{ |target|
         target.enable
-        block.call
+
+        describe "also enabling #{target}" do
+          block.call
+        end
+
         target.disable
       }
     end
@@ -77,17 +88,31 @@ copy :rib do
     def test_level2 rest, block
       rest.combination(2).each{ |targets|
         Rib.enable_plugins(targets)
-        block.call
+
+        describe "also enabling #{targets.join(', ')}" do
+          block.call
+        end
+
         Rib.disable_plugins(targets)
       }
     end
 
     def test_level3 rest, block
-      return block.call if rest.empty?
-      rest[0].enable
-      test_level3(rest[1..-1], block)
-      rest[0].disable
-      test_level3(rest[1..-1], block)
+      if rest.empty?
+        block.call
+      else
+        rest[0].enable
+
+        describe "also enabling #{rest[0]}" do
+          test_level3(rest[1..-1], block)
+        end
+
+        rest[0].disable
+
+        describe "disabling #{rest[0]}" do
+          test_level3(rest[1..-1], block)
+        end
+      end
     end
   end
 end

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.5.4'
+  VERSION = '1.6.1'
 end

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.5.4 ruby lib
+# stub: rib 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib".freeze
-  s.version = "1.5.4"
+  s.version = "1.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2017-10-23"
+  s.date = "2022-12-30"
   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".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.executables = [
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   "rib-rails".freeze]
   s.files = [
   ".gitignore".freeze,
+  ".gitlab-ci.yml".freeze,
   ".gitmodules".freeze,
-  ".travis.yml".freeze,
   "CHANGES.md".freeze,
   "Gemfile".freeze,
   "LICENSE".freeze,
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
   "lib/rib/core/strip_backtrace.rb".freeze,
   "lib/rib/debug.rb".freeze,
   "lib/rib/extra/autoindent.rb".freeze,
+  "lib/rib/extra/byebug.rb".freeze,
   "lib/rib/extra/hirb.rb".freeze,
   "lib/rib/extra/paging.rb".freeze,
   "lib/rib/extra/spring.rb".freeze,
@@ -92,7 +93,7 @@ Gem::Specification.new do |s|
   "test/test_shell.rb".freeze]
   s.homepage = "https://github.com/godfat/rib".freeze
   s.licenses = ["Apache-2.0".freeze]
-  s.rubygems_version = "2.6.13".freeze
+  s.rubygems_version = "3.4.1".freeze
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell".freeze
   s.test_files = [
   "test/core/test_completion.rb".freeze,

data/task/README.md

@@ -13,7 +13,7 @@ Provided tasks:
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby), Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -39,7 +39,7 @@ end
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2021, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/task/gemgem.rb

@@ -42,6 +42,7 @@ module Gemgem
 
   def gem_install
     require 'rubygems/commands/install_command'
+    require 'rubygems/package'
     # read ~/.gemrc
     Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
     Gem::Command.extra_args = Gem.configuration[:gem]
@@ -51,7 +52,8 @@ module Gemgem
     cmd.handle_options([])
 
     # install
-    install = Gem::Installer.new(gem_path, cmd.options)
+    gem_package = Gem::Package.new(gem_path)
+    install = Gem::Installer.new(gem_package, cmd.options)
     install.install
     puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
   end

data/test/core/test_history.rb

@@ -5,10 +5,9 @@ require 'rib/core/history'
 
 describe Rib::History do
   paste :rib
+  paste :setup_history
 
   test_for Rib::History do
-    paste :setup_history
-
     would '#after_loop save history' do
       inputs = %w[blih blah]
       shell.history.push(*inputs)

data/test/core/test_squeeze_history.rb

@@ -5,10 +5,9 @@ require 'rib/core/squeeze_history'
 
 describe Rib::SqueezeHistory do
   paste :rib
+  paste :setup_history
 
   test_for Rib::History, Rib::SqueezeHistory do
-    paste :setup_history
-
     before do
       @input = %w[foo bar bar foo bar]
     end

data/test/extra/test_autoindent.rb

@@ -39,7 +39,7 @@ describe Rib::Autoindent do
     expect(@indent.stack_size).eq size
   end
 
-  would 'begin rescue else end' do
+  would 'begin rescue else ensure end' do
     ri('begin'         , 1)
     ri(  '1'           , 1)
     le('rescue'        , 1)
@@ -53,6 +53,30 @@ describe Rib::Autoindent do
     le('rescue E=> e'  , 1)
     le('rescue E =>e ' , 1)
     le('else'          , 1)
+    ri(  '1'           , 1)
+    le('ensure'        , 1)
+    ri(  '1'           , 1)
+    le('end while nil' , 0)
+  end
+
+  would 'def rescue else ensure end' do
+    ri('def f a'       , 1)
+    ri(  'if a'        , 2)
+    le(  'end'         , 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)
+    ri(  '1'           , 1)
+    le('ensure'        , 1)
+    ri(  '1'           , 1)
     le('end while nil' , 0)
   end
 
@@ -96,13 +120,6 @@ describe Rib::Autoindent do
     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)
@@ -125,6 +142,13 @@ describe Rib::Autoindent do
     le('end'           , 0)
   end
 
+  would 'for end' do
+    ri('for x in 1..2' , 1)
+    ri(  'if true'     , 2)
+    le(  'end'         , 1)
+    le('end'           , 0)
+  end
+
   would 'until end' do
     ri('until true'    , 1)
     ri(  'if true'     , 2)
@@ -142,4 +166,41 @@ describe Rib::Autoindent do
     le(  'end'         , 1)
     le('end'           , 0)
   end
+
+  would '{}' do
+    ri('{'             , 1)
+    ri(  ':a => :b'    , 1)
+    le('}'             , 0)
+  end
+
+  would '[].each{}' do
+    ri('[].each{'      , 1)
+    ri(  '0'           , 1)
+    ri(    '[].each {' , 2)
+    le(    '}'         , 1)
+    le('}'             , 0)
+  end
+
+  would '()' do
+    ri('('             , 1)
+    ri(  '0'           , 1)
+    le(')'             , 0)
+  end
+
+  would '{}.dig()' do
+    ri('{}.dig('       , 1)
+    ri(  '0,'          , 1)
+    ri(  '1'           , 1)
+    le(')'             , 0)
+  end
+
+  would '[]' do
+    ri('['             , 1)
+    ri(  '0,'          , 1)
+    ri(  '1,'          , 1)
+    ri(  '['           , 2)
+    ri(    '2'         , 2)
+    le(  ']'           , 1)
+    le(']'             , 0)
+  end
 end

data/test/more/test_beep.rb

@@ -9,21 +9,24 @@ describe Rib::Beep do
     Rib::Beep.enable
   end
 
-  after do
-    expect(Rib::Beep).disabled?
-  end
-
   def verify delay, threshold=nil, &block
-    new_shell(:started_at => Time.now - delay,
-              :beep_threshold => threshold, &block)
+    shell(:started_at => Time.now - delay,
+          :beep_threshold => threshold, &block)
+
+    stub_output
+    mock(shell).get_input{}
+
+    shell.loop
+
+    ok
   end
 
-  def expect_beep shell
-    mock(shell).print("\a"){}
+  def expect_beep sh
+    mock(sh).print("\a"){}
   end
 
-  def unexpect_beep shell
-    stub(shell).print.with_any_args{ flunk }
+  def unexpect_beep sh
+    stub(sh).print.with_any_args{ flunk }
   end
 
   describe 'beep' do

data/test/more/test_multiline_history.rb

@@ -9,6 +9,7 @@ describe Rib::MultilineHistory do
 
   def check str, err=nil
     shell.history.clear
+    yield if block_given?
     with_history(str, err)
 
     @shell = nil
@@ -16,6 +17,7 @@ describe Rib::MultilineHistory do
 
     shell.history.clear
     shell.history << 'old history'
+    yield if block_given?
     with_history(str, err, 'old history')
   end
 
@@ -30,9 +32,7 @@ describe Rib::MultilineHistory do
 
       result
     }
-    input_done(lines.last, err) do
-      shell.eval_binding.eval(str)
-    end
+    input_done(lines.last, err)
 
     history = if lines.size == 1
                 lines.first

data/test/test_shell.rb

@@ -75,6 +75,14 @@ describe Rib::Shell do
       input('"m" * 2')
     end
 
+    %w[next break].each do |keyword|
+      would "handle #{keyword}" do
+        mock(shell).puts(matching(/^SyntaxError:/)){}
+
+        input(keyword)
+      end
+    end
+
     would 'error in print_result' do
       mock(Rib).warn(matching(/Error while printing result.*BOOM/m)){}
 
@@ -167,26 +175,24 @@ describe Rib::Shell do
   end
 
   would 'have empty binding' do
-    expect(shell.eval_input('local_variables').first).empty?
+    expect(shell(:binding => nil).eval_input('local_variables').first).empty?
   end
 
   would 'not pollute main' do
-    expect(shell.eval_input('main').first).eq 'rib'
+    expect(shell(:binding => nil).eval_input('main').first).eq 'rib'
+  end
+
+  would 'be main' do
+    expect(shell(:binding => nil).eval_input('self.inspect').first).eq 'main'
   end
 
   would 'warn on removing main' do
-    TOPLEVEL_BINDING.eval <<-RUBY
-      singleton_class.module_eval do
-        def main; end
-      end
-    RUBY
+    mock(TOPLEVEL_BINDING.eval('singleton_class')).method_defined?(:main) do
+      true
+    end
 
     mock(Rib).warn(is_a(String)){}
 
-    expect(shell.eval_input('main').first).eq 'rib'
-  end
-
-  would 'be main' do
-    expect(shell.eval_input('self.inspect').first).eq 'main'
+    expect(shell(:binding => nil).eval_input('main').first).eq 'rib'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -34,8 +34,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -65,6 +65,7 @@ files:
 - lib/rib/core/strip_backtrace.rb
 - lib/rib/debug.rb
 - lib/rib/extra/autoindent.rb
+- lib/rib/extra/byebug.rb
 - lib/rib/extra/hirb.rb
 - lib/rib/extra/paging.rb
 - lib/rib/extra/spring.rb
@@ -108,7 +109,7 @@ homepage: https://github.com/godfat/rib
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
 test_files:

data/.travis.yml

@@ -1,23 +0,0 @@
-sudo: false
-language: ruby
-
-before_install:
-  - rvm get head
-  - rvm reload
-  - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
-install: 'gem install bundler; bundle install --retry=3'
-script: 'ruby -r bundler/setup -S rake test'
-
-matrix:
-  include:
-    - rvm: 2.2.5
-    - rvm: 2.3.2
-    - rvm: 2.4.1
-    - rvm: ruby-head
-    - rvm: jruby-9
-      env: JRUBY_OPTS=--debug
-    - rvm: rbx
-
-  allow_failures:
-    - rvm: 2.4.1
-    - rvm: rbx