rib 0.9.1 → 0.9.2

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Rib CHANGES
 
+## Rib 0.9.2 -- 2011-08-25
+
+* [extra/autoindent] It has been greatly improved. A lot more accurate.
+* [extra/autoindent] Fixed a bug when you're typing too fast upon rib
+                     launching, it might eat your input. Thanks bootleq.
+
 ## Rib 0.9.1 -- 2011-08-19
 
 * [extra/autoindent] Autoindent plugin help you indent multiline editing.

data/lib/rib/extra/autoindent.rb

@@ -40,13 +40,22 @@ module Rib::Autoindent
     /^until/         => /^(end)\b/                ,
     # consider cases:
     # 'do
-    # "do
+    # ' do
+    # "' do
     # /do
     # '{
-    # "{
-    # /{
-    /[^'"\/]do( *\|.*\|)?$/ => /^(end)\b/         ,
-    /[^'"\/]\{( *\|.*\|)?$/ => /^(\})\B/          ,
+    # %q{
+    # %q| do
+    # hey, two lines are even harder!
+    # "
+    # begin
+    /do( *\|.*\|)?$/ => /^(end)\b/                ,
+    /\{( *\|.*\|)?$/ => /^(\})\B/                 ,
+    # those are too hard to deal with, so we use syntax error to double check
+    # what about this then?
+    # v = if true
+    #     else
+    #     end
   }
 
   # --------------- Rib API ---------------
@@ -59,43 +68,74 @@ module Rib::Autoindent
 
   def get_input
     return super if Autoindent.disabled?
+    # this is only a fix in case we don't autoindent correctly
+    # if we're autoindenting 100% correct, then this is a useless check
     autoindent_stack.clear if multiline_buffer.empty?
+
+    # this should be called after ::Readline.readline, but it's blocking,
+    # and i don't know if there's any hook to do this, so here we use thread
     Thread.new do
       sleep(0.01)
-      # this should be called after ::Readline.readline, but it's blocking,
-      # and i don't know if there's any hook to do this, so here we use thread
-      ::Readline.line_buffer = current_autoindent
+      ::Readline.line_buffer = current_autoindent if
+        ::Readline.line_buffer.empty?
     end
+
     super
   end
 
-  def loop_eval input
+  def eval_input raw_input
     return super if Autoindent.disabled?
-    if indented = handle_autoindent(input.strip)
-      super(indented)
-    else
-      super
-    end
+    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
+    handle_autoindent(input, indent, err)
+    [result, err]
   end
 
   # --------------- Plugin API ---------------
 
-  def handle_autoindent input
-    _, up = BLOCK_REGEXP.find{ |key,  _| input =~ key }
-    if up
-      autoindent_stack << up
-      nil
+  def detect_autoindent input
+    _, backmark = BLOCK_REGEXP.find{ |key,  _| input =~ key }
+    if backmark # e.g. begin
+      [:right, backmark]
     elsif input =~ autoindent_stack.last
-      if $1 # e.g. end, }, etc
-        autoindent_stack.pop
-        handle_last_line(input)
-      else # e.g. elsif, rescue, etc
-        handle_last_line(input, current_autoindent(autoindent_stack.size-1))
+      if $1     # e.g. end, }, etc
+        [:left_end]
+      else      # e.g. elsif, rescue, etc
+        [:left_tmp]
       end
+    else
+      [:stay]
+    end
+  end
+
+  def handle_autoindent input, indent, err
+    case indent.first
+    when :right    # we need to go deeper
+      if multiline?(err)
+        if err.message =~ /unterminated \w+ meets end of file/
+          # skip if we're in the middle of a string or regexp
+        else
+          # indent.last is the way (input regexp matches) to go back
+          autoindent_stack << indent.last
+        end
+      end
+
+    when :left_end # we need to go back
+      # could happen in either multiline or not
+      autoindent_stack.pop
+
+    when :left_tmp # temporarily go back
+      handle_last_line(input) if multiline?(err)
     end
   end
 
-  def handle_last_line input, indent=current_autoindent
+  def handle_last_line input,
+                       indent=current_autoindent(autoindent_stack.size-1)
     new_input = "#{indent}#{input}"
     puts("\e[1A\e[K#{prompt}#{new_input}")
     new_input

data/lib/rib/version.rb

@@ -1,4 +1,4 @@
 
 module Rib
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/rib.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rib}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Lin Jen-Shin (godfat)}]
-  s.date = %q{2011-08-19}
+  s.date = %q{2011-08-25}
   s.description = %q{Ruby-Interactive-ruBy -- Yet another interactive Ruby shell
 
 Rib is based on the design of [ripl][] and the work of [ripl-rc][], some of

data/task/gemgem.rb

@@ -160,7 +160,7 @@ task :test do
   Bacon.extend(Bacon::TestUnitOutput)
   Bacon.summary_on_exit
   $LOAD_PATH.unshift('lib')
-  Dir['test/**/test_*.rb'].each{ |file| load file }
+  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
 end
 
 desc 'Run tests with shell'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rib
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bond
-  requirement: &2166446500 !ruby/object:Gem::Requirement
+  requirement: &2157793060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166446500
+  version_requirements: *2157793060
 - !ruby/object:Gem::Dependency
   name: hirb
-  requirement: &2166446020 !ruby/object:Gem::Requirement
+  requirement: &2157792580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166446020
+  version_requirements: *2157792580
 - !ruby/object:Gem::Dependency
   name: readline_buffer
-  requirement: &2166445540 !ruby/object:Gem::Requirement
+  requirement: &2157792100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166445540
+  version_requirements: *2157792100
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2166445060 !ruby/object:Gem::Requirement
+  requirement: &2157791620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166445060
+  version_requirements: *2157791620
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2166444580 !ruby/object:Gem::Requirement
+  requirement: &2157791140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166444580
+  version_requirements: *2157791140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166444100 !ruby/object:Gem::Requirement
+  requirement: &2157790660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166444100
+  version_requirements: *2157790660
 description: ! 'Ruby-Interactive-ruBy -- Yet another interactive Ruby shell