git_game_show 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd69e30776e28d63d3fd20db47716c0e957dace72788a5e0479047fe8cbe708
-  data.tar.gz: cd8e8579ec722b25a67ffd1c8268f35a724dcf75cd863420ffebad9025f1ebf4
+  metadata.gz: 3a9bd7f2e076ca47a5bb8205267ce51f3568e9ee9d03acb599c4014ae259278e
+  data.tar.gz: 2752fe1f922c36d5ccbcf46c5f45cb13e0377a08f46f6d71629d9eb6cba63d8d
 SHA512:
-  metadata.gz: 8874ab5bb9a8349e9b22926e8456fef2aa1ce4bcdaf1ca14b170d82d6e0491a68db6c576eda153b92fbca942efa1861dd44d139d1d57e709fe2853e5c2b36fe6
-  data.tar.gz: 37c9292edb46b4e3be1283efbd09b3762c504696a5d875a16c7d8a12fdbc68265319f40b4db992e0c4fd71d42bf420abcce75bd3e62402c741ba38e459c265a2
+  metadata.gz: b2dccfb2deae7c56d482f0429e5d70d17f781be4d9bce8db78d8c02aa58b50b61465fb55e8a692e9eb93d2d706f7786dd0ae20b68f0957a3050481e05f207b39
+  data.tar.gz: ddb0d3486564fbbaaa1086d4705404150096e7975374e8c0accd3294fbc2e0eda855cdc8a04309693fe3281d007308ea1fc9efe46a72d21fe7e81f42cc1f5bda

data/lib/git_game_show/game_server.rb

@@ -165,28 +165,60 @@ module GitGameShow
         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.keys.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(:light_yellow)
         end
 
-        # Determine which players to display (for now, show first N players)
-        visible_players = @players.keys.take(max_visible_players)
+        # Determine which players to display (show top N players by score)
+        visible_players = sorted_players.take(max_visible_players)
 
-        # Display 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)
-          # Truncate long names
-          truncated_name = name.length > (@sidebar_width - 6) ?
-                           "#{name[0...(@sidebar_width-9)]}..." :
-                           name
 
-          if index < 9
-            print "#{index + 1}. #{truncated_name}".colorize(:light_blue)
+          # 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
+          # Allow space for prefix (like "🥇 " or "10. ") + minimum 3 chars of name + 2 spaces + 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 @game_state == :playing && @scores.any?
+            prefix = case index
+                     when 0 then "🥇 "
+                     when 1 then "🥈 "
+                     when 2 then "🥉 "
+                     else "#{index + 1}. "
+                     end
           else
-            print "#{index + 1}. #{truncated_name}".colorize(:light_blue)
+            prefix = "#{index + 1}. "
           end
+
+          # Calculate how much space we have for the name
+          max_name_length = usable_width - score_str.length - 1 # 2 spaces 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
@@ -391,6 +423,8 @@ module GitGameShow
       current_question = @round_questions[@current_question_index]
 
       # Handle nil answer (timeout) differently
+      points = 0
+
       if answer.nil?
         # For timeouts, set a special "TIMEOUT" answer with 0 points
         @player_answers[player_name] = {
@@ -398,7 +432,7 @@ module GitGameShow
           time_taken: time_taken,
           answered: true,
           correct: false,
-          points: 0
+          points: points
         }
 
         # Send timeout feedback to the player
@@ -407,7 +441,7 @@ module GitGameShow
           answer: "TIMEOUT",
           correct: false,
           correct_answer: current_question[:correct_answer],
-          points: 0
+          points: points
         }
         @players[player_name]&.send(feedback.to_json)
 
@@ -421,7 +455,8 @@ module GitGameShow
         if current_question[:question_type] == 'ordering'
           # Just store the answer and time, points will be calculated in evaluate_answers
           correct = false # Will be properly set during evaluation
-          points = 0     # Will be properly set during evaluation
+          points = @current_mini_game.evaluate_answers(current_question, {player_name => {answer: answer, time_taken: time_taken}})
+          points = points.values.first[:points]
         else
           # For regular quizzes, calculate points immediately
           correct = answer == current_question[:correct_answer]
@@ -575,6 +610,9 @@ module GitGameShow
         results.each do |player, result|
           @scores[player] = (@scores[player] || 0) + (result[:points] || 0)
         end
+
+        # Update the player list in sidebar to reflect new scores and ranking
+        update_player_list
       rescue => e
         log_message("Error evaluating answers: #{e.message}", :red)
       end
@@ -727,8 +765,6 @@ module GitGameShow
 
       # Select mini-game for this round with better variety
       @current_mini_game = select_next_mini_game.new
-      @round_questions = @current_mini_game.generate_questions(@repo)
-      @current_question_index = 0
 
       # Announce new round
       broadcast_message({
@@ -736,9 +772,14 @@ module GitGameShow
         round: @current_round,
         total_rounds: @rounds,
         mini_game: @current_mini_game.class.name,
-        description: @current_mini_game.class.description
+        description: @current_mini_game.class.description,
+        example: @current_mini_game.class.example
       })
 
+      @round_questions = @current_mini_game.generate_questions(@repo)
+      @current_question_index = 0
+
+
       log_message("Starting round #{@current_round}: #{@current_mini_game.class.name}", :cyan)
 
       # Start the first question after a short delay
@@ -826,6 +867,11 @@ module GitGameShow
             question_data[:commit_info] = current_question[:commit_info].to_s
           end
         end
+
+        # Add context if available (for BlameGame)
+        if current_question && current_question[:context]
+          question_data[:context] = current_question[:context].to_s
+        end
       rescue => e
         log_message("Error adding additional question data: #{e.message}", :red)
         # Continue without the additional data
@@ -1594,7 +1640,9 @@ module GitGameShow
         GitGameShow::AuthorQuiz,
         GitGameShow::FileQuiz,
         GitGameShow::CommitMessageCompletion,
-        GitGameShow::DateOrderingQuiz
+        GitGameShow::DateOrderingQuiz,
+        GitGameShow::BranchDetective,
+        GitGameShow::BlameGame
       ]
     end
   end

data/lib/git_game_show/mini_game.rb

@@ -5,53 +5,53 @@ module GitGameShow
       def descendants
         @descendants ||= []
       end
-      
+
       def inherited(subclass)
         descendants << subclass
       end
-      
-      attr_accessor :name, :description, :questions_per_round
+
+      attr_accessor :name, :description, :example, :questions_per_round
     end
-    
+
     # Default number of questions per round
     self.questions_per_round = 5
-    
+
     # Default name and description
     self.name = "Base Mini Game"
     self.description = "This is a base mini game class. You should not see this in the actual game."
-    
+
     # Method to generate questions based on Git repo data
     # This should be overridden by subclasses
     def generate_questions(repo)
       raise NotImplementedError, "#{self.class} must implement #generate_questions"
     end
-    
+
     # Method to evaluate player answers and return results
     # This should be overridden by subclasses
     def evaluate_answers(question, player_answers)
       raise NotImplementedError, "#{self.class} must implement #evaluate_answers"
     end
-    
+
     # Helper method to get all commits from a repo
     def get_all_commits(repo)
       # Get a larger number of commits to ensure more diversity
       repo.log(1000).each.to_a
     end
-    
+
     # Helper method to get unique authors from commits
     def get_commit_authors(commits)
       commits.map { |commit| commit.author.name }.uniq
     end
-    
+
     # Helper method to get commit messages
     def get_commit_messages(commits)
       commits.map(&:message)
     end
-    
+
     # Helper method to shuffle an array with the option to exclude certain items
     def shuffled_excluding(array, exclude = nil)
       items = exclude ? array.reject { |item| item == exclude } : array.dup
       items.shuffle
     end
   end
-end
+end

data/lib/git_game_show/player_client.rb

@@ -115,7 +115,7 @@ module GitGameShow
       rescue JSON::ParserError => e
         puts "Invalid message format: #{e.message}".colorize(:red)
       rescue => e
-        puts "Error processing message: #{e.message}".colorize(:red)
+        puts "Error processing message: #{e.message}\n#{e.backtrace.join("\n")}".colorize(:red)
       end
     end
 
@@ -599,6 +599,7 @@ module GitGameShow
       total_rounds = data['total_rounds']
       mini_game = data['mini_game']
       description = data['description']
+      example = data['example']
 
       # Box is drawn with exactly 45 "━" characters for the top and bottom borders
       # The top and bottom including borders are 48 characters wide
@@ -616,7 +617,8 @@ module GitGameShow
       puts "   Mini-game: #{mini_game}".colorize(:light_blue)
       puts "   #{description}".colorize(:light_blue)
       puts "\n"
-
+      puts "   Example: #{example}"
+      puts "\n"
       # Count down to the start - don't sleep here as we're waiting for the server
       # to send us the questions after a fixed delay
       puts "   Get ready for the first question...".colorize(:yellow)
@@ -662,6 +664,19 @@ module GitGameShow
       if data['commit_info']
         puts "\n   Commit: #{data['commit_info']}".colorize(:yellow)
       end
+
+      # Display code context if available (for BlameGame)
+      if data['context']
+        puts "\n   Code Context:".colorize(:light_blue)
+        data['context'].split("\n").each do |line|
+          # Check if this is the target line (with the > prefix)
+          if line.start_with?('>')
+            puts "   #{line}".colorize(:yellow) # Highlight the target line
+          else
+            puts "   #{line}".colorize(:white)
+          end
+        end
+      end
       puts "\n"
 
       # Create a unique timer ID for this question
@@ -830,6 +845,8 @@ module GitGameShow
       puts "\n   #{"─" * 40}".colorize(:light_black)
       puts "\n"
 
+      points_text = "(#{data['points']} points)"
+
       # Show immediate feedback
       if data['answer'] == "TIMEOUT"
         # Special handling for timeouts
@@ -838,7 +855,6 @@ module GitGameShow
         puts "   (0 points)".colorize(:light_black)
       elsif data['correct']
         # Correct answer
-        points_text = data['points'] > 0 ? " (+#{data['points']} points)" : ""
         puts "   ✅ CORRECT! Your answer was correct: #{data['answer']}#{points_text}".colorize(:green)
 
         # Show bonus points details if applicable
@@ -847,9 +863,21 @@ module GitGameShow
           puts "   🎉 SPEED BONUS: +#{bonus} points for fast answer!".colorize(:light_yellow)
         end
       else
-        # Incorrect answer
-        puts "   ❌ INCORRECT! The correct answer was: #{data['correct_answer']}".colorize(:red)
-        puts "   You answered: #{data['answer']} (0 points)".colorize(:yellow)
+        if data['correct_answer'].is_a?(Array)
+          puts "Correct Order".rjust(39).colorize(:green) + "  Your Order"
+          0.upto(data['correct_answer'].size - 1) do |i|
+            answer_color = data['correct_answer'][i] == data['answer'][i] ? :green : :red
+            truncated_1 = data['correct_answer'][i].length > 38 ? data['correct_answer'][i][0..35] + "..." : data['correct_answer'][i]
+            truncated_2 = data['answer'][i].length > 38 ? data['answer'][i][0..35] + "..." : data['answer'][i]
+            puts "#{truncated_1}".rjust(38).colorize(:green) + "  #{truncated_2}".colorize(answer_color)
+          end
+          puts "\n\n"
+          puts points_text.center(80).colorize(:yellow)
+        else
+          # Incorrect answer
+          puts "   ❌ INCORRECT! The correct answer was: #{data['correct_answer']}".colorize(:red)
+          puts "   You answered: #{data['answer']} (0 points)".colorize(:yellow)
+        end
       end
 
       puts "\n   Waiting for the round to complete. Please wait for the next question...".colorize(:light_blue)
@@ -859,7 +887,7 @@ module GitGameShow
     def handle_round_result(data)
       # Invalidate any running timer and reset window title
       @current_timer_id = SecureRandom.uuid
-      print "\033]0;Git Game Show - Round Results\007"  # Reset window title with context
+      print "\033]0;Git Game Show - Question Results\007"  # Reset window title with context
 
       # Start with a clean screen
       clear_screen
@@ -869,7 +897,7 @@ module GitGameShow
       box_width = 40
       box_top    = ("╭" + "─" * box_width + "╮").center(@game_width)
       box_bottom = ("╰" + "─" * box_width + "╯").center(@game_width)
-      box_middle = "│#{'Round Results'.center(box_width)}│".center(@game_width)
+      box_middle = "│#{'Question Results'.center(box_width)}│".center(@game_width)
 
       # Output the box
       puts "\n"
@@ -882,8 +910,8 @@ module GitGameShow
       puts "   Question: #{data['question'][:question]}".colorize(:light_blue)
 
       # Handle different display formats for correct answers
-      if data['question'][:question_type] == 'ordering' && data['correct_answer'].is_a?(Array)
-        puts "   Correct order (oldest to newest):".colorize(:green)
+      if data['correct_answer'].is_a?(Array)
+        puts "   Correct order".colorize(:green)
         data['correct_answer'].each do |item|
           puts "     #{item}".colorize(:green)
         end
@@ -901,9 +929,9 @@ module GitGameShow
           # Ensure result is a hash with the expected keys
           if result.is_a?(Hash)
             # Check if 'correct' is a boolean or check string equality if it's a string
-            correct = result[:correct] || result['correct'] || false
-            answer = result[:answer] || result['answer'] || "No answer"
-            points = result[:points] || result['points'] || 0
+            correct = result['correct'] || false
+            answer = result['answer'].is_a?(Array) ? "" : (result['answer'] || "No answer")
+            points = result['points'] || 0
 
             status = correct ? "✓" : "✗"
             points_str = "(+#{points} points)"
@@ -986,7 +1014,7 @@ module GitGameShow
       box_width = 40
       puts "\n"
       puts ("╭" + "─" * box_width + "╮").center(@game_width).colorize(:yellow)
-      puts "│#{'Scoreboard'.center(box_width)}┃".center(@game_width).colorize(:yellow)
+      puts "│#{'Scoreboard'.center(box_width)}│".center(@game_width).colorize(:yellow)
       puts ("╰" + "─" * box_width + "╯").center(@game_width).colorize(:yellow)
       puts "\n"
 

data/lib/git_game_show/version.rb

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

data/mini_games/author_quiz.rb

@@ -2,28 +2,41 @@ module GitGameShow
   class AuthorQuiz < MiniGame
     self.name = "Author Quiz"
     self.description = "Guess which team member made each commit!"
+    self.example = <<~EXAMPLE
+    Who authored this commit?
+
+       "Add user authentication features"
+
+    abc123d (Feb 15, 2025)
+
+    Choose your answer:
+      Bob
+    \e[0;32;49m> Alice\e[0m
+      Charlie
+      David
+    EXAMPLE
     self.questions_per_round = 5
-    
+
     # Custom timing for this mini-game (overrides default config)
     def self.question_timeout
       15 # 15 seconds per question
     end
-    
+
     def self.question_display_time
       5 # 5 seconds between questions
     end
-    
+
     def generate_questions(repo)
       # For testing, manually add some questions if we can't get meaningful ones from repo
       questions = []
-      
+
       begin
         # Get commits from the past year
         one_year_ago = Time.now - (365 * 24 * 60 * 60) # One year in seconds
-        
+
         # Get all commits
         all_commits = get_all_commits(repo)
-        
+
         # Filter commits from the past year, if any
         commits_from_past_year = all_commits.select do |commit|
           # Be safe with date parsing
@@ -34,39 +47,39 @@ module GitGameShow
             false # If we can't parse the date, exclude it
           end
         end
-        
+
         # If we don't have enough commits from the past year, use all commits
         commits = commits_from_past_year.size >= 10 ? commits_from_past_year : all_commits
-        
+
         authors = get_commit_authors(commits)
-        
+
         # We need at least 2 authors for this game to be meaningful
         if authors.size < 2
           return generate_sample_questions
         end
-        
+
         # Shuffle all commits to ensure randomness, then select commits for questions
         selected_commits = commits.shuffle.sample(self.class.questions_per_round)
-        
+
         selected_commits.each do |commit|
         # Get the real author
         correct_author = commit.author.name
-        
+
         # Get incorrect options (other authors)
         incorrect_authors = shuffled_excluding(authors, correct_author).take(3)
-        
+
         # Create options array with the correct answer and incorrect ones
         all_options = ([correct_author] + incorrect_authors).shuffle
-        
+
         # Extract the commit message, but handle multi-line messages gracefully
         message_lines = commit.message.lines.reject(&:empty?)
         message_preview = message_lines.first&.strip || "No message"
-        
+
         # For longer messages, add an indication that there's more
         if message_lines.size > 1
-          message_preview += "..." 
+          message_preview += "..."
         end
-        
+
         # Create a more compact question format to avoid overflows
         # Add proper indentation to the commit message with spaces
         questions << {
@@ -80,27 +93,27 @@ module GitGameShow
         # Silently fail and use sample questions instead
         return generate_sample_questions
       end
-      
+
       # If we couldn't generate enough questions, add sample ones
       if questions.empty?
         return generate_sample_questions
       end
-      
+
       questions
     end
-    
+
     def generate_sample_questions
       # Create sample questions in case the repo doesn't have enough data
       sample_authors = ["Alice", "Bob", "Charlie", "David", "Emma"]
-      
+
       questions = []
-      
+
       5.times do |i|
         correct_author = sample_authors.sample
         incorrect_authors = sample_authors.reject { |a| a == correct_author }.sample(3)
-        
+
         all_options = ([correct_author] + incorrect_authors).shuffle
-        
+
         questions << {
           question: "Who authored this commit?\n\n   \"Sample commit message ##{i+1}\"",
           commit_info: "abc123#{i} (Jan #{i+1}, 2025)",
@@ -108,35 +121,35 @@ module GitGameShow
           correct_answer: correct_author
         }
       end
-      
+
       questions
     end
-    
+
     def evaluate_answers(question, player_answers)
       results = {}
-      
+
       player_answers.each do |player_name, answer_data|
         answered = answer_data[:answered] || false
         player_answer = answer_data[:answer]
         correct = player_answer == question[:correct_answer]
-        
+
         points = correct ? 10 : 0
-        
+
         # Bonus points for fast answers (if correct)
         if correct && answer_data[:time_taken] < 5
           points += 5
         elsif correct && answer_data[:time_taken] < 10
           points += 3
         end
-        
+
         results[player_name] = {
           answer: player_answer,
           correct: correct,
           points: points
         }
       end
-      
+
       results
     end
   end
-end
+end