rib 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa94deca610e9ec811983f478aed80825cc3e6d9
-  data.tar.gz: a32394966d70f6fe678aa8f62b98acd2c4013123
+  metadata.gz: 2150377cb877771f501f288373ccf7750a786be5
+  data.tar.gz: 72a3bc6e08131e09ede6e1b81b16a904e8080244
 SHA512:
-  metadata.gz: 44d64da0019490fb7b39ea1bfba0bd84114480e78a1ce57381bb2be4207517a3fa39085b679707e266e0e64f728a35315c008289bb96f90aa53390353911d258
-  data.tar.gz: 47f165fc38f1bfbc5bb0509ae3aa71c12852ac24037a0f577f1048e4642ebfb1e716d2f0bdaab32f1f8f401f18d2c30f0d424835f5a56d72f8b6a0d2340075cb
+  metadata.gz: f9a3ac832fc847890ca41e7fbcf4760e0c1a1b46d1f07d71135bf5bc1e117af114be038319cb18a85bd348b074845e86bcf8d300ab260662f10239dca96229ca
+  data.tar.gz: 60f6eeeee1bb056cd56ca103c198c7cf7fcf0cfe1d288dcafe5ac2b8658ea75d96aad163dd735defd59af5065c30abd45b15ebd5e530edb2136d154d1efef21b

data/.travis.yml

@@ -1,13 +1,15 @@
-before_install: 'git submodule update --init'
-script: 'ruby -r bundler/setup -S rake test'
 
+language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - ruby
-  - rbx
+  - 1.9
+  - 2.0
+  - 2.1
+  - rbx-2
   - jruby
 
 matrix:
   allow_failures:
     - rvm: jruby
+
+script: 'ruby -r bundler/setup -S rake test'
+sudo: false

data/CHANGES.md

@@ -1,5 +1,13 @@
 # CHANGES
 
+## Rib 1.2.6 -- 2014-11-07
+
+* [extra/autoindent] Now `module_function` would indent correctly.
+* [extra/autoindent] Now `else` in `case` would indent correctly.
+* [extra/autoindent] Fixed printing end clause twice. (performance fix)
+* [extra/multiline] Fixed in some cases it's not recognized as multiline
+  in Rubinius (rbx).
+
 ## Rib 1.2.5 -- 2014-03-13
 
 * Fixed binding. Sorry my bad.

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'bacon'
+gem 'pork'
 gem 'muack'
 
 gem 'bond'

data/README.md

@@ -23,7 +23,7 @@ be simple, lightweight and modular so that everyone could customize Rib.
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby), Rubinius and JRuby.
 * All gem dependencies are optional, but it's highly recommended to use
   Rib with [bond][] for tab completion.
 

data/lib/rib/core/multiline.rb

@@ -49,6 +49,9 @@ module Rib::Multiline
                       "syntax error, unexpected \\$end"    ,
                       # rubinius
                       "expecting keyword_end"              ,
+                      "expecting keyword_then"             ,
+                      "expecting keyword_when"             ,
+                      "expecting keyword_do_cond"          ,
                       "expecting \\$end"                   ,
                       "expecting '.+'( or '.+')*"          ,
                       "missing '.+' for '.+' started on line \\d+"].join('|'))

data/lib/rib/extra/autoindent.rb

@@ -24,21 +24,21 @@ module Rib::Autoindent
     # rescue E => e
     # rescue E=> e
     # rescue E =>e
-    /^begin$/        => /^(end)\b|^else$|^rescue *((\w+)? *(=> *\w+)?)?$/,
+    /^begin$/          => /^(end)\b|^else$|^rescue *((\w+)? *(=> *\w+)?)?$/,
     # elsif Expression
     # consider cases:
     # elsif(true)
     # elsif true
     # elsif true == true
     # elsif (a = true) && false
-    /^if/            => /^(end)\b|^else$|^elsif\b/,
-    /^unless/        => /^(end)\b|^else$|^elsif\b/,
-    /^case/          => /^(end)\b|^when\b/        ,
-    /^def/           => /^(end)\b/                ,
-    /^class/         => /^(end)\b/                ,
-    /^module/        => /^(end)\b/                ,
-    /^while/         => /^(end)\b/                ,
-    /^until/         => /^(end)\b/                ,
+    /^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/                ,
+    /^until\b/         => /^(end)\b/                ,
     # consider cases:
     # 'do
     # ' do
@@ -88,11 +88,7 @@ module Rib::Autoindent
     return super if Autoindent.disabled?
     input  = raw_input.strip
     indent = detect_autoindent(input)
-    result, err = if indent.first.to_s.start_with?('left')
-                    super(handle_last_line(input))
-                  else
-                    super
-                  end
+    result, err = super
     handle_autoindent(input, indent, err)
     [result, err]
   end
@@ -128,6 +124,7 @@ module Rib::Autoindent
 
     when :left_end # we need to go back
       # could happen in either multiline or not
+      handle_last_line(input)
       autoindent_stack.pop
 
     when :left_tmp # temporarily go back

data/lib/rib/test/multiline.rb

@@ -1,5 +1,5 @@
 
-shared :setup_multiline do
+copy :setup_multiline do
   def setup_shell
     @shell = Rib::Shell.new(
       :binding => Object.new.instance_eval{binding}).before_loop
@@ -34,12 +34,12 @@ shared :setup_multiline do
   end
 end
 
-shared :multiline do
+copy :multiline do
   before do
     setup_shell
   end
 
-  should 'work with no prompt' do
+  would 'work with no prompt' do
     @shell.config[:prompt] = ''
     check <<-RUBY
       def f
@@ -48,7 +48,7 @@ shared :multiline do
     RUBY
   end
 
-  should 'def f' do
+  would 'def f' do
     check <<-RUBY
       def f
         1
@@ -56,21 +56,21 @@ shared :multiline do
     RUBY
   end
 
-  should 'class C' do
+  would 'class C' do
     check <<-RUBY
       class C
       end
     RUBY
   end
 
-  should 'begin' do
+  would 'begin' do
     check <<-RUBY
       begin
       end
     RUBY
   end
 
-  should 'begin with RuntimeError' do
+  would 'begin with RuntimeError' do
     check <<-RUBY, RuntimeError
       begin
         raise 'multiline raised an error'
@@ -78,118 +78,118 @@ shared :multiline do
     RUBY
   end
 
-  should 'do end' do
+  would 'do end' do
     check <<-RUBY
       [].each do
       end
     RUBY
   end
 
-  should 'block brace' do
+  would 'block brace' do
     check <<-RUBY
       [].each{
       }
     RUBY
   end
 
-  should 'hash' do
+  would 'hash' do
     check <<-RUBY
       {
       }
     RUBY
   end
 
-  should 'hash value' do
+  would 'hash value' do
     check <<-RUBY
       {1 =>
        2}
     RUBY
   end
 
-  should 'array' do
+  would 'array' do
     check <<-RUBY
       [
       ]
     RUBY
   end
 
-  should 'group' do
+  would 'group' do
     check <<-RUBY
       (
       )
     RUBY
   end
 
-  should 'string double quote' do
+  would 'string double quote' do
     check <<-RUBY
       "
       "
     RUBY
   end
 
-  should 'string single quote' do
+  would 'string single quote' do
     check <<-RUBY
       '
       '
     RUBY
   end
 
-  should 'be hash treated as a block SyntaxError' do
+  would 'be hash treated as a block SyntaxError' do
     check <<-RUBY, SyntaxError
       puts { :x => 10 }.class
     RUBY
   end
 
-  should 'begin with SyntaxError' do
+  would 'begin with SyntaxError' do
     check <<-RUBY, SyntaxError
       begin
         s-y n
     RUBY
   end
 
-  should 'binary operator +' do
+  would 'binary operator +' do
     check <<-RUBY
       1/1.to_i +
       1
     RUBY
   end
 
-  should 'binary operator -' do
+  would 'binary operator -' do
     check <<-RUBY
       1*1.to_i -
       1
     RUBY
   end
 
-  should 'binary operator *' do
+  would 'binary operator *' do
     check <<-RUBY
       1-1.to_i *
       1
     RUBY
   end
 
-  should 'binary operator /' do
+  would 'binary operator /' do
     check <<-RUBY
       1+1.to_i /
       1
     RUBY
   end
 
-  should 'binary operator |' do
+  would 'binary operator |' do
     check <<-RUBY
       1+1.to_i |
       1
     RUBY
   end
 
-  should 'binary operator &' do
+  would 'binary operator &' do
     check <<-RUBY
       1+1.to_i &
       1
     RUBY
   end
 
-  should 'binary operator ^' do
+  would 'binary operator ^' do
     check <<-RUBY
       1+1.to_i ^
       1

data/lib/rib/test.rb

@@ -1,13 +1,13 @@
 
-require 'bacon'
+require 'pork/auto'
 require 'muack'
 require 'fileutils'
-Bacon.summary_on_exit
-include Muack::API
+
+Pork::Executor.__send__(:include, Muack::API)
 
 require 'rib'
 
-shared :rib do
+copy :rib do
   before do
   end
 
@@ -15,48 +15,50 @@ shared :rib do
     Muack.verify
   end
 
-  def test_for *plugins, &block
-    require 'rib/all' # exhaustive tests
-    rest = Rib.plugins - plugins
-    Rib.enable_plugins(plugins)
-    Rib.disable_plugins(rest)
-    yield
+  singleton_class.module_eval do
+    def test_for *plugins, &block
+      require 'rib/all' # exhaustive tests
+      rest = Rib.plugins - plugins
+      Rib.enable_plugins(plugins)
+      Rib.disable_plugins(rest)
+      yield
 
-    case ENV['TEST_LEVEL']
-      when '0'
-      when '1'
-        test_level1(rest, block)
-      when '2'
-        test_level2(rest, block)
-      when '3'
-        test_level3(rest, block)
-      else # test_level3 is too slow because of rr (i guess)
-        test_level2(rest, block)
+      case ENV['TEST_LEVEL']
+        when '0'
+        when '1'
+          test_level1(rest, block)
+        when '2'
+          test_level2(rest, block)
+        when '3'
+          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
-      target.disable
-    }
-  end
+    def test_level1 rest, block
+      rest.each{ |target|
+        target.enable
+        block.call
+        target.disable
+      }
+    end
 
-  def test_level2 rest, block
-    rest.combination(2).each{ |targets|
-      Rib.enable_plugins(targets)
-      block.call
-      Rib.disable_plugins(targets)
-    }
-  end
+    def test_level2 rest, block
+      rest.combination(2).each{ |targets|
+        Rib.enable_plugins(targets)
+        block.call
+        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)
+    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)
+    end
   end
 
   def readline?
@@ -71,12 +73,6 @@ shared :rib do
   end
 end
 
-module Kernel
-  def eq? rhs
-    self == rhs
-  end
-end
-
 def main
   'rib'
 end

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

data/rib.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rib 1.2.5 ruby lib
+# stub: rib 1.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rib"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2014-03-13"
+  s.date = "2014-11-07"
   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 = [
@@ -54,7 +54,6 @@ Gem::Specification.new do |s|
   "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",
@@ -63,7 +62,6 @@ Gem::Specification.new do |s|
   "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",
@@ -80,6 +78,7 @@ Gem::Specification.new do |s|
   "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",
@@ -88,7 +87,7 @@ Gem::Specification.new do |s|
   "test/test_shell.rb"]
   s.homepage = "https://github.com/godfat/rib"
   s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.2"
   s.summary = "Ruby-Interactive-ruBy -- Yet another interactive Ruby shell"
   s.test_files = [
   "test/core/test_completion.rb",
@@ -97,6 +96,7 @@ Gem::Specification.new do |s|
   "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/task/gemgem.rb

@@ -34,7 +34,7 @@ module Gemgem
       s.executables = bin_files
     end
     spec_create.call(spec)
-    spec.homepage = "https://github.com/godfat/#{spec.name}"
+    spec.homepage ||= "https://github.com/godfat/#{spec.name}"
     self.spec = spec
   end
 
@@ -227,10 +227,6 @@ end # of gem namespace
 desc 'Run tests'
 task :test do
   next if Gemgem.test_files.empty?
-
-  require 'bacon'
-  Bacon.extend(Bacon::TestUnitOutput)
-  Bacon.summary_on_exit
   Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
 end
 

data/test/core/test_completion.rb

@@ -3,7 +3,7 @@ require 'rib/test'
 require 'rib/core/completion'
 
 describe Rib::Completion do
-  behaves_like :rib
+  paste :rib
 
   before do
     @completion = Class.new do
@@ -11,7 +11,7 @@ describe Rib::Completion do
     end.new
   end
 
-  should 'find correct ripl plugins' do
+  would 'find correct ripl plugins' do
     $LOADED_FEATURES << '/dir/ripl/some_plugin.rb'
     @completion.send(:ripl_plugins).should.eq ['ripl/some_plugin.rb']
   end

data/test/core/test_history.rb

@@ -2,8 +2,8 @@
 require 'rib/test'
 require 'rib/core/history'
 
-shared :history do
-  should '#after_loop save history' do
+copy :history do
+  would '#after_loop save history' do
     inputs = %w[blih blah]
     @shell.history.clear
     @shell.history.push(*inputs)
@@ -12,18 +12,18 @@ shared :history do
     File.read(@history_file).should.eq "#{inputs.join("\n")}\n"
   end
 
-  should '#before_loop load previous history' do
+  would '#before_loop load previous history' do
     File.open(@history_file, 'w'){ |f| f.write "check\nthe\nmike" }
     @shell.before_loop
     @shell.history.to_a.should.eq %w[check the mike]
   end
 
-  should '#before_loop have empty history if no history file exists' do
+  would '#before_loop have empty history if no history file exists' do
     @shell.before_loop
     @shell.history.to_a.should.eq []
   end
 
-  should '#read_history be accessible to plugins in #before_loop' do
+  would '#read_history be accessible to plugins in #before_loop' do
     mod = Module.new do
       def read_history
         config[:history] = ['pong_read_history']
@@ -34,7 +34,7 @@ shared :history do
     shell.new.before_loop.history.should.eq ['pong_read_history']
   end
 
-  should '#write_history be accessible to plugins in #after_loop' do
+  would '#write_history be accessible to plugins in #after_loop' do
     mod = Module.new do
       def write_history
         config[:history] = ['pong_write_history']
@@ -47,7 +47,7 @@ shared :history do
 end
 
 describe Rib::History do
-  behaves_like :rib
+  paste :rib
 
   before do
     if readline?
@@ -63,6 +63,6 @@ describe Rib::History do
   end
 
   test_for Rib::History do
-    behaves_like :history
+    paste :history
   end
 end

data/test/core/test_multiline.rb

@@ -4,8 +4,8 @@ require 'rib/test/multiline'
 require 'rib/core/multiline'
 
 describe Rib::Multiline do
-  behaves_like :rib
-  behaves_like :setup_multiline
+  paste :rib
+  paste :setup_multiline
 
   def check str, err=nil
     lines = str.split("\n")
@@ -17,6 +17,6 @@ describe Rib::Multiline do
   end
 
   test_for Rib::Multiline do
-    behaves_like :multiline
+    paste :multiline
   end
 end

data/test/core/test_readline.rb

@@ -2,25 +2,25 @@
 require 'rib/test'
 require 'rib/core/readline'
 
-shared :readline do
-  should '#before_loop set @history' do
+copy :readline do
+  would '#before_loop set @history' do
     @shell.history.should.eq Readline::HISTORY
   end
 
-  should '#get_input calling Readline.readline' do
+  would '#get_input calling Readline.readline' do
     mock(Readline).readline(@shell.prompt, true){'ok'}
     @shell.get_input.should.eq 'ok'
   end
 end
 
 describe Rib::Readline do
-  behaves_like :rib
+  paste :rib
 
   before do
     @shell = Rib::Shell.new.before_loop
   end
 
   test_for Rib::Readline do
-    behaves_like :readline
+    paste :readline
   end
 end