terminal_rb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03611bf9c12091c1899cf96f9b4bc8b116e8e6a7a83722cbd8cbfc0fdec0aa50
-  data.tar.gz: 9645a8ee9fb60c745804ac370492d81e8d217bfce58209a5f8a7b1dba4fc9631
+  metadata.gz: f0ee278f7b96ba33953b258b8ca66365bbd3e97ea670488711e8ad42aa3e59b3
+  data.tar.gz: de6c7769a32cf5aef25cf8acd055b1e86a5ac5b80eb36ff71afa83eba057f083
 SHA512:
-  metadata.gz: d665b9b9c43b7a6df18248ae8a1d12ef791de691bc2a4b6bbe44790ee361af781cedbe9dfab020700c4f989f2f3e7126d30560b8a8eadc1d92251a16c5774733
-  data.tar.gz: 1dff9e55da621dd5b86ee3e887b4d234f972198c2123c3be0f4a71ae256b60d15bd89ad19a731a572c757d5372ac0c98d00736481e73a558771f5ec8417ecf17
+  metadata.gz: f7c9198faea2f62bb289f19c3a42c8d271b898b826b1990164bea6eead69b1f78324ec02cc408b3d35a40b915de7e9e59b5d43489971c4ec6222a36a55b4a202
+  data.tar.gz: f61cb0793edf2b27b9455e14df9ee5604c142f72e078cde13655fff055d626d0b3d9566dea2f029954c8b298a1c278af9f6612de4fded640dd1a3c17b7ae2f4d

data/README.md

@@ -19,17 +19,28 @@ Terminal access with support for ANSI control codes and [BBCode-like](https://en
 
 ## Examples
 
-### Check if ANSI is supported
+### Check whether ANSI is supported
 
 ```ruby
 Terminal.ansi?
 # => true when current terminal emulator supports ANSI control codes
 ```
 
-### Print with embedded formatting
+### Print embedded formatting
 
 ```ruby
 Terminal.puts "[red on_bright_yellow bold]Hello World![/]"
+# when terminal supports ANSI
+# => prints  "\e[31;103;1mHello World!\e[m"
+# when terminal does not support ANSI
+# => prints  "Hello World"
+```
+
+### Calculate display width of a string
+
+```ruby
+Terminal::Text.width('ライブラリは中国語、日本語、韓国語のテキストをサポートしています')
+# => 64
 ```
 
 Have a look at the [examples](./examples/) directory to learn from code.
@@ -42,7 +53,7 @@ You can install the gem in your system with
 gem install terminal_rb
 ```
 
-or you can use [Bundler](http://gembundler.com/) to add Terminal to your own project:
+or you can use [Bundler](http://gembundler.com/) to add Terminal.rb to your own project:
 
 ```shell
 bundle add terminal_rb

data/examples/info.rb

@@ -6,10 +6,10 @@ Terminal.puts <<~TEXT
 
   ✅ [b bright_green]Terminal.rb[/b] — Terminal Info:[/]
 
-         Ansi mode: #{Terminal.ansi? ? '✓' : '𐄂'}
-       Application: #{Terminal.application}
-  Supported Colors: #{Terminal.colors}#{' (truecolor)' if Terminal.true_color?}
-     Terminal Size: #{Terminal.size.join(' x ')}
-   Cursor Position: #{Terminal.pos.join(', ')}
+         Ansi mode: #{Terminal.ansi? ? '[b bright_green]✓' : '[b bright_red]𐄂'}[/]
+       Application: [b bright_blue]#{Terminal.application}[/]
+  Supported Colors: [b]#{Terminal.colors}#{Terminal::Ansi.rainbow(' (truecolor)') if Terminal.true_color?}[/]
+     Terminal Size: [b]#{Terminal.size.join(' x ')}[/]
+   Cursor Position: [b]#{Terminal.pos&.join(', ')}[/]
 
 TEXT

data/lib/terminal/detect.rb

@@ -5,31 +5,26 @@ module Terminal
     class << self
       def application
         return :kitty if ENV.key?('KITTY_PID')
+        return :alacritty if ENV.key?('ALACRITTY_WINDOW_ID')
         app_from_term_program || app_from_term
       end
 
       def colors
-        case app_from_term_program
-        when :kitty, :ghostty, :vscode, :iterm
-          16_777_216
+        if KNOW_APP_WITH_TRUE_COLOR.include?(app_from_term_program) ||
+             (ENV['COLORTERM'] == 'truecolor')
+          return 16_777_216
+        end
+        term = ENV['TERM'] or return 8
+        return 16_777_216 if /[+-]direct/.match?(term)
+        match = /[-+](\d+)color/.match(term) and return match[1].to_i
+        match = /[-+](\d+)bit/.match(term) and return 2**match[1].to_i
+        ret = color_by_name[term] and return ret
+        case term
+        when /^(?:iTerm\s?\d*\.app|nsterm-build\d+|terminology(-[0-9.]+)?)$/
+          256
+        when /^(?:dg\+ccc|dgunix\+ccc|d430.*?[-+](?:dg|unix).*?[-+]ccc)$/
+          52
         else
-          term = ENV['TERM'] or return 8
-          return 16_777_216 if /[+-]direct/.match?(term)
-          match = /[-+](\d+)color/.match(term) and return match[1].to_i
-          match = /[-+](\d+)bit/.match(term) and return 2**match[1].to_i
-          ret = color_by_name[term] and return ret
-          if /^(
-            iTerm\s?\d*\.app
-            |nsterm-build\d+
-            |terminology(-[0-9.]+)?
-            )$/x.match?(
-               term
-             )
-            return 256
-          end
-          if /^(dg+ccc|dgunix+ccc|d430.*?[-+](dg|unix).*?[-+]ccc)$/.match?(term)
-            return 52
-          end
           8
         end
       end
@@ -46,6 +41,8 @@ module Terminal
           'Hyper' => :hyper,
           'HyperTerm' => :hyper,
           'iTerm.app' => :iterm,
+          'rio' => :rio,
+          'Tabby' => :tabby,
           'Terminus' => :terminus,
           'tmux' => :tmux,
           'vscode' => :vscode,
@@ -79,6 +76,7 @@ module Terminal
           'wy370' => :wyse,
           'xnuppc' => :xnuppc
         }.each_pair { |str, type| return type if value.start_with?(str) }
+        nil
       end
 
       def color_by_name
@@ -144,6 +142,9 @@ module Terminal
           'dummy' => 2
         }
       end
+
+      KNOW_APP_WITH_TRUE_COLOR = %i[kitty ghostty vscode iterm].freeze
+      private_constant :KNOW_APP_WITH_TRUE_COLOR
     end
   end
 

data/lib/terminal/text.rb

@@ -37,7 +37,14 @@ module Terminal
         width
       end
 
-      # Report each line of the text.
+      # Iterate each line of given text.
+      # It can optionally
+      #
+      # - interprete embedded BBCode
+      # - remove ANSI control codes
+      # - ignore embedded new line
+      # - limit text output width
+      # - report each line's size
       #
       # @param (see Wrap#initialize)
       # @param (see Wrap#each_line)
@@ -110,7 +117,7 @@ module Terminal
         end
       end
 
-      # Report each line of the text.
+      # Iterate each line of given text.
       #
       # @param [#to_i, nil] limit
       #   optionally limit line size

data/lib/terminal/version.rb

@@ -2,5 +2,5 @@
 
 module Terminal
   # The version number of the gem.
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/terminal.rb

@@ -41,6 +41,8 @@ module Terminal
     # - `:ms_terminal`,
     # - `:ncr260`,
     # - `:nsterm`,
+    # - `:rio`,
+    # - `:tabby`,
     # - `:terminator`,
     # - `:terminology`,
     # - `:terminus`,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal_rb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -46,7 +46,7 @@ licenses:
 metadata:
   source_code_uri: https://codeberg.org/mblumtritt/Terminal.rb
   bug_tracker_uri: https://codeberg.org/mblumtritt/Terminal.rb/issues
-  documentation_uri: https://rubydoc.info/gems/terminal_rb
+  documentation_uri: https://rubydoc.info/gems/terminal_rb/Terminal
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: