fancy_irb 1.0.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6bd897b79b18d01f373c1559c2c7a12ca14f2164
-  data.tar.gz: 7bc42840677843d4e61769c7ddec3b14c6d3cfc3
+SHA256:
+  metadata.gz: a4f69cefc38fcb5d225c8afe57c4cbed73e2e1411c15806ed2df4f88947fa072
+  data.tar.gz: 1f3e2bf8dd492c48eb6e3a4b1ffd45be1f96e6f461bc6286b57c16d8b7de3ee1
 SHA512:
-  metadata.gz: 7444265dffbf53f820b5caad81c56514e646fab9c8d4b0a6e0e29c6d2a0aa2b85a07850ef6722b9827bc9a92e88e2b43c605c04d6f1e640d9b5909b034aaffc5
-  data.tar.gz: 8d6e1c0c873fa84072672be1a7eede62da62742482427673f588f657395d84d8a2c95dca0fc92096e0b272b07f7363f62b001bef2edc4c08a30a9b2534953ecf
+  metadata.gz: 60b03c1900ff6002a77e965d35eba6b1575d058c8e72efc3dc0272dca17929fb201fbae2e8a460c2059c85b2b602a9ff0a163b17610808fe51576617a6832abe
+  data.tar.gz: 22a9d9ffb6a8b8c0516be6fcd9ff038a0b84bb5319d6e0e6c4cdab059395f116926b09877e02de90759b8dbcfa0565f5717d774c8f95c15e12e1108416634a0f

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 1.4.0
+* Full support for non-ttys
+
+## 1.3.0
+* Use `script` wrapper on linux in case we are not on a tty
+
+## 1.2.1
+* Fix 2.7 keyword warning
+
+## 1.2.0
+* Read indentation level directly so it won't fail on newer Rubies
+
+## 1.1.0
+* Rename `east_asian_width` option to `unicode_display_width` and activate by default
+* Relax paint dependency
+
 ## 1.0.2
 * Bump unicode-display_width to 1.0
 
@@ -12,15 +28,12 @@
 * Recognize multi-line regexes
 * Improve size detector (-> less wrongly placed rockets)
 
-
 ## 0.8.2
 * Support objects that don't support #inspect
 
-
 ## 0.8.1
 * Use io/console correctly, fixes bug on mingw
 
-
 ## 0.8.0
 * Internals partly refactored
 * Bump paint and unicode-display_width dependencies
@@ -32,28 +45,22 @@
 * Not patching Kernel anymore
 * Only path String if east_asian_width option is used
 
-
 ## 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
 
-
 ## 0.7.1
 * Deactivate buggy input coloring :/
 
-
 ## 0.7.0
 * Use paint gem for terminal colors
 * Fix some rocket issues (when using with colored content)
 
-
 ## 0.6.5
 * Windows support
 
-
 ## < 0.6.5
 See https://github.com/janlelis/fancy_irb/commits/0.6.4

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012, 2015-2016 Jan Lelis
+Copyright (c) 2010-2012, 2015-2020 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.md

@@ -1,9 +1,8 @@
-# FancyIrb [![version](https://badge.fury.io/rb/fancy_irb.svg)](http://badge.fury.io/rb/fancy_irb)
+# FancyIrb [![version](https://badge.fury.io/rb/fancy_irb.svg)](https://badge.fury.io/rb/fancy_irb)  [![[ci]](https://github.com/janlelis/fancy_irb/workflows/Test/badge.svg)](https://github.com/janlelis/fancy_irb/actions?query=workflow%3ATest)
 
 *   Colorizes IRB prompts, errors, `$stderr` and `$stdout`
 *   Uses "Hash Rockets" (# =>) to display IRB results
 
-
 ## Usage
 
     require 'fancy_irb'
@@ -12,11 +11,12 @@
 You can pass an options hash. These are the default values:
 
     DEFAULT_OPTIONS = {
-      :rocket_mode     => true,   # activate or deactivate #=> rocket
-      :rocket_prompt   => '#=> ', # prompt to use for the rocket
-      :result_prompt   => '=> ',  # prompt to use for normal output
-      :east_asian_width => false, # set to true if you have double-width characters (slower)
-      :colorize => {              # colors hash. Set to nil to deactivate colors
+      :rocket_mode     => true,       # activate or deactivate #=> rocket
+      :rocket_prompt   => '#=> ',     # prompt to use for the rocket
+      :result_prompt   => '=> ',      # prompt to use for normal output
+      :unicode_display_width => true, # set to false if you don't want to check for proper
+                                      # string width for better performance
+      :colorize => {                  # colors hash. Set to nil to deactivate colors
         :rocket_prompt => [:blue],
         :result_prompt => [:blue],
         :input_prompt  => nil,
@@ -31,25 +31,23 @@ 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.
 
-For more information on which colors can be used, see the [paint
-documentation](https://github.com/janlelis/paint).
-
+For more information on which colors can be used, see the [paint documentation](https://github.com/janlelis/paint).
 
 ## Troubleshooting
 ### Windows Support
 You will need [ansicon](https://github.com/adoxa/ansicon) or [ConEmu](https://code.google.com/p/conemu-maximus5/).
 
-### Wrong display widths?
-When using double-width unicode chars, you should set `:east_asian_width` to
-`true`. It is not activated by default, because of its performance impact.
+### Need More Performance?
+The gem checks for the Unicode display width of characters, which requires a
+lookup of every character. You can deactivate this check by setting
+ `:unicode_display_width` to `false`.
 
-### Known bugs
+### Known Bugs
 Not all stdin methods are patched properly to work with the rocket: The gems
 focuses on the often used ones
 
-
 ## J-_-L
 Inspired by the irb_rocket gem by genki.
 
-Copyright (c) 2010-2012, 2015 Jan Lelis <http://janlelis.com> released under
+Copyright (c) 2010-2012, 2015-2020 Jan Lelis <https://janlelis.com> released under
 the MIT license.

data/Rakefile

@@ -15,7 +15,7 @@ end
 
 desc "Install the gem locally (without docs)"
 task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-rdoc --no-ri --local}
+  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-doc --local}
 end
 
 desc "Generate the gemspec"

data/fancy_irb.gemspec

@@ -6,15 +6,15 @@ Gem::Specification.new do |s|
   s.name        = "fancy_irb"
   s.version     = FancyIrb::VERSION
   s.authors     = ["Jan Lelis"]
-  s.email       = "mail@janlelis.de"
-  s.homepage    = "http://github.com/janlelis/fancy_irb"
-  s.summary     = "FancyIrb makes IRB friendly."
-  s.description = "FancyIrb makes IRB # => friendly."
+  s.email       = ["hi@ruby.consulting"]
+  s.homepage    = "https://github.com/janlelis/fancy_irb"
+  s.summary     = "FancyIrb makes IRB # => friendly."
+  s.description = "A fancy IRB has a colorful input prompt and profiles rocket-style #=> return values"
   s.required_ruby_version = '>= 1.9.3'
   s.license = 'MIT'
   s.requirements = ['Windows: ansicon <https://github.com/adoxa/ansicon>']
-  s.add_dependency 'paint', '>= 0.9', '< 2.0'
-  s.add_dependency 'unicode-display_width', "~> 1.0"
+  s.add_dependency 'paint', '>= 0.9', '< 3.0'
+  s.add_dependency 'unicode-display_width', "~> 1.1"
   s.add_development_dependency 'rspec', "~> 3.2"
   s.add_development_dependency 'rake', "~> 10.4"
   s.files = [
@@ -37,4 +37,3 @@ Gem::Specification.new do |s|
     "spec/fixtures.rb",
   ]
 end
-

data/lib/fancy_irb.rb

@@ -2,6 +2,7 @@ require_relative 'fancy_irb/version'
 
 require 'stringio'
 require 'paint'
+require 'unicode/display_width'
 
 require_relative 'fancy_irb/terminal_info'
 require_relative 'fancy_irb/size_detector'
@@ -10,11 +11,12 @@ require_relative 'fancy_irb/implementation'
 
 module FancyIrb
   DEFAULT_OPTIONS = {
-    :rocket_mode     => true,   # activate or deactivate #=> rocket output
-    :rocket_prompt   => '#=> ', # prompt to use for the rocket
-    :result_prompt   => '=> ',  # prompt to use for normal output
-    :east_asian_width => false, # set to true if you have double-width characters (slower)
-    :colorize => {              # colors hash. Set to nil to deactivate colors
+    :rocket_mode     => true,       # activate or deactivate #=> rocket output
+    :rocket_prompt   => '#=> ',     # prompt to use for the rocket
+    :result_prompt   => '=> ',      # prompt to use for normal output
+    :unicode_display_width => true, # set to false if you don't want to check for proper
+                                    # string width for better performance
+    :colorize => {                  # colors hash. Set to nil to deactivate colors
       :rocket_prompt => [:blue],
       :result_prompt => [:blue],
       :input_prompt  => nil,

data/lib/fancy_irb/implementation.rb

@@ -17,7 +17,6 @@ module FancyIrb
 
     # hook into IRB
     def extend!
-      require 'unicode/display_width' if @options[:east_asian_width]
       require_relative 'irb_ext'
       require_relative 'core_ext'
       require_relative 'clean_up'
@@ -51,9 +50,10 @@ module FancyIrb
       }
     end
 
-    def east_asian_width?
-      @options[:east_asian_width]
+    def unicode_display_width?
+      @options[:unicode_display_width] || @options[:east_asian_width]
     end
+    alias east_asian_width? unicode_display_width?
 
     def reset_line!
       @tracked_height = 0

data/lib/fancy_irb/irb_ext.rb

@@ -8,7 +8,7 @@ module IRB
     def prompt(*args, &block)
       FancyIrb.handle_prompt(
         prompt_non_fancy(*args, &block),
-        IRB.conf[:AUTO_INDENT] ? @scanner.indent * 2 : 0,
+        IRB.conf[:AUTO_INDENT] ? @scanner.instance_variable_get(:@indent) * 2 : 0,
         IRB.conf[:AUTO_INDENT] && IRB.conf[:PROMPT][IRB.conf[:PROMPT_MODE]][:PROMPT_C] == args[0]
       )
     end
@@ -27,8 +27,8 @@ module IRB
   class Context
     alias evaluate_non_fancy evaluate
 
-    def evaluate(*args)
-      evaluate_non_fancy(*args)
+    def evaluate(*args, **kwargs)
+      evaluate_non_fancy(*args, **kwargs)
     rescue Exception
       FancyIrb.register_error_capturer!
       raise

data/lib/fancy_irb/size_detector.rb

@@ -5,7 +5,7 @@ module FancyIrb
     def width_of(data)
       return 0 unless data
       data = Paint.unpaint data.to_s
-      FancyIrb.east_asian_width? ? data.display_width : data.size
+      FancyIrb.unicode_display_width? ? Unicode::DisplayWidth.of(data) : data.length
     end
 
     def height_of(data, width)

data/lib/fancy_irb/terminal_info.rb

@@ -4,25 +4,45 @@ module FancyIrb
   module TerminalInfo
     def self.lines
       STDOUT.winsize[0]
+    rescue Errno::ENOTTY
+      ENV['LINES'] || ENV['ROWS'] || 25
     end
 
     def self.cols
       STDOUT.winsize[1]
+    rescue Errno::ENOTTY
+      ENV['COLUMNS'] || 80
     end
 
-    if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+    begin
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+        TPUT = {
+          :sc   => "\e[s",
+          :rc   => "\e[u",
+          :cuu1 => "\e[1A",
+          :cuf1 => "\e[1C",
+        }
+      elsif RbConfig::CONFIG['host_os'] =~ /linux/
+        TPUT = {
+          :sc   => `script -q -e -t /dev/null -c 'tput sc'`,
+          :rc   => `script -q -e -t /dev/null -c 'tput rc'`,
+          :cuu1 => `script -q -e -t /dev/null -c 'tput cuu1'`,
+          :cuf1 => `script -q -e -t /dev/null -c 'tput cuf1'`,
+        }
+      else
+        TPUT = {
+          :sc   => `tput sc`,
+          :rc   => `tput rc`,
+          :cuu1 => `tput cuu1`,
+          :cuf1 => `tput cuf1`,
+        }
+      end
+    rescue Errno::ENOTTY
       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`,
+        :sc   => "\e7",
+        :rc   => "\e8",
+        :cuu1 => "\e[A",
+        :cuf1 => "\e[C",
       }
     end
   end

data/lib/fancy_irb/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FancyIrb
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.4.0'
 end

data/spec/size_detector_spec.rb

@@ -5,10 +5,9 @@ describe FancyIrb::SizeDetector do
   include FancyIrb::SizeDetector
 
   before do
-    FancyIrb.instance_variable_set(:@options, {east_asian_width: false})
+    FancyIrb.instance_variable_set(:@options, { unicode_display_width: true })
   end
 
-
   describe ".width_of" do
     it "returns 0 when no data given" do
       expect( width_of(nil) ).to eq 0
@@ -22,18 +21,17 @@ describe FancyIrb::SizeDetector do
       expect( width_of("\e[31mstring\e[0m") ).to eq 6
     end
 
-    it "does not respect double-width chars by default" do
-      expect( width_of('一') ).to eq 1
+    it "respects double-width chars by default" do
+      expect( width_of('一') ).to eq 2
     end
 
-    context "east_asian_width? true" do
+    context "unicode_display_width? false" do
       before do
-        require 'unicode/display_width'
-        FancyIrb.instance_variable_set(:@options, {east_asian_width: true})
+        FancyIrb.instance_variable_set(:@options, { unicode_display_width: false })
       end
 
-      it "respects double-width chars" do
-        expect( width_of('一') ).to eq 2
+      it "does not respect double-width chars" do
+        expect( width_of('一') ).to eq 1
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fancy_irb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -19,7 +19,7 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '0.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,8 +72,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.4'
-description: 'FancyIrb makes IRB # => friendly.'
-email: mail@janlelis.de
+description: 'A fancy IRB has a colorful input prompt and profiles rocket-style #=>
+  return values'
+email:
+- hi@ruby.consulting
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -95,7 +97,7 @@ files:
 - lib/fancy_irb/version.rb
 - spec/fixtures.rb
 - spec/size_detector_spec.rb
-homepage: http://github.com/janlelis/fancy_irb
+homepage: https://github.com/janlelis/fancy_irb
 licenses:
 - MIT
 metadata: {}
@@ -115,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - 'Windows: ansicon <https://github.com/adoxa/ansicon>'
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: FancyIrb makes IRB friendly.
+summary: 'FancyIrb makes IRB # => friendly.'
 test_files: []