git_game_show 0.2.1 → 0.2.2

data/lib/git_game_show/ui/console.rb

@@ -0,0 +1,66 @@
+module GitGameShow
+  # Handles console input and command processing
+  class Console
+    def initialize(server_handler, renderer)
+      @server_handler = server_handler
+      @renderer = renderer
+    end
+
+    def setup_command_handler
+      # Log initial instructions
+      @renderer.log_message("Available commands: help, start, exit", :cyan)
+      @renderer.log_message("Type a command and press Enter", :cyan)
+      @renderer.log_message("Server is running. Waiting for players to join...", :green)
+
+      # Handle commands in a separate thread
+      Thread.new do
+        loop do
+          @renderer.draw_command_prompt
+          command = gets&.chomp&.downcase
+          next unless command
+
+          # Process commands
+          handle_command(command)
+          
+          # Small delay to process any display changes
+          sleep 0.1
+        end
+      end
+    end
+
+    private
+
+    def handle_command(command)
+      case command
+      when 'start'
+        @server_handler.handle_start_command
+      when 'help'
+        show_help
+      when 'end'
+        @server_handler.handle_end_command
+      when 'reset'
+        @server_handler.handle_reset_command
+      when 'exit'
+        handle_exit_command
+      else
+        @renderer.log_message("Unknown command: #{command}. Type 'help' for available commands.", :red)
+      end
+    end
+
+    def show_help
+      @renderer.log_message("Available commands:", :cyan)
+      @renderer.log_message("  start   - Start the game with current players", :cyan)
+      @renderer.log_message("  end     - End current game and show final scores", :cyan)
+      @renderer.log_message("  reset   - Manually reset players to waiting room (after game ends)", :cyan)
+      @renderer.log_message("  help    - Show this help message", :cyan)
+      @renderer.log_message("  exit    - Shut down the server and exit", :cyan)
+    end
+
+    def handle_exit_command
+      # Clean up before exiting
+      @renderer.log_message("Shutting down server...", :yellow)
+      @renderer.cleanup
+      EM.stop_event_loop
+    end
+  end
+end

data/lib/git_game_show/ui/message_area.rb

@@ -0,0 +1,7 @@
+module GitGameShow
+  # Message area to display game events and status messages
+  class MessageArea
+    # This class was merged into the Renderer class for simplicity
+    # Keeping this file as a placeholder in case we want to separate it later
+  end
+end

data/lib/git_game_show/ui/renderer.rb

@@ -0,0 +1,232 @@
+module GitGameShow
+  # Main UI renderer for terminal display
+  class Renderer
+    def initialize
+      @message_log = []
+      @cursor = TTY::Cursor
+
+      # Get terminal dimensions
+      @terminal_width = `tput cols`.to_i rescue 80
+      @terminal_height = `tput lines`.to_i rescue 24
+
+      # Calculate layout
+      @main_width = (@terminal_width * 0.7).to_i
+      @sidebar_width = @terminal_width - @main_width - 3 # 3 for border
+
+      # The fixed line for command input (near bottom of screen)
+      @command_line = @terminal_height - 3
+    end
+
+    def setup
+      # Clear screen and hide cursor
+      print @cursor.clear_screen
+      print @cursor.hide
+
+      # Draw initial UI
+      draw_ui_frame
+    end
+
+    def cleanup
+      print @cursor.show  # Make sure cursor is visible
+      print @cursor.clear_screen
+    end
+    
+    def draw_ui_frame
+      # Clear screen
+      print @cursor.clear_screen
+
+      # Draw horizontal divider line between main area and command area
+      print @cursor.move_to(0, @command_line - 1)
+      print "═" * (@terminal_width - @sidebar_width - 3) + "╧" + "═" * (@sidebar_width + 2)
+
+      # Draw vertical divider line between main area and sidebar
+      print @cursor.move_to(@main_width, 0)
+      print "│"
+      print @cursor.move_to(@main_width, 1)
+      print "│"
+      print @cursor.move_to(@main_width, 2)
+      print "╞═"
+      (3...@command_line-1).each do |line|
+        print @cursor.move_to(@main_width, line)
+        print "│"
+      end
+    end
+
+    def draw_welcome_banner
+      # Position cursor at top left
+      lines = [
+        " ██████╗ ".colorize(:red) + "  ██████╗ ".colorize(:green) + "  █████╗".colorize(:blue),
+        "██╔════╝ ".colorize(:red) + " ██╔════╝ ".colorize(:green) + " ██╔═══╝".colorize(:blue),
+        "██║  ███╗".colorize(:red) + " ██║  ███╗".colorize(:green) + " ███████╗".colorize(:blue),
+        "██║   ██║".colorize(:red) + " ██║   ██║".colorize(:green) + " ╚════██║".colorize(:blue),
+        "╚██████╔╝".colorize(:red) + " ╚██████╔╝".colorize(:green) + " ██████╔╝".colorize(:blue),
+        " ╚═════╝ ".colorize(:red) + "  ╚═════╝ ".colorize(:green) + " ╚═════╝ ".colorize(:blue),
+      ]
+
+      start_y = 1
+      lines.each_with_index do |line, i|
+        print @cursor.move_to((@main_width - 28) / 2, start_y + i)
+        print line
+      end
+    end
+
+    def draw_join_link(join_link)
+      # Copy the join link to clipboard
+      Clipboard.copy(join_link)
+
+      link_box_width = [join_link.length + 6, @main_width - 10].min
+      start_x = (@main_width - link_box_width) / 2
+      start_y = 8
+
+      print @cursor.move_to(start_x, start_y)
+      print "╭" + "─" * (link_box_width - 2) + "╮"
+
+      print @cursor.move_to(start_x, start_y + 1)
+      print "│" + " Join Link (Copied to Clipboard) ".center(link_box_width - 2).colorize(:green) + "│"
+
+      print @cursor.move_to(start_x, start_y + 2)
+      print "│" + join_link.center(link_box_width - 2).colorize(:yellow) + "│"
+
+      print @cursor.move_to(start_x, start_y + 3)
+      print "╰" + "─" * (link_box_width - 2) + "╯"
+
+      # Also log that the link was copied
+      log_message("Join link copied to clipboard", :green)
+    end
+
+    def log_message(message, color = :white)
+      # Add message to log
+      @message_log << {text: message, color: color}
+
+      # Keep only last few messages
+      @message_log = @message_log.last(15) if @message_log.size > 15
+
+      # Redraw message area
+      draw_message_area
+
+      # Return cursor to command prompt
+      draw_command_prompt
+    end
+
+    def draw_message_area
+      # Calculate message area dimensions
+      message_area_start = 18
+      message_area_height = @command_line - message_area_start - 2
+
+      # Clear message area
+      (message_area_start..(@command_line-2)).each do |line|
+        print @cursor.move_to(1, line)
+        print " " * (@main_width - 2)
+      end
+
+      # Draw most recent messages
+      display_messages = @message_log.last(message_area_height)
+      display_messages.each_with_index do |msg, index|
+        print @cursor.move_to(1, message_area_start + index)
+        # Truncate message to fit within main width to prevent overflow
+        truncated_text = msg[:text][0...(@main_width - 3)]
+        print truncated_text.colorize(msg[:color])
+      end
+    end
+
+    def draw_command_prompt
+      # Clear command line and two lines below to prevent commit info bleeding
+      print @cursor.move_to(0, @command_line)
+      print " " * @terminal_width
+      print @cursor.move_to(0, @command_line + 1)
+      print " " * @terminal_width
+      print @cursor.move_to(0, @command_line + 2)
+      print " " * @terminal_width
+
+      # Draw command prompt
+      print @cursor.move_to(0, @command_line)
+      print "Command> ".colorize(:green)
+
+      # Position cursor after prompt
+      print @cursor.move_to(9, @command_line)
+      print @cursor.show
+    end
+
+    def draw_game_over(winner, scores)
+      # Safety check for winner
+      if !winner || !winner[0] || !winner[1]
+        log_message("Error: Invalid winner data", :red)
+        return
+      end
+
+      # Create a safe copy of scores to work with
+      safe_scores = {}
+      begin
+        if scores && !scores.empty?
+          scores.each do |player, score|
+            next unless player && player.to_s != ""
+            safe_scores[player.to_s] = score.to_i
+          end
+        end
+      rescue => e
+        log_message("Error copying scores: #{e.message}", :red)
+      end
+      
+      # Use log messages for display
+      divider = "=" * (@main_width - 5)
+      log_message(divider, :yellow)
+      log_message("🏆 GAME OVER - FINAL SCORES 🏆", :yellow)
+      
+      # Announce winner
+      winner_name = winner[0].to_s
+      winner_name = winner_name.length > 20 ? "#{winner_name[0...17]}..." : winner_name
+      winner_score = winner[1].to_i
+      log_message("Winner: #{winner_name} with #{winner_score} points!", :green)
+      
+      # Show leaderboard
+      log_message("Leaderboard:", :cyan)
+      
+      # Sort scores safely
+      sorted_scores = []
+      begin
+        sorted_scores = safe_scores.sort_by { |_, score| -(score || 0) }.to_a
+      rescue => e
+        log_message("Error sorting scores for display: #{e.message}", :red)
+        sorted_scores = safe_scores.to_a
+      end
+      
+      max_to_show = 10
+      entries_to_show = [sorted_scores.size, max_to_show].min
+      
+      sorted_scores.take(entries_to_show).each_with_index do |score_entry, index|
+        # Extra safety check for each entry
+        next unless score_entry && score_entry.is_a?(Array) && score_entry.size >= 2
+        
+        name = score_entry[0]
+        score = score_entry[1]
+        
+        # Safely handle name and score
+        player_name = name.to_s
+        player_score = score.to_i
+        
+        # Truncate name if needed
+        display_name = player_name.length > 15 ? "#{player_name[0...12]}..." : player_name
+        
+        # Format based on position
+        case index
+        when 0
+          log_message("🥇 #{display_name}: #{player_score} points", :yellow)
+        when 1
+          log_message("🥈 #{display_name}: #{player_score} points", :light_blue)
+        when 2
+          log_message("🥉 #{display_name}: #{player_score} points", :light_magenta)
+        else
+          log_message("#{(index + 1).to_s}. #{display_name}: #{player_score} points", :white)
+        end
+      end
+      
+      # If there are more players than shown, add a note
+      if sorted_scores.size > max_to_show
+        log_message("... and #{sorted_scores.size - max_to_show} more", :light_black)
+      end
+      
+      log_message(divider, :yellow)
+      log_message("Ready for a new game! Type 'start' when players have joined.", :green)
+    end
+  end
+end

data/lib/git_game_show/ui/sidebar.rb

@@ -0,0 +1,116 @@
+module GitGameShow
+  # Manages the sidebar display
+  class Sidebar
+    def initialize(renderer)
+      @renderer = renderer
+      @cursor = TTY::Cursor
+
+      # Get terminal dimensions
+      @terminal_width = `tput cols`.to_i rescue 80
+      @terminal_height = `tput lines`.to_i rescue 24
+
+      # Calculate layout
+      @main_width = (@terminal_width * 0.7).to_i
+      @sidebar_width = @terminal_width - @main_width - 3 # 3 for border
+
+      # The fixed line for command input (near bottom of screen)
+      @command_line = @terminal_height - 3
+    end
+
+    def draw_header
+      # Draw sidebar header
+      print @cursor.move_to(@main_width + 2, 1)
+      print "Players".colorize(:cyan)
+
+      print @cursor.move_to(@main_width + 2, 2)
+      print "═" * (@sidebar_width - 2)
+    end
+
+    def update_player_list(players, scores)
+      draw_header
+
+      # Clear player area
+      (3..(@command_line-3)).each do |line|
+        print @cursor.move_to(@main_width + 2, line)
+        print " " * (@sidebar_width - 2)
+      end
+
+      # Show player count
+      print @cursor.move_to(@main_width + 2, 3)
+      print "Total: #{players.size} player(s)".colorize(:yellow)
+
+      # Calculate available space for the player list
+      max_visible_players = @command_line - 8 # Allow space for headers, counts and scrolling indicators
+
+      # List players with scrolling if needed
+      if players.empty?
+        print @cursor.move_to(@main_width + 2, 5)
+        print "Waiting for players...".colorize(:light_black)
+      else
+        # Sort players by score (highest first)
+        sorted_players = players.sort_by { |name| -(scores[name] || 0) }
+
+        # Show scrolling indicator if needed
+        if players.size > max_visible_players
+          print @cursor.move_to(@main_width + 2, 4)
+          print "Showing #{max_visible_players} of #{players.size}:".colorize(:yellow)
+        end
+
+        # Determine which players to display (show top N players by score)
+        visible_players = sorted_players.take(max_visible_players)
+
+        # Display visible players with their scores
+        visible_players.each_with_index do |name, index|
+          print @cursor.move_to(@main_width + 2, 5 + index)
+
+          # Get score (default to 0 if not found)
+          score = scores[name] || 0
+          score_str = score.to_s
+
+          # Calculate available space for name and right-justified score
+          usable_width = @sidebar_width - 6
+          prefix_width = 3 # Account for emoji or number + dot + space
+
+          # Apply medal emoji for top 3 players when in game
+          prefix = ""
+          if scores.any?
+            prefix = case index
+                     when 0 then "🥇 "
+                     when 1 then "🥈 "
+                     when 2 then "🥉 "
+                     else "#{index + 1}. "
+                     end
+          else
+            prefix = "#{index + 1}. "
+          end
+
+          # Calculate how much space we have for the name
+          max_name_length = usable_width - score_str.length - 1 # 1 space before score
+
+          # Truncate long names
+          truncated_name = name.length > max_name_length ?
+                           "#{name[0...(max_name_length-3)]}..." :
+                           name
+
+          # Print player name
+          print @cursor.move_to(@main_width + 2, 5 + index)
+          print "#{prefix}#{truncated_name}".colorize(:light_blue)
+
+          # Print right-justified score
+          score_position = @main_width + usable_width
+          print @cursor.move_to(score_position, 5 + index)
+          print score_str.colorize(:light_blue)
+        end
+
+        # If there are more players than can be shown, add an indicator
+        if players.size > max_visible_players
+          print @cursor.move_to(@main_width + 2, 5 + max_visible_players)
+          print "... and #{players.size - max_visible_players} more".colorize(:light_black)
+        end
+      end
+
+      # Return cursor to command prompt
+      @renderer.draw_command_prompt
+    end
+  end
+end

data/lib/git_game_show/ui/welcome_screen.rb

@@ -0,0 +1,40 @@
+module GitGameShow
+  # Handles the welcome screen display
+  class WelcomeScreen
+    def self.display_ggs
+      # Clear screen
+      system('clear') || system('cls')
+
+      puts ""
+      lines = [
+        " ██████╗ ".colorize(:red) + "  ██████╗ ".colorize(:green) + "  █████╗".colorize(:blue),
+        "██╔════╝ ".colorize(:red) + " ██╔════╝ ".colorize(:green) + " ██╔═══╝".colorize(:blue),
+        "██║  ███╗".colorize(:red) + " ██║  ███╗".colorize(:green) + " ███████╗".colorize(:blue),
+        "██║   ██║".colorize(:red) + " ██║   ██║".colorize(:green) + " ╚════██║".colorize(:blue),
+        "╚██████╔╝".colorize(:red) + " ╚██████╔╝".colorize(:green) + " ██████╔╝".colorize(:blue),
+        " ╚═════╝ ".colorize(:red) + "  ╚═════╝ ".colorize(:green) + " ╚═════╝ ".colorize(:blue),
+      ]
+      lines.each { |line| puts line.center(120) }
+    end
+
+    def self.display_game_logo
+      # Clear screen
+      system('clear') || system('cls')
+
+      puts ""
+      puts (" ██████╗ ██╗████████╗".colorize(:red) + "     ██████╗  █████╗ ███╗   ███╗███████╗".colorize(:green)).center(110)
+      puts ("██╔════╝ ██║╚══██╔══╝".colorize(:red) + "    ██╔════╝ ██╔══██╗████╗ ████║██╔════╝".colorize(:green)).center(110)
+      puts ("██║  ███╗██║   ██║   ".colorize(:red) + "    ██║  ███╗███████║██╔████╔██║█████╗  ".colorize(:green)).center(110)
+      puts ("██║   ██║██║   ██║   ".colorize(:red) + "    ██║   ██║██╔══██║██║╚██╔╝██║██╔══╝  ".colorize(:green)).center(110)
+      puts ("╚██████╔╝██║   ██║   ".colorize(:red) + "    ╚██████╔╝██║  ██║██║ ╚═╝ ██║███████╗".colorize(:green)).center(110)
+      puts (" ╚═════╝ ╚═╝   ╚═╝   ".colorize(:red) + "     ╚═════╝ ╚═╝  ╚═╝╚═╝     ╚═╝╚══════╝".colorize(:green)).center(110)
+
+      puts (" █████╗ ██╗  ██╗ ██████╗ ██╗    ██╗".colorize(:blue)).center(95)
+      puts ("██╔═══╝ ██║  ██║██╔═══██╗██║    ██║".colorize(:blue)).center(95)
+      puts ("███████╗███████║██║   ██║██║ █╗ ██║".colorize(:blue)).center(95)
+      puts ("╚════██║██╔══██║██║   ██║██║███╗██║".colorize(:blue)).center(95)
+      puts ("██████╔╝██║  ██║╚██████╔╝╚███╔███╔╝".colorize(:blue)).center(95)
+      puts ("╚═════╝ ╚═╝  ╚═╝ ╚═════╝  ╚══╝╚══╝ ".colorize(:blue)).center(95)
+    end
+  end
+end

data/lib/git_game_show/version.rb

@@ -1,4 +1,4 @@
 module GitGameShow
   # Current version of Git Game Show
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/git_game_show.rb

@@ -27,24 +27,47 @@ module GitGameShow
     transition_delay: 10 # seconds between rounds
   }.freeze
 
-  # Message types for WebSocket communication
-  module MessageType
-    JOIN_REQUEST = 'join_request'
-    JOIN_RESPONSE = 'join_response'
-    GAME_START = 'game_start'
-    QUESTION = 'question'
-    ANSWER = 'answer'
-    ANSWER_FEEDBACK = 'answer_feedback' # New message type for immediate feedback
-    ROUND_RESULT = 'round_result'
-    SCOREBOARD = 'scoreboard'
-    GAME_END = 'game_end'
-    GAME_RESET = 'game_reset' # New message type for resetting the game
-    CHAT = 'chat'
-  end
+  # File structure is now:
+  # 1. Load core message types first
+  # 2. Load version file
+  # 3. Load core files
+  # 4. Load UI components
+  # 5. Load network components
+  # 6. Load main coordination files (server_handler, game_server)
+  # 7. Load mini-games
 end
 
-# Load all files in the git_game_show directory
-Dir[File.join(__dir__, 'git_game_show', '*.rb')].sort.each { |file| require file }
+# Load message types
+require_relative 'git_game_show/message_type'
+
+# Load version file
+require_relative 'git_game_show/version'
+
+# Load core components
+require_relative 'git_game_show/core/game_state'
+require_relative 'git_game_show/core/player_manager'
+require_relative 'git_game_show/core/mini_game_loader'
+require_relative 'git_game_show/core/question_manager'
+
+# Load UI components
+require_relative 'git_game_show/ui/renderer'
+require_relative 'git_game_show/ui/sidebar'
+require_relative 'git_game_show/ui/console'
+require_relative 'git_game_show/ui/welcome_screen'
+
+# Load network components
+require_relative 'git_game_show/network/server'
+require_relative 'git_game_show/network/message_handler'
+
+# Load coordination files
+require_relative 'git_game_show/server_handler'
+require_relative 'git_game_show/game_server'
+
+# Load other required files
+require_relative 'git_game_show/cli'
+require_relative 'git_game_show/mini_game'
+require_relative 'git_game_show/player_client'
+require_relative 'git_game_show/updater' if File.exist?(File.join(__dir__, 'git_game_show', 'updater.rb'))
 
 # Load all mini-games
-Dir[File.join(__dir__, '..', 'mini_games', '*.rb')].sort.each { |file| require file }
+Dir[File.join(__dir__, '..', 'mini_games', '*.rb')].sort.each { |file| require file }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_game_show
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Justin Paulson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -207,9 +207,22 @@ files:
 - bin/git-game-show
 - lib/git_game_show.rb
 - lib/git_game_show/cli.rb
+- lib/git_game_show/core/game_state.rb
+- lib/git_game_show/core/mini_game_loader.rb
+- lib/git_game_show/core/player_manager.rb
+- lib/git_game_show/core/question_manager.rb
 - lib/git_game_show/game_server.rb
+- lib/git_game_show/message_type.rb
 - lib/git_game_show/mini_game.rb
+- lib/git_game_show/network/message_handler.rb
+- lib/git_game_show/network/server.rb
 - lib/git_game_show/player_client.rb
+- lib/git_game_show/server_handler.rb
+- lib/git_game_show/ui/console.rb
+- lib/git_game_show/ui/message_area.rb
+- lib/git_game_show/ui/renderer.rb
+- lib/git_game_show/ui/sidebar.rb
+- lib/git_game_show/ui/welcome_screen.rb
 - lib/git_game_show/updater.rb
 - lib/git_game_show/version.rb
 - mini_games/author_quiz.rb