rufio 0.63.0 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903b51d0ee611d29ad7ea8961e7948b9dceae16b6d04280c28252149ae2fdd20
-  data.tar.gz: 287941ec941e8200c98a881c3ce6de2f7cc7ce3b13e63ba17875ff2222c92bc8
+  metadata.gz: c80ee03ac65fdfbf06623c7702795bdbaced929d40e72739f599d43eb8d240ef
+  data.tar.gz: 8bc1a41cd84d762923e6f4785542c8ad4de418c804d0b30150d4217dac0168bd
 SHA512:
-  metadata.gz: ab00eea888ea729262a4b8c787ecdf43814afe0c573fdc2624597b014027836ae81da4342b413024a10ba6f3212faf5cee1f987af45357fc99134f93d3425314
-  data.tar.gz: c665a171a03ab2ebe1941d7b38eeac86ccbd1552c3ee5a7e8cf252fa20293470399cf4cf1ecdeacba8d0d6fb251d5cd4b87ae74a4b4e924814d6821c34d99857
+  metadata.gz: c42bffef8f63ed300ef17a960625e0e5b5b20735e1f326fba26691e7731c37a0f24a09194b2c51d10e758e4c44710f0e938781e47e0662ba63a1b7afce760195
+  data.tar.gz: 7033a73f5a0c124eb9fa722e614a7a28f17972872a4cbe8d7682558ba7760852c3c10db6226e5771222ddb94e1f9a68dbe686f1b621c0dee6ae45073aae47a2a

data/CHANGELOG.md

@@ -7,6 +7,42 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.65.0] - 2026-02-14
+
+### Changed
+- **Display version in title bar**: Changed header format from `💎 rufio - /path` to `💎 rufio v0.65.0 - /path`
+
+## [0.64.0] - 2026-02-07
+
+### Added
+- **Screen Overlay Layer**: Added overlay layer to Screen class for dialog rendering
+  - `enable_overlay` / `disable_overlay` / `clear_overlay` / `overlay_enabled?`
+  - Draw to overlay layer with `put_overlay` / `put_overlay_string`
+  - `row()` method automatically composites overlay and base layers
+  - Automatically marks dirty rows when overlay is disabled (guarantees redraw)
+- **`show_overlay_dialog` helper method**: Added unified overlay dialog display method to TerminalUI, KeybindHandler, BookmarkManager, CommandModeUI, and ZoxideIntegration
+  - Uses overlay when `terminal_ui` is available, falls back to direct drawing otherwise
+- **`draw_floating_window_to_overlay`**: Added floating window drawing method to DialogRenderer for overlay layer
+- **Screen Overlay tests**: Added `test/test_screen_overlay.rb`
+
+### Changed
+- **Buffer-based dialog rendering**: Changed all dialog rendering to go through Screen overlay
+  - BookmarkManager: bookmark menu, list, rename, delete, and confirmation dialogs
+  - KeybindHandler: delete confirmation, copy/move confirmation, exit confirmation, script path management, bookmark operation results
+  - CommandModeUI: command execution result display
+  - ZoxideIntegration: no history message, history selection dialog
+  - TerminalUI: help dialog, announcements, plugin loading errors
+- **Overlay-based command mode**: Changed from direct drawing (outside Screen buffer) to overlay-based buffer drawing
+  - Integrated into main loop buffer drawing via `draw_command_mode_to_overlay` method
+- **Box drawing character width fix**: Fixed `TextUtils.char_width` to treat box drawing characters (U+2500-U+257F) as width 1 (matching actual terminal display width)
+- **Code style unification**: Unified `require_relative` in `lib/rufio.rb` from double quotes to single quotes
+- **`set_terminal_ui` propagation**: Set `terminal_ui` on BookmarkManager and ZoxideIntegration via KeybindHandler
+- **TerminalUI**: Exposed `screen` and `renderer` `attr_reader`
+
+### Technical Details
+- **New files**: `test/test_screen_overlay.rb`
+- **Modified files**: `lib/rufio.rb`, `lib/rufio/screen.rb`, `lib/rufio/dialog_renderer.rb`, `lib/rufio/terminal_ui.rb`, `lib/rufio/keybind_handler.rb`, `lib/rufio/bookmark_manager.rb`, `lib/rufio/command_mode_ui.rb`, `lib/rufio/text_utils.rb`, `lib/rufio/zoxide_integration.rb`
+
 ## [0.63.0] - 2026-02-01
 
 ### Added
@@ -92,28 +128,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.60.0] - 2026-01-24
 
 ### Added
-- **⌨️ スクリプト補完機能**: コマンドモードでスクリプトのTab補完が可能に
-  - `@`プレフィックスでスクリプト専用補完（例: `@bu` + Tab → `@build.sh`）
-  - 通常補完時も登録済みスクリプトが候補に表示
-  - `CommandCompletion`が`CommandMode`と連携してスクリプト候補を取得
+- **⌨️ Script Tab Completion**: Tab completion for scripts in command mode
+  - `@` prefix for script-specific completion (e.g., `@bu` + Tab → `@build.sh`)
+  - Registered scripts also appear in regular completion candidates
+  - `CommandCompletion` works with `CommandMode` to retrieve script candidates
 
 ### Removed
-- **🗑️ プロジェクトモード廃止**: `P`キーで起動するプロジェクトモードを削除
-  - `lib/rufio/project_mode.rb` - ProjectModeクラス
-  - `lib/rufio/project_command.rb` - ProjectCommandクラス
-  - `lib/rufio/project_log.rb` - ProjectLogクラス
-  - 関連するUI描画メソッド（`draw_project_mode_screen`等）
-  - 関連するキーハンドリング（`handle_project_mode_key`等）
-  - 関連するテストファイル
+- **🗑️ Project Mode Removal**: Removed project mode launched by `P` key
+  - `lib/rufio/project_mode.rb` - ProjectMode class
+  - `lib/rufio/project_command.rb` - ProjectCommand class
+  - `lib/rufio/project_log.rb` - ProjectLog class
+  - Related UI drawing methods (`draw_project_mode_screen`, etc.)
+  - Related key handling (`handle_project_mode_key`, etc.)
+  - Related test files
 
 ### Changed
-- **📋 ヘルプ表示更新**: ヘルプダイアログに`J`キー（Job mode）を追加
-- **🧹 コードクリーンアップ**: プロジェクトモード関連の未使用コードを削除
+- **📋 Help Display Update**: Added `J` key (Job mode) to help dialog
+- **🧹 Code Cleanup**: Removed unused code related to project mode
 
 ### Technical Details
-- **テストカバレッジ**: 684 tests, 2474 assertions (all passing)
-- **削除ファイル**: 7ファイル（ライブラリ3、テスト4）
-- **影響範囲**: `keybind_handler.rb`, `terminal_ui.rb`, `rufio.rb`
+- **Test coverage**: 684 tests, 2474 assertions (all passing)
+- **Deleted files**: 7 files (3 library, 4 test)
+- **Affected files**: `keybind_handler.rb`, `terminal_ui.rb`, `rufio.rb`
 
 ## [0.41.0] - 2026-01-13
 

data/lib/rufio/bookmark_manager.rb

@@ -10,6 +10,12 @@ module Rufio
     def initialize(bookmark = nil, dialog_renderer = nil)
       @bookmark = bookmark || create_default_bookmark
       @dialog_renderer = dialog_renderer
+      @terminal_ui = nil
+    end
+
+    # terminal_ui を設定
+    def set_terminal_ui(terminal_ui)
+      @terminal_ui = terminal_ui
     end
 
     private
@@ -46,40 +52,45 @@ module Rufio
 
       dialog_width = 45
       dialog_height = 4 + content_lines.length
-      x, y = @dialog_renderer.calculate_center(dialog_width, dialog_height)
-
-      @dialog_renderer.draw_floating_window(x, y, dialog_width, dialog_height, title, content_lines, {
-                                               border_color: "\e[34m", # Blue
-                                               title_color: "\e[1;34m",   # Bold blue
-                                               content_color: "\e[37m"    # White
-                                             })
-
-      # Wait for key input
-      loop do
-        input = STDIN.getch.downcase
-
-        case input
-        when 'a'
-          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
-          return { action: :add, path: current_path }
-        when 'l'
-          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
-          return { action: :list }
-        when 'r'
-          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
-          return { action: :rename }
-        when 'd'
-          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
-          return { action: :remove }
-        when '1', '2', '3', '4', '5', '6', '7', '8', '9'
-          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
-          return { action: :navigate, number: input.to_i }
-        else
-          # Cancel
-          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
-          return { action: :cancel }
+
+      result = { action: :cancel }
+      show_overlay_dialog(title, content_lines, {
+        width: dialog_width,
+        height: dialog_height,
+        border_color: "\e[34m", # Blue
+        title_color: "\e[1;34m",   # Bold blue
+        content_color: "\e[37m"    # White
+      }) do
+        # Wait for key input
+        loop do
+          input = STDIN.getch.downcase
+
+          case input
+          when 'a'
+            result = { action: :add, path: current_path }
+            break
+          when 'l'
+            result = { action: :list }
+            break
+          when 'r'
+            result = { action: :rename }
+            break
+          when 'd'
+            result = { action: :remove }
+            break
+          when '1', '2', '3', '4', '5', '6', '7', '8', '9'
+            result = { action: :navigate, number: input.to_i }
+            break
+          else
+            # Cancel
+            result = { action: :cancel }
+            break
+          end
         end
+        nil
       end
+
+      result
     end
 
     # Add a bookmark interactively
@@ -141,32 +152,33 @@ module Rufio
       title = 'Rename Bookmark'
       width = 60
       height = [content_lines.length + 4, 20].min
-      x, y = @dialog_renderer.calculate_center(width, height)
 
-      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+      # Wait for selection
+      selected_number = nil
+      show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
         border_color: "\e[33m",    # Yellow
         title_color: "\e[1;33m",   # Bold yellow
         content_color: "\e[37m"    # White
-      })
-
-      # Wait for selection
-      selected_number = nil
-      loop do
-        input = STDIN.getch.downcase
-
-        if input >= '1' && input <= '9'
-          number = input.to_i
-          if number > 0 && number <= bookmarks.length
-            selected_number = number
+      }) do
+        loop do
+          input = STDIN.getch.downcase
+
+          if input >= '1' && input <= '9'
+            number = input.to_i
+            if number > 0 && number <= bookmarks.length
+              selected_number = number
+              break
+            end
+          elsif input == "\e" # ESC
             break
           end
-        elsif input == "\e" # ESC
-          @dialog_renderer.clear_area(x, y, width, height)
-          return false
         end
+        nil
       end
 
-      @dialog_renderer.clear_area(x, y, width, height)
+      return false unless selected_number
 
       # Get new name
       bookmark_to_rename = bookmarks[selected_number - 1]
@@ -216,32 +228,33 @@ module Rufio
       title = 'Delete Bookmark'
       width = 60
       height = [content_lines.length + 4, 20].min
-      x, y = @dialog_renderer.calculate_center(width, height)
 
-      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+      # Wait for selection
+      selected_number = nil
+      show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
         border_color: "\e[31m",    # Red (warning)
         title_color: "\e[1;31m",   # Bold red
         content_color: "\e[37m"    # White
-      })
-
-      # Wait for selection
-      selected_number = nil
-      loop do
-        input = STDIN.getch.downcase
-
-        if input >= '1' && input <= '9'
-          number = input.to_i
-          if number > 0 && number <= bookmarks.length
-            selected_number = number
+      }) do
+        loop do
+          input = STDIN.getch.downcase
+
+          if input >= '1' && input <= '9'
+            number = input.to_i
+            if number > 0 && number <= bookmarks.length
+              selected_number = number
+              break
+            end
+          elsif input == "\e" # ESC
             break
           end
-        elsif input == "\e" # ESC
-          @dialog_renderer.clear_area(x, y, width, height)
-          return false
         end
+        nil
       end
 
-      @dialog_renderer.clear_area(x, y, width, height)
+      return false unless selected_number
 
       # Confirm deletion
       bookmark_to_remove = bookmarks[selected_number - 1]
@@ -284,31 +297,32 @@ module Rufio
       title = 'Bookmarks'
       width = 60
       height = [content_lines.length + 4, 20].min
-      x, y = @dialog_renderer.calculate_center(width, height)
 
-      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+      # Wait for selection
+      selected_bookmark = nil
+      show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
         border_color: "\e[34m",    # Blue
         title_color: "\e[1;34m",   # Bold blue
         content_color: "\e[37m"    # White
-      })
-
-      # Wait for selection
-      selected_bookmark = nil
-      loop do
-        input = STDIN.getch.downcase
-
-        if input >= '1' && input <= '9'
-          number = input.to_i
-          if number > 0 && number <= bookmarks.length
-            selected_bookmark = bookmarks[number - 1]
+      }) do
+        loop do
+          input = STDIN.getch.downcase
+
+          if input >= '1' && input <= '9'
+            number = input.to_i
+            if number > 0 && number <= bookmarks.length
+              selected_bookmark = bookmarks[number - 1]
+              break
+            end
+          elsif input == "\e" # ESC
             break
           end
-        elsif input == "\e" # ESC
-          break
         end
+        nil
       end
 
-      @dialog_renderer.clear_area(x, y, width, height)
       selected_bookmark
     end
 
@@ -376,6 +390,48 @@ module Rufio
 
     private
 
+    # オーバーレイダイアログを表示してキー入力を待つヘルパーメソッド
+    def show_overlay_dialog(title, content_lines, options = {}, &block)
+      # terminal_ui が利用可能で、screen と renderer が存在する場合のみオーバーレイを使用
+      use_overlay = @terminal_ui &&
+                    @terminal_ui.respond_to?(:screen) &&
+                    @terminal_ui.respond_to?(:renderer) &&
+                    @terminal_ui.screen &&
+                    @terminal_ui.renderer
+
+      if use_overlay
+        # オーバーレイを使用
+        @terminal_ui.show_overlay_dialog(title, content_lines, options, &block)
+      else
+        # フォールバック: 従来の方法
+        width = options[:width]
+        height = options[:height]
+
+        unless width && height
+          width, height = @dialog_renderer.calculate_dimensions(content_lines, {
+            title: title,
+            min_width: options[:min_width] || 40,
+            max_width: options[:max_width] || 80
+          })
+        end
+
+        x, y = @dialog_renderer.calculate_center(width, height)
+
+        @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+          border_color: options[:border_color] || "\e[37m",
+          title_color: options[:title_color] || "\e[1;33m",
+          content_color: options[:content_color] || "\e[37m"
+        })
+
+        key = block_given? ? yield : STDIN.getch
+
+        @dialog_renderer.clear_area(x, y, width, height)
+        @terminal_ui&.refresh_display
+
+        key
+      end
+    end
+
     # Show result dialog with success or error styling
     # @param title [String] Dialog title
     # @param message [String] Result message
@@ -401,16 +457,15 @@ module Rufio
 
       width = 50
       height = 6
-      x, y = @dialog_renderer.calculate_center(width, height)
 
-      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+      # オーバーレイダイアログを表示
+      show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
         border_color: border_color,
         title_color: title_color,
         content_color: "\e[37m"
       })
-
-      STDIN.getch
-      @dialog_renderer.clear_area(x, y, width, height)
     end
 
     # Show confirmation dialog for bookmark removal
@@ -431,30 +486,31 @@ module Rufio
       title = 'Confirm Delete'
       width = 50
       height = content_lines.length + 4
-      x, y = @dialog_renderer.calculate_center(width, height)
 
-      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+      # Wait for confirmation
+      confirmed = false
+      show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
         border_color: "\e[33m",    # Yellow (warning)
         title_color: "\e[1;33m",   # Bold yellow
         content_color: "\e[37m"    # White
-      })
+      }) do
+        loop do
+          input = STDIN.getch.downcase
 
-      # Wait for confirmation
-      confirmed = false
-      loop do
-        input = STDIN.getch.downcase
-
-        case input
-        when 'y'
-          confirmed = true
-          break
-        when 'n', "\e" # n or ESC
-          confirmed = false
-          break
+          case input
+          when 'y'
+            confirmed = true
+            break
+          when 'n', "\e" # n or ESC
+            confirmed = false
+            break
+          end
         end
+        nil
       end
 
-      @dialog_renderer.clear_area(x, y, width, height)
       confirmed
     end
   end

data/lib/rufio/command_mode_ui.rb

@@ -8,10 +8,16 @@ module Rufio
     def initialize(command_mode, dialog_renderer)
       @command_mode = command_mode
       @dialog_renderer = dialog_renderer
+      @terminal_ui = nil
       # 最後に表示したウィンドウの位置とサイズを保存
       @last_window = nil
     end
 
+    # terminal_ui を設定
+    def set_terminal_ui(terminal_ui)
+      @terminal_ui = terminal_ui
+    end
+
     # 入力文字列に対する補完候補を取得
     # @param input [String] 現在の入力文字列
     # @return [Array<String>] 補完候補の配列
@@ -124,21 +130,14 @@ module Rufio
                                                                max_width: 100
                                                              })
 
-      # 中央位置を計算
-      x, y = @dialog_renderer.calculate_center(width, height)
-
-      # フローティングウィンドウを描画
-      @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
-                                               border_color: border_color,
-                                               title_color: title_color,
-                                               content_color: content_color
-                                             })
-
-      # キー入力を待つ
-      STDIN.getch
-
-      # ウィンドウをクリア
-      @dialog_renderer.clear_area(x, y, width, height)
+      # オーバーレイダイアログを表示
+      show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
+        border_color: border_color,
+        title_color: title_color,
+        content_color: content_color
+      })
     end
 
     # コマンド入力プロンプトをクリア
@@ -156,6 +155,48 @@ module Rufio
 
     private
 
+    # オーバーレイダイアログを表示してキー入力を待つヘルパーメソッド
+    def show_overlay_dialog(title, content_lines, options = {}, &block)
+      # terminal_ui が利用可能で、screen と renderer が存在する場合のみオーバーレイを使用
+      use_overlay = @terminal_ui &&
+                    @terminal_ui.respond_to?(:screen) &&
+                    @terminal_ui.respond_to?(:renderer) &&
+                    @terminal_ui.screen &&
+                    @terminal_ui.renderer
+
+      if use_overlay
+        # オーバーレイを使用
+        @terminal_ui.show_overlay_dialog(title, content_lines, options, &block)
+      else
+        # フォールバック: 従来の方法
+        width = options[:width]
+        height = options[:height]
+
+        unless width && height
+          width, height = @dialog_renderer.calculate_dimensions(content_lines, {
+            title: title,
+            min_width: options[:min_width] || 40,
+            max_width: options[:max_width] || 80
+          })
+        end
+
+        x, y = @dialog_renderer.calculate_center(width, height)
+
+        @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+          border_color: options[:border_color] || "\e[37m",
+          title_color: options[:title_color] || "\e[1;33m",
+          content_color: options[:content_color] || "\e[37m"
+        })
+
+        key = block_given? ? yield : STDIN.getch
+
+        @dialog_renderer.clear_area(x, y, width, height)
+        @terminal_ui&.refresh_display
+
+        key
+      end
+    end
+
     # 文字列配列の共通プレフィックスを見つける
     # @param strings [Array<String>] 文字列配列
     # @return [String] 共通プレフィックス

data/lib/rufio/dialog_renderer.rb

@@ -75,6 +75,73 @@ module Rufio
       screen.put_string(x, bottom_y, "└#{'─' * (width - 2)}┘", fg: border_color)
     end
 
+    # オーバーレイレイヤーにフローティングウィンドウを描画
+    # @param screen [Screen] Screen buffer with overlay enabled
+    # @param x [Integer] X position (column)
+    # @param y [Integer] Y position (row)
+    # @param width [Integer] Window width
+    # @param height [Integer] Window height
+    # @param title [String, nil] Window title (optional)
+    # @param content_lines [Array<String>] Content lines to display
+    # @param options [Hash] Customization options
+    def draw_floating_window_to_overlay(screen, x, y, width, height, title, content_lines, options = {})
+      # オーバーレイが有効でない場合は有効化
+      screen.enable_overlay unless screen.overlay_enabled?
+
+      border_color = options[:border_color] || "\e[37m"
+      title_color = options[:title_color] || "\e[1;33m"
+      content_color = options[:content_color] || "\e[37m"
+
+      # Draw top border
+      screen.put_overlay_string(x, y, "┌#{'─' * (width - 2)}┐", fg: border_color)
+
+      # Draw title line if title exists
+      if title
+        title_width = TextUtils.display_width(title)
+        title_padding = (width - 2 - title_width) / 2
+        padded_title = ' ' * title_padding + title
+        title_line = TextUtils.pad_string_to_width(padded_title, width - 2)
+
+        screen.put_overlay(x, y + 1, '│', fg: border_color)
+        screen.put_overlay_string(x + 1, y + 1, title_line, fg: title_color)
+        screen.put_overlay(x + width - 1, y + 1, '│', fg: border_color)
+
+        # Draw title separator
+        screen.put_overlay_string(x, y + 2, "├#{'─' * (width - 2)}┤", fg: border_color)
+        content_start_y = y + 3
+      else
+        content_start_y = y + 1
+      end
+
+      # Draw content lines
+      content_height = title ? height - 4 : height - 2
+      content_lines.each_with_index do |line, index|
+        break if index >= content_height
+
+        line_y = content_start_y + index
+        line_content = TextUtils.pad_string_to_width(line, width - 2)
+
+        screen.put_overlay(x, line_y, '│', fg: border_color)
+        screen.put_overlay_string(x + 1, line_y, line_content, fg: content_color)
+        screen.put_overlay(x + width - 1, line_y, '│', fg: border_color)
+      end
+
+      # Fill remaining lines with empty space
+      remaining_lines = content_height - content_lines.length
+      remaining_lines.times do |i|
+        line_y = content_start_y + content_lines.length + i
+        empty_line = ' ' * (width - 2)
+
+        screen.put_overlay(x, line_y, '│', fg: border_color)
+        screen.put_overlay_string(x + 1, line_y, empty_line)
+        screen.put_overlay(x + width - 1, line_y, '│', fg: border_color)
+      end
+
+      # Draw bottom border
+      bottom_y = y + height - 1
+      screen.put_overlay_string(x, bottom_y, "└#{'─' * (width - 2)}┘", fg: border_color)
+    end
+
     # Draw a floating window with title, content, and customizable colors
     # @param x [Integer] X position (column)
     # @param y [Integer] Y position (row)