beniya 0.6.0 → 0.6.2

data/lib/beniya/logger.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Beniya
+  # Unified logger for debug and error messages
+  # Only logs when BENIYA_DEBUG environment variable is set to '1'
+  class Logger
+    LOG_FILE = File.join(Dir.home, '.beniya_debug.log')
+
+    # Log levels
+    DEBUG = :debug
+    INFO = :info
+    WARN = :warn
+    ERROR = :error
+
+    class << self
+      # Log a debug message with optional context
+      # @param message [String] The log message
+      # @param context [Hash] Additional context information
+      def debug(message, context: {})
+        return unless debug_enabled?
+
+        write_log(DEBUG, message, context)
+      end
+
+      # Log an info message
+      # @param message [String] The log message
+      # @param context [Hash] Additional context information
+      def info(message, context: {})
+        return unless debug_enabled?
+
+        write_log(INFO, message, context)
+      end
+
+      # Log a warning message
+      # @param message [String] The log message
+      # @param context [Hash] Additional context information
+      def warn(message, context: {})
+        return unless debug_enabled?
+
+        write_log(WARN, message, context)
+      end
+
+      # Log an error message with optional exception
+      # @param message [String] The error message
+      # @param exception [Exception, nil] Optional exception object
+      # @param context [Hash] Additional context information
+      def error(message, exception: nil, context: {})
+        return unless debug_enabled?
+
+        full_context = context.dup
+        if exception
+          full_context[:exception] = exception.message
+          full_context[:backtrace] = exception.backtrace&.first(5)
+        end
+
+        write_log(ERROR, message, full_context)
+      end
+
+      # Clear the log file
+      def clear_log
+        return unless debug_enabled?
+
+        File.open(LOG_FILE, 'w') { |f| f.puts "=== Beniya Debug Log Cleared at #{Time.now} ===" }
+      end
+
+      private
+
+      # Check if debug logging is enabled
+      # @return [Boolean]
+      def debug_enabled?
+        ENV['BENIYA_DEBUG'] == '1'
+      end
+
+      # Write a log entry to the log file
+      # @param level [Symbol] Log level
+      # @param message [String] Log message
+      # @param context [Hash] Context information
+      def write_log(level, message, context)
+        File.open(LOG_FILE, 'a') do |f|
+          timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S')
+          f.puts "[#{timestamp}] [#{level.to_s.upcase}] #{message}"
+
+          unless context.empty?
+            f.puts '  Context:'
+            context.each do |key, value|
+              if value.is_a?(Array) && value.length > 10
+                f.puts "    #{key}: [#{value.length} items]"
+              else
+                f.puts "    #{key}: #{value.inspect}"
+              end
+            end
+          end
+
+          f.puts ''
+        end
+      rescue StandardError => e
+        # Silently fail if we can't write to log file
+        # Don't want logging to break the application
+        warn "Failed to write to log file: #{e.message}"
+      end
+    end
+  end
+end

data/lib/beniya/selection_manager.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Beniya
+  # Manages selected items (files/directories) for bulk operations
+  class SelectionManager
+    def initialize
+      @selected_items = []
+    end
+
+    # Toggle selection for an entry
+    # @param entry [Hash] Entry with :name key
+    # @return [Boolean] true if now selected, false if unselected
+    def toggle_selection(entry)
+      return false unless entry
+
+      if @selected_items.include?(entry[:name])
+        @selected_items.delete(entry[:name])
+        false
+      else
+        @selected_items << entry[:name]
+        true
+      end
+    end
+
+    # Check if an entry is selected
+    # @param entry_name [String] Entry name
+    # @return [Boolean]
+    def selected?(entry_name)
+      @selected_items.include?(entry_name)
+    end
+
+    # Get all selected items
+    # @return [Array<String>] Copy of selected items
+    def selected_items
+      @selected_items.dup
+    end
+
+    # Clear all selections
+    def clear
+      @selected_items.clear
+    end
+
+    # Check if any items are selected
+    # @return [Boolean]
+    def any?
+      !@selected_items.empty?
+    end
+
+    # Get the count of selected items
+    # @return [Integer]
+    def count
+      @selected_items.length
+    end
+
+    # Add an item to selection
+    # @param item_name [String] Item name
+    def add(item_name)
+      @selected_items << item_name unless @selected_items.include?(item_name)
+    end
+
+    # Remove an item from selection
+    # @param item_name [String] Item name
+    def remove(item_name)
+      @selected_items.delete(item_name)
+    end
+
+    # Select multiple items
+    # @param item_names [Array<String>] Item names
+    def select_multiple(item_names)
+      item_names.each { |name| add(name) }
+    end
+
+    # Check if selection is empty
+    # @return [Boolean]
+    def empty?
+      @selected_items.empty?
+    end
+  end
+end

data/lib/beniya/terminal_ui.rb

@@ -4,14 +4,43 @@ require 'io/console'
 
 module Beniya
   class TerminalUI
+    # Layout constants
+    HEADER_HEIGHT = 2              # Header占有行数
+    FOOTER_HEIGHT = 1              # Footer占有行数
+    HEADER_FOOTER_MARGIN = 4       # Header + Footer分のマージン
+
+    # Panel layout ratios
+    LEFT_PANEL_RATIO = 0.5         # 左パネルの幅比率
+    RIGHT_PANEL_RATIO = 1.0 - LEFT_PANEL_RATIO
+
+    # Display constants
+    DEFAULT_SCREEN_WIDTH = 80      # デフォルト画面幅
+    DEFAULT_SCREEN_HEIGHT = 24     # デフォルト画面高さ
+    HEADER_PADDING = 2             # ヘッダーのパディング
+    BASE_INFO_RESERVED_WIDTH = 20  # ベースディレクトリ表示の予約幅
+    BASE_INFO_MIN_WIDTH = 10       # ベースディレクトリ表示の最小幅
+    FILTER_TEXT_RESERVED = 15      # フィルタテキスト表示の予約幅
+
+    # File display constants
+    ICON_SIZE_PADDING = 12         # アイコン、選択マーク、サイズ情報分
+    CURSOR_OFFSET = 1              # カーソル位置のオフセット
+
+    # Size display constants (bytes)
+    KILOBYTE = 1024
+    MEGABYTE = KILOBYTE * 1024
+    GIGABYTE = MEGABYTE * 1024
+
+    # Line offsets
+    CONTENT_START_LINE = 3         # コンテンツ開始行（ヘッダー2行スキップ）
+
     def initialize
       console = IO.console
       if console
         @screen_width, @screen_height = console.winsize.reverse
       else
         # fallback values (for test environments etc.)
-        @screen_width = 80
-        @screen_height = 24
+        @screen_width = DEFAULT_SCREEN_WIDTH
+        @screen_height = DEFAULT_SCREEN_HEIGHT
       end
       @running = false
     end
@@ -83,9 +112,9 @@ module Beniya
       entries = get_display_entries
       selected_entry = entries[@keybind_handler.current_index]
 
-      # calculate height with header (2 lines) and footer margin
-      content_height = @screen_height - 4 # ヘッダー（2行）とフッター分を除く
-      left_width = @screen_width / 2
+      # calculate height with header and footer margin
+      content_height = @screen_height - HEADER_FOOTER_MARGIN
+      left_width = (@screen_width * LEFT_PANEL_RATIO).to_i
       right_width = @screen_width - left_width
 
       # adjust so right panel doesn't overflow into left panel
@@ -112,14 +141,14 @@ module Beniya
       end
 
       # abbreviate if path is too long
-      if header.length > @screen_width - 2
+      if header.length > @screen_width - HEADER_PADDING
         if @keybind_handler.filter_active?
           # prioritize showing filter when active
           filter_text = " [Filter: #{@keybind_handler.filter_query}]"
-          base_length = @screen_width - filter_text.length - 15
+          base_length = @screen_width - filter_text.length - FILTER_TEXT_RESERVED
           header = "📁 beniya - ...#{current_path[-base_length..-1]}#{filter_text}"
         else
-          header = "📁 beniya - ...#{current_path[-(@screen_width - 15)..-1]}"
+          header = "📁 beniya - ...#{current_path[-(@screen_width - FILTER_TEXT_RESERVED)..-1]}"
         end
       end
 
@@ -143,15 +172,15 @@ module Beniya
       end
       
       # 長すぎる場合は省略
-      if base_info.length > @screen_width - 2
+      if base_info.length > @screen_width - HEADER_PADDING
         if base_info.include?(" | Selected:")
           selected_part = base_info.split(" | Selected:").last
-          available_length = @screen_width - 20 - " | Selected:#{selected_part}".length
+          available_length = @screen_width - BASE_INFO_RESERVED_WIDTH - " | Selected:#{selected_part}".length
         else
-          available_length = @screen_width - 20
+          available_length = @screen_width - BASE_INFO_RESERVED_WIDTH
         end
         
-        if available_length > 10
+        if available_length > BASE_INFO_MIN_WIDTH
           # パスの最後の部分を表示
           dir_part = base_info.split(": ").last.split(" | ").first
           short_base_dir = "...#{dir_part[-available_length..-1]}"
@@ -170,7 +199,7 @@ module Beniya
 
       (0...height).each do |i|
         entry_index = start_index + i
-        line_num = i + 3 # skip header (2 lines)
+        line_num = i + CONTENT_START_LINE
 
         print "\e[#{line_num};1H" # set cursor position
 
@@ -181,7 +210,7 @@ module Beniya
           draw_entry_line(entry, width, is_selected)
         else
           # 左ペイン専用の安全な幅で空行を出力
-          safe_width = [width - 1, @screen_width / 2 - 1].min
+          safe_width = [width - CURSOR_OFFSET, (@screen_width * LEFT_PANEL_RATIO).to_i - CURSOR_OFFSET].min
           print ' ' * safe_width
         end
       end
@@ -192,14 +221,14 @@ module Beniya
       icon, color = get_entry_display_info(entry)
 
       # 左ペイン専用の安全な幅を計算（右ペインにはみ出さないよう）
-      safe_width = [width - 1, @screen_width / 2 - 1].min
+      safe_width = [width - CURSOR_OFFSET, (@screen_width * LEFT_PANEL_RATIO).to_i - CURSOR_OFFSET].min
 
       # 選択マークの追加
       selection_mark = @keybind_handler.is_selected?(entry[:name]) ? "✓ " : "  "
 
       # ファイル名（必要に応じて切り詰め）
       name = entry[:name]
-      max_name_length = safe_width - 12 # アイコン、選択マーク、サイズ情報分を除く
+      max_name_length = safe_width - ICON_SIZE_PADDING
       name = name[0...max_name_length - 3] + '...' if max_name_length > 0 && name.length > max_name_length
 
       # サイズ情報
@@ -260,22 +289,22 @@ module Beniya
     def format_size(size)
       return '      ' if size == 0
 
-      if size < 1024
+      if size < KILOBYTE
         "#{size}B".rjust(6)
-      elsif size < 1024 * 1024
-        "#{(size / 1024.0).round(1)}K".rjust(6)
-      elsif size < 1024 * 1024 * 1024
-        "#{(size / (1024.0 * 1024)).round(1)}M".rjust(6)
+      elsif size < MEGABYTE
+        "#{(size / KILOBYTE.to_f).round(1)}K".rjust(6)
+      elsif size < GIGABYTE
+        "#{(size / MEGABYTE.to_f).round(1)}M".rjust(6)
       else
-        "#{(size / (1024.0 * 1024 * 1024)).round(1)}G".rjust(6)
+        "#{(size / GIGABYTE.to_f).round(1)}G".rjust(6)
       end
     end
 
     def draw_file_preview(selected_entry, width, height, left_offset)
       (0...height).each do |i|
-        line_num = i + 3 # skip header (2 lines)
+        line_num = i + CONTENT_START_LINE
         # カーソル位置を左パネルの右端に設定
-        cursor_position = left_offset + 1
+        cursor_position = left_offset + CURSOR_OFFSET
 
         # 画面の境界を厳密に計算
         max_chars_from_cursor = @screen_width - cursor_position
@@ -450,7 +479,7 @@ module Beniya
 
     def draw_footer
       # 最下行から1行上に表示してスクロールを避ける
-      footer_line = @screen_height - 1
+      footer_line = @screen_height - FOOTER_HEIGHT
       print "\e[#{footer_line};1H"
 
       if @keybind_handler.filter_active?

data/lib/beniya/text_utils.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Beniya
+  # Text utility methods for display width calculation and string manipulation
+  # Handles multi-byte characters (Japanese, etc.) correctly
+  module TextUtils
+    module_function
+
+    # Character width constants
+    FULLWIDTH_CHAR_WIDTH = 2
+    HALFWIDTH_CHAR_WIDTH = 1
+    MULTIBYTE_THRESHOLD = 1
+
+    # Truncation constants
+    ELLIPSIS_MIN_WIDTH = 3
+    ELLIPSIS = '...'
+
+    # Line break constants
+    BREAK_POINT_THRESHOLD = 0.5  # Break after 50% of max_width
+
+    # Calculate display width of a string
+    # Full-width characters (Japanese, etc.) count as 2, half-width as 1
+    def display_width(string)
+      string.each_char.map do |char|
+        case char
+        when /[\u3000-\u303F\u3040-\u309F\u30A0-\u30FF\u4E00-\u9FAF\uFF00-\uFFEF]/
+          FULLWIDTH_CHAR_WIDTH  # Japanese characters (hiragana, katakana, kanji, full-width symbols)
+        when /[\u0020-\u007E]/
+          HALFWIDTH_CHAR_WIDTH  # ASCII characters
+        else
+          char.bytesize > MULTIBYTE_THRESHOLD ? FULLWIDTH_CHAR_WIDTH : HALFWIDTH_CHAR_WIDTH
+        end
+      end.sum
+    end
+
+    # Truncate string to fit within max_width
+    def truncate_to_width(string, max_width)
+      return string if display_width(string) <= max_width
+
+      result = ''
+      current_width = 0
+
+      string.each_char do |char|
+        char_width = display_width(char)
+        break if current_width + char_width > max_width
+
+        result += char
+        current_width += char_width
+      end
+
+      # Add ellipsis if there's room
+      result += ELLIPSIS if max_width >= ELLIPSIS_MIN_WIDTH && current_width <= max_width - ELLIPSIS_MIN_WIDTH
+      result
+    end
+
+    # Pad string to target_width with spaces
+    def pad_string_to_width(string, target_width)
+      current_width = display_width(string)
+      if current_width >= target_width
+        truncate_to_width(string, target_width)
+      else
+        string + ' ' * (target_width - current_width)
+      end
+    end
+
+    # Find the best break point for wrapping text within max_width
+    def find_break_point(line, max_width)
+      return line.length if display_width(line) <= max_width
+
+      current_width = 0
+      best_break_point = 0
+      space_break_point = nil
+      punct_break_point = nil
+
+      line.each_char.with_index do |char, index|
+        char_width = display_width(char)
+        break if current_width + char_width > max_width
+
+        current_width += char_width
+        best_break_point = index + 1
+
+        # Record break point at space
+        space_break_point = index + 1 if char == ' ' && current_width > max_width * BREAK_POINT_THRESHOLD
+
+        # Record break point at Japanese punctuation
+        punct_break_point = index + 1 if char.match?(/[、。，．！？]/) && current_width > max_width * BREAK_POINT_THRESHOLD
+      end
+
+      space_break_point || punct_break_point || best_break_point
+    end
+  end
+end

data/lib/beniya/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Beniya
-  VERSION = '0.6.0'
+  VERSION = '0.6.2'
 end

data/lib/beniya/zoxide_integration.rb

@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+require 'shellwords'
+
+module Beniya
+  # Integrates with zoxide for directory history navigation
+  class ZoxideIntegration
+    # Dialog size constants
+    DIALOG_WIDTH = 45
+    DIALOG_BORDER_HEIGHT = 4
+
+    def initialize(dialog_renderer = nil)
+      @dialog_renderer = dialog_renderer
+    end
+
+    # Check if zoxide is available
+    # @return [Boolean]
+    def available?
+      system('which zoxide > /dev/null 2>&1')
+    end
+
+    # Get zoxide history
+    # @return [Array<Hash>] Array of { path: String, score: Float }
+    def get_history
+      return [] unless available?
+
+      begin
+        # Get zoxide history with scores
+        output = `zoxide query --list --score 2>/dev/null`.strip
+        return [] if output.empty?
+
+        # Parse each line into path and score
+        lines = output.split("\n")
+        history = lines.map do |line|
+          # zoxide output format: "score path"
+          if line.match(/^\s*(\d+(?:\.\d+)?)\s+(.+)$/)
+            score = ::Regexp.last_match(1).to_f
+            path = ::Regexp.last_match(2).strip
+            { path: path, score: score }
+          else
+            # No score (backward compatibility)
+            { path: line.strip, score: 0.0 }
+          end
+        end
+
+        # Filter to only existing directories
+        history.select { |entry| Dir.exist?(entry[:path]) }
+      rescue StandardError
+        []
+      end
+    end
+
+    # Show zoxide history menu and let user select
+    # @return [String, nil] Selected path or nil if cancelled
+    def show_menu
+      return nil unless @dialog_renderer
+
+      history = get_history
+
+      if history.empty?
+        show_no_history_message
+        return nil
+      end
+
+      select_from_history(history)
+    end
+
+    # Add directory to zoxide history
+    # @param path [String] Directory path
+    # @return [Boolean] Success status
+    def add_to_history(path)
+      return false unless available?
+      return false unless Dir.exist?(path)
+
+      begin
+        system("zoxide add #{Shellwords.escape(path)} > /dev/null 2>&1")
+        true
+      rescue StandardError
+        false
+      end
+    end
+
+    private
+
+    # Show message when no history is available
+    def show_no_history_message
+      return unless @dialog_renderer
+
+      title = 'Zoxide'
+      content_lines = [
+        '',
+        'No zoxide history found.',
+        '',
+        'Zoxide learns from your directory navigation.',
+        'Use zoxide more to build up history.',
+        '',
+        'Press any key to continue...'
+      ]
+
+      dialog_width = DIALOG_WIDTH
+      dialog_height = DIALOG_BORDER_HEIGHT + 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[33m", # Yellow
+                                               title_color: "\e[1;33m",   # Bold yellow
+                                               content_color: "\e[37m"    # White
+                                             })
+
+      STDIN.getch
+      @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
+    end
+
+    # Select from zoxide history
+    # @param history [Array<Hash>] History entries
+    # @return [String, nil] Selected path or nil
+    def select_from_history(history)
+      return nil unless @dialog_renderer
+
+      title = 'Zoxide History'
+
+      # Format history for display (max 20 items)
+      display_history = history.first(20)
+      content_lines = ['']
+
+      display_history.each_with_index do |entry, index|
+        # Shorten path display (replace home directory with ~)
+        display_path = entry[:path].gsub(ENV['HOME'], '~')
+        line = "  #{index + 1}. #{display_path}"
+        # Truncate if too long
+        line = line[0...60] + '...' if line.length > 63
+        content_lines << line
+      end
+
+      content_lines << ''
+      content_lines << 'Enter number (1-' + display_history.length.to_s + ') or ESC to cancel'
+
+      dialog_width = 70
+      dialog_height = [4 + content_lines.length, 25].min
+      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[36m", # Cyan
+                                               title_color: "\e[1;36m",   # Bold cyan
+                                               content_color: "\e[37m"    # White
+                                             })
+
+      # Number input mode
+      input_buffer = ''
+
+      loop do
+        char = STDIN.getch
+
+        case char
+        when "\e", "\x03" # ESC, Ctrl+C
+          @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
+          return nil
+        when "\r", "\n" # Enter
+          unless input_buffer.empty?
+            number = input_buffer.to_i
+            if number > 0 && number <= display_history.length
+              selected_entry = display_history[number - 1]
+              @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
+              return selected_entry[:path]
+            end
+          end
+          # Invalid input, ask again
+          input_buffer = ''
+        when "\u007f", "\b" # Backspace
+          input_buffer = input_buffer[0...-1] unless input_buffer.empty?
+        when /[0-9]/
+          input_buffer += char
+          # Max 2 digits
+          input_buffer = input_buffer[-2..-1] if input_buffer.length > 2
+
+          # If number is within range, select immediately
+          number = input_buffer.to_i
+          if number > 0 && number <= display_history.length &&
+             (number >= 10 || input_buffer.length == 1)
+            selected_entry = display_history[number - 1]
+            @dialog_renderer.clear_area(x, y, dialog_width, dialog_height)
+            return selected_entry[:path]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/beniya.rb

@@ -5,6 +5,15 @@ require_relative "beniya/config"
 require_relative "beniya/config_loader"
 require_relative "beniya/color_helper"
 require_relative "beniya/directory_listing"
+require_relative "beniya/filter_manager"
+require_relative "beniya/selection_manager"
+require_relative "beniya/file_operations"
+require_relative "beniya/bookmark_manager"
+require_relative "beniya/bookmark"
+require_relative "beniya/zoxide_integration"
+require_relative "beniya/dialog_renderer"
+require_relative "beniya/text_utils"
+require_relative "beniya/logger"
 require_relative "beniya/keybind_handler"
 require_relative "beniya/file_preview"
 require_relative "beniya/terminal_ui"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: beniya
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - masisz
 bindir: bin
 cert_chain: []
-date: 2025-09-28 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-console
@@ -129,16 +129,24 @@ files:
 - lib/beniya.rb
 - lib/beniya/application.rb
 - lib/beniya/bookmark.rb
+- lib/beniya/bookmark_manager.rb
 - lib/beniya/color_helper.rb
 - lib/beniya/config.rb
 - lib/beniya/config_loader.rb
+- lib/beniya/dialog_renderer.rb
 - lib/beniya/directory_listing.rb
 - lib/beniya/file_opener.rb
+- lib/beniya/file_operations.rb
 - lib/beniya/file_preview.rb
+- lib/beniya/filter_manager.rb
 - lib/beniya/health_checker.rb
 - lib/beniya/keybind_handler.rb
+- lib/beniya/logger.rb
+- lib/beniya/selection_manager.rb
 - lib/beniya/terminal_ui.rb
+- lib/beniya/text_utils.rb
 - lib/beniya/version.rb
+- lib/beniya/zoxide_integration.rb
 - publish_gem.zsh
 - test_delete/test1.txt
 - test_delete/test2.txt