ruby_rich 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af37dc09091efdc06215f083a176d91ce1b9ecf240ba22f4471b739b9eaeb890
-  data.tar.gz: 57e7a9e0378b20353b94d9f815d9c96e1865f96128257857921c80e5f7a31fb9
+  metadata.gz: 22f7fb9cb3aa52b99809ca646ca234aa1f098967a8cfd13caddb49d71b3e455a
+  data.tar.gz: adbd0feae9e0a6bb2f4b631b390a1a067b6426ab99fb94ce19c4f0b3923c55e3
 SHA512:
-  metadata.gz: 440203e48f904f11270482a9e80f9edb28787e64302d6d6dcf8527eaee2ec57028303e8d8a331b6bfe2ce45c445aba122ceaa6cdd975a524ce62f8c55fe2638f
-  data.tar.gz: 4f043b626479294f8d785e6e181614e1b2b0ca867f5714a8e6323ccb6b96433ad0ec7ef432b173ecc4cfbe9e6ecc215799174fffcb5953a3d0ce41bad8964f74
+  metadata.gz: abd1b8ecbcc18f755cd72182f59774fb2a28dcf763610c2486ba3f80f00671ee590a6c132692d1ad981d7d01fa66964204ac904ee710ac801ca03c7ccf3c9486
+  data.tar.gz: 3cd9279be0f8a2f47a451263ca6813ac1a6ba46490dc4db829f52336307e17edd0a8c3eefdd816ee79d07cb61d91b2ba6088cfe7f0eec59673f0f3dbebffbe96

data/lib/ruby_rich/console.rb

@@ -1,9 +1,31 @@
+require 'io/console'
+
 module RubyRich
   class Console
+    ESCAPE_SEQUENCES = {
+      # 方向键
+      '[A' => :up,    '[B' => :down,
+      '[C' => :right, '[D' => :left,
+      # 功能键
+      'OP' => :f1, 'OQ' => :f2, 'OR' => :f3, 'OS' => :f4,
+      '[15~' => :f5, '[17~' => :f6, '[18~' => :f7,
+      '[19~' => :f8, '[20~' => :f9, '[21~' => :f10,
+      '[23~' => :f11, '[24~' => :f12,
+      # 添加媒体键示例
+      '[1~' => :home,    '[4~' => :end,
+      # 添加 macOS 功能键
+      '[25~' => :audio_mute,
+      # 其他
+      '[5~' => :page_up, '[6~' => :page_down,
+      '[H' => :home, '[F' => :end,
+      '[2~' => :insert, '[3~' => :delete      
+    }.freeze
+
     def initialize
       @lines = []
       @buffer = []
       @layout = { spacing: 1, align: :left }
+      @styles = {}
     end
 
     def set_layout(spacing: 1, align: :left)
@@ -11,12 +33,86 @@ module RubyRich
       @layout[:align] = align
     end
 
+    def style(name, **attributes)
+      @styles[name] = attributes
+    end
+
+    def print(*objects, sep: ' ', end_char: "\n")
+      line_text = objects.map(&:to_s).join(sep)
+      add_line(line_text)
+      render
+    end
+
+    def log(message, *objects, sep: ' ', end_char: "\n")
+      timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+      log_message = "[#{timestamp}] LOG: #{message} #{objects.map(&:to_s).join(sep)}"
+      add_line(log_message)
+      render
+    end
+
+    def rule(title: nil, characters: '#', style: 'bold')
+      rule_line = characters * 80
+      if title
+        formatted_title = " #{title} ".center(80, characters)
+        add_line(formatted_title)
+      else
+        add_line(rule_line)
+      end
+      render
+    end
+
+    def self.raw
+      old_state = `stty -g`
+      system('stty raw -echo -icanon isig') rescue nil
+      yield
+    ensure
+      system("stty #{old_state}") rescue nil
+    end
+
+    def self.clear
+      system('clear')
+    end
+
+    def get_key(input: $stdin)
+      input.raw(intr: true) do |io|
+        char = io.getch
+        
+        # 优先处理回车键（ASCII 13 = \r，ASCII 10 = \n）
+        if char == "\r" || char == "\n"
+          return :enter
+        end
+        # 单独处理 Tab 键（ASCII 9）
+        if char == "\t"
+          return :tab
+        elsif char.ord == 0x07F
+          return :backspace
+        elsif char == "\e" # 检测到转义序列
+          sequence = ''
+          begin
+            while (c = io.read_nonblock(1))
+              sequence << c
+            end
+          rescue IO::WaitReadable
+            retry if IO.select([io], nil, nil, 0.01)
+          rescue EOFError
+          end
+          return ESCAPE_SEQUENCES[sequence] || :escape
+        # 处理 Ctrl 组合键（排除 Tab 和回车）
+        elsif char.ord.between?(1, 8) || char.ord.between?(10, 26)
+          ctrl_char = (char.ord + 64).chr.downcase
+          return :"ctrl_#{ctrl_char}"
+        else
+          char
+        end
+      end
+    end
+
     def add_line(text)
       @lines << text
     end
 
     def clear
-      print "\e[H\e[2J"
+      Kernel.print "\e[H\e[2J"
     end
 
     def render
@@ -24,14 +120,13 @@ module RubyRich
       @lines.each_with_index do |line, index|
         formatted_line = format_line(line)
         @buffer << formatted_line
-        puts formatted_line
-        puts "\n" * @layout[:spacing] if index < @lines.size - 1
+        Kernel.puts formatted_line
+        Kernel.puts "\n" * @layout[:spacing] if index < @lines.size - 1
       end
     end
 
     def update_line(index, text)
       return unless index.between?(0, @lines.size - 1)
-
       @lines[index] = text
       render
     end
@@ -50,4 +145,4 @@ module RubyRich
       end
     end
   end
-end
+end

data/lib/ruby_rich/dialog.rb

@@ -0,0 +1,136 @@
+module RubyRich
+  class Dialog
+    attr_accessor :title, :content, :buttons
+
+    def initialize(title: "", content: "", buttons: ["OK"])
+      @title = title
+      @content = content
+      @buttons = buttons
+      @selected_index = 0
+      @result = nil
+    end
+
+    # 主显示方法
+    def show
+      Console.raw do
+        loop do
+          Console.clear
+          render
+          handle_input(Console.get_key)
+          break if @result
+        end
+      end
+      @result
+    end
+
+    private
+
+    # 渲染对话框
+    def render
+      build_layout unless @layout
+      update_panels
+      @layout.draw
+    end
+
+    def build_layout
+      @layout = RubyRich::Layout.new
+      @layout.split_column(
+        RubyRich::Layout.new(size: 1, name: :title_area),  # 标题区域
+        RubyRich::Layout.new(name: :content_area),         # 内容区域
+        RubyRich::Layout.new(size: 3, name: :button_area)  # 按钮区域
+      )
+
+      @title_panel = RubyRich::Panel.new("", title: @title, border_style: :white)
+      @content_panel = RubyRich::Panel.new("", border_style: :default)
+      @button_panel = RubyRich::Panel.new("", border_style: :blue)
+
+      @layout[:title_area].update_content(@title_panel)
+      @layout[:content_area].update_content(@content_panel)
+      @layout[:button_area].update_content(@button_panel)
+    end
+
+    def update_panels
+      # 更新内容面板
+      @content_panel.content = @content.lines.map { |line|
+        line.chomp.gsub(/\n/, ' ').scan(/.{1,#{@content_panel.inner_width}}/)
+      }.flatten.join("\n")
+
+      # 更新按钮面板
+      button_row = @buttons.each_with_index.map { |btn, i|
+        i == @selected_index ? "[#{btn}]" : " #{btn} "
+      }.join("  ")
+
+      @button_panel.content = button_row.center(@button_panel.inner_width)
+    end
+
+    # 渲染按钮区域
+    def render_buttons(right_x, bottom_y)
+      # 已通过布局系统处理按钮渲染
+    end
+
+    # 处理键盘输入
+    def handle_input(key)
+      case key
+      when :left then @selected_index = (@selected_index - 1) % @buttons.size
+      when :right then @selected_index = (@selected_index + 1) % @buttons.size
+      when :enter then @result = @buttons[@selected_index]
+      when :q, "\u0003" then @result = :cancel # Ctrl+C
+      end
+    end
+  end
+
+  # 确认对话框
+  class ConfirmDialog < Dialog
+    def initialize(title: "确认", content: "确定要执行此操作吗？")
+      super(
+        title: title,
+        content: content,
+        buttons: ["取消", "确定"]
+      )
+    end
+  end
+
+  # 输入对话框
+  class InputDialog < Dialog
+    def initialize(title: "输入", prompt: "请输入：")
+      super(title: title, buttons: ["确定"])
+      @input = ""
+      @prompt = prompt
+    end
+
+    private
+
+    def build_layout
+      super
+      # 在内容区域下方添加输入行
+      @layout[:content_area].split_column(
+        RubyRich::Layout.new(ratio: 1, name: :main_content),
+        RubyRich::Layout.new(size: 3, name: :input_line)
+      )
+
+      @input_panel = RubyRich::Panel.new("", border_style: :yellow)
+      @layout[:input_line].update_content(@input_panel)
+    end
+
+    def update_panels
+      super
+      @input_panel.content = "#{@prompt}#{@input}"
+    end
+
+    def handle_input(key)
+      case key
+      when String
+        @input << key
+      when :backspace
+        @input.chop!
+      else
+        super
+      end
+    end
+
+    def show
+      super
+      @result == "确定" ? @input : nil
+    end
+  end
+end

data/lib/ruby_rich/layout.rb

@@ -0,0 +1,225 @@
+module RubyRich
+  class Layout
+    attr_accessor :name, :ratio, :size, :children, :content, :parent, :x_offset, :y_offset, :width, :height
+    attr_reader :split_direction
+
+    def initialize(name: nil, ratio: 1, size: nil)
+      @name = name
+      @ratio = ratio
+      @size = size
+      @children = []
+      @content = nil
+      @parent = nil
+      @x_offset = 0
+      @y_offset = 0
+      @width = nil
+      @height = nil
+      @split_direction = nil
+    end
+
+    def root
+      @parent ? @parent.root : self
+    end
+
+    def split_row(*layouts)
+      @split_direction = :row
+      layouts.each { |l| l.parent = self }
+      @children.concat(layouts)
+    end
+
+    def split_column(*layouts)
+      @split_direction = :column
+      layouts.each { |l| l.parent = self }
+      @children.concat(layouts)
+    end
+
+    def update_content(content)
+      @content = content
+    end
+
+    def calculate_dimensions(terminal_width, terminal_height)
+      @x_offset = 0
+      @y_offset = 0
+      calculate_node_dimensions(terminal_width, terminal_height)
+    end
+
+    def [](name)
+      find_by_name(name)
+    end
+    
+    def find_by_name(name)
+      return self if @name == name
+      @children.each do |child|
+        result = child.find_by_name(name)
+        return result if result
+      end
+      nil
+    end
+
+    def render
+      # 将缓冲区转换为字符串（每行用换行符连接）
+      render_to_buffer.map { |line| line.compact.join("") }.join("\n")
+    end
+
+    def render_to_buffer
+      # 初始化缓冲区（二维数组，每个元素代表一个字符）
+      buffer = Array.new(@height) { Array.new(@width, " ") }
+      
+      # 递归填充内容到缓冲区
+      render_into(buffer)
+
+      return buffer
+    end
+
+    def draw
+      puts render
+    end
+
+    def render_into(buffer)
+      children.each { |child| child.render_into(buffer) } if children
+      return unless content
+      content_lines = if content.is_a?(String)
+                        content.split("\n")[0...height]
+                      else
+                        content.render[0...height]
+                      end
+    
+      content_lines.each_with_index do |line, line_index|
+        y_pos = y_offset + line_index
+        next if y_pos >= buffer.size
+    
+        in_escape = false
+        escape_char = ""
+        char_width = 0 # 初始宽度调整为0，方便位置计算
+        line.each_char do |char|
+          # 处理ANSI转义码
+          if in_escape
+            escape_char += char
+            in_escape = false if char == 'm'
+            if escape_char=="\e[0m"
+              escape_char = ""
+            end
+            next
+          elsif char.ord == 27 # 检测到转义开始符\e
+            in_escape = true
+            escape_char += char
+            next
+          end
+    
+          # 计算字符宽度
+          char_w = case char.ord
+                   when 0x0000..0x007F then 1 # 英文字符
+                   when 0x4E00..0x9FFF then 2 # 中文字符
+                   else Unicode::DisplayWidth.of(char)
+                   end
+          # 计算字符的起始位置
+          x_start = x_offset + char_width
+    
+          # 超出右边界则跳过
+          next if x_start >= buffer[y_pos].size
+    
+          # 处理字符渲染（中文字符可能占用多个位置）
+          char_w.times do |i|
+            x_pos = x_start + i
+            break if x_pos >= buffer[y_pos].size # 超出右边界停止
+            unless escape_char.empty?
+              char = escape_char + char + "\e[0m" # 每次都记录字符的实际颜色
+            end
+            buffer[y_pos][x_pos] = char unless i > 0 # 中文字符仅在第一个位置写入，避免覆盖
+            buffer[y_pos][x_pos+1] = nil if char_w == 2
+          end
+          char_width += char_w # 更新累计宽度
+        end
+      end
+    end
+
+    def calculate_node_dimensions(available_width, available_height)
+      # 只在未设置宽度时计算宽度
+      @width ||= if @size
+                  [@size, available_width].min
+                else
+                  available_width
+                end
+
+      # 只在未设置高度时计算高度
+      @height ||= if @size
+                  [@size, available_height].min
+                else
+                  available_height
+                end
+
+      if @content.class == RubyRich::Panel
+        @content.width = @width
+        @content.height = @height
+      end
+
+      return if @children.empty?
+
+      case @split_direction
+      when :row
+        remaining_width = @width
+        fixed_children, flexible_children = @children.partition { |c| c.size }
+
+        fixed_children.each do |child|
+          child_width = [child.size, remaining_width].min
+          child.width = child_width
+          remaining_width -= child_width
+        end
+
+        total_ratio = flexible_children.sum(&:ratio)
+        if total_ratio > 0
+          ratio_width = remaining_width.to_f / total_ratio
+          flexible_children.each do |child|
+            child_width = (child.ratio * ratio_width).floor
+            child.width = child_width
+            remaining_width -= child_width
+          end
+
+          flexible_children.last.width += remaining_width if remaining_width > 0
+        end
+
+        @children.each { |child| child.height = @height }
+
+        current_x = @x_offset
+        @children.each do |child|
+          child.x_offset = current_x
+          child.y_offset = @y_offset
+          current_x += child.width
+          child.calculate_node_dimensions(child.width, child.height)
+        end
+
+      when :column
+        remaining_height = @height
+        fixed_children, flexible_children = @children.partition { |c| c.size }
+
+        fixed_children.each do |child|
+          child_height = [child.size, remaining_height].min
+          child.height = child_height
+          remaining_height -= child_height
+        end
+
+        total_ratio = flexible_children.sum(&:ratio)
+        if total_ratio > 0
+          ratio_height = remaining_height.to_f / total_ratio
+          flexible_children.each do |child|
+            child_height = (child.ratio * ratio_height).floor
+            child.height = child_height
+            remaining_height -= child_height
+          end
+
+          flexible_children.last.height += remaining_height if remaining_height > 0
+        end
+
+        @children.each { |child| child.width = @width }
+
+        current_y = @y_offset
+        @children.each do |child|
+          child.x_offset = @x_offset
+          child.y_offset = current_y
+          current_y += child.height
+          child.calculate_node_dimensions(child.width, child.height)
+        end
+      end
+    end
+  end
+end

data/lib/ruby_rich/live.rb

@@ -0,0 +1,101 @@
+require 'io/console'
+require "tty-screen"
+require "tty-cursor"
+
+module RubyRich
+
+  class CacheRender
+    def initialize
+      @cache = nil
+    end
+  
+    def print_with_pos(x,y,char)
+      print "\e[?25l"   # 隐藏光标
+      print "\e[#{y};#{x}H"   # 移动光标到左上角
+      print char
+    end
+  
+    def draw(buffer)
+      unless @cache
+        system("clear")
+        print_with_pos(0,0,buffer.map { |line| line.compact.join("") }.join("\n"))
+        @cache = buffer
+      else
+        buffer.each_with_index do |arr, y|
+          arr.each_with_index do |char, x|
+            if @cache[y][x] != char
+              print_with_pos(x + 1 , y + 1 , char)
+              @cache[y][x] = char
+            end
+          end
+        end
+      end
+    end
+  end
+
+  class Live
+    class << self
+      def start(layout, refresh_rate: 30, full_screen: false, &proc)
+        setup_terminal
+        live = new(layout, refresh_rate)
+        live.run(proc)
+      rescue => e
+        puts e.message
+      ensure
+        restore_terminal
+      end
+
+      private
+
+      def setup_terminal
+        @original_state = `stty -g`
+        system("stty -echo")
+      end
+
+      def restore_terminal
+        system("stty #{@original_state}")
+        print TTY::Cursor.show
+      end
+    end
+
+    def initialize(layout, refresh_rate)
+      @layout = layout
+      @refresh_rate = refresh_rate
+      @running = true
+      @last_frame = Time.now
+      @cursor = TTY::Cursor
+      @render = CacheRender.new
+    end
+
+    def run(proc = nil)
+      while @running
+        render_frame
+        proc.call(self) if proc
+        sleep 1.0 / @refresh_rate
+      end
+    end
+
+    def stop
+      @running = false
+    end
+
+    def move_cursor(x,y)
+      print @cursor.move_to(x, y)
+    end
+
+    private
+
+    def render_frame
+      @layout.calculate_dimensions(terminal_width, terminal_height)
+      @render.draw(@layout.render_to_buffer)
+    end
+
+    def terminal_width
+      TTY::Screen.width
+    end
+
+    def terminal_height
+      TTY::Screen.height
+    end
+  end
+end

data/lib/ruby_rich/{rich_panel.rb → panel.rb}

@@ -1,3 +1,115 @@
+module RubyRich
+  class Panel
+    attr_accessor :width, :height, :content, :line_pos, :border_style, :title
+    COLORS = {
+      red: "\e[31m",
+      green: "\e[32m",
+      blue: "\e[34m",
+      yellow: "\e[33m",
+      cyan: "\e[36m",
+      white: "\e[37m",
+      reset: "\e[0m"
+    }
+
+    def initialize(content = "", title: nil, border_style: :white)
+      @content = content
+      @title = title
+      @border_style = border_style
+      @width = 0
+      @height = 0
+      @line_pos = 0
+    end
+
+    def inner_width
+      @width - 2  # Account for border characters
+    end
+
+    def calculate_string_width(str)
+      width = 0
+      str.each_char do |char|
+        width += Unicode::DisplayWidth.of(char)
+      end
+      width
+    end
+
+    def render
+      lines = []
+      color_code = COLORS[@border_style] || COLORS[:white]
+      reset_code = COLORS[:reset]
+
+      # Top border
+      top_border = color_code + "┌"
+      if @title
+        title_text = "[ #{@title} ]"        
+        top_border += title_text + '─' * (@width - calculate_string_width(@title)-6)
+      else
+        top_border += '─' * (@width - 2)
+      end
+      top_border += "┐" + reset_code
+      lines << top_border
+
+      # Content area
+      content_lines = wrap_content(@content)
+      if content_lines.size > @height - 2
+        @line_pos = content_lines.size - @height + 2
+        content_lines=content_lines[@line_pos..-1]
+      end
+      content_lines.each do |line|
+        lines << color_code + "│" + reset_code +
+                line + " "*(@width - calculate_string_width(line) - 2) +
+                color_code + "│" + reset_code
+      end
+
+      # Fill remaining vertical space
+      remaining_lines = @height - 2 - content_lines.size
+      remaining_lines.times do
+        lines << color_code + "│" + reset_code +
+                " " * (@width - 2) +
+                color_code + "│" + reset_code
+      end
+
+      # Bottom border
+      lines << color_code + "└" + "─" * (@width - 2) + "┘" + reset_code
+
+      lines
+    end
+
+    def update_content(new_content)
+      @content = new_content
+    end
+
+    private
+
+    def split_text_by_width(text)
+      result = []
+      current_line = ""
+      current_width = 0
+    
+      text.each_char do |char|
+        char_width = Unicode::DisplayWidth.of(char)
+        if current_width + char_width <= @width - 4
+          current_line += char
+          current_width += char_width
+        else
+          result << current_line
+          current_line = char
+          current_width = char_width
+        end
+      end
+    
+      # 添加最后一行
+      result << current_line unless current_line.empty?
+    
+      result
+    end
+
+    def wrap_content(text)
+      text.split("\n").flat_map do |line|
+        split_text_by_width(line)
+      end
+    end
+  end
+end
 module RubyRich
     class RichPanel
         # ANSI escape codes for styling

data/lib/ruby_rich/progress_bar.rb

@@ -1,5 +1,8 @@
 module RubyRich
   class ProgressBar
+    
+    attr_reader :progress
+
     def initialize(total, width: 50, style: :default)
       @total = total
       @progress = 0

data/lib/ruby_rich/version.rb

@@ -1,3 +1,3 @@
 module RubyRich
-  VERSION = "0.1.0"
-end
+  VERSION = "0.2.0"
+end

data/lib/ruby_rich.rb

@@ -10,9 +10,12 @@ require 'redcarpet'
 require_relative 'ruby_rich/console'
 require_relative 'ruby_rich/table'
 require_relative 'ruby_rich/progress_bar'
-require_relative 'ruby_rich/rich_text'
-require_relative 'ruby_rich/rich_print'
-require_relative 'ruby_rich/rich_panel'
+require_relative 'ruby_rich/layout'
+require_relative 'ruby_rich/live'
+require_relative 'ruby_rich/text'
+require_relative 'ruby_rich/print'
+require_relative 'ruby_rich/panel'
+require_relative 'ruby_rich/dialog'
 require_relative 'ruby_rich/version'
 
 # 定义主模块

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rich
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - zhuang biaowei
 bindir: bin
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,11 +46,14 @@ extra_rdoc_files: []
 files:
 - lib/ruby_rich.rb
 - lib/ruby_rich/console.rb
+- lib/ruby_rich/dialog.rb
+- lib/ruby_rich/layout.rb
+- lib/ruby_rich/live.rb
+- lib/ruby_rich/panel.rb
+- lib/ruby_rich/print.rb
 - lib/ruby_rich/progress_bar.rb
-- lib/ruby_rich/rich_panel.rb
-- lib/ruby_rich/rich_print.rb
-- lib/ruby_rich/rich_text.rb
 - lib/ruby_rich/table.rb
+- lib/ruby_rich/text.rb
 - lib/ruby_rich/version.rb
 homepage: https://github.com/zhuangbiaowei/ruby_rich
 licenses: