rib 1.0.3 → 1.0.4

data/.travis.yml

@@ -5,4 +5,5 @@ rvm:
   - 1.9.3
   - rbx-18mode
   - rbx-19mode
-  - jruby
+  - jruby-18mode
+  - jruby-19mode

data/CHANGES.md

@@ -1,5 +1,16 @@
 # CHANGES
 
+## Rib 1.0.4 -- 2012-03-20
+
+* [core/multiline] Fixed a corner case:
+
+  ``` ruby
+      1/1.to_i +
+      1
+  ```
+
+* [rib] Do not crash because of a loop error. Try to relaunch the shell.
+
 ## Rib 1.0.3 -- 2012-01-21
 
 ### Bugs fixes

data/README.md

@@ -224,7 +224,7 @@ simple, simpler than rib-rails.
 
 Apache License 2.0
 
-Copyright (c) 2011, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2012, 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/TODO.md

@@ -1,5 +1,7 @@
 # TODO
 
+* Fix whenever Color.enabled? but StripBacktrace.disabled?
+
 * Runner tests
 * Documentation
 * Implement exception_spy

data/lib/rib/core/multiline.rb

@@ -21,12 +21,22 @@ module Rib::Multiline
   # ruby -e 'class C'
   # ruby -e 'def f'
   # ruby -e 'begin'
+  # ruby -e 'eval "1+1.to_i +"'
+  # ruby -e 'eval "1+1.to_i -"'
+  # ruby -e 'eval "1+1.to_i *"'
+  # ruby -e 'eval "1+1.to_i /"'
+  # ruby -e 'eval "1+1.to_i &"'
+  # ruby -e 'eval "1+1.to_i |"'
+  # ruby -e 'eval "1+1.to_i ^"'
+  BINARY_OP = %w[tUPLUS tUMINUS tSTAR tREGEXP_BEG tAMPER]
   ERROR_REGEXP = case engine
     when 'ruby' ; Regexp.new(
                     [ # string or regexp
                       "unterminated \\w+ meets end of file",
                       # mri and rubinius
-                      "syntax error, unexpected \\$end"]           .join('|'))
+                      "syntax error, unexpected \\$end"    ,
+                      "unexpected (#{BINARY_OP.join('|')}), expecting \\$end"
+                                                                  ].join('|'))
     when 'rbx'  ; Regexp.new(
                     [ # string or regexp
                       "unterminated \\w+ meets end of file",

data/lib/rib/core/strip_backtrace.rb

@@ -7,7 +7,7 @@ module Rib::StripBacktrace
 
   # --------------- Rib API ---------------
 
-  # strip backtrace until ripl
+  # strip backtrace until rib
   def format_error err
     return super if StripBacktrace.disabled?
     message, backtrace = get_error(err, strip_backtrace(err))

data/lib/rib/runner.rb

@@ -73,7 +73,16 @@ module Rib::Runner
     # not any other Rib command
     Rib.warn("Unused arguments: #{unused.inspect}") unless unused.empty?
     require 'rib/core' if Rib.config.delete(:mimic_irb)
+    loop
+  end
+
+  def loop
     Rib.shell.loop
+  rescue Exception
+    Rib.warn("Relaunching a new shell...")
+    Rib.shells.pop
+    Rib.shells << Rib::Shell.new(Rib.config)
+    retry
   end
 
   def parse argv

data/lib/rib/test/multiline.rb

@@ -137,4 +137,53 @@ shared :multiline do
         s-y n
     RUBY
   end
+
+  should 'binary operator +' do
+    check <<-RUBY
+      1/1.to_i +
+      1
+    RUBY
+  end
+
+  should 'binary operator -' do
+    check <<-RUBY
+      1*1.to_i -
+      1
+    RUBY
+  end
+
+  should 'binary operator *' do
+    check <<-RUBY
+      1-1.to_i *
+      1
+    RUBY
+  end
+
+  should 'binary operator /' do
+    check <<-RUBY
+      1+1.to_i /
+      1
+    RUBY
+  end
+
+  should 'binary operator |' do
+    check <<-RUBY
+      1+1.to_i |
+      1
+    RUBY
+  end
+
+  should 'binary operator &' do
+    check <<-RUBY
+      1+1.to_i &
+      1
+    RUBY
+  end
+
+  should 'binary operator ^' do
+    check <<-RUBY
+      1+1.to_i ^
+      1
+    RUBY
+  end
 end

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/rib.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2012-01-21"
+  s.date = "2012-03-20"
   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 = [
@@ -80,7 +80,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.15"
+  s.rubygems_version = "1.8.19"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",

data/task/gemgem.rb

@@ -113,7 +113,7 @@ module Gemgem
 
   def all_files
     @all_files ||= find_files(Pathname.new(dir)).map{ |file|
-      if file.to_s =~ %r{\.git/}
+      if file.to_s =~ %r{\.git/|\.git$}
         nil
       else
         file.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
 
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -137,3 +137,4 @@ test_files:
 - test/test_api.rb
 - test/test_plugin.rb
 - test/test_shell.rb
+has_rdoc: