fancy_irb 0.6.2 → 0.6.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jan Lelis
+Copyright (c) 2010-2011 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

@@ -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 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

@@ -7,13 +7,14 @@ begin
     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+
+* 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

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/fancy_irb.gemspec

@@ -1,36 +1,34 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fancy_irb}
-  s.version = "0.6.2"
+  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{2010-11-10}
+  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+
+* 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"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "fancy_irb.gemspec",
-     "lib/fancy_irb.rb",
-     "lib/fancy_irb/irb_ext.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "fancy_irb.gemspec",
+    "lib/fancy_irb.rb",
+    "lib/fancy_irb/irb_ext.rb"
   ]
   s.homepage = %q{http://github.com/janlelis/fancy_irb}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{FancyIrb patches your IRB to create a smooth output experience.}
@@ -41,11 +39,14 @@ Gem::Specification.new do |s|
 
     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,5 +1,12 @@
 module IRB
   class Irb
+    TPUT = {
+      :sc   => `tput sc`,
+      :rc   => `tput rc`,
+      :cuu1 => `tput cuu1`,
+      :cuf1 => `tput cuf1`,
+    }
+
     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 )
@@ -33,7 +40,7 @@ module IRB
         # get lengths
         last_input               = @scanner.instance_variable_get( :@line )
         last_line_without_prompt = last_input.split("\n").last
-        offset = last_line_without_prompt.size + FancyIrb.real_lengths[:input_prompt] + 1
+        offset = last_line_without_prompt.display_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]
@@ -44,12 +51,12 @@ module IRB
         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
+          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
                 rocket +                   # draw rocket prompt
                 output +                   # draw output
-                `tput rc`                  # return to normal cursor position
+                TPUT[:rc]                  # return to normal cursor position
           return
         end
       end

data/lib/fancy_irb.rb

@@ -1,5 +1,6 @@
 require 'stringio'
 require 'wirble'
+require 'unicode/display_width'
 
 module FancyIrb
   VERSION = ( File.read File.expand_path( '../VERSION', File.dirname(__FILE__)) ).chomp
@@ -106,8 +107,7 @@ class << FancyIrb
   def track_height(data)
     lines      = data.to_s.count("\n")
     long_lines = data.to_s.split("\n").inject(0){ |sum, line|
-      line_size = (RUBY_VERSION[2] == ?8) ? line.unpack('U*').size : line.size
-      sum + (line_size / `tput cols`.to_i)
+      sum + (line.display_size / `tput cols`.to_i)
     }
     @height_counter << lines + long_lines
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fancy_irb
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Jan Lelis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2011-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,23 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: unicode-display_width
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    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+
+  * 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
 email: mail@janlelis.de
@@ -46,7 +60,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -59,8 +72,8 @@ homepage: http://github.com/janlelis/fancy_irb
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,4 +0,0 @@
-*.swp
-*~
-doc
-pkg