ripl-multi_line 0.1.1 → 0.1.2

data/.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "A ripl plugin for multi-line eval."
   s.description =  "This ripl plugin allows you to evaluate multiple lines of Ruby code."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency 'ripl', '>= 0.2.0'
+  s.add_dependency 'ripl', '>= 0.2.1'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.license = 'MIT'

data/README.rdoc

@@ -12,8 +12,6 @@ Add to your ~/.riplrc
 
     require 'ripl/multi_line'
 
-== Todo
-
-* Hook in more cleanly (future ripl version may break functionality of this plugin)
+You can customize your multi-line prompt with the <tt>multi_line_prompt</tt> option.
 
 J-_-L

data/lib/ripl/multi_line.rb

@@ -1,35 +1,35 @@
 module Ripl
   module MultiLine
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
 
-    def during_loop
-      input = ''
-      while true do
-        @error_raised = nil
-        input = catch :multiline do
-          new_input = get_input
-          exit if !new_input
-          input += new_input
-          exit if input == 'exit'
-          loop_once(input)
-          puts(format_result(@last_result)) unless @error_raised
-          input = ''
-        end
+    def before_loop
+      super
+      @buffer = nil
+      config[:multi_line_prompt] ||= ' > '
+    end
+
+    def prompt
+      @buffer ? config[:multi_line_prompt] : super
+    end
+
+    def loop_once
+      catch(:multiline) do
+        super
+        @buffer = nil
+      end
+    end
+
+    def print_eval_error(e)
+      if e.is_a?(SyntaxError) && e.message =~ /unexpected \$end|unterminated string meets end of file/
+        (@buffer ||= '') << @input+"\n"
+        throw :multiline
+      else
+        super
       end
     end
 
-    def loop_once(input)
-      @last_result = loop_eval(input)
-      eval("_ = Ripl.shell.last_result", @binding)
-    rescue Exception => e
-     if e.is_a?(SyntaxError) && e.message =~ /unexpected \$end|unterminated string meets end of file/
-       throw :multiline, input + "\n"
-     else
-       @error_raised = true
-       print_eval_error(e)
-     end
-    ensure
-      @line += 1
+    def eval_input(input)
+      super(@buffer ? @buffer + input : input)
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ripl-multi_line
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
   type: :runtime
   version_requirements: *id001
 description: This ripl plugin allows you to evaluate multiple lines of Ruby code.