fancy_irb 0.6.3 → 0.6.4

data/README.rdoc

@@ -29,19 +29,21 @@ You can pass an options hash. These are the default values:
       :stderr        => :light_red,
       :stdout        => :dark_gray,
       :input         => nil,
-      :output        => true, # wirble's output colorization
+      :output        => true, # wirb's output colorization
      },
     :result_proc     => default_result_proc,       # how to get the output result (see below)
     :output_procs    => [default_colorizer_proc],  # you can modify/enhance/log your output
+    :east_asian_width => false, # set to true if you have double-width characters (slower)
   }
 
 === Rocket mode
-
 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.
 
+=== 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
-  >> Wirble::Colorize::Color::COLORS.keys
-  => [:light_purple, :yellow, :light_gray, :white, :black, :dark_gray, :red, :green, :light_green, :brown, :light_blue, :light_red, :cyan, :blue, :light_cyan, :purple, :nothing]
+  See <tt>Wirb::COLORS.keys</tt>
 
 === Modify your output
 
@@ -61,8 +63,8 @@ You can modify how to get and display the input. The <tt>result_proc</tt> is a p
 
   default_colorizer_proc = proc{ |value|
     FancyIrb.real_lengths[:output] =    value.size
-    if defined?(Wirble) && FancyIrb[:colorize, :output]
-      Wirble::Colorize.colorize value
+    if defined?(Wirb) && FancyIrb[:colorize, :output]
+      Wirb.colorize_result value
     else
       value 
     end
@@ -82,7 +84,7 @@ You can modify how to get and display the input. The <tt>result_proc</tt> is a p
                  :colorize      => { :output => false,
                                      :result_prompt => :yellow },
                  :result_proc   => proc{ |context|
-                                    context.last_value.awesome_inspect
+                                     context.last_value.awesome_inspect
                                    }
 
 === Smileyfy output
@@ -99,8 +101,6 @@ You can modify how to get and display the input. The <tt>result_proc</tt> is a p
 === Features, maybe
 * Count string lengths without ansi escape sequences (would be more flexible than remembering)
 * "Always rocket"-mode
-* Allow custom ansi escape strings instead of wirble's colors
-* Refactor some code duplications
 
 Feel free to fix a bug or implement a todo ;)
 
@@ -108,6 +108,6 @@ Feel free to fix a bug or implement a todo ;)
 
 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-2011 Jan Lelis <http://rbjl.net> released under the MIT license.
 
 J-_-L

data/Rakefile

@@ -1,26 +1,35 @@
 require 'rubygems'
 require 'rake'
+require 'rake/rdoctask'
+require 'fileutils'
+
+def gemspec
+  @gemspec ||= eval(File.read('fancy_irb.gemspec'), binding, 'fancy_irb.gemspec')
+end
+
+desc "Build the gem"
+task :gem => :gemspec do
+  sh "gem build fancy_irb.gemspec"
+  FileUtils.mkdir_p 'pkg'
+  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "fancy_irb"
-    gem.summary = %q{FancyIrb patches your IRB to create a smooth output experience.}
-    gem.description = %q{FancyIrb patches your IRB to create a smooth output experience.
-* Use fancy colors! You can colorize the prompts, irb errors, stderr and stdout
-* Output results as Ruby comment #=> (rocket)
-* Enhance your output value, using procs}
-    gem.email = "mail@janlelis.de"
-    gem.homepage = "http://github.com/janlelis/fancy_irb"
-    gem.authors = ["Jan Lelis"]
-    gem.add_dependency 'wirble'
-    gem.add_dependency 'unicode-display_width'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+desc "Install the gem locally (without docs)"
+task :install => :gem do
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version} --no-rdoc --no-ri}
 end
 
+desc "Generate the gemspec"
+task :generate do
+  puts gemspec.to_ruby
+end
+
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
+
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION').chomp : ""

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/fancy_irb.gemspec

@@ -1,24 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-
+require 'rubygems' unless defined? Gem
+ 
 Gem::Specification.new do |s|
-  s.name = %q{fancy_irb}
-  s.version = "0.6.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jan Lelis"]
-  s.date = %q{2011-01-03}
-  s.description = %q{FancyIrb patches your IRB to create a smooth output experience.
-* Use fancy colors! You can colorize the prompts, irb errors, stderr and stdout
-* Output results as Ruby comment #=> (rocket)
-* Enhance your output value, using procs}
-  s.email = %q{mail@janlelis.de}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
+  s.name        = "fancy_irb"
+  s.version     = File.exist?('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.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.add_dependency('wirb', '>= 0')
+  s.add_dependency('unicode-display_width', ">= 0")
   s.files = [
     "LICENSE",
     "README.rdoc",
@@ -28,25 +25,5 @@ Gem::Specification.new do |s|
     "lib/fancy_irb.rb",
     "lib/fancy_irb/irb_ext.rb"
   ]
-  s.homepage = %q{http://github.com/janlelis/fancy_irb}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{FancyIrb patches your IRB to create a smooth output experience.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<wirble>, [">= 0"])
-      s.add_runtime_dependency(%q<unicode-display_width>, [">= 0"])
-    else
-      s.add_dependency(%q<wirble>, [">= 0"])
-      s.add_dependency(%q<unicode-display_width>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<wirble>, [">= 0"])
-    s.add_dependency(%q<unicode-display_width>, [">= 0"])
-  end
 end
 

data/lib/fancy_irb/irb_ext.rb

@@ -1,3 +1,11 @@
+if FancyIrb[:east_asian_width]
+  require 'unicode/display_size'
+else
+  class String
+    alias display_size size
+  end
+end
+
 module IRB
   class Irb
     TPUT = {
@@ -8,8 +16,8 @@ module IRB
     }
 
     def colorize(string, color)
-      if defined?(Wirble) && color && color_string = Wirble::Colorize::Color.escape( color.to_sym )
-        color_string + string.to_s + Wirble::Colorize::Color.escape( :nothing )
+      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
@@ -33,7 +41,7 @@ module IRB
         }
 
       # reset color
-      print Wirble::Colorize::Color.escape( :nothing ) 
+      print ::Wirb.get_color( :nothing ) 
 
       # try to output in rocket mode (depending on rocket_mode setting)
       if FancyIrb[:rocket_mode]
@@ -67,7 +75,7 @@ module IRB
     # colorize prompt & input
     alias prompt_non_fancy prompt
     def prompt(*args, &block)
-      print Wirble::Colorize::Color.escape(:nothing)
+      print ::Wirb.get_color(:nothing)
       prompt = prompt_non_fancy(*args, &block)
 
       # this is kinda hacky... but that's irb °_°
@@ -78,8 +86,8 @@ module IRB
       
       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
-                                                                          # TODO buggy
+        colorized_prompt + ::Wirb.get_color( input_color )  # NOTE: No reset, relies on next one
+                                                            # TODO buggy
       else
         colorized_prompt
       end
@@ -177,3 +185,5 @@ end
 END{
   print `tput sgr0`
 }
+
+# J-_-L

data/lib/fancy_irb.rb

@@ -1,6 +1,5 @@
 require 'stringio'
-require 'wirble'
-require 'unicode/display_width'
+require 'wirb'
 
 module FancyIrb
   VERSION = ( File.read File.expand_path( '../VERSION', File.dirname(__FILE__)) ).chomp
@@ -41,8 +40,8 @@ class << FancyIrb
 
     default_colorizer_proc = proc{ |value|
       FancyIrb.real_lengths[:output] =    value.size
-      if defined?(Wirble) && FancyIrb[:colorize, :output]
-        Wirble::Colorize.colorize value
+      if defined?(Wirb) && FancyIrb[:colorize, :output]
+        Wirb.colorize_result value
       else
         value 
       end
@@ -60,10 +59,11 @@ class << FancyIrb
         :stderr        => :light_red,
         :stdout        => :dark_gray,
         :input         => nil,
-        :output        => true, # wirble's output colorization
+        :output        => true, # wirb's output colorization
        },
       :result_proc     => default_result_proc,       # how to get the output result
       :output_procs    => [default_colorizer_proc],  # you can modify/enhance/log your output
+      :east_asian_width => false, # set to true if you have double-width characters (slower)
     }
 
     @options = default_options
@@ -118,8 +118,8 @@ class << FancyIrb
 
   def write_stream(stream, data, color = nil)
     stream.write_non_fancy(
-      if defined?(Wirble) && FancyIrb.stdout_colorful && color
-        Wirble::Colorize::Color.escape( color ) + data.to_s + Wirble::Colorize::Color.escape(:nothing)
+      if defined?(Wirb) && FancyIrb.stdout_colorful && color
+        Wirb.colorize_string data.to_s, color
       else
         data.to_s
       end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fancy_irb
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,18 +14,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: wirble
+  name: wirb
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,25 +38,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: |-
-  FancyIrb patches your IRB to create a smooth output experience.
-  * Use fancy colors! You can colorize the prompts, irb errors, stderr and stdout
-  * Output results as Ruby comment #=> (rocket)
-  * Enhance your output value, using procs
+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."
 email: mail@janlelis.de
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
+- LICENSE
 files: 
 - LICENSE
 - README.rdoc
@@ -69,8 +62,8 @@ files:
 - lib/fancy_irb/irb_ext.rb
 has_rdoc: true
 homepage: http://github.com/janlelis/fancy_irb
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -81,19 +74,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: