rib 0.1.0 → 0.9.0

data/test/core/test_multiline.rb

@@ -0,0 +1,22 @@
+
+require 'rib/test'
+require 'rib/test/multiline'
+require 'rib/core/multiline'
+
+describe Rib::Multiline do
+  behaves_like :rib
+  behaves_like :setup_multiline
+
+  def check str, err=nil
+    lines = str.split("\n")
+    lines[0...-1].each{ |line|
+      input(line)
+      @shell.loop_once
+    }
+    input_done(lines.last, err)
+  end
+
+  test_for Rib::Multiline do
+    behaves_like :multiline
+  end
+end

data/test/core/test_readline.rb

@@ -2,14 +2,7 @@
 require 'rib/test'
 require 'rib/core/readline'
 
-describe Rib::Readline do
-  behaves_like :rib
-
-  before do
-    Rib::Readline.enable
-    @shell = Rib::Shell.new.before_loop
-  end
-
+shared :readline do
   should '#before_loop set @history' do
     @shell.history.should.eq Readline::HISTORY
   end
@@ -19,3 +12,15 @@ describe Rib::Readline do
     @shell.get_input.should.eq 'ok'
   end
 end
+
+describe Rib::Readline do
+  behaves_like :rib
+
+  before do
+    @shell = Rib::Shell.new.before_loop
+  end
+
+  test_for Rib::Readline do
+    behaves_like :readline
+  end
+end

data/test/{more → core}/test_squeeze_history.rb

@@ -1,22 +1,8 @@
 
 require 'rib/test'
-require 'rib/more/squeeze_history'
-
-describe Rib::SqueezeHistory do
-  behaves_like :rib
-
-  before do
-    Rib::HistoryFile.enable
-    Rib::SqueezeHistory.enable
-    @history = "/tmp/test_rib_#{rand}"
-    @shell   = Rib::Shell.new(:history_file => @history).before_loop
-    @input   = %w[foo bar bar foo bar]
-  end
-
-  after do
-    FileUtils.rm_f(@history)
-  end
+require 'rib/core/squeeze_history'
 
+shared :squeeze_history do
   should 'after_loop saves squeezed history' do
     @shell.history.push(*@input)
     @shell.after_loop
@@ -26,7 +12,7 @@ describe Rib::SqueezeHistory do
   should 'loop_once squeeze history' do
     times = @input.size
     stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'")[-1] }
-    stub(@shell).print_result(anything)
+    stub(@shell).print_result
     times.times{ @shell.loop_once }
     @shell.history.to_a.should.eq %w[foo bar foo bar].map{ |i| "'#{i}'" }
   end
@@ -36,8 +22,28 @@ describe Rib::SqueezeHistory do
     times = @input.size
     input = @input.dup
     stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'")[-1] }
-    stub(@shell).print_result(anything)
+    stub(@shell).print_result
     times.times{ @shell.loop_once }
     @shell.history.to_a.should.eq input.map{ |i| "'#{i}'" }
+    Rib::SqueezeHistory.enable
+  end
+end
+
+describe Rib::SqueezeHistory do
+  behaves_like :rib
+
+  before do
+    @history = "/tmp/test_rib_#{rand}"
+    @shell   = Rib::Shell.new(:history_file => @history).before_loop
+    @input   = %w[foo bar bar foo bar]
+    @shell.history.clear
+  end
+
+  after do
+    FileUtils.rm_f(@history)
+  end
+
+  test_for Rib::History, Rib::SqueezeHistory do
+    behaves_like :squeeze_history
   end
 end

data/test/core/test_underscore.rb

@@ -2,23 +2,15 @@
 require 'rib/test'
 require 'rib/core/underscore'
 
-describe Rib::Underscore do
-  behaves_like :rib
-
-  before do
-    Rib::Underscore.enable
-  end
-
-  def setup bound=Object.new
-    @shell = Rib::Shell.new(
-      :binding => bound.instance_eval{binding}).before_loop
-  end
-
+shared :underscore do
   should 'set _' do
     setup
-    @shell.eval_input('_').should.eq nil
-    @shell.eval_input('10 ** 2')
-    @shell.eval_input('_').should.eq 100
+    mock(@shell).get_input{'_'}
+    mock(@shell).get_input{'10**2'}
+    mock(@shell).get_input{'_'}
+    @shell.loop_once.should.eq [nil, nil]
+    @shell.loop_once
+    @shell.loop_once.should.eq [100, nil]
   end
 
   should 'not set _ if already there' do
@@ -27,15 +19,34 @@ describe Rib::Underscore do
       'hey'
     end
     setup(bound)
-    @shell.eval_input('_').should.eq 'hey'
-    @shell.eval_input('10 ** 2')
-    @shell.eval_input('_').should.eq 'hey'
+    mock(@shell).get_input{'_'}
+    mock(@shell).get_input{'10**2'}
+    mock(@shell).get_input{'_'}
+    @shell.loop_once.should.eq ['hey', nil]
+    @shell.loop_once
+    @shell.loop_once.should.eq ['hey', nil]
   end
 
   should 'set __' do
     setup
-    stub(@shell).warn
-    @shell.eval_input('XD')
-    @shell.eval_input('__').should.kind_of?(NameError)
+    stub(@shell).puts
+    mock(@shell).get_input{'XD'}
+    mock(@shell).get_input{'__'}
+    @shell.loop_once
+    @shell.loop_once.first.should.kind_of?(NameError)
+  end
+end
+
+describe Rib::Underscore do
+  behaves_like :rib
+
+  def setup bound=Object.new
+    @shell = Rib::Shell.new(
+      :binding => bound.instance_eval{binding}).before_loop
+    stub(@shell).puts
+  end
+
+  test_for Rib::Underscore do
+    behaves_like :underscore
   end
 end

data/test/more/test_multiline_history.rb

@@ -0,0 +1,42 @@
+
+require 'rib/test'
+require 'rib/test/multiline'
+require 'rib/more/multiline_history'
+
+describe Rib::MultilineHistory do
+  behaves_like :rib
+  behaves_like :setup_multiline
+
+  def check str, err=nil
+    @shell.history.clear
+    with_history(str, err)
+
+    setup_shell
+
+    @shell.history.clear
+    @shell.history << 'old history'
+    with_history(str, err, 'old history')
+  end
+
+  def with_history str, err, *prefix
+    lines = str.split("\n")
+    lines[0...-1].inject([]){ |result, line|
+      input(line)
+      @shell.loop_once
+      result << line
+      @shell.history.to_a.should.eq prefix + result
+      result
+    }
+    input_done(lines.last, err)
+    history = if lines.size == 1
+                lines.first
+              else
+                "\n#{lines.join("\n")}"
+              end
+    @shell.history.to_a.should.eq prefix + [history]
+  end
+
+  test_for Rib::History, Rib::Multiline, Rib::MultilineHistory do
+    behaves_like :multiline
+  end
+end

data/test/test_shell.rb

@@ -6,13 +6,15 @@ describe Rib::Shell do
   behaves_like :rib
 
   before do
+    Rib.disable_plugins
     @shell = Rib::Shell.new
   end
 
   describe '#loop' do
     def input str
       mock(@shell).get_input{str}
-      @shell.loop.should.eq @shell
+      @shell.loop
+      true.should.eq true
     end
     should 'exit'   do                    input('exit') end
     should 'quit'   do                    input('quit') end
@@ -26,7 +28,8 @@ describe Rib::Shell do
       else
         mock(@shell).get_input{ str }
       end
-      @shell.loop_once.should.eq nil
+      @shell.loop_once
+      true.should.eq true
     end
 
     should 'handles ctrl+c' do
@@ -40,12 +43,12 @@ describe Rib::Shell do
     end
 
     should 'error in print_result' do
-      mock(@shell).warn(/rib: Error while printing result.*BOOM/m)
+      mock(Rib).warn(/Error while printing result.*BOOM/m)
       input('obj = Object.new; def obj.inspect; raise "BOOM"; end; obj')
     end
 
     should 'print error from eval' do
-      mock(@shell).warn(/RuntimeError/)
+      mock(@shell).puts(/RuntimeError/)
       input('raise "blah"')
     end
   end
@@ -68,15 +71,17 @@ describe Rib::Shell do
     end
 
     should 'print error and increments line' do
-      mock(@shell).warn(/^SyntaxError:/)
-      @shell.eval_input('{').should.eq nil
-      @shell.config[:line]  .should.eq @line + 1
+      result, err = @shell.eval_input('{')
+      result.should.eq nil
+      err.should.kind_of?(SyntaxError)
+      @shell.config[:line].should.eq @line + 1
     end
   end
 
   should 'call after_loop even if in_loop raises' do
     mock(@shell).loop_once{ raise 'boom' }
+    mock(Rib).warn(is_a(String))
     mock(@shell).after_loop
-    lambda{ @shell.loop }.should.raise(RuntimeError)
+    lambda{@shell.loop}.should.raise(RuntimeError)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-06 00:00:00.000000000Z
+date: 2011-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bond
-  requirement: &2157065040 !ruby/object:Gem::Requirement
+  requirement: &2169075740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: *2169075740
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: &2169075260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *2157065040
+  version_requirements: *2169075260
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2157064560 !ruby/object:Gem::Requirement
+  requirement: &2169074780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157064560
+  version_requirements: *2169074780
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2157064080 !ruby/object:Gem::Requirement
+  requirement: &2169074300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,66 +54,98 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157064080
-description: ripl plugins collection, take you want, leave you don't.
+  version_requirements: *2169074300
+description: ! 'Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
+
+
+  Rib is based on the design of [ripl][] and the work of [ripl-rc][], some of
+
+  the features are also inspired by [pry][]. The aim of Rib is to be fully
+
+  featured and yet very easy to opt-out or opt-in other features. It shall
+
+  be simple, lightweight and modular so that everyone could customize Rib.
+
+
+  [ripl]: https://github.com/cldwalker/ripl
+
+  [ripl-rc]: https://github.com/godfat/ripl-rc
+
+  [pry]: https://github.com/pry/pry'
 email:
 - godfat (XD) godfat.org
 executables:
 - rib
+- rib-all
+- rib-auto
+- rib-min
+- rib-rails
+- rib-ramaze
 extensions: []
 extra_rdoc_files:
-- CHANGES
 - CONTRIBUTORS
 - LICENSE
-- TODO
+- CHANGES.md
+- TODO.md
 files:
 - .gitignore
 - .gitmodules
 - .travis.yml
-- 2011-02-28.md
-- CHANGES
+- CHANGES.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README
 - README.md
 - Rakefile
-- TODO
+- TODO.md
 - bin/rib
+- bin/rib-all
+- bin/rib-auto
+- bin/rib-min
+- bin/rib-rails
+- bin/rib-ramaze
 - lib/rib.rb
 - lib/rib/all.rb
 - lib/rib/api.rb
+- lib/rib/app/auto.rb
+- lib/rib/app/rails.rb
+- lib/rib/app/ramaze.rb
+- lib/rib/config.rb
 - lib/rib/core.rb
 - lib/rib/core/completion.rb
-- lib/rib/core/history_file.rb
+- lib/rib/core/history.rb
+- lib/rib/core/multiline.rb
 - lib/rib/core/readline.rb
+- lib/rib/core/squeeze_history.rb
+- lib/rib/core/strip_backtrace.rb
 - lib/rib/core/underscore.rb
 - lib/rib/debug.rb
+- lib/rib/dep/hirb.rb
 - lib/rib/more.rb
+- lib/rib/more/anchor.rb
 - lib/rib/more/color.rb
-- lib/rib/more/multiline.rb
+- lib/rib/more/edit.rb
 - lib/rib/more/multiline_history.rb
 - lib/rib/more/multiline_history_file.rb
-- lib/rib/more/squeeze_history.rb
-- lib/rib/more/strip_backtrace.rb
 - lib/rib/plugin.rb
 - lib/rib/runner.rb
 - lib/rib/shell.rb
 - lib/rib/test.rb
+- lib/rib/test/multiline.rb
 - lib/rib/version.rb
-- lib/rib/zore.rb
-- lib/rib/zore/anchor.rb
-- lib/rib/zore/edit.rb
 - rib.gemspec
 - screenshot.png
 - task/.gitignore
 - task/gemgem.rb
 - test/core/test_completion.rb
-- test/core/test_history_file.rb
+- test/core/test_history.rb
+- test/core/test_multiline.rb
 - test/core/test_readline.rb
+- test/core/test_squeeze_history.rb
 - test/core/test_underscore.rb
 - test/more/test_color.rb
-- test/more/test_squeeze_history.rb
+- test/more/test_multiline_history.rb
 - test/test_api.rb
 - test/test_plugin.rb
 - test/test_shell.rb
@@ -131,14 +174,16 @@ rubyforge_project:
 rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
-summary: ripl plugins collection, take you want, leave you don't.
+summary: Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
 test_files:
 - test/core/test_completion.rb
-- test/core/test_history_file.rb
+- test/core/test_history.rb
+- test/core/test_multiline.rb
 - test/core/test_readline.rb
+- test/core/test_squeeze_history.rb
 - test/core/test_underscore.rb
 - test/more/test_color.rb
-- test/more/test_squeeze_history.rb
+- test/more/test_multiline_history.rb
 - test/test_api.rb
 - test/test_plugin.rb
 - test/test_shell.rb