rib 1.5.1 → 1.5.2

data/test/more/test_beep.rb

@@ -19,7 +19,7 @@ describe Rib::Beep do
   end
 
   def expect_beep shell
-    mock(shell).print("\a")
+    mock(shell).print("\a"){}
   end
 
   def unexpect_beep shell

data/test/more/test_color.rb

@@ -5,11 +5,19 @@ require 'rib/more/color'
 describe Rib::Color do
   paste :rib
 
+  before do
+    Rib::Color.enable
+  end
+
   color = Class.new do
     include Rib::Color
     def colors
       @colors ||= Rib::Shell.new.before_loop.config[:color]
     end
+
+    def inspect_result result
+      result.inspect
+    end
   end.new
 
   would 'give correct color' do
@@ -49,4 +57,12 @@ describe Rib::Color do
           "#{Regexp.escape(msg)}`.+'#{Regexp.escape(Rib::Color.reset)}")
     end
   end
+
+  would 'colorize warnings' do
+    shell = new_shell
+
+    shell.warn('test')
+
+    expect(shell.warnings).eq ["\e[31mtest\e[0m"]
+  end
 end

data/test/more/test_multiline_history.rb

@@ -8,13 +8,14 @@ describe Rib::MultilineHistory do
   paste :setup_multiline
 
   def check str, err=nil
-    @shell.history.clear
+    shell.history.clear
     with_history(str, err)
 
-    setup_shell
+    @shell = nil
+    stub_output
 
-    @shell.history.clear
-    @shell.history << 'old history'
+    shell.history.clear
+    shell.history << 'old history'
     with_history(str, err, 'old history')
   end
 
@@ -22,18 +23,22 @@ describe Rib::MultilineHistory do
     lines = str.split("\n")
     lines[0...-1].inject([]){ |result, line|
       input(line)
-      @shell.loop_once
+      shell.loop_once
       result << line
-      @shell.history.to_a.should.eq prefix + result
+
+      expect(shell.history.to_a).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]
+
+    expect(shell.history.to_a).eq prefix + [history]
   end
 
   test_for Rib::History, Rib::Multiline, Rib::MultilineHistory do

data/test/test_api.rb

@@ -12,9 +12,45 @@ describe Rib::API do
           "pong_#{meth}"
         end
       end
-      shell = Rib::Shell.dup
-      shell.use(mod)
-      shell.new.send(meth).should == "pong_#{meth}"
+      klass = Rib::Shell.dup
+      klass.use(mod)
+
+      expect(klass.new.send(meth)).eq "pong_#{meth}"
+    end
+  end
+
+  would 'emit a warning whenever result is not a string' do
+    object = Class.new{ alias_method :inspect, :object_id }.new
+
+    mock(shell).get_input{'object'}
+    mock(shell).loop_eval('object'){object}
+    mock(shell).puts("=> #{object.object_id}"){}
+    mock($stderr).puts(including("#{object.class}#inspect")){}
+
+    shell.loop_once
+
+    ok
+  end
+
+  describe '#warn' do
+    would 'append a warning message to warnings' do
+      shell.warn('test')
+
+      expect(shell.warnings).eq ['test']
+    end
+  end
+
+  describe '#flush_warnings' do
+    before do
+      shell.warn('test')
+
+      mock($stderr).puts('rib: test'){}
+    end
+
+    would 'warn to $stderr from #warnings' do
+      shell.send(:flush_warnings)
+
+      ok
     end
   end
 end

data/test/test_plugin.rb

@@ -13,26 +13,38 @@ describe Rib::Plugin do
   end
 
   would 'have shortcut methods' do
-    @names.each{ |name|
-      %w[enable disable].each{ |meth|
-        Rib.respond_to?("#{meth}_#{name}").should == true
-      }
-      %w[enabled? disabled?].each{ |meth|
-        Rib.respond_to?("#{name}_#{meth}").should == true
-      }
-    }
+    @names.each do |name|
+      %w[enable disable].each do |meth|
+        expect(Rib).respond_to?("#{meth}_#{name}")
+      end
+
+      %w[enabled? disabled?].each do |meth|
+        expect(Rib).respond_to?("#{name}_#{meth}")
+      end
+    end
   end
 
   would 'be the same as mod methods' do
     @mods.shuffle.take(@mods.size/2).each(&:disable)
