fancy_irb 0.6.4 → 0.6.5

data/CHANGELOG.rdoc

@@ -0,0 +1,5 @@
+== 0.6.5
+* Windows support
+
+== < 0.6.5
+See https://github.com/janlelis/fancy_irb/commits/0.6.4

data/README.rdoc

@@ -70,6 +70,10 @@ You can modify how to get and display the input. The <tt>result_proc</tt> is a p
     end
   }
 
+== FancyIrb on Windows?
+
+You need ansicon[https://github.com/adoxa/ansicon] and everything will be fine :D
+
 == Example configurations
 
 === Default

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/fancy_irb.gemspec

@@ -14,13 +14,15 @@ Gem::Specification.new do |s|
   #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.requirements = ['On Windows, you need ansicon: https://github.com/adoxa/ansicon']
+  s.add_dependency('wirb', '>= 0.2.4')
+  s.add_dependency('unicode-display_width', ">= 0.1.1")
   s.files = [
     "LICENSE",
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "CHANGELOG.rdoc",
     "fancy_irb.gemspec",
     "lib/fancy_irb.rb",
     "lib/fancy_irb/irb_ext.rb"

data/lib/fancy_irb/irb_ext.rb

@@ -8,12 +8,21 @@ end
 
 module IRB
   class Irb
-    TPUT = {
-      :sc   => `tput sc`,
-      :rc   => `tput rc`,
-      :cuu1 => `tput cuu1`,
-      :cuf1 => `tput cuf1`,
-    }
+    if FancyIrb.win?
+      TPUT = {
+        :sc   => "\e[s",
+        :rc   => "\e[u",
+        :cuu1 => "\e[1A",
+        :cuf1 => "\e[1C",
+      }
+    else
+      TPUT = {
+        :sc   => `tput sc`,
+        :rc   => `tput rc`,
+        :cuu1 => `tput cuu1`,
+        :cuf1 => `tput cuf1`,
+      }
+    end
 
     def colorize(string, color)
       if defined?(::Wirb) && color
@@ -49,8 +58,8 @@ module IRB
         last_input               = @scanner.instance_variable_get( :@line )
         last_line_without_prompt = last_input.split("\n").last
         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
+        screen_length = FancyIrb.current_length
+        screen_lines  = FancyIrb.current_lines
         output_length = FancyIrb.real_lengths[:output]
         rocket_length = FancyIrb[:rocket_prompt].size
         stdout_lines  = FancyIrb.get_height
@@ -181,9 +190,6 @@ class << $stdin
   }
 end
 
-# reset everything (e.g. colors) when exiting
-END{
-  print `tput sgr0`
-}
+END{ print "\e[0;0m" } # reset colors when exiting
 
 # J-_-L

data/lib/fancy_irb.rb

@@ -107,7 +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|
-      sum + (line.display_size / `tput cols`.to_i)
+      sum + (line.display_size / current_length)
     }
     @height_counter << lines + long_lines
   end
@@ -125,4 +125,27 @@ class << FancyIrb
       end
     )
   end
+
+  def win?
+    RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+  end
+
+  if FancyIrb.win? 
+    raise LoadError, 'FancyIrb needs ansicon on windows, see https://github.com/adoxa/ansicon' unless ENV['ANSICON']
+    def current_length
+       ENV['ANSICON'][/\((.*)x/, 1].to_i
+    end
+
+    def current_lines
+       ENV['ANSICON'][/\(.*x(.*)\)/, 1].to_i
+    end
+  else
+    def current_length
+     `tput cols`.to_i
+    end
+
+    def current_lines
+     `tput lines`.to_i
+    end
+  end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fancy_irb
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 4
-  version: 0.6.4
+  prerelease: 
+  version: 0.6.5
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        version: 0.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -38,9 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+        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."
@@ -57,6 +49,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- CHANGELOG.rdoc
 - fancy_irb.gemspec
 - lib/fancy_irb.rb
 - lib/fancy_irb/irb_ext.rb
@@ -74,25 +67,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
-requirements: []
-
+requirements: 
+- "On Windows, you need ansicon: https://github.com/adoxa/ansicon"
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: FancyIrb patches your IRB to create a smooth output experience.