fancy_irb 0.6.5 → 0.7.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.7.0
+* Use paint gem for terminal colors
+* Fix some rocket issues (when using with colored content)
+
 == 0.6.5
 * Windows support
 

data/README.rdoc

@@ -6,7 +6,7 @@ FancyIrb patches your IRB to create a smooth output experience.
 * 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.
+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.
 
 This plugin is compatible with other great gems like {hirb}[https://github.com/cldwalker/hirb], {interactive_editor}[https://github.com/jberkel/interactive_editor], etc.
 
@@ -22,12 +22,12 @@ You can pass an options hash. These are the default values:
     :rocket_prompt   => '#=> ', # prompt to use for the rocket
     :result_prompt   => '=> ',  # prompt to use for normal output
     :colorize => {              # colors hash. Set to nil to deactivate colorizing
-      :rocket_prompt => :blue,
-      :result_prompt => :blue,
+      :rocket_prompt => [:blue],
+      :result_prompt => [:blue],
       :input_prompt  => nil,
-      :irb_errors    => :red,
-      :stderr        => :light_red,
-      :stdout        => :dark_gray,
+      :irb_errors    => [:red],
+      :stderr        => [:red, :bright],
+      :stdout        => [:black, :bright],
       :input         => nil,
       :output        => true, # wirb's output colorization
      },
@@ -42,11 +42,10 @@ Rocket mode means: Output result as comment if there is enough space left on the
 === Wrong display widths?
 When using double-width unicode chars, you should set <tt>:east_asian_width</tt> to <tt>true</tt>. It is deactivated because of performance issues.
 
-=== Available colors
-  See <tt>Wirb::COLORS.keys</tt>
-
-=== Modify your output
+=== Customize colors
+  See paint[https://github.com/janlelis/paint]
 
+=== Modify your IRB output
 You can modify how to get and display the input. The <tt>result_proc</tt> is a proc which takes the irb context object and should return the value. You can change it with <tt>FancyIrb.set_result_proc do (your code) end</tt>. After that, each proc in <tt>output_procs</tt> gets triggered. They take the value and can return a modified one. You can use the <tt>FancyIrb.add_output_proc</tt> method for adding new output filter procs.
 
 ===== default_result_proc

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.7.0

data/fancy_irb.gemspec

@@ -3,19 +3,18 @@ require 'rubygems' unless defined? Gem
  
 Gem::Specification.new do |s|
   s.name        = "fancy_irb"
-  s.version     = File.exist?('VERSION') ? File.read('VERSION').chomp : ""
+  s.version     = File.read('VERSION').chomp
   s.authors     = ["Jan Lelis"]
   s.email       = "mail@janlelis.de"
   s.homepage    = "http://github.com/janlelis/fancy_irb"
   s.summary     = "FancyIrb patches your IRB to create a smooth output experience."
-  s.description = "FancyIrb patches your IRB to create a smooth output experience. You can colorize the prompts, irb errors, stderr and stdout. Results can be putted as #=> (rocket). Furthermore, it's possible to apply filter procs to your output value."
+  s.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."
   s.required_rubygems_version = '>= 1.3.6'
   s.required_ruby_version     = '>= 1.8.7'
-  #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"]
   s.license = 'MIT'
   s.requirements = ['On Windows, you need ansicon: https://github.com/adoxa/ansicon']
-  s.add_dependency('wirb', '>= 0.2.4')
+  s.add_dependency('paint', '>= 0.8.1')
   s.add_dependency('unicode-display_width', ">= 0.1.1")
   s.files = [
     "LICENSE",
@@ -27,5 +26,14 @@ Gem::Specification.new do |s|
     "lib/fancy_irb.rb",
     "lib/fancy_irb/irb_ext.rb"
   ]
+
+  len = s.homepage.size
+  s.post_install_message = \
+   ("       ┌── " + "info ".ljust(len-2,'%')              + "─┐\n" +
+    " J-_-L │ "   + s.homepage                            + " │\n" +
+    "       ├── " + "usage ".ljust(len-2,'%')             + "─┤\n" +
+    "       │ "   + "require 'fancy_irb'".ljust(len,' ')  + " │\n" +
+    "       │ "   + "FancyIrb.start".ljust(len,' ')       + " │\n" +
+    "       └─"   + '─'*len                               + "─┘").gsub('%', '─') # 1.8 workaround
 end
 

data/lib/fancy_irb/irb_ext.rb

@@ -25,15 +25,7 @@ module IRB
     end
 
     def colorize(string, color)
-      if defined?(::Wirb) && color
-        ::Wirb.colorize_string string.to_s, color.to_sym
-      else
-      #  if defined? Wirble
-      #    Wirble::Colorize::Color.escape( :nothing ) + string.to_s
-      #  else
-          string.to_s
-      #  end
-      end
+      Paint[string, *Array(color)]
     end
 
     def output_value
@@ -50,7 +42,7 @@ module IRB
         }
 
       # reset color
-      print ::Wirb.get_color( :nothing ) 
+      print Paint::NOTHING
 
       # try to output in rocket mode (depending on rocket_mode setting)
       if FancyIrb[:rocket_mode]
@@ -84,7 +76,7 @@ module IRB
     # colorize prompt & input
     alias prompt_non_fancy prompt
     def prompt(*args, &block)
-      print ::Wirb.get_color(:nothing)
+      print Paint::NOTHING
       prompt = prompt_non_fancy(*args, &block)
 
       # this is kinda hacky... but that's irb °_°
@@ -92,11 +84,10 @@ module IRB
       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 + ::Wirb.get_color( input_color )  # NOTE: No reset, relies on next one
-                                                            # TODO buggy
+        colorized_prompt + Paint.color(*Array(input_color)) # NOTE: No reset, relies on next one
       else
         colorized_prompt
       end
@@ -190,6 +181,6 @@ class << $stdin
   }
 end
 
-END{ print "\e[0;0m" } # reset colors when exiting
+END{ print "\e[0m" } # reset colors when exiting
 
 # J-_-L

data/lib/fancy_irb.rb

@@ -1,8 +1,8 @@
 require 'stringio'
-require 'wirb'
+require 'paint'
 
 module FancyIrb
-  VERSION = ( File.read File.expand_path( '../VERSION', File.dirname(__FILE__)) ).chomp
+  VERSION = ( File.read File.expand_path( '../VERSION', File.dirname(__FILE__)) ).chomp.freeze
 end
 
 class << FancyIrb
@@ -52,13 +52,13 @@ class << FancyIrb
       :rocket_prompt   => '#=> ', # prompt to use for the rocket
       :result_prompt   => '=> ',  # prompt to use for normal output
       :colorize => {              # colors hash. Set to nil to deactivate colorizing
-        :rocket_prompt => :blue,
-        :result_prompt => :blue,
-        :input_prompt  => nil,
-        :irb_errors    => :red,
-        :stderr        => :light_red,
-        :stdout        => :dark_gray,
-        :input         => nil,
+        :rocket_prompt => [:blue],
+        :result_prompt => [:blue],
+        :input_prompt  => :nothing,
+        :irb_errors    => [:red],
+        :stderr        => [:red, :bright],
+        :stdout        => [:black, :bright],
+        :input         => :nothing,
         :output        => true, # wirb's output colorization
        },
       :result_proc     => default_result_proc,       # how to get the output result
@@ -105,8 +105,9 @@ class << FancyIrb
   end
 
   def track_height(data)
-    lines      = data.to_s.count("\n")
-    long_lines = data.to_s.split("\n").inject(0){ |sum, line|
+    data       = Paint.unpaint(data.to_s)
+    lines      = data.count("\n")
+    long_lines = data.split("\n").inject(0){ |sum, line|
       sum + (line.display_size / current_length)
     }
     @height_counter << lines + long_lines
@@ -117,13 +118,7 @@ class << FancyIrb
   end
 
   def write_stream(stream, data, color = nil)
-    stream.write_non_fancy(
-      if defined?(Wirb) && FancyIrb.stdout_colorful && color
-        Wirb.colorize_string data.to_s, color
-      else
-        data.to_s
-      end
-    )
+    stream.write_non_fancy( FancyIrb.stdout_colorful ? Paint[data, *Array(color)] : data.to_s )
   end
 
   def win?

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fancy_irb
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
-  version: 0.6.5
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Jan Lelis
@@ -10,18 +15,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +01:00
-default_executable: 
+date: 2011-07-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: wirb
+  name: paint
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.4
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,10 +41,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
   type: :runtime
   version_requirements: *id002
-description: "FancyIrb patches your IRB to create a smooth output experience. You can colorize the prompts, irb errors, stderr and stdout. Results can be putted as #=> (rocket). Furthermore, it's possible to apply filter procs to your output value."
+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."
 email: mail@janlelis.de
 executables: []
 
@@ -53,11 +67,23 @@ files:
 - fancy_irb.gemspec
 - lib/fancy_irb.rb
 - lib/fancy_irb/irb_ext.rb
-has_rdoc: true
 homepage: http://github.com/janlelis/fancy_irb
 licenses: 
 - MIT
-post_install_message: 
+post_install_message: !binary |
+  ICAgICAgIOKUjOKUgOKUgCBpbmZvIOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU
+  gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKU
+  gOKUgOKUgOKUgOKUgOKUgOKUgOKUgOKUkAogSi1fLUwg4pSCIGh0dHA6Ly9n
+  aXRodWIuY29tL2phbmxlbGlzL2ZhbmN5X2lyYiDilIIKICAgICAgIOKUnOKU
+  gOKUgCB1c2FnZSDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDi
+  lIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDilIDi
+  lIDilIDilIDilKQKICAgICAgIOKUgiByZXF1aXJlICdmYW5jeV9pcmInICAg
+  ICAgICAgICAgICAgICAg4pSCCiAgICAgICDilIIgRmFuY3lJcmIuc3RhcnQg
+  ICAgICAgICAgICAgICAgICAgICAgIOKUggogICAgICAg4pSU4pSA4pSA4pSA
+  4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA
+  4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA4pSA
+  4pSA4pSA4pSA4pSA4pSA4pSY
+
 rdoc_options: []
 
 require_paths: 
@@ -67,17 +93,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: 
 - "On Windows, you need ansicon: https://github.com/adoxa/ansicon"
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: FancyIrb patches your IRB to create a smooth output experience.