rufio 0.81.0 → 0.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533e0a5b32ced89d9d65bfd1abaafee73bada752cc24848538abc05e878a3f41
-  data.tar.gz: f614bb8ee10f320c3b8e3387f5374b5c1bc2c2b9299112f0640061dffcb47b05
+  metadata.gz: 12227b8ad934dc15230c756490aa8fff59aaec22a8d535a08bab0598533d52b0
+  data.tar.gz: 3fe89daae07e436eb27202a6dc3b0852daad7e45a5209a0c5178d139dfe27fc6
 SHA512:
-  metadata.gz: a0f9f950cfa19fc467fe220614f298ac35473aa8e9112e7776b683b9414e39436f4cce7bf5f5d3cf3a481dbf48545e2e971a9773e3e68bc11bfae53c6b63fc13
-  data.tar.gz: cff712ea8904a749d0d3f646bc0b9a016c085a043bf08bc6cf304d1f1bbbc5a4e94daf7e05464334f6da56c0bdcf32f6411e8d0787a7763b303428bde0993f65
+  metadata.gz: f614795b114ae1483947331a1f929e43cbf5b57b2e9f05923ccd0c143082836ee00740f43056279761fe36c462c5a40a9f9922de40c6ed72fc7910b332942b72
+  data.tar.gz: 85c223ae9f1a6c678e65871eafa17fe65ecdb8bf9926a09fc9fa003df6c287f78f45dee76c79fa8b14e51c96c3577969b843b9d9cb62bd5f35e55bf720ea0ef4

data/CHANGELOG.md

@@ -5,10 +5,12 @@ All notable changes to rufio will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.82.0] - 2026-02-28
 
 ### Added
-- **Bookmark Jump Highlight**: When cycling bookmarks with `Tab`, the target bookmark in the top bar is highlighted in cyan for 500ms, then automatically fades back to gray
+- **Bookmark Jump Highlight**: When cycling bookmarks with `Tab` or `Shift+Tab`, or jumping directly with number keys `1`–`9`, the target bookmark in the top bar is highlighted in cyan for 500ms, then automatically fades back to gray
+- **`Shift+Tab` backward bookmark cycling**: In Files mode, `Shift+Tab` now cycles backwards through bookmarks (previously it switched tab modes)
+- **Number key bookmark highlight**: Pressing `1`–`9` to jump to a bookmark now triggers the same 500ms cyan highlight as `Tab`; subsequent `Tab` presses continue forward from the jumped position
 
 ### Changed
 - **UI Layout**: Merged mode tabs and title bar into a single combined bottom row
@@ -18,13 +20,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **`Tab` key**: Changed from mode cycling to **bookmark cycling** (Files mode only)
   - In Files mode: jump to next registered bookmark in sequence (wraps to first)
   - In other modes (Logs / Jobs / Help): no action
-  - Mode switching is done via `J` / `L` / `?` keys and `Shift+Tab`
+  - Mode switching is done via `J` / `L` / `?` keys
+- **Bookmark cycling state**: `BookmarkController` now tracks `@last_bookmark_idx` to maintain cycling position independently of the current directory — navigating into a subdirectory no longer resets Tab cycling to the first bookmark
+- **UIRenderer bookmark source**: Footer display now reads bookmarks via `@keybind_handler.bookmark_list` (same `BookmarkManager` instance as navigation) instead of creating a separate `Bookmark.new` instance pointing to the legacy `bookmarks.json`
 
 ### Fixed
+- **Tab cycling past 3rd bookmark**: Fixed a bug where Tab always returned to the first bookmark after navigating to a subdirectory (non-bookmark directory), because `find_index` returned `nil` for non-bookmark paths
+- **Mismatched bookmark files**: UIRenderer was reading from `~/.config/rufio/bookmarks.json` while navigation used `~/.config/rufio/bookmarks.yml`, causing the footer to display different bookmarks than Tab actually navigated to
+- **Navigation blocked by stale bookmarks**: `goto_next_bookmark` and `goto_prev_bookmark` now skip bookmarks whose paths no longer exist (`Dir.exist?`), preventing the cycling from getting stuck on deleted directories
+- **Test contamination of real bookmark file**: `test_bookmark_controller.rb` used `Bookmark.new` without arguments, writing test entries into the real `~/.config/rufio/bookmarks.json`; fixed to use a temp file
+- **Number key crash**: Pressing `1`–`9` caused a `NoMethodError` crash because `goto_bookmark` was defined after `private` in `KeybindHandler`, making it inaccessible from `TerminalUI`; moved to the public section
 - **zoxide 2-digit input**: Fixed a bug where pressing a single digit in the zoxide history dialog immediately navigated, making it impossible to enter 2-digit numbers (e.g., `12`)
 - **Jobs mode tab highlight**: Fixed active tab not highlighting when entering Jobs mode from Logs or Help mode
 - **Jobs mode navigation**: Fixed inability to switch away from Jobs mode using `L`, `?` keys
 
+### Removed
+- Deleted 3 legacy hand-written test scripts that were not part of the Minitest suite and duplicated coverage already in proper test files:
+  - `test/test_bookmark_simple.rb` — covered by `test_bookmark.rb`
+  - `test/test_filter_reset.rb` — covered by `test_filter_manager.rb`
+  - `test/test_rga_search.rb` — obsolete manual script with monkey-patching
+
 ## [0.80.0] - 2026-02-21
 
 ### Added

data/lib/rufio/bookmark_controller.rb

@@ -0,0 +1,439 @@
+# frozen_string_literal: true
+
+module Rufio
+  # ブックマーク・zoxide・スクリプトパス専用コントローラ
+  # KeybindHandler からブックマーク系・zoxide・スクリプトパス系メソッドを分離し、単一責任原則に準拠
+  class BookmarkController
+    def initialize(directory_listing, bookmark_manager, dialog_renderer, nav_controller,
+                   script_path_manager, notification_manager, zoxide_integration)
+      @directory_listing = directory_listing
+      @bookmark_manager = bookmark_manager
+      @dialog_renderer = dialog_renderer
+      @nav_controller = nav_controller
+      @script_path_manager = script_path_manager
+      @notification_manager = notification_manager
+      @zoxide_integration = zoxide_integration
+      @terminal_ui = nil
+      @last_bookmark_idx = nil
+    end
+
+    def set_terminal_ui(terminal_ui)
+      @terminal_ui = terminal_ui
+    end
+
+    def set_directory_listing(directory_listing)
+      @directory_listing = directory_listing
+    end
+
+    # ============================
+    # ブックマーク操作
+    # ============================
+
+    def add_bookmark
+      current_path = @directory_listing&.current_path || Dir.pwd
+
+      bookmarks = @bookmark_manager.list
+      existing = bookmarks.find { |b| b[:path] == current_path }
+
+      if existing
+        content_lines = [
+          '',
+          'This directory is already bookmarked',
+          "Name: #{existing[:name]}",
+          '',
+          'Press any key to continue...'
+        ]
+
+        title = 'Bookmark Exists'
+        width = 50
+        height = content_lines.length + 4
+
+        show_overlay_dialog(title, content_lines, {
+          width: width,
+          height: height,
+          border_color: "\e[33m",
+          title_color: "\e[1;33m",
+          content_color: "\e[37m"
+        })
+
+        return false
+      end
+
+      dir_name = File.basename(current_path)
+
+      title = "Add Bookmark: #{dir_name}"
+      prompt = "Enter bookmark name:"
+      bookmark_name = @dialog_renderer.show_input_dialog(title, prompt, {
+        border_color: "\e[32m",
+        title_color: "\e[1;32m",
+        content_color: "\e[37m"
+      })
+
+      return false if bookmark_name.nil? || bookmark_name.empty?
+
+      result = @bookmark_manager.add(current_path, bookmark_name)
+
+      @terminal_ui&.refresh_display
+      result
+    end
+
+    def show_bookmark_menu
+      current_path = @directory_listing&.current_path || Dir.pwd
+
+      menu_items = [
+        '1. Add current dir to bookmarks',
+        '2. Add to script paths',
+        '3. Manage script paths',
+        '4. View bookmarks'
+      ]
+
+      content_lines = [''] + menu_items + ['', '[1-4] Select | [Esc] Cancel']
+
+      title = 'Bookmark Menu'
+      width = 45
+      height = content_lines.length + 4
+
+      key = show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
+        border_color: "\e[36m",
+        title_color: "\e[1;36m",
+        content_color: "\e[37m"
+      })
+
+      case key
+      when '1'
+        add_bookmark
+      when '2'
+        add_to_script_paths
+      when '3'
+        show_script_paths_manager
+      when '4'
+        selected_bookmark = @bookmark_manager.list_interactive
+        @terminal_ui&.refresh_display
+        if selected_bookmark
+          if @bookmark_manager.path_exists?(selected_bookmark)
+            navigate_to_directory(selected_bookmark[:path])
+          else
+            show_error_and_wait('bookmark.path_not_exist', selected_bookmark[:path])
+          end
+        end
+      else
+        @terminal_ui&.refresh_display
+      end
+
+      true
+    end
+
+    def goto_bookmark(number)
+      bookmark = @bookmark_manager.find_by_number(number)
+
+      return false unless bookmark
+      return false unless @bookmark_manager.path_exists?(bookmark)
+
+      # Tab循環位置を更新（数字キー後の Tab が次の番号から続くように）
+      @last_bookmark_idx = number - 1
+      navigate_to_directory(bookmark[:path])
+    end
+
+    # パスを指定してブックマーク移動（テスト用）
+    def goto_bookmark_by_path(path)
+      navigate_to_directory(path)
+    end
+
+    def goto_start_directory
+      start_dir = @directory_listing&.start_directory
+      return false unless start_dir
+
+      navigate_to_directory(start_dir)
+    end
+
+    # 次のブックマークに移動（Tabキー）
+    # 現在のディレクトリがブックマーク内なら current_path を基準に次へ、
+    # そうでない場合は @last_bookmark_idx から継続（ブックマーク外に出ても循環が止まらない）
+    # 存在しないパスのブックマークはスキップする
+    # @return [Integer, nil] 新しいブックマークインデックス、またはnil
+    def goto_next_bookmark
+      bookmarks = @bookmark_manager.list
+      return nil unless bookmarks&.any?
+
+      current_path = @directory_listing.current_path
+      current_position = bookmarks.find_index { |bm| bm[:path] == current_path }
+      start_idx = if current_position
+        (current_position + 1) % bookmarks.length
+      elsif @last_bookmark_idx
+        (@last_bookmark_idx + 1) % bookmarks.length
+      else
+        0
+      end
+
+      bookmarks.length.times do |i|
+        idx = (start_idx + i) % bookmarks.length
+        next unless Dir.exist?(bookmarks[idx][:path])
+
+        @last_bookmark_idx = idx
+        navigate_to_directory(bookmarks[idx][:path])
+        return @last_bookmark_idx
+      end
+      nil
+    end
+
+    # 前のブックマークに移動（Shift+Tabキー）
+    # 存在しないパスのブックマークはスキップする
+    # @return [Integer, nil] 新しいブックマークインデックス、またはnil
+    def goto_prev_bookmark
+      bookmarks = @bookmark_manager.list
+      return nil unless bookmarks&.any?
+
+      current_path = @directory_listing.current_path
+      current_position = bookmarks.find_index { |bm| bm[:path] == current_path }
+      start_idx = if current_position
+        (current_position - 1 + bookmarks.length) % bookmarks.length
+      elsif @last_bookmark_idx
+        (@last_bookmark_idx - 1 + bookmarks.length) % bookmarks.length
+      else
+        bookmarks.length - 1
+      end
+
+      bookmarks.length.times do |i|
+        idx = (start_idx - i + bookmarks.length) % bookmarks.length
+        next unless Dir.exist?(bookmarks[idx][:path])
+
+        @last_bookmark_idx = idx
+        navigate_to_directory(bookmarks[idx][:path])
+        return @last_bookmark_idx
+      end
+      nil
+    end
+
+    # ============================
+    # zoxide 連携
+    # ============================
+
+    def show_zoxide_menu
+      selected_path = @zoxide_integration.show_menu
+
+      if selected_path && Dir.exist?(selected_path)
+        if navigate_to_directory(selected_path)
+          @zoxide_integration.add_to_history(selected_path)
+          true
+        else
+          false
+        end
+      else
+        @terminal_ui&.refresh_display
+        false
+      end
+    end
+
+    # ============================
+    # スクリプトパス管理
+    # ============================
+
+    def add_to_script_paths
+      current_path = @directory_listing&.current_path || Dir.pwd
+
+      @script_path_manager ||= ScriptPathManager.new(Config::SCRIPT_PATHS_YML)
+
+      if @script_path_manager.paths.include?(current_path)
+        show_notification('Already in paths', current_path, :info)
+      elsif @script_path_manager.add_path(current_path)
+        show_notification('Added to scripts', current_path, :success)
+      else
+        show_notification('Failed to add', current_path, :error)
+      end
+
+      @terminal_ui&.refresh_display
+      true
+    end
+
+    def show_script_paths_manager
+      unless @script_path_manager
+        show_notification('No script paths configured', '', :info)
+        @terminal_ui&.refresh_display
+        return false
+      end
+
+      paths = @script_path_manager.paths
+      if paths.empty?
+        show_notification('No script paths', 'Press B > 2 to add', :info)
+        @terminal_ui&.refresh_display
+        return false
+      end
+
+      selected_index = 0
+      screen = @terminal_ui&.screen
+      renderer = @terminal_ui&.renderer
+
+      loop do
+        menu_items = paths.each_with_index.map do |path, i|
+          prefix = i == selected_index ? '> ' : '  '
+          "#{prefix}#{i + 1}. #{truncate_path(path, 35)}"
+        end
+
+        content_lines = [''] + menu_items + ['', '[j/k] Move | [d] Delete | [Enter] Jump | [Esc] Back']
+
+        title = 'Script Paths'
+        width = 50
+        height = content_lines.length + 4
+
+        if screen && renderer
+          screen.enable_overlay
+          x, y = @dialog_renderer.calculate_center(width, height)
+          @dialog_renderer.draw_floating_window_to_overlay(screen, x, y, width, height, title, content_lines, {
+            border_color: "\e[35m",
+            title_color: "\e[1;35m",
+            content_color: "\e[37m"
+          })
+          renderer.render(screen)
+
+          key = STDIN.getch
+          screen.disable_overlay
+          renderer.render(screen)
+        else
+          x, y = @dialog_renderer.calculate_center(width, height)
+          @dialog_renderer.draw_floating_window(x, y, width, height, title, content_lines, {
+            border_color: "\e[35m",
+            title_color: "\e[1;35m",
+            content_color: "\e[37m"
+          })
+
+          key = STDIN.getch
+          @dialog_renderer.clear_area(x, y, width, height)
+        end
+
+        case key
+        when 'j'
+          selected_index = [selected_index + 1, paths.length - 1].min
+        when 'k'
+          selected_index = [selected_index - 1, 0].max
+        when 'd'
+          path_to_delete = paths[selected_index]
+          if confirm_delete_script_path(path_to_delete)
+            @script_path_manager.remove_path(path_to_delete)
+            paths = @script_path_manager.paths
+            selected_index = [selected_index, paths.length - 1].min
+            break if paths.empty?
+          end
+        when "\r", "\n"
+          path = paths[selected_index]
+          navigate_to_directory(path) if Dir.exist?(path)
+          break
+        when "\e"
+          break
+        end
+      end
+
+      @terminal_ui&.refresh_display
+      true
+    end
+
+    def confirm_delete_script_path(path)
+      content_lines = [
+        '',
+        'Delete this script path?',
+        '',
+        truncate_path(path, 40),
+        '',
+        '[y] Yes | [n] No'
+      ]
+
+      title = 'Confirm Delete'
+      width = 50
+      height = content_lines.length + 4
+
+      key = show_overlay_dialog(title, content_lines, {
+        width: width,
+        height: height,
+        border_color: "\e[31m",
+        title_color: "\e[1;31m",
+        content_color: "\e[37m"
+      })
+
+      key.downcase == 'y'
+    end
+
+    # ============================
+    # ナビゲーション（委譲）
+    # ============================
+
+    def navigate_to_directory(path)
+      return false unless @directory_listing
+
+      result = @directory_listing.navigate_to_path(path)
+      if result
+        @nav_controller.select_index(0)
+        @nav_controller.clear_filter_mode
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+    def show_overlay_dialog(title, content_lines, options = {}, &block)
+      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
+
+    def show_notification(title, message, type)
+      return unless @notification_manager
+
+      @notification_manager.add(title, type, duration: 3, exit_code: nil)
+    end
+
+    def show_error_and_wait(message_key, value)
+      puts "\n#{ConfigLoader.message(message_key) || message_key}: #{value}"
+      wait_for_keypress
+      false
+    end
+
+    def wait_for_keypress
+      print ConfigLoader.message('keybind.press_any_key') || 'Press any key to continue...'
+      STDIN.getch
+    end
+
+    def truncate_path(path, max_length)
+      return path if path.length <= max_length
+
+      display_path = path.sub(Dir.home, '~')
+      return display_path if display_path.length <= max_length
+
+      "...#{display_path[-(max_length - 3)..]}"
+    end
+  end
+end

data/lib/rufio/config_loader.rb

@@ -38,8 +38,66 @@ module Rufio
         load_config[:colors]
       end
 
+      # デフォルトキーバインド（全アクションの単一キー定義）
+      def default_keybinds
+        {
+          # ナビゲーション
+          move_up:         'k',
+          move_down:       'j',
+          navigate_parent: 'h',
+          navigate_enter:  'l',
+          top:             'g',
+          bottom:          'G',
+          refresh:         'R',
+          # ファイル操作
+          open_file:       'o',
+          rename:          'r',
+          delete:          'd',
+          create_file:     'a',
+          create_dir:      'A',
+          move_selected:   'm',
+          copy_selected:   'c',
+          delete_selected: 'x',
+          open_explorer:   'e',
+          # 選択・検索
+          select:          ' ',
+          filter:          'f',
+          fzf_search:      's',
+          fzf_search_alt:  '/',
+          rga_search:      'F',
+          # ブックマーク
+          add_bookmark:    'b',
+          bookmark_menu:   'B',
+          zoxide:          'z',
+          start_dir:       '0',
+          # モード・ツール
+          job_mode:        'J',
+          help:            '?',
+          log_viewer:      'L',
+          command_mode:    ':',
+          quit:            'q'
+        }.freeze
+      end
+
+      # デフォルトUI設定
+      def default_ui_options
+        {
+          panel_ratio:     0.5,   # 左パネル幅比率（0.3〜0.7）
+          preview_enabled: true   # ファイルプレビューのON/OFF
+        }.freeze
+      end
+
+      # UI設定（デフォルト＋ユーザー設定のマージ）
+      def ui_options
+        user_opts = load_config[:ui_options] || {}
+        default_ui_options.merge(user_opts)
+      end
+
       def keybinds
-        load_config[:keybinds]
+        raw_user_keybinds = load_config[:keybinds] || {}
+        # 新フォーマット（単一文字列値）のみ受け入れ、古いフォーマット（配列値）は無視
+        user_keybinds = raw_user_keybinds.select { |_, v| v.is_a?(String) }
+        default_keybinds.merge(user_keybinds)
       end
 
       def language
@@ -228,7 +286,7 @@ module Rufio
         config = {
           applications: safe_const_get(:APPLICATIONS, default_config[:applications]),
           colors: safe_const_get(:COLORS, default_config[:colors]),
-          keybinds: safe_const_get(:KEYBINDS, default_config[:keybinds])
+          keybinds: safe_const_get(:KEYBINDS, {})
         }
 
         if Object.const_defined?(:LANGUAGE)
@@ -245,6 +303,10 @@ module Rufio
           config[:command_history_size] = Object.const_get(:COMMAND_HISTORY_SIZE)
         end
 
+        if Object.const_defined?(:UI_OPTIONS)
+          config[:ui_options] = safe_const_get(:UI_OPTIONS, {})
+        end
+
         config
       rescue StandardError => e
         warn "Failed to load config file: #{e.message}"
@@ -273,18 +335,8 @@ module Rufio
             selected: { hsl: [50, 90, 70] },
             preview: { hsl: [180, 60, 65] }
           },
-          keybinds: {
-            quit: %w[q ESC],
-            up: %w[k UP],
-            down: %w[j DOWN],
-            left: %w[h LEFT],
-            right: %w[l RIGHT ENTER],
-            top: %w[g],
-            bottom: %w[G],
-            refresh: %w[r],
-            search: %w[/],
-            open_file: %w[o SPACE]
-          }
+          keybinds: {},    # ユーザーの上書きのみ格納（デフォルトはdefault_keybindsを参照）
+          ui_options: {}   # ユーザーの上書きのみ格納（デフォルトはdefault_ui_optionsを参照）
         }
       end
     end