fancy_irb 0.6.0 → 0.6.1

data/{README → README.rdoc}

@@ -2,8 +2,8 @@ FancyIrb patches your IRB to create a smooth output experience.
 
 == Features
 * Use fancy colors! You can colorize the prompts, irb errors, +stderr+ and +stdout+
-* Output results as Ruby comment
-* Enhance your output value, using procs
+* Output evaluation results as Ruby comments
+* Enhance your output value using procs
 
 == Motivation
 I really like the {irb_rocket}[https://github.com/genki/irb_rocket] gem, which outputs the evaluation result as comment and colorizes errors. Unfortunately, the implementation leads to bugs, because it tries to run the whole command before printing anything to +stdout+. For this reason, I've rewritten (and extended) it.
@@ -37,7 +37,7 @@ You can pass an options hash. These are the default values:
 
 === Rocket mode
 
-Rocket mode means: Output result as comment if there is enough space left on the terminal line.
+Rocket mode means: Output result as comment if there is enough space left on the terminal line and +stdout+ does not output more than the current terminal height.
 
 === Available colors
   >> Wirble::Colorize::Color::COLORS.keys
@@ -93,14 +93,13 @@ You can modify how to get and display the input. The <tt>result_proc</tt> is a p
 
 == TODO
 === Known bugs
-* If stdout of the current command scrolls, the rocket is displayed not higher than the first terminal line
 * Something is wrong with input-newline when colorizing input
 * Not all input methods are patched properly (to work with the rocket) --> focusing on the often used ones
 
 === Features, maybe
 * Count string lengths without ansi escape sequences (would be more flexible than remembering)
 * "Always rocket"-mode
-* Allow custom ansi escape strings
+* Allow custom ansi escape strings instead of wirble's colors
 * Refactor some code duplications
 
 Feel free to fix a bug or implement a todo ;)

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/fancy_irb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fancy_irb}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jan Lelis"]
@@ -17,12 +17,12 @@ Gem::Specification.new do |s|
   s.email = %q{mail@janlelis.de}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README"
+     "README.rdoc"
   ]
   s.files = [
     ".gitignore",
      "LICENSE",
-     "README",
+     "README.rdoc",
      "Rakefile",
      "VERSION",
      "fancy_irb.gemspec",

data/lib/fancy_irb.rb

@@ -19,13 +19,15 @@ class << FancyIrb
   attr_accessor :original_stdout
   attr_accessor :capture_irb_errors
   attr_accessor :real_lengths
+  attr_accessor :continue
   attr_accessor :stdout_colorful
 
   def start(user_options = {})
     # track some irb stuff
-    @height_counter = []
-    @real_lengths = { :output => 1, :input_prompt => 9999 } # or whatever
+    @height_counter  = []
+    @real_lengths    = { :output => 1, :input_prompt => 9999 } # or whatever
     @stdout_colorful = false
+    @continue        = false
 
     # set defaults and parse user options
     default_result_proc = proc{ |context|

data/lib/fancy_irb/irb_ext.rb

@@ -35,12 +35,15 @@ module IRB
         last_line_without_prompt = last_input.split("\n").last
         offset = last_line_without_prompt.size + FancyIrb.real_lengths[:input_prompt] + 1
         screen_length = `tput cols`.to_i
+        screen_lines = `tput lines`.to_i
         output_length = FancyIrb.real_lengths[:output]
         rocket_length = FancyIrb[:rocket_prompt].size
         stdout_lines  = FancyIrb.get_height
 
         # auto rocket mode
-        if FancyIrb[:rocket_mode] && screen_length > offset + rocket_length + output_length
+        if FancyIrb[:rocket_mode] &&
+            screen_length > offset + rocket_length + output_length &&
+            stdout_lines < screen_lines
           print `tput sc` +                # save current cursor position
                 `tput cuu1`*stdout_lines + # move cursor upwards    to the original input line
                 `tput cuf1`*offset +       # move cursor rightwards to the original input offset
@@ -58,9 +61,14 @@ module IRB
     alias prompt_non_fancy prompt
     def prompt(*args, &block)
       print Wirble::Colorize::Color.escape(:nothing)
-
       prompt = prompt_non_fancy(*args, &block)
-      FancyIrb.real_lengths[:input_prompt] = prompt.size
+
+      # this is kinda hacky... but that's irb °_°
+      indents = @scanner.indent*2
+      FancyIrb.continue = true if args[0] == IRB.conf[:PROMPT][IRB.conf[:PROMPT_MODE]][:PROMPT_C]
+      indents += 2 if FancyIrb.continue
+      FancyIrb.real_lengths[:input_prompt] = prompt.size + indents
+      
       colorized_prompt = colorize prompt, FancyIrb[:colorize, :input_prompt]
       if input_color = FancyIrb[:colorize, :input]
         colorized_prompt + Wirble::Colorize::Color.escape( input_color )  # NOTE: No reset, relies on next one
@@ -73,6 +81,7 @@ module IRB
     # track height and capture irb errors (part 2)
     alias signal_status_non_fancy signal_status
     def signal_status(name, *args, &block)
+      FancyIrb.continue = false
       FancyIrb.reset_height
       signal_status_non_fancy(name, *args, &block)
     ensure

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fancy_irb
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -42,11 +44,11 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
+- README.rdoc
 files: 
 - .gitignore
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
 - VERSION
 - fancy_irb.gemspec
@@ -66,6 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -74,6 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"