ripl-auto_indent 0.1.0 → 0.1.1

data/.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.summary     = "A ripl plugin which indents your entered Ruby code."
   s.description = "This ripl plugin indents your multi-line Ruby input using coderay."
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency 'ripl', '>= 0.2.5'
-  s.add_dependency 'ripl-multi_line', '>= 0.1.4'
+  s.add_dependency 'ripl', '>= 0.2.6'
+  s.add_dependency 'ripl-multi_line', '>= 0.2.0'
   s.add_dependency 'coderay', '~> 0.9'
   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"]

data/CHANGELOG.rdoc

@@ -1,2 +1,5 @@
+== 0.1.1
+* Be compatible with multi_line 0.2.0
+
 == 0.1.0
 * Initial release.

data/README.rdoc

@@ -17,4 +17,9 @@ Add the following line to your <tt>~/.riplrc</tt>
 The plugin rewrites the last line (if the there are closing elements). If this is too buggy for you or your terminal does not support it, you can deactivate it with <tt>Ripl.config[:auto_indent_rewrite] = false</tt>.
 You can change the default two spaces used for indention (per level) with <tt>Ripl.config[:auto_indent_space]</tt>.
 
+== Known bugs
+
+* Statement modifiers (if at the end of the line) get displayed incorrectly
+* Long lines might cause wrong rewriting (if activated)
+
 J-_-L

data/lib/ripl/auto_indent.rb

@@ -1,31 +1,43 @@
 require 'ripl'
 require 'ripl/multi_line'
 require 'coderay'
+#require 'open3'
 
 module Ripl
   module AutoIndent
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
     TPUT = {
       :sc   => `tput sc`,   # save current cursor position
-      :cuu1 => `tput cuu1`, # move cursor upwards    to the original input line
-      :cuf1 => `tput cuf1`, # move cursor rightwards to the original input offset
+      :cuu1 => `tput cuu1`, # move cursor on line upwards
       :rc   => `tput rc`,   # return to normal cursor position
     }
 
     def before_loop
-      super
       @current_indent = 0
+      super
     end
 
     def get_indent(buffer)
-      indent = 0
+      #syntax_ok = proc{ |code|
+      #  Open3.popen3('ruby -c'){ |sin, sout, _|
+      #    sin << code
+      #    sin.close
+      #    sout.read.chomp
+      #  } == "Syntax OK"
+      #}
+
       opening_tokens = %w[begin case class def for if module unless until while do {]
       closing_tokens = %w[end }]
+      indent = 0
       # parse each token
       buffer_tokens = CodeRay.scan(buffer, :ruby)
       buffer_tokens.each{ |token, kind|
         if kind == :reserved || kind == :operator
           if opening_tokens.include? token
+            # modifiers cause trouble - so guess, if it is intended as one 
+            #  (because the current line has valid syntax)
+            #next if %w[if unless until while].include?(token) && syntax_ok[ line ]
+
             indent += 1
           elsif closing_tokens.include? token
             indent -= 1
@@ -41,17 +53,19 @@ module Ripl
     end
 
     def rewrite_line(append_indents = 0)
-      print TPUT[:sc] +
-            TPUT[:cuu1] +
-            prompt + 
-            @input +
-            config[:auto_indent_space]*append_indents +
-            TPUT[:rc]
+      print_method = defined?(Ripl::ColorStreams) ? :real_write : :write
+      $stdout.send print_method,
+        TPUT[:sc] +
+        TPUT[:cuu1] +
+        prompt + 
+        @input +
+        config[:auto_indent_space]*append_indents +
+        TPUT[:rc]
     end
 
-    def eval_input(input)
+    def loop_eval(input)
       last_indent     = @current_indent
-      @current_indent = get_indent(@buffer ? @buffer + input : input)
+      @current_indent = get_indent(@buffer ? @buffer*"\n" + "\n" + input : input)
 
       if config[:auto_indent_rewrite] && @current_indent < last_indent
         rewrite_line last_indent - @current_indent

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 +01:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 5
-        version: 0.2.5
+        - 6
+        version: 0.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,9 +42,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency