rib 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd655c34f6696f9ee88606efcf30acbd726ad54
-  data.tar.gz: 46ad8ec8b715f478c0677a1a49c0190473df42df
+  metadata.gz: 8941437990b160e6b6a8c135d7ab7034511bb488
+  data.tar.gz: 269903601d0ea5f052153e4dc0ad921d15c7b111
 SHA512:
-  metadata.gz: ba6586bba0c20fb2cfdb1a731d67824a1f43f9fe1d240b7764ab8de50394e0c4c595799cad527cdd80ecc1201203c4f3acd286736aac2e87dda1c71659b6363e
-  data.tar.gz: '080e885ebd7e6a8e5be217e985ff5efa40631b4847a15b887aea158f43ef1b1a66d43b96538d36abb642f69537045f2704b71899b37eb43ffa2bfd005caff6ca'
+  metadata.gz: 101ab01ecca0dfc75ab09412b58d199e64a2641c92f2c1bc1b6a42f260d364ef81e409e2f34738d9fd10ac53999d241100e23282f7ee01776d7191b0d22165a4
+  data.tar.gz: e3298bcdcec51701c6fb2e4c15cdbc924830679f9e71744c2c9b1c23bac71817f9ba14c50962ffc190188657a0983ce65d349bad6187dbec0d9d6c1aa0156922

data/.travis.yml

@@ -13,9 +13,11 @@ matrix:
     - 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: rbx
+    - rvm: 2.4.1
+    - rvm: rbx

data/CHANGES.md

@@ -1,5 +1,13 @@
 # CHANGES
 
+## Rib 1.5.3 -- 2017-08-05
+
+* Now we set trap only when the shell starts, and restore the old trap
+  after the shell stops. This should fix some problems using anchor inside
+  RSpec or Unicorn. They would no longer interfere with them.
+* [core/multiline] Now we support backslash. See:
+  [Using backslash line continuation character results in syntax error](https://github.com/godfat/rib/issues/15)
+
 ## Rib 1.5.2 -- 2017-05-01
 
 * We now `require 'rib/version'` from the beginning, avoid loading error

data/lib/rib/core/multiline.rb

@@ -81,7 +81,11 @@ module Rib; module Multiline
   def loop_eval input
     return super if Multiline.disabled?
     multiline_buffer << input
-    super(multiline_buffer.join("\n"))
+    if input =~ /\\\z/
+      throw :rib_multiline
+    else
+      super(multiline_buffer.join("\n"))
+    end
   end
 
   def print_eval_error err

data/lib/rib/shell.rb

@@ -4,7 +4,6 @@ require 'rib/api'
 
 module Rib; class Shell
   include API
-  trap('INT'){ raise Interrupt }
 
   def self.use mod
     include mod
@@ -47,6 +46,7 @@ module Rib; class Shell
   # Loops shell until user exits
   def loop
     before_loop
+    set_trap
     start
     in_loop
     stop
@@ -55,7 +55,7 @@ module Rib; class Shell
     Rib.warn("Error while running loop:\n  #{format_error(e)}")
     raise
   ensure
-
+    release_trap
     after_loop
   end
 
@@ -78,6 +78,14 @@ module Rib; class Shell
   protected
   attr_writer :config
 
+  def set_trap
+    @trap_proc = trap('INT'){ raise Interrupt }
+  end
+
+  def release_trap
+    trap('INT', &@trap_proc) if @trap_proc.kind_of?(Proc)
+  end
+
   private
   # Avoid namespace pollution from rubygems bin stub.
   # To be specific, version and str.

data/lib/rib/test/multiline.rb

@@ -18,7 +18,7 @@ copy :setup_multiline do
     if err
       mock(shell).print_eval_error(is_a(err)){}
     else
-      mock(shell).print_result(is_a(Object)){}
+      mock(shell).print_result(yield){}
     end
     shell.loop_once
     ok
@@ -30,7 +30,9 @@ copy :setup_multiline do
       input(line)
       shell.loop_once
     }
-    input_done(lines.last, err)
+    input_done(lines.last, err) do
+      shell.eval_binding.eval(str)
+    end
   end
 end
 
@@ -41,7 +43,7 @@ copy :multiline do
 
   would 'work with no prompt' do
     shell.config[:prompt] = ''
-    check <<-RUBY
+    check <<~RUBY
       def f
         0
       end
@@ -49,7 +51,7 @@ copy :multiline do
   end
 
   would 'def f' do
-    check <<-RUBY
+    check <<~RUBY
       def f
         1
       end
@@ -57,21 +59,21 @@ copy :multiline do
   end
 
   would 'class C' do
-    check <<-RUBY
+    check <<~RUBY
       class C
       end
     RUBY
   end
 
   would 'begin' do
-    check <<-RUBY
+    check <<~RUBY
       begin
       end
     RUBY
   end
 
   would 'begin with RuntimeError' do
-    check <<-RUBY, RuntimeError
+    check <<~RUBY, RuntimeError
       begin
         raise 'multiline raised an error'
       end
@@ -79,120 +81,127 @@ copy :multiline do
   end
 
   would 'do end' do
-    check <<-RUBY
+    check <<~RUBY
       [].each do
       end
     RUBY
   end
 
   would 'block brace' do
-    check <<-RUBY
+    check <<~RUBY
       [].each{
       }
     RUBY
   end
 
   would 'hash' do
-    check <<-RUBY
+    check <<~RUBY
       {
       }
     RUBY
   end
 
   would 'hash value' do
-    check <<-RUBY
+    check <<~RUBY
       {1 =>
        2}
     RUBY
   end
 
   would 'array' do
-    check <<-RUBY
+    check <<~RUBY
       [
       ]
     RUBY
   end
 
   would 'group' do
-    check <<-RUBY
+    check <<~RUBY
       (
       )
     RUBY
   end
 
   would 'string double quote' do
-    check <<-RUBY
+    check <<~RUBY
       "
       "
     RUBY
   end
 
   would 'string single quote' do
-    check <<-RUBY
+    check <<~RUBY
       '
       '
     RUBY
   end
 
   would 'be hash treated as a block SyntaxError' do
-    check <<-RUBY, SyntaxError
+    check <<~RUBY, SyntaxError
       puts { :x => 10 }.class
     RUBY
   end
 
   would 'begin with SyntaxError' do
-    check <<-RUBY, SyntaxError
+    check <<~RUBY, SyntaxError
       begin
         s-y n
     RUBY
   end
 
   would 'binary operator +' do
-    check <<-RUBY
+    check <<~RUBY
       1/1.to_i +
       1
     RUBY
   end
 
   would 'binary operator -' do
-    check <<-RUBY
+    check <<~RUBY
       1*1.to_i -
       1
     RUBY
   end
 
   would 'binary operator *' do
-    check <<-RUBY
+    check <<~RUBY
       1-1.to_i *
       1
     RUBY
   end
 
   would 'binary operator /' do
-    check <<-RUBY
+    check <<~RUBY
       1+1.to_i /
       1
     RUBY
   end
 
   would 'binary operator |' do
-    check <<-RUBY
+    check <<~RUBY
       1+1.to_i |
       1
     RUBY
   end
 
   would 'binary operator &' do
-    check <<-RUBY
+    check <<~RUBY
       1+1.to_i &
       1
     RUBY
   end
 
   would 'binary operator ^' do
-    check <<-RUBY
+    check <<~RUBY
       1+1.to_i ^
       1
     RUBY
   end
+
+  would 'backslash at the end' do
+    check <<~RUBY
+      'nice ' \\
+      'shell'
+    RUBY
+  end
 end

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.5.2 ruby lib
+# stub: rib 1.5.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib".freeze
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   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-05-01"
+  s.date = "2017-08-05"
   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 = [
@@ -92,7 +92,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.10".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell".freeze
   s.test_files = [
   "test/core/test_completion.rb".freeze,

data/test/more/test_multiline_history.rb

@@ -30,7 +30,9 @@ describe Rib::MultilineHistory do
 
       result
     }
-    input_done(lines.last, err)
+    input_done(lines.last, err) do
+      shell.eval_binding.eval(str)
+    end
 
     history = if lines.size == 1
                 lines.first

data/test/test_shell.rb

@@ -6,8 +6,8 @@ describe Rib::Shell do
   paste :rib
 
   describe '#loop' do
-    def input str
-      mock(shell).get_input{str}
+    def input str=Rib::Skip
+      mock(shell).get_input{if block_given? then yield else str end}
       shell.loop
       ok
     end
@@ -25,6 +25,29 @@ describe Rib::Shell do
 
       input('@shell.stop; throw :rib_exit')
     end
+
+    describe 'trap' do
+      before do
+        @token = Class.new(Exception)
+        @old_trap = trap('INT'){ raise @token }
+        mock(shell).handle_interrupt{ mock(shell).get_input{'exit'} }
+      end
+
+      after do
+        trap('INT', &@old_trap)
+      end
+
+      def interrupt
+        Process.kill('SIGINT', Process.pid)
+        sleep
+      end
+
+      would 'fence and restore ctrl+c interruption' do
+        input{ interrupt }
+
+        expect.raise(@token){ interrupt }
+      end
+    end
   end
 
   describe '#loop_once' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell