git_game_show 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 719118cfd107443e62e4c5e91fe2ee425bf58d30b9c681df744e9e8fbc25f81d
-  data.tar.gz: 80cb0a7b0f9653d33e0e58057eb9fc85df59757486e452c22de2ea3508a0bcb2
+  metadata.gz: 716f1e1333d827134e24ece60dd4d14762c72f7c67ba77d4041e3ed020234fc7
+  data.tar.gz: 94fbdf09cf6588a357ffdcb1722d97bd43afb97872c96904ed272539b4d36a54
 SHA512:
-  metadata.gz: 6ba0dec0a4e51517994a4c574cb1d1c738780e2a812a4d516fb53f18d46d9c08661ec924a67dbb228d4efffe360e0f47bebe804464fe7b83e10ad053a859da96
-  data.tar.gz: acc62cb0dcaf6ae4d6249b8a1b4b5b6f03fc3d2d19016dc2f65a64991d31069b7b5b1786ff5c1566575c193473ba36d4ac3285385f46d74f81f30e6e21449a10
+  metadata.gz: f9ce22d13a247c04acc299bb0d4e988f00db8bddea9c30ff9102196dd2cd8df38accad3fb07368cae4e9deaa5d713729c89d55296fcf21a22afee4157d08b761
+  data.tar.gz: cd91d7b25ca66d04ff9bf53a399021a5adac70224799426401f284de41659a6a8e6909a9aeb430c0d64201faee881b0919a99ac41a6a1fbf1418b643e8abeb6e

data/lib/git_game_show/cli.rb

@@ -510,6 +510,7 @@ module GitGameShow
 
     def display_ggs
       clear_screen
+      puts ""
       lines = [
         " ██████╗ ".colorize(:red) + "  ██████╗ ".colorize(:green) + "  █████╗".colorize(:blue),
         "██╔════╝ ".colorize(:red) + " ██╔════╝ ".colorize(:green) + " ██╔═══╝".colorize(:blue),

data/lib/git_game_show/game_server.rb

@@ -1594,7 +1594,8 @@ module GitGameShow
         GitGameShow::AuthorQuiz,
         GitGameShow::FileQuiz,
         GitGameShow::CommitMessageCompletion,
-        GitGameShow::DateOrderingQuiz
+        GitGameShow::DateOrderingQuiz,
+        GitGameShow::BranchDetective
       ]
     end
   end

data/lib/git_game_show/player_client.rb

@@ -543,7 +543,7 @@ module GitGameShow
 
       # Display a fun "Game Starting" animation
       box_width = 40
-      puts "\n\n"
+      puts "\n"
       puts ("╭" + "─" * box_width + "╮").center(@game_width).colorize(:green)
       puts ("│" + "Game starting...".center(box_width) + "│").center(@game_width).colorize(:green)
       puts ("╰" + "─" * box_width + "╯").center(@game_width).colorize(:green)
@@ -600,8 +600,6 @@ module GitGameShow
       mini_game = data['mini_game']
       description = data['description']
 
-      puts "\n\n"
-
       # Box is drawn with exactly 45 "━" characters for the top and bottom borders
       # The top and bottom including borders are 48 characters wide
       box_width = 42
@@ -610,6 +608,7 @@ module GitGameShow
       box_middle = "│#{"Round #{round_num} of #{total_rounds}".center(box_width - 2)}│".center(@game_width)
 
       # Output the box
+      puts "\n"
       puts box_top.colorize(:green)
       puts box_middle.colorize(:green)
       puts box_bottom.colorize(:green)
@@ -643,9 +642,6 @@ module GitGameShow
 
       # No need to reserve space for timer - it will be at the bottom of the screen
 
-      # Display question header
-      puts "\n"
-
       # Draw a simple box for the question header
       box_width = 42
       box_top    = ("╭" + "─" * (box_width - 2) + "╮").center(@game_width)
@@ -653,6 +649,7 @@ module GitGameShow
       box_middle = "│#{"Question #{question_num} of #{total_questions}".center(box_width - 2)}│".center(@game_width)
 
       # Output the question box
+      puts "\n"
       puts box_top.colorize(:light_blue)
       puts box_middle.colorize(:light_blue)
       puts box_bottom.colorize(:light_blue)
@@ -867,8 +864,6 @@ module GitGameShow
       # Start with a clean screen
       clear_screen
 
-      puts "\n"
-
       # Box is drawn with exactly 45 "━" characters for the top and bottom borders
       # The top and bottom including borders are 48 characters wide
       box_width = 40
@@ -877,6 +872,7 @@ module GitGameShow
       box_middle = "│#{'Round Results'.center(box_width)}│".center(@game_width)
 
       # Output the box
+      puts "\n"
       puts box_top.colorize(:light_blue)
       puts box_middle.colorize(:light_blue)
       puts box_bottom.colorize(:light_blue)
@@ -988,9 +984,9 @@ module GitGameShow
       clear_screen
 
       box_width = 40
-      puts ""
+      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.8"
+  VERSION = "0.1.10"
 end

data/mini_games/branch_detective.rb

@@ -0,0 +1,228 @@
+module GitGameShow
+  class BranchDetective < MiniGame
+    self.name = "Branch Detective"
+    self.description = "Identify which branch a commit belongs to!"
+    self.questions_per_round = 5
+
+    # Custom timing for this mini-game
+    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)
+      @repo = repo
+      begin
+        # Get all branches (both local and remote)
+        branches = {}
+
+        # Use Git command to get all local and remote branches
+
+        # get all remote branches from the git repository
+        all_remotes_cmd = "cd #{@repo.dir.path} && git branch -r"
+        all_branch_output = `#{all_remotes_cmd}`
+
+        # Parse branch names and clean them up
+        branch_names = all_branch_output.split("\n").map do |branch|
+          branch = branch.gsub(/^\* /, '').strip  # Remove the * prefix from current branch
+
+          # Skip special branches like HEAD
+          next if branch == 'HEAD' || branch =~ /HEAD detached/
+
+          branch
+        end.compact.uniq  # Remove nils and duplicates
+
+        # Filter out any empty branch names
+        branch_names.reject!(&:empty?)
+
+        # Need at least 3 branches to make interesting questions
+        if branch_names.size < 5
+          return generate_sample_questions
+        end
+
+        branch_names = branch_names.sample(100) if branch_names.size > 100
+
+        branch_names.each do |branch|
+          # Get commits for this branch
+          branches[branch] = get_commits_for_branch(branch)
+        end
+
+        # Generate questions
+        questions = []
+
+        self.class.questions_per_round.times do
+          # Select branches that have commits
+          branch_options = branch_names.sample(4)
+
+
+          # If we don't have 4 valid branches, pad with duplicates and ensure uniqueness later
+          if branch_options.size < 4
+            branch_options = branch_names.dup
+            while branch_options.size < 4
+              branch_options << branch_names.sample
+            end
+          end
+
+          # Choose a random branch as the correct answer
+          correct_branch = branch_options.sample
+
+          # Choose a random commit from this branch
+          commit = branches[correct_branch].sample
+
+          # Create the question
+          commit_date = commit[:date] #.split(" ")[0..2].join(" ") + " " + commit[:date].split(" ")[4]
+          commit_short_sha = commit[:sha][0..6]
+
+          # Format the commit message for display
+          message = commit[:message].lines.first&.strip || "No message"
+          message = message.length > 50 ? "#{message[0...47]}..." : message
+
+          questions << {
+            question: "Which branch was this commit originally made on?\n\n   \"#{message}\"",
+            commit_info: "#{commit_short_sha} (by #{commit[:author]} on #{commit_date})",
+            options: branch_options.uniq.shuffle,
+            correct_answer: correct_branch
+          }
+        end
+
+        # If we couldn't generate enough questions, fill with sample questions
+        if questions.size < self.class.questions_per_round
+          sample_questions = generate_sample_questions
+          questions += sample_questions[0...(self.class.questions_per_round - questions.size)]
+        end
+
+        questions
+      rescue => e
+        # If any errors occur, fall back to sample questions
+        generate_sample_questions
+      end
+    end
+
+    # Generate sample questions
+    def generate_sample_questions
+      questions = []
+
+      # Sample data with branch names and commits
+      sample_branches = [
+        "main", "develop", "feature/user-auth", "bugfix/login",
+        "feature/payment", "hotfix/security", "release/v2.0", "staging"
+      ]
+
+      # Sample commit data
+      sample_commits = [
+        { message: "[SAMPLE] Add user authentication flow", author: "Jane Doe", date: "2023-05-15 14:30:22", sha: "a1b2c3d" },
+        { message: "[SAMPLE] Fix login page styling issues", author: "John Smith", date: "2023-05-18 10:15:45", sha: "e4f5g6h" },
+        { message: "[SAMPLE] Implement password reset functionality", author: "Alice Johnson", date: "2023-05-20 16:45:12", sha: "i7j8k9l" },
+        { message: "[SAMPLE] Add payment gateway integration", author: "Bob Brown", date: "2023-05-22 09:20:33", sha: "m2n3o4p" },
+        { message: "[SAMPLE] Update README with API documentation", author: "Charlie Davis", date: "2023-05-25 11:05:56", sha: "q5r6s7t" }
+      ]
+
+      # Generate sample questions
+      self.class.questions_per_round.times do |i|
+        # Select a random commit
+        commit = sample_commits[i % sample_commits.size]
+
+        # Select 4 random branch names
+        branch_options = sample_branches.sample(4)
+
+        # Choose a correct branch
+        correct_branch = branch_options.sample
+
+        questions << {
+          question: "Which branch was this commit originally made on?\n\n   \"#{commit[:message]}\"",
+          commit_info: "#{commit[:sha]} (by #{commit[:author]} on #{commit[:date]})",
+          options: branch_options,
+          correct_answer: correct_branch
+        }
+      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]
+        time_taken = answer_data[:time_taken] || self.class.question_timeout
+
+        # Check if the answer is correct
+        correct = player_answer == question[:correct_answer]
+
+        # Calculate points
+        points = 0
+
+        # Base points for correct answer
+        if correct
+          points = 10
+
+          # Bonus points for fast answers
+          if time_taken < 5
+            points += 5  # Very fast (under 5 seconds)
+          elsif time_taken < 10
+            points += 3  # Pretty fast (under 10 seconds)
+          elsif time_taken < 12
+            points += 1  # Somewhat fast (under 12 seconds)
+          end
+        end
+
+        # Store the results
+        results[player_name] = {
+          answer: player_answer,
+          correct: correct,
+          points: points
+        }
+      end
+
+      results
+    end
+
+    private
+
+    def get_commits_for_branch branch
+      unique_commits = []
+
+      # Try different ways to reference the branch
+      begin
+        # Try a few different ways to reference the branch
+        got_commits = false
+
+        # First try as a local branch
+        cmd = "cd #{@repo.dir.path} && git log --pretty '#{branch}' --max-count=5 2>/dev/null"
+        commit_output = `#{cmd}`
+
+        # Process commits if we found any
+        commits = commit_output.split("commit ")[1..-1]
+
+        commits.each do |commit|
+
+          # Extract commit info
+          sha = commit.lines[0].split(" ")[0].strip
+          author = commit.lines[1].gsub("Author: ", "").split("<")[0].strip
+          date = commit.lines[2].gsub("Date: ", "").strip
+          message = commit.lines[4..-1].join("\n")
+
+          next unless message.length > 10
+          next if message.include?("Merge pull request")
+          # Store this commit info
+          unique_commits << {
+            sha: sha,
+            message: message,
+            author: author,
+            date: date
+          }
+        end
+
+      rescue => e
+        # If we hit any errors with this branch, just skip it
+        []
+      end
+
+      unique_commits
+    end
+  end
+end

data/mini_games/file_quiz.rb

@@ -1,4 +1,7 @@
 module GitGameShow
+  # Disable debug mode for normal operation
+  $FILE_QUIZ_DEBUG = false
+
   class FileQuiz < MiniGame
     self.name = "File Quiz"
     self.description = "Match the commit message to the right changed file!"
@@ -15,39 +18,54 @@ module GitGameShow
 
     def generate_questions(repo)
       begin
-        # Get commits from the repo - based on similar approach as AuthorQuiz
-        # Start by getting a larger number of commits to ensure enough variety
-        commit_count = [self.class.questions_per_round * 10, 100].min
-        
-        # Get all commits
-        commits = repo.log(commit_count).to_a
-        
+        # Use the same approach as AuthorQuiz - get ALL commits using the helper method
+        commits = get_all_commits(repo)
+
+        # Check if we got any commits at all
+        if commits.nil? || commits.empty?
+          # Silently fall back to sample questions
+          return generate_sample_questions
+        end
+
         # Shuffle commits for better variety
         commits.shuffle!
-        
+
         # Process commits to find ones with good file changes
         valid_commits = []
-        
+
         commits.each do |commit|
           # Get changed files for this commit
           changed_files = []
-          
+
           begin
-            # Try to get the diff with previous commit
+            # Use standard Git methods instead of run_command (silently)
+
+            # Use git commands quietly without showing output
             if commit.parents.empty?
-              # First commit - get the files directly
-              diff_output = repo.lib.run_command('show', ['--name-only', '--pretty=format:', commit.sha])
-              changed_files = diff_output.split("\n").reject(&:empty?)
+              # For first commit, get files directly
+              cmd = "cd #{repo.dir.path} && git show --name-only --pretty=format: #{commit.sha} 2>/dev/null"
+              diff_output = `#{cmd}`
             else
-              # Regular commit with parent
-              diff_output = repo.lib.run_command('diff', ['--name-only', "#{commit.sha}^", commit.sha])
-              changed_files = diff_output.split("\n").reject(&:empty?)
+              # For normal commits with parents
+              cmd = "cd #{repo.dir.path} && git diff --name-only #{commit.sha}^ #{commit.sha} 2>/dev/null"
+              diff_output = `#{cmd}`
+
+              # If diff returns empty, try using show as fallback
+              if diff_output.strip.empty?
+                cmd = "cd #{repo.dir.path} && git show --name-only --pretty=format: #{commit.sha} 2>/dev/null"
+                diff_output = `#{cmd}`
+              end
             end
-            
-            # Skip if no files or too many files (probably a merge or refactoring)
+
+            # Parse the output to get changed files (quietly)
+            changed_files = diff_output.split("\n").reject(&:empty?)
+
+            # Skip if no files changed (can't create a question for this)
             next if changed_files.empty?
-            next if changed_files.size > 8 # Skip large commits that likely changed multiple unrelated files
-            
+
+            # Super relaxed - accept ANY commit with files that changed
+            # No more filtering by number of files
+
             # Create structure with relevant commit data
             valid_commits << {
               sha: commit.sha,
@@ -56,29 +74,31 @@ module GitGameShow
               date: commit.date,
               files: changed_files
             }
-            
+
             # Once we have enough commits, we can stop
-            break if valid_commits.size >= self.class.questions_per_round * 3
+            # Get more commits to have a better selection
+            break if valid_commits.size >= self.class.questions_per_round * 5
           rescue => e
-            # Skip problematic commits
+            # Silently skip problematic commits
             next
           end
         end
-        
-        # If we couldn't find enough good commits, fall back to samples
-        if valid_commits.size < self.class.questions_per_round
+
+        # Never fall back to samples as long as we have at least 1 valid commit
+        if valid_commits.empty?
+          # Silently fall back to sample questions if needed
           return generate_sample_questions
         end
-        
+
         # Prioritize commits that modified interesting files (not just .gitignore etc.)
         prioritized_commits = valid_commits.sort_by do |commit|
           # Higher score = more interesting commit
           score = 0
-          
+
           # Prioritize based on file types
           commit[:files].each do |file|
             ext = File.extname(file).downcase
-            
+
             case ext
             when '.rb', '.js', '.py', '.java', '.tsx', '.jsx'
               score += 3  # Source code is most interesting
@@ -90,30 +110,33 @@ module GitGameShow
               score -= 1  # Less interesting files
             end
           end
-          
+
           # Prioritize based on commit message length - longer messages are often more descriptive
           message_length = commit[:message].to_s.strip.length
           score += [message_length / 20, 5].min
-          
+
           # Return negative score so highest scores come first in sort
           -score
         end
-        
-        # Select top commits for questions
-        selected_commits = prioritized_commits.take(self.class.questions_per_round)
-        
+
+        # Take as many commits as we need for questions
+        needed_commits = [self.class.questions_per_round, prioritized_commits.size].min
+        selected_commits = prioritized_commits.take(needed_commits)
+
         # Create questions from selected commits
         questions = []
-        
+
         selected_commits.each do |commit|
           # Choose the most interesting file as the correct answer
-          # (Sort by extension priority, then by path length to favor shorter paths)
           files = commit[:files]
-          
+
+          # Skip if somehow we got a commit with no files
+          next if files.empty?
+
           # Score files by interestingness
           scored_files = files.map do |file|
             ext = File.extname(file).downcase
-            
+
             # Start with base score by extension
             score = case ext
             when '.rb', '.js', '.py', '.java', '.tsx', '.jsx'
@@ -129,32 +152,33 @@ module GitGameShow
             else
               5   # Other files are neutral
             end
-            
+
             # Shorter paths are usually more recognizable
             score -= [file.length / 10, 5].min
-            
+
             # Prefer files in main directories (src, lib, app) over deeply nested ones
             if file.start_with?('src/', 'lib/', 'app/')
               score += 3
             end
-            
+
             [file, score]
           end
-          
+
           # Sort by score (highest first) and select most interesting file
-          correct_file = scored_files.sort_by { |_, score| -score }.first[0]
-          
+          scored_files.sort_by! { |_, score| -score }
+          correct_file = scored_files.first[0]
+
           # Get incorrect options from other commits
           other_files = []
           other_commits = selected_commits - [commit]
-          
+
           # Collect files from other commits
           other_commits.each do |other_commit|
             other_commit[:files].each do |file|
               other_files << file unless files.include?(file)
             end
           end
-          
+
           # If we don't have enough other files, use some from sample data
           if other_files.size < 3
             sample_files = [
@@ -164,19 +188,19 @@ module GitGameShow
             ]
             other_files += sample_files.reject { |f| files.include?(f) }
           end
-          
+
           # Take up to 3 unique other files, prioritizing diverse ones
           other_files = other_files.uniq.sample(3)
-          
+
           # Create options array with the correct answer and incorrect ones
           all_options = ([correct_file] + other_files).shuffle
-          
+
           # Format the commit date nicely
           nice_date = commit[:date].strftime('%b %d, %Y') rescue "Unknown date"
-          
+
           # Clean up commit message - take first line if multiple lines
           message = commit[:message].to_s.split("\n").first.strip
-          
+
           # Format consistently with other mini-games
           questions << {
             question: "Which file was most likely changed in this commit?\n\n   \"#{message}\"",
@@ -185,62 +209,66 @@ module GitGameShow
             correct_answer: correct_file
           }
         end
-        
-        # Final safety check - if we couldn't create enough questions, use samples
+
+        # If we still couldn't create enough questions, use a mix of real and samples
         if questions.size < self.class.questions_per_round
-          return generate_sample_questions
+          # Add sample questions to fill the remaining slots (silently)
+          sample_questions = generate_sample_questions
+          remaining_slots = self.class.questions_per_round - questions.size
+          questions += sample_questions.take(remaining_slots)
         end
-        
+
         return questions
       rescue => e
-        # If anything fails, fall back to sample questions
+        # If anything fails, silently fall back to sample questions
         return generate_sample_questions
       end
     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
           time_taken = answer_data[:time_taken] || 15
-          
+
           if time_taken < 5
             points += 5
           elsif time_taken < 10
             points += 3
           end
         end
-        
+
         results[player_name] = {
           answer: player_answer,
           correct: correct,
           points: points
         }
       end
-      
+
       results
     end
 
     # Generate sample questions only used when no repository data is available
     def generate_sample_questions
+      # No debug message in production
       questions = []
 
       # Common file options
       common_files = [
         "src/main.js",
         "README.md",
-        "lib/utils.js", 
+        "lib/utils.js",
         "css/styles.css"
       ]
-      
+
       # Common sample commit messages
       sample_messages = [
         "Update documentation with new API endpoints",
@@ -254,14 +282,14 @@ module GitGameShow
       self.class.questions_per_round.times do |i|
         # Use modulo to cycle through sample messages
         message = sample_messages[i % sample_messages.size]
-        
+
         # Different correct answers for each question
         correct_file = common_files[i % common_files.size]
-        
+
         # Options are all files with the correct one included
         all_options = common_files.shuffle
-        
-        # Create the question
+
+        # Create the question - clearly label as sample data
         questions << {
           question: "Which file was most likely changed in this commit?\n\n   \"#{message} (SAMPLE)\"",
           commit_info: "sample#{i} (Demo Question)",
@@ -272,7 +300,5 @@ module GitGameShow
 
       questions
     end
-
-    # No private methods needed anymore
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_game_show
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Justin Paulson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -213,6 +213,7 @@ files:
 - lib/git_game_show/updater.rb
 - lib/git_game_show/version.rb
 - mini_games/author_quiz.rb
+- mini_games/branch_detective.rb
 - mini_games/commit_message_completion.rb
 - mini_games/date_ordering_quiz.rb
 - mini_games/file_quiz.rb