rib 1.5.1 → 1.5.2

data/task/README.md

@@ -4,12 +4,12 @@
 
 Provided tasks:
 
-    rake clean        # Remove ignored files
+    rake clean        # Trash ignored files
     rake gem:build    # Build gem
     rake gem:install  # Install gem
     rake gem:release  # Release gem
     rake gem:spec     # Generate gemspec
-    rake test         # Run tests in memory
+    rake test         # Run tests
 
 ## REQUIREMENTS:
 
@@ -25,7 +25,7 @@ And in Rakefile:
 begin
   require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
@@ -37,9 +37,9 @@ end
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2016, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2017, 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/task/gemgem.rb

@@ -28,7 +28,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
+      s.license     = license
 
       s.date        = Time.now.strftime('%Y-%m-%d')
       s.files       = gem_files
@@ -208,6 +208,11 @@ module Gemgem
     @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
     @all_files ||= fold_files(glob).sort
   end

data/test/core/test_completion.rb

@@ -6,13 +6,20 @@ describe Rib::Completion do
   paste :rib
 
   before do
-    @completion = Class.new do
-      include Rib::Completion
-    end.new
+    Rib::Completion.enable
   end
 
-  would 'find correct ripl plugins' do
-    $LOADED_FEATURES << '/dir/ripl/some_plugin.rb'
-    @completion.send(:ripl_plugins).should.eq ['ripl/some_plugin.rb']
+  would 'start bond' do
+    new_shell do |sh|
+      eval_binding = sh.method(:eval_binding).source_location
+
+      mock(Bond).start(having(eval_binding: is_a(Proc))).peek_args do |*args|
+        expect(args.first[:eval_binding].source_location).eq eval_binding
+
+        args
+      end
+    end
+
+    expect(Bond).started?
   end
 end

data/test/core/test_history.rb

@@ -1,71 +1,61 @@
 
 require 'rib/test'
+require 'rib/test/history'
 require 'rib/core/history'
-require 'tempfile'
 
-copy :history do
-  would '#after_loop save history' do
-    inputs = %w[blih blah]
-    @shell.history.clear
-    @shell.history.push(*inputs)
+describe Rib::History do
+  paste :rib
 
-    @shell.after_loop
-    File.read(@history_file).should.eq "#{inputs.join("\n")}\n"
-  end
+  test_for Rib::History do
+    paste :setup_history
 
-  would '#before_loop load previous history' do
-    File.write(@history_file, "check\nthe\nmike")
-    @shell.before_loop
-    @shell.history.to_a.should.eq %w[check the mike]
-  end
+    would '#after_loop save history' do
+      inputs = %w[blih blah]
+      shell.history.push(*inputs)
 
-  would '#before_loop have empty history if no history file exists' do
-    @shell.before_loop
-    @shell.history.to_a.should.eq []
-  end
+      shell.after_loop
 
-  would '#read_history be accessible to plugins in #before_loop' do
-    mod = Module.new do
-      def read_history
-        config[:history] = ['pong_read_history']
-      end
+      expect(File.read(history_file)).eq "#{inputs.join("\n")}\n"
     end
-    shell = Rib::Shell.dup
-    shell.use(mod)
-    shell.new.before_loop.history.should.eq ['pong_read_history']
-  end
 
-  would '#write_history be accessible to plugins in #after_loop' do
-    mod = Module.new do
-      def write_history
-        config[:history] = ['pong_write_history']
-      end
+    would '#before_loop load previous history' do
+      File.write(history_file, "check\nthe\nmike")
+
+      shell.before_loop
+
+      expect(shell.history.to_a).eq %w[check the mike]
     end
-    shell = Rib::Shell.dup
-    shell.use(mod)
-    shell.new.before_loop.after_loop.history.should.eq ['pong_write_history']
-  end
-end
 
-describe Rib::History do
-  paste :rib
+    would '#before_loop have empty history if no history file exists' do
+      expect(shell.history.to_a).eq []
+    end
 
-  test_for Rib::History do
-    before do
-      if readline?
-        ::Readline::HISTORY.clear
-        stub_readline
+    would '#read_history be accessible to plugins in #before_loop' do
+      mod = Module.new do
+        def read_history
+          config[:history] = ['pong_read_history']
+        end
       end
-      @tempfile     = Tempfile.new('rib')
-      @history_file = @tempfile.path
-      @shell        = Rib::Shell.new(
-        :history_file => @history_file).before_loop
-    end
+      klass = Rib::Shell.dup
+      klass.use(mod)
 
-    after do
-      @tempfile.unlink
+      shell = klass.new.before_loop
+
+      expect(shell.history).eq ['pong_read_history']
     end
 
-    paste :history
+    would '#write_history be accessible to plugins in #after_loop' do
+      mod = Module.new do
+        def write_history
+          config[:history] = ['pong_write_history']
+        end
+      end
+      klass = Rib::Shell.dup
+      klass.use(mod)
+
+      shell = klass.new.before_loop.after_loop
+
+      expect(shell.history).eq ['pong_write_history']
+    end
   end
 end

data/test/core/test_last_value.rb

@@ -2,35 +2,34 @@
 require 'rib/test'
 require 'rib/core/last_value'
 
-copy :last_value do
-  would 'set last_value' do
-    mock(@shell).get_input{'Rib.last_value'}
-    mock(@shell).get_input{'10**2'}
-    mock(@shell).get_input{'Rib.last_value'}
-    @shell.loop_once.should.eq [nil, nil]
-    @shell.loop_once
-    @shell.loop_once.should.eq [100, nil]
-  end
-
-  would 'set last_exception' do
-    stub(@shell).puts{}.with_any_args
-    mock(@shell).get_input{'XD'}
-    mock(@shell).get_input{'Rib.last_exception'}
-    @shell.loop_once
-    @shell.loop_once.first.should.kind_of?(NameError)
-  end
-end
-
 describe Rib::LastValue do
   paste :rib
 
   before do
-    @shell = new_shell
-    stub(@shell).puts(is_a(String)){}
-    stub(Rib).shell{ @shell }
+    stub_output
+    stub(Rib).shell{shell}
   end
 
   test_for Rib::LastValue do
-    paste :last_value
+    would 'set last_value' do
+      mock(shell).get_input{'Rib.last_value'}
+      mock(shell).get_input{'10**2'}
+      mock(shell).get_input{'Rib.last_value'}
+
+      expect(shell.loop_once).eq [nil, nil]
+
+      shell.loop_once
+
+      expect(shell.loop_once).eq [100, nil]
+    end
+
+    would 'set last_exception' do
+      mock(shell).get_input{'XD'}
+      mock(shell).get_input{'Rib.last_exception'}
+
+      shell.loop_once
+
+      expect(shell.loop_once.first).kind_of?(NameError)
+    end
   end
 end

data/test/core/test_readline.rb

@@ -2,25 +2,18 @@
 require 'rib/test'
 require 'rib/core/readline'
 
-copy :readline do
-  would '#before_loop set @history' do
-    @shell.history.should.eq Readline::HISTORY
-  end
-
-  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
   paste :rib
 
   test_for Rib::Readline do
-    before do
-      @shell = Rib::Shell.new.before_loop
+    would '#before_loop set @history' do
+      expect(shell.history).eq Readline::HISTORY
     end
 
-    paste :readline
+    would '#get_input calling Readline.readline' do
+      mock(Readline).readline(shell.prompt, true){'ok'}
+
+      expect(shell.get_input).eq 'ok'
+    end
   end
 end

data/test/core/test_squeeze_history.rb

@@ -1,51 +1,44 @@
 
 require 'rib/test'
+require 'rib/test/history'
 require 'rib/core/squeeze_history'
-require 'tempfile'
-
-copy :squeeze_history do
-  would 'after_loop saves squeezed history' do
-    @shell.history.push(*@input)
-    @shell.after_loop
-    File.read(@history).should.eq %w[foo bar foo bar].join("\n") + "\n"
-  end
-
-  would 'loop_once squeeze history' do
-    times = @input.size
-    stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'").last }
-    stub(@shell).print_result{}.with_any_args
-    times.times{ @shell.loop_once }
-    @shell.history.to_a.should.eq %w[foo bar foo bar].map{ |i| "'#{i}'" }
-  end
-
-  would 'be disabled if disabled' do
-    Rib::SqueezeHistory.disable do
-      times = @input.size
-      input = @input.dup
-      stub(@shell).get_input{ (@shell.history << "'#{@input.shift}'").last }
-      stub(@shell).print_result{}.with_any_args
-      times.times{ @shell.loop_once }
-      @shell.history.to_a.should.eq input.map{ |i| "'#{i}'" }
-    end
-  end
-end
 
 describe Rib::SqueezeHistory do
   paste :rib
 
   test_for Rib::History, Rib::SqueezeHistory do
+    paste :setup_history
+
     before do
-      @tempfile = Tempfile.new('rib')
-      @history  = @tempfile.path
-      @shell    = Rib::Shell.new(:history_file => @history).before_loop
-      @input    = %w[foo bar bar foo bar]
-      @shell.history.clear
+      @input = %w[foo bar bar foo bar]
     end
 
-    after do
-      @tempfile.unlink
+    would 'after_loop saves squeezed history' do
+      shell.history.push(*@input)
+      shell.after_loop
+
+      expect(File.read(history_file)).eq %w[foo bar foo bar].join("\n") + "\n"
+    end
+
+    would 'loop_once squeeze history' do
+      stub_output
+      stub(shell).get_input{ (shell.history << "'#{@input.shift}'").last }
+
+      @input.size.times{ shell.loop_once }
+
+      expect(shell.history.to_a).eq %w[foo bar foo bar].map{ |i| "'#{i}'" }
     end
 
-    paste :squeeze_history
+    would 'be disabled if disabled' do
+      Rib::SqueezeHistory.disable do
+        stub_output
+        stub(shell).get_input{ (shell.history << "'#{@input.shift}'").last }
+        input = @input.dup
+
+        @input.size.times{ shell.loop_once }
+
+        expect(shell.history.to_a).eq input.map{ |i| "'#{i}'" }
+      end
+    end
   end
 end

data/test/extra/test_autoindent.rb

@@ -19,22 +19,27 @@ describe Rib::Autoindent do
     Rib::Multiline.enable
     Rib::Autoindent.enable
     @indent = autoindent.new
+
     mock(@indent).puts(matching(/^\e/)).times(0)
+
+    expect(@indent.stack_size).eq 0
   end
 
   def ri input, size
     @indent.eval_input(input)
-    @indent.stack_size.should.eq size
+
+    expect(@indent.stack_size).eq size
   end
 
   def le input, size
     mock(@indent).puts(matching(/^\e/)){}
+
     @indent.eval_input(input)
-    @indent.stack_size.should.eq size
+
+    expect(@indent.stack_size).eq size
   end
 
   would 'begin rescue else end' do
-    @indent.stack_size.should.eq 0
     ri('begin'         , 1)
     ri(  '1'           , 1)
     le('rescue'        , 1)

data/test/more/test_anchor.rb

@@ -0,0 +1,85 @@
+
+require 'rib/test'
+require 'rib/more/anchor'
+require 'rib/core/multiline'
+require 'rib/test/multiline'
+
+describe Rib::Anchor do
+  paste :rib
+  paste :setup_multiline
+
+  before do
+    Rib::Anchor.enable
+  end
+
+  describe '#anchor?' do
+    would 'give true when anchoring' do
+      stub(Rib).shell{shell}
+
+      mock(shell).get_input do
+        expect(shell).anchor?
+
+        mock(shell).puts{}
+
+        nil
+      end
+
+      Rib.anchor 'test'
+    end
+
+    would 'give false when not anchoring' do
+      expect(new_shell).not.anchor?
+    end
+  end
+
+  describe '.stop_anchors' do
+    def anchor_deeper shell, index
+      mock(shell).get_input do
+        mock(shell).puts.times(0)
+
+        expect(shell).anchor?
+        expect(shell.loop_eval('self')).eq index
+
+        mock_deeper(index + 1)
+        'Rib.anchor self + 1'
+      end
+    end
+
+    def escape shell
+      mock(shell).get_input do
+        'Rib.stop_anchors'
+      end
+    end
+
+    def mock_deeper index
+      mock(Rib).shell.times(2) # ignore first 2 calls, see Rib.anchor
+      mock(Rib).shell.peek_return do |deeper_shell|
+        if index < 5
+          anchor_deeper(deeper_shell, index)
+        else
+          escape(deeper_shell)
+        end
+
+        deeper_shell
+      end
+    end
+
+    would 'exit all anchors' do
+      shell = Rib.shell
+
+      mock(shell).get_input do
+        mock_deeper(0)
+        'Rib.anchor 0'
+      end
+
+      mock(shell).get_input{}
+      mock(shell).puts{}
+
+      shell.loop
+    end
+  end
+
+  test_for Rib::Anchor, Rib::Multiline do
+    paste :multiline
+  end
+end