merge walker

.github/workflows/create-puzzle-issue.yml

@@ -23,8 +23,11 @@ jobs:
   create-issue:
     runs-on: ubuntu-latest
     env:
-      GH_TOKEN: ${{ secrets.USER_TOKEN }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
       - name: Create puzzle issue
         id: create-issue
         run: |
@@ -38,3 +41,10 @@ jobs:
           gh issue comment "${ISSUE_URL}" --body "@sourcery-ai develop - you can read the puzzle statement with \`uv run advent_of_code.py read ${{ inputs.year }} ${{ inputs.day }} ${{ inputs.part }}\`. Run the solution on \`puzzles/year_${{ inputs.year }}/day_${{ inputs.day }}/input.txt\` and write answer to \`puzzles/year_${{ inputs.year }}/day_${{ inputs.day }}/answer_part${{ inputs.part }}.txt\`"
         env:
           ISSUE_URL: ${{ steps.create-issue.outputs.issue_url }}
+
+      - name: Merge develop into main
+        run: |
+          git fetch origin
+          git checkout main
+          git merge develop
+          gh pr merge --squash --auto --delete-branch

.github/workflows/merge-repos.yml

@@ -0,0 +1,28 @@
+name: Merge Repos
+
+on:
+  repository_dispatch:
+    types: [merge-repos]
+
+permissions:
+  contents: write
+
+jobs:
+  merge-repos:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out target repository
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.client_payload.target_repo }}
+          token: ${{ secrets.GH_TOKEN }}
+
+      - name: Merge source repository
+        run: |
+          git remote add source https://github.com/${{ github.event.client_payload.source_repo }}.git
+          git fetch source
+          git merge source/main --allow-unrelated-histories
+
+      - name: Push changes to target repository
+        run: |
+          git push origin main

.github/workflows/merge-sourcery-ai-bot-pr.yml

@@ -8,17 +8,27 @@ permissions:
   contents: write
 
 env:
-  GH_TOKEN: ${{ secrets.USER_TOKEN }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   merge-sourcery-pr:
     runs-on: ubuntu-latest
     if: github.event.pull_request.user.login == 'sourcery-ai[bot]'
     steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
       - name: Merge Pull Request
         run: |
           gh pr merge "${{ github.event.pull_request.number }}" \
             --squash \
             --auto \
             --delete-branch \
             --repo "${{ github.repository }}"
+
+      - name: Merge develop into main
+        run: |
+          git fetch origin
+          git checkout main
+          git merge develop
+          gh pr merge --squash --auto --delete-branch

.github/workflows/submit-advent-of-code.yml

@@ -15,7 +15,7 @@ permissions:
 
 env:
   AOC_SESSION: ${{ secrets.AOC_SESSION }}
-  GH_TOKEN: ${{ secrets.USER_TOKEN }}
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
   submit:
@@ -89,3 +89,10 @@ jobs:
           token: ${{ env.GH_TOKEN }}
           event-type: create-puzzle-issue
           client-payload: '{"year": "${{ steps.extract-info.outputs.year }}", "day": "${{ steps.extract-info.outputs.day }}", "part": "2"}'
+
+      - name: Merge develop into main
+        run: |
+          git fetch origin
+          git checkout main
+          git merge develop
+          gh pr merge --squash --auto --delete-branch

README.md

@@ -2,7 +2,7 @@
 
 - Each day during advent of code this repo solves the latest puzzle and submits the solution - all without human intervention
 - All code in this repo was written by `sourcery-ai[bot]`
-- Everything was set up by manually writing [five issues](https://github.com/sourcery-ai/autonomous-advent-of-code/labels/inception) and asking `sourcery-ai[bot]` to implement them
+- Everything was set up by manually writing [five issues](https://github.com/JohnDaWalka/test-aoc/labels/inception) and asking `sourcery-ai[bot]` to implement them
 - Since then everything runs fully autonomously
 
 There are two main processes that work together to solve the puzzles:
@@ -76,7 +76,123 @@ It will be most useful for handling routine maintenance and clearing your backlo
 
 If you like the sound of this, [join our waitlist](https://getsourcery.netlify.app/) and tell us anything else you want it to do.
 
-#### Footnotes
+## Triggering the `merge-repos` Workflow
 
-[^1]: We run this twelve hours after the puzzles are published to avoid interfering with any leaderboards
-[^2]: `sourcery-ai[bot]` cannot log into the advent of code website and read the puzzles and input, so we store them in the repository. The advent of code rules ask you not to publish the puzzle text - so we're ROT13 encoding it
+To trigger the `merge-repos` workflow, you need to dispatch a repository event with the event type `merge-repos`. You can do this using the GitHub API or the `gh` CLI tool.
+
+### Example using `gh` CLI
+
+```sh
+gh api repos/:owner/:repo/dispatches --field event_type=merge-repos --field client_payload='{"source_repo": "source-repo-name", "target_repo": "target-repo-name"}'
+```
+
+Replace `:owner` with the repository owner, `:repo` with the repository name, `source-repo-name` with the name of the source repository, and `target-repo-name` with the name of the target repository.
+
+### Example using GitHub API
+
+```sh
+curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token YOUR_GITHUB_TOKEN" https://api.github.com/repos/:owner/:repo/dispatches -d '{"event_type":"merge-repos","client_payload":{"source_repo":"source-repo-name","target_repo":"target-repo-name"}}'
+```
+
+Replace `YOUR_GITHUB_TOKEN` with your GitHub token, `:owner` with the repository owner, `:repo` with the repository name, `source-repo-name` with the name of the source repository, and `target-repo-name` with the name of the target repository.
+
+## Rotating `GH_TOKEN` Regularly
+
+To rotate the `GH_TOKEN` regularly, follow these steps:
+
+1. Generate a new GitHub token with the required permissions.
+2. Update the GitHub Secrets in your repository settings with the new token.
+3. Update any local environment variables or configuration files that use the `GH_TOKEN`.
+4. Monitor the usage of the new token to ensure it is working correctly.
+5. Revoke the old token to minimize the risk of unauthorized access.
+
+## Monitoring the Usage of `GH_TOKEN`
+
+To monitor the usage of the `GH_TOKEN`, follow these best practices:
+
+1. Enable GitHub's security features, such as security alerts and vulnerability scanning, to detect any suspicious activity.
+2. Regularly review the audit logs in your GitHub repository to track the usage of the `GH_TOKEN`.
+3. Set up notifications for any unusual activity or changes in the repository.
+4. Use third-party tools or services to monitor the usage of the `GH_TOKEN` and detect any potential security issues.
+5. Periodically review and update the permissions assigned to the `GH_TOKEN` to ensure they are still necessary and appropriate.
+
+## Merging Code from Different Branches or Repositories
+
+The repository contains GitHub Actions workflows that automatically merge code from different branches or repositories. These workflows use the `gh pr merge` command with the `--squash`, `--auto`, and `--delete-branch` options.
+
+### Example using `gh pr merge`
+
+```sh
+gh pr merge <pull-request-number> --squash --auto --delete-branch
+```
+
+Replace `<pull-request-number>` with the number of the pull request you want to merge.
+
+### Example using GitHub Actions Workflow
+
+The following GitHub Actions workflow automatically merges pull requests created by the `sourcery-ai[bot]` user:
+
+```yaml
+name: Auto-merge Sourcery AI Bot PRs
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: write
+
+env:
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+jobs:
+  merge-sourcery-pr:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'sourcery-ai[bot]'
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+
+      - name: Merge Pull Request
+        run: |
+          gh pr merge "${{ github.event.pull_request.number }}" \
+            --squash \
+            --auto \
+            --delete-branch \
+            --repo "${{ github.repository }}"
+
+      - name: Merge develop into main
+        run: |
+          git fetch origin
+          git checkout main
+          git merge develop
+          gh pr merge --squash --auto --delete-branch
+```
+
+## Poker Coach UI
+
+The Poker Coach UI is an interactive interface for hand analysis and game play. It helps users analyze their poker hands and provides feedback.
+
+### Installation
+
+To install the Poker Coach UI, follow these steps:
+
+1. Ensure you have Python 3.12 or higher installed.
+2. Clone the repository:
+   ```sh
+   git clone https://github.com/sourcery-ai/test-aoc.git
+   cd test-aoc
+   ```
+3. Install the required dependencies:
+   ```sh
+   pip install -r requirements.txt
+   ```
+
+### Usage
+
+To use the Poker Coach UI, run the following command:
+```sh
+python -m poker_coach.ui
+```
+
+This will open the Poker Coach UI window where you can enter your poker hand and analyze it.

poker_coach/ui.py

@@ -0,0 +1,38 @@
+import tkinter as tk
+from tkinter import messagebox
+
+class PokerCoachUI:
+    def __init__(self, root):
+        self.root = root
+        self.root.title("Poker Coach")
+
+        self.create_widgets()
+
+    def create_widgets(self):
+        self.hand_label = tk.Label(self.root, text="Enter your hand:")
+        self.hand_label.pack()
+
+        self.hand_entry = tk.Entry(self.root)
+        self.hand_entry.pack()
+
+        self.analyze_button = tk.Button(self.root, text="Analyze Hand", command=self.analyze_hand)
+        self.analyze_button.pack()
+
+        self.result_label = tk.Label(self.root, text="")
+        self.result_label.pack()
+
+    def analyze_hand(self):
+        hand = self.hand_entry.get()
+        if not hand:
+            messagebox.showerror("Error", "Please enter a hand.")
+            return
+
+        # Placeholder for hand analysis logic
+        result = f"Analysis result for hand: {hand}"
+
+        self.result_label.config(text=result)
+
+if __name__ == "__main__":
+    root = tk.Tk()
+    app = PokerCoachUI(root)
+    root.mainloop()

tests/test_poker_coach_ui.py

@@ -0,0 +1,24 @@
+import pytest
+import tkinter as tk
+from poker_coach.ui import PokerCoachUI
+
+@pytest.fixture
+def app():
+    root = tk.Tk()
+    app = PokerCoachUI(root)
+    yield app
+    root.destroy()
+
+def test_initial_state(app):
+    assert app.hand_entry.get() == ""
+    assert app.result_label.cget("text") == ""
+
+def test_analyze_hand_empty(app):
+    app.hand_entry.delete(0, tk.END)
+    app.analyze_hand()
+    assert app.result_label.cget("text") == ""
+
+def test_analyze_hand_valid(app):
+    app.hand_entry.insert(0, "AS KS QS JS TS")
+    app.analyze_hand()
+    assert "Analysis result for hand: AS KS QS JS TS" in app.result_label.cget("text")