-    @names.each{ |name|
-      %w[enabled? disabled?].each{ |meth|
-        Rib.send("#{name}_#{meth}").should ==
+
+    @names.each do |name|
+      %w[enabled? disabled?].each do |meth|
+        expect(Rib.send("#{name}_#{meth}")).eq \
           @mods.find{ |mod|
             mod.name[/::\w+$/].tr(':', '') ==
             name.gsub(/([^_]+)/){$1.capitalize}.tr('_', '') }.
           send(meth)
-      }
-    }
+      end
+    end
+  end
+
+  would 'have backward compatibility for accessing Shell' do
+    mock(Rib).warn(
+      is_a(String), is_a(String), including("#{__FILE__}:47")){ok}
+
+    Module.new.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+      extend Rib::Plugin
+      Shell
+    RUBY
   end
 end

data/test/test_runner.rb

@@ -6,31 +6,31 @@ describe Rib::Runner do
   paste :rib
 
   before do
-    Rib.disable_plugins
-    @shell = Rib::Shell.new
-    mock(Rib).shell{ @shell }.times(2)
+    mock(Rib).shell{ shell }.times(2)
   end
 
   def input *args
-    args.each{ |item| mock(@shell).get_input{ item } }
-    mock(@shell).get_input{}
+    args.each{ |item| mock(shell).get_input{ item } }
+    mock(shell).get_input{}
   end
 
   def output *args
-    args.each{ |item| mock(@shell).puts("=> #{item}"){} }
-    mock(@shell).puts{}
+    args.each{ |item| mock(shell).puts("=> #{item}"){} }
+    mock(shell).puts{}
   end
 
   would '-e' do
      input('a')
     output('1')
-    Rib::Runner.run(%w[-ea=1]).should.eq @shell
+
+    expect(Rib::Runner.run(%w[-ea=1])).eq shell
   end
 
   would '-e nothing' do
      input
     output
-    Rib::Runner.run(%w[-e]).should.eq @shell
+
+    expect(Rib::Runner.run(%w[-e])).eq shell
   end
 
   def verify_app_e argv
@@ -38,10 +38,12 @@ describe Rib::Runner do
     output('1')
     conf = {:name => 'rib'}
     min  = 'rib-min'
+
     mock(Rib::Runner).which_bin(min){ min }
     mock(Rib::Runner).load(min){ Rib::Runner.run(argv) }
     stub(Rib).config{ conf }
-    Rib::Runner.run(argv).should.eq @shell
+
+    expect(Rib::Runner.run(argv)).eq shell
   end
 
   would 'min -e' do

data/test/test_shell.rb

@@ -5,26 +5,26 @@ require 'rib/shell'
 describe Rib::Shell do
   paste :rib
 
-  before do
-    Rib.disable_plugins
-    @shell = nil
-  end
-
-  def shell
-    @shell ||= Rib::Shell.new
-  end
-
   describe '#loop' do
     def input str
       mock(shell).get_input{str}
       shell.loop
-      true.should.eq true
+      ok
     end
-    would 'exit'      do                               input('exit' ) end
-    would 'also exit' do                               input(' exit') end
+
+    would 'exit'      do                              input('exit' ) end
+    would 'also exit' do                              input(' exit') end
     would 'ctrl+d'    do mock(shell).puts{}         ; input(nil)     end
     would ':q'        do shell.config[:exit] << ':q'; input(':q')    end
     would '\q'        do shell.config[:exit] << '\q'; input('\q')    end
+
+    would 'not puts anything if it is not running' do
+      mock(shell).puts.times(0)
+
+      shell.eval_binding.eval('self').instance_variable_set(:@shell, shell)
+
+      input('@shell.stop; throw :rib_exit')
+    end
   end
 
   describe '#loop_once' do
@@ -34,32 +34,39 @@ describe Rib::Shell do
       else
         mock(shell).get_input{ str }
       end
+
       shell.loop_once
-      true.should.eq true
+
+      ok
     end
 
     would 'handles ctrl+c' do
       mock(shell).handle_interrupt{}
+
       input{ raise Interrupt }
     end
 
     would 'prints result' do
       mock(shell).puts('=> "mm"'){}
+
       input('"m" * 2')
     end
 
     would 'error in print_result' do
       mock(Rib).warn(matching(/Error while printing result.*BOOM/m)){}
+
       input('obj = Object.new; def obj.inspect; raise "BOOM"; end; obj')
     end
 
     would 'not crash if user input is a blackhole' do
       mock(Rib).warn(matching(/Error while printing result/)){}
+
       input('Rib::Blackhole')
     end
 
     would 'print error from eval' do
       mock(shell).puts(matching(/RuntimeError/)){}
+
       input('raise "blah"')
     end
   end
@@ -67,7 +74,8 @@ describe Rib::Shell do
   describe '#prompt' do
     would 'be changeable' do
       shell.config[:prompt] = '> '
-      shell.prompt.should.eq  '> '
+
+      expect(shell.prompt).eq  '> '
     end
   end
 
@@ -78,14 +86,50 @@ describe Rib::Shell do
 
     would 'line' do
       shell.eval_input('10 ** 2')
-      shell.config[:line].should.eq @line + 1
+
+      expect(shell.config[:line]).eq @line + 1
     end
 
     would 'print error and increments line' do
       result, err = shell.eval_input('{')
-      result.should.eq nil
-      err.should.kind_of?(SyntaxError)
-      shell.config[:line].should.eq @line + 1
+
+      expect(result).eq nil
+      expect(err).kind_of?(SyntaxError)
+      expect(shell.config[:line]).eq @line + 1
+    end
+  end
+
+  describe '#running?' do
+    would 'have complete flow' do
+      expect(shell).not.running?
+
+      mock(shell).get_input do
+        expect(shell).running?
+
+        mock(shell).puts{}
+
+        nil
+      end
+
+      shell.loop
+
+      expect(shell).not.running?
+    end
+  end
+
+  describe '#stop' do
+    would 'stop the loop if it is stopped' do
+      mock(shell).get_input do
+        expect(shell).running?
+
+        shell.stop
+
+        expect(shell).not.running?
+
+        'Rib::Skip'
+      end
+
+      shell.loop
     end
   end
 
@@ -93,15 +137,18 @@ describe Rib::Shell do
     mock(shell).loop_once{ raise 'boom' }
     mock(Rib).warn(is_a(String)){}
     mock(shell).after_loop{}
-    lambda{shell.loop}.should.raise(RuntimeError)
+
+    expect.raise(RuntimeError) do
+      shell.loop
+    end
   end
 
   would 'have empty binding' do
-    shell.eval_input('local_variables').first.should.empty?
+    expect(shell.eval_input('local_variables').first).empty?
   end
 
   would 'not pollute main' do
-    shell.eval_input('main').first.should.eq 'rib'
+    expect(shell.eval_input('main').first).eq 'rib'
   end
 
   would 'warn on removing main' do
@@ -110,11 +157,13 @@ describe Rib::Shell do
         def main; end
       end
     RUBY
+
     mock(Rib).warn(is_a(String)){}
-    shell.eval_input('main').first.should.eq 'rib'
+
+    expect(shell.eval_input('main').first).eq 'rib'
   end
 
   would 'be main' do
-    shell.eval_input('self.inspect').first.should.eq 'main'
+    expect(shell.eval_input('self.inspect').first).eq 'main'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
@@ -81,6 +81,7 @@ files:
 - lib/rib/runner.rb
 - lib/rib/shell.rb
 - lib/rib/test.rb
+- lib/rib/test/history.rb
 - lib/rib/test/multiline.rb
 - lib/rib/version.rb
 - rib.gemspec
@@ -93,8 +94,8 @@ files:
 - test/core/test_readline.rb
 - test/core/test_squeeze_history.rb
 - test/core/test_strip_backtrace.rb
-- test/extra/test_anchor.rb
 - test/extra/test_autoindent.rb
+- test/more/test_anchor.rb
 - test/more/test_beep.rb
 - test/more/test_caller.rb
 - test/more/test_color.rb
@@ -105,7 +106,7 @@ files:
 - test/test_shell.rb
 homepage: https://github.com/godfat/rib
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -135,8 +136,8 @@ test_files:
 - test/core/test_readline.rb
 - test/core/test_squeeze_history.rb
 - test/core/test_strip_backtrace.rb
-- test/extra/test_anchor.rb
 - test/extra/test_autoindent.rb
+- test/more/test_anchor.rb
 - test/more/test_beep.rb
 - test/more/test_caller.rb
 - test/more/test_color.rb