fancy_irb 0.7.2 → 0.7.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.7.3
+* Don't colorize stdout by default
+* Deactivate rocket for common system commands
+
 == 0.7.2
 * Fix a small bug that happens if there was no last line
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Jan Lelis
+Copyright (c) 2010-2012 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -2,13 +2,13 @@ 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 evaluation results as Ruby comments
-* Enhance your output value using procs
+* Output evaluation results as Ruby comments (hash rocket)
+* Filter your output value using procs
 
 == Motivation
-I really like the {irb_rocket}[https://github.com/genki/irb_rocket] gem, which outputs Ruby results as hash rocket 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.
+I really like the {irb_rocket}[https://github.com/genki/irb_rocket] gem, which outputs Ruby results using a hash rocket 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.
 
-This plugin is compatible with other great gems like {hirb}[https://github.com/cldwalker/hirb], {interactive_editor}[https://github.com/jberkel/interactive_editor], etc.
+This rubygem is compatible with other great irb gems like {hirb}[https://github.com/cldwalker/hirb], {interactive_editor}[https://github.com/jberkel/interactive_editor], etc.
 
 == Usage
 
@@ -27,7 +27,7 @@ You can pass an options hash. These are the default values:
       :input_prompt  => nil,
       :irb_errors    => [:red],
       :stderr        => [:red, :bright],
-      :stdout        => [:black, :bright],
+      :stdout        => nil,
       :input         => nil,
       :output        => true, # wirb's output colorization
      },
@@ -105,12 +105,10 @@ You need ansicon[https://github.com/adoxa/ansicon] and everything will be fine :
 * Count string lengths without ansi escape sequences (would be more flexible than remembering)
 * "Always rocket"-mode
 
-Feel free to fix a bug or implement a todo ;)
-
 == Copyright / Credits
 
 Inspired by the irb_rocket gem from genki.
 
-Copyright (c) 2010-2011 Jan Lelis <http://rbjl.net> released under the MIT license.
+Copyright (c) 2010-2012 Jan Lelis <http://rbjl.net> released under the MIT license.
 
 J-_-L

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/fancy_irb.rb

@@ -2,12 +2,12 @@ require 'stringio'
 require 'paint'
 
 module FancyIrb
-  VERSION = ( File.read File.expand_path( '../VERSION', File.dirname(__FILE__)) ).chomp.freeze
+  VERSION = File.read( File.dirname(__FILE__) + '/../VERSION' ).chomp
 end
 
 class << FancyIrb
   # setup instance variable accessors
-  attr_reader :options
+  attr_accessor :options
   def [](key, key2 = nil)
     if key2
       @options[key][key2]
@@ -21,13 +21,15 @@ class << FancyIrb
   attr_accessor :real_lengths
   attr_accessor :continue
   attr_accessor :stdout_colorful
+  attr_accessor :skip_next_rocket
 
   def start(user_options = {})
     # track some irb stuff
-    @height_counter  = []
-    @real_lengths    = { :output => 1, :input_prompt => 9999 } # or whatever
-    @stdout_colorful = false
-    @continue        = false
+    @height_counter   = []
+    @real_lengths     = { :output => 1, :input_prompt => 9999 } # or whatever
+    @stdout_colorful  = false
+    @continue         = false
+    @skip_next_rocket = false
 
     # set defaults and parse user options
     default_result_proc = proc{ |context|
@@ -57,7 +59,7 @@ class << FancyIrb
         :input_prompt  => nil,
         :irb_errors    => [:red],
         :stderr        => [:red, :bright],
-        :stdout        => [:black, :bright],
+        :stdout        => nil,
         :input         => nil,
         :output        => true, # wirb's output colorization
        },
@@ -87,8 +89,7 @@ class << FancyIrb
 
     # hook code into IRB
     require 'fancy_irb/irb_ext'
-
-    "Enjoy your FancyIrb :)"
+    true
   end
 
   def add_output_proc(prepend = false, &proc)

data/lib/fancy_irb/irb_ext.rb

@@ -45,7 +45,7 @@ module IRB
       print Paint::NOTHING
 
       # try to output in rocket mode (depending on rocket_mode setting)
-      if FancyIrb[:rocket_mode]
+      if FancyIrb[:rocket_mode] && !FancyIrb.skip_next_rocket
         # get lengths
         last_input               = @scanner.instance_variable_get( :@line )
         last_line_without_prompt = last_input.split("\n").last
@@ -60,8 +60,7 @@ module IRB
         stdout_lines  = FancyIrb.get_height
 
         # auto rocket mode
-        if FancyIrb[:rocket_mode] &&
-            screen_length > offset + rocket_length + output_length &&
+        if  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
@@ -73,6 +72,7 @@ module IRB
         end
       end
       # normal output mode
+      FancyIrb.skip_next_rocket = false
       puts no_rocket + output
     end
 
@@ -155,6 +155,13 @@ class << $stderr
   end
 end
 
+# deactivate rocket for common system commands
+%w[system spawn].each{ |m|
+  Object.send(:define_method, m.to_sym, &lambda{ |*args, &block|
+    FancyIrb.skip_next_rocket = true
+    super(*args, &block)
+  })
+}
 
 # patch some input methods to track height
 alias gets_non_fancy gets

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fancy_irb
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
-  requirement: &21083360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *21083360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
-  requirement: &21081220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21081220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: ! 'FancyIrb patches your IRB to create a smooth output experience. You
   can colorize the prompts, irb errors, stderr and stdout, output your result as #=>
   (hash rockets) and some other improvements.'
@@ -76,8 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ! 'On Windows, you need ansicon: https://github.com/adoxa/ansicon'
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: FancyIrb patches your IRB to create a smooth output experience.
 test_files: []
+has_rdoc: