rib 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f537a283fed2eef2c6e07ede1e4cc027dc28f4a4f3d4c59cee58338b02cad9c
-  data.tar.gz: c25ade3869c7319ce557c1ab50d7029126af6d171fc892d0032a259c848efa97
+  metadata.gz: 62dad317e197fde4c11688f03c450205b2e47a7536175b9ec4fbd74bf1ba40e5
+  data.tar.gz: 59b8c6ac55c4fd1a95d640710e01930d8d68a636e61c86a5c2d63f0546c25123
 SHA512:
-  metadata.gz: eba78ab629e758e66963db826cd39a2b9ec7b392c4b451f26ab680ab9924a7d3748f9d1ddd9966f2296f5e5aef0ac30cd389d2449505f55f1662b43a1fb3605e
-  data.tar.gz: f35eac4d8ed09a0e6ab1dc21a63ed1aea6fde118f110adf280044cbf3fb39a1ce748a77f558fe4d7115ec7b519428cefb28c11ad31b655794529ad3b89758d56
+  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,17 @@
 # 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

data/README.md

@@ -1,4 +1,4 @@
-# Rib [![Build Status](https://secure.travis-ci.org/godfat/rib.svg?branch=master)](http://travis-ci.org/godfat/rib) [![Coverage Status](https://coveralls.io/repos/github/godfat/rib/badge.svg)](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))
 
@@ -479,7 +479,7 @@ simple, simpler than rib-rails.
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2018, 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/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/extra/byebug.rb

@@ -8,6 +8,13 @@ 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?
@@ -73,6 +80,8 @@ module Byebug
     end
 
     def resume_rib
+      return if Rib.shell.running?
+
       byebug_binding = frame._binding
 
       print_location

data/lib/rib/more/color.rb

@@ -88,7 +88,10 @@ module Rib; module Color
       path, msgs = b.split(':', 2)
       dir, sep, file = path.rpartition('/')
       msgs ||= (line - 1).to_s # msgs would be nil when input is next/break
-      msg = msgs.sub(/(\d+)(:?)/){red{$1}+$2}.sub(/`.+?'/){green{$&}}
+      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

@@ -25,6 +25,8 @@ copy :setup_multiline do
   end
 
   def check str, err=nil
+    yield if block_given?
+
     lines = str.split("\n")
     lines[0...-1].each{ |line|
       input(line)
@@ -135,9 +137,17 @@ 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
@@ -175,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,8 +20,10 @@ copy :rib do
   end
 
   def new_shell opts={}
+    binding_object = Object.new
     result = Rib::Shell.new(
-      {:binding => Object.new.instance_eval{binding}}.
+      {:binding => binding_object.instance_eval{binding},
+       :binding_object => binding_object}.
       merge(opts))
     yield(result) if block_given?
     result.before_loop

data/lib/rib/version.rb

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

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.6.0 ruby lib
+# stub: rib 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib".freeze
-  s.version = "1.6.0"
+  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 = "2018-06-20"
+  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,
@@ -93,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.7.7".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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-20 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
@@ -109,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
@@ -124,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-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,17 +0,0 @@
-sudo: false
-language: ruby
-
-install: 'gem install bundler; bundle install --retry=3'
-before_script: unset CI
-script: 'ruby -vr bundler/setup -S rake test'
-
-matrix:
-  include:
-    - rvm: 2.4
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: 2.5
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: ruby-head
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: jruby
-      env: JRUBY_OPTS=--debug