update docs
This commit is contained in:
parent
b6c05ced0a
commit
01f552b7ec
29
CLAUDE.md
29
CLAUDE.md
@ -23,30 +23,37 @@ The entire implementation is a single Babashka script (`commitly`) with these ke
|
||||
- `has-changes?` - Uses `git status --porcelain` to detect uncommitted changes
|
||||
- `commit-changes` - Executes `git add -A` and `git commit -m` for a repo
|
||||
- `push-changes` - Executes `git push` for a repo
|
||||
- `commitly` - Main orchestration function that coordinates the workflow
|
||||
- `status-all` - Shows git status for all modified repositories
|
||||
- `commitly` - Main orchestration function that coordinates commit workflow
|
||||
- `push-all` - Pushes all repositories without committing
|
||||
- `-main` - CLI argument parsing and entry point
|
||||
|
||||
### Workflow
|
||||
|
||||
1. Scan current directory for subdirectories with `.git` folders
|
||||
2. Filter to only repos with uncommitted changes
|
||||
2. Filter to only repos with uncommitted changes (for commit operations)
|
||||
3. For each modified repo: stage all changes and commit with provided message
|
||||
4. If `-p` flag is present, push each successfully committed repo
|
||||
4. If `push` subcommand is used, push each successfully committed repo (or all repos if no commit message)
|
||||
5. Report success/failure for each repository
|
||||
|
||||
## Common Commands
|
||||
|
||||
### Basic Usage
|
||||
|
||||
**Note:** These examples assume `commitly` is in your PATH.
|
||||
|
||||
```bash
|
||||
# Commit changes across all modified subrepos
|
||||
./commitly "commit message"
|
||||
# Show status of all modified subrepos
|
||||
commitly status
|
||||
|
||||
# Commit changes across all modified subrepos (no push)
|
||||
commitly "commit message"
|
||||
|
||||
# Commit and push changes
|
||||
./commitly -p "commit message"
|
||||
commitly push "commit message"
|
||||
|
||||
# Push only (no commit) - useful after manual commits
|
||||
./commitly -p
|
||||
commitly push
|
||||
```
|
||||
|
||||
### Running via Babashka Tasks
|
||||
@ -61,7 +68,7 @@ bb run "commit message"
|
||||
The script is self-contained with no external dependencies beyond Babashka standard library (`babashka.process`, `babashka.fs`). To modify:
|
||||
|
||||
1. Edit the `commitly` script directly
|
||||
2. Test changes by running `./commitly` with test arguments
|
||||
2. Test changes by running `commitly` with test arguments (or `./commitly` if running from the repo directory)
|
||||
3. The script is executable via shebang `#!/usr/bin/env bb`
|
||||
|
||||
## Important Implementation Details
|
||||
@ -73,9 +80,9 @@ The script is self-contained with no external dependencies beyond Babashka stand
|
||||
- Non-zero exit code (1) if any operations fail
|
||||
- Empty commit message validation prevents accidental empty commits
|
||||
|
||||
### Special `-p` Flag Behavior
|
||||
### Push Subcommand Behavior
|
||||
|
||||
The `-p` flag has dual behavior:
|
||||
The `push` subcommand has dual behavior:
|
||||
- With commit message: commits then pushes
|
||||
- Without commit message: pushes only (skips committing)
|
||||
|
||||
@ -85,7 +92,7 @@ This allows workflows like:
|
||||
cd service-manager && git commit -m "specific message"
|
||||
cd ../www && git commit -m "different message"
|
||||
cd ..
|
||||
./commitly -p # Push all repos
|
||||
commitly push # Push all repos
|
||||
```
|
||||
|
||||
### Process Execution
|
||||
|
||||
18
README.md
18
README.md
@ -17,18 +17,20 @@ A CLI tool for making commits to many subrepos after a distributed change.
|
||||
|
||||
## Usage
|
||||
|
||||
**Note:** These examples assume `commitly` is in your PATH (e.g., installed via bbin or symlinked).
|
||||
|
||||
```bash
|
||||
# Show status of all modified subrepos
|
||||
./commitly status
|
||||
commitly status
|
||||
|
||||
# Commit changes across all modified subrepos
|
||||
./commitly "Your commit message here"
|
||||
commitly "Your commit message here"
|
||||
|
||||
# Commit and push changes
|
||||
./commitly -p "Your commit message here"
|
||||
commitly push "Your commit message here"
|
||||
|
||||
# Push only (without committing)
|
||||
./commitly -p
|
||||
commitly push
|
||||
```
|
||||
|
||||
## Requirements
|
||||
@ -62,11 +64,15 @@ bash < <(curl -s https://raw.githubusercontent.com/babashka/bbin/main/bbin)
|
||||
### Manual Installation
|
||||
|
||||
```bash
|
||||
# Clone the repository
|
||||
git clone git@git.ajet.fyi:ajet-industries/commitly.git
|
||||
cd commitly
|
||||
|
||||
# Make the script executable
|
||||
chmod +x commitly
|
||||
|
||||
# Optionally, symlink to a directory in your PATH
|
||||
ln -s $(pwd)/commitly /usr/local/bin/commitly
|
||||
# Symlink to a directory in your PATH
|
||||
ln -s $(pwd)/commitly ~/.local/bin/commitly
|
||||
```
|
||||
|
||||
## How It Works
|
||||
|
||||
70
commitly
70
commitly
@ -131,50 +131,58 @@
|
||||
(println (format "\n%d repositories failed to push" (count failed)))
|
||||
(System/exit 1))))))))
|
||||
|
||||
(defn push-all []
|
||||
"Push all repositories without committing"
|
||||
(let [current-dir (fs/cwd)
|
||||
subrepos (find-subrepos current-dir)]
|
||||
(println "\nPushing changes...")
|
||||
(let [push-results (map push-changes subrepos)]
|
||||
(doseq [result push-results]
|
||||
(if (:success result)
|
||||
(println (format "✓ %s" (fs/file-name (:repo result))))
|
||||
(println (format "✗ %s: %s" (fs/file-name (:repo result)) (:error result)))))
|
||||
(let [failed (filter #(not (:success %)) push-results)]
|
||||
(when (seq failed)
|
||||
(println (format "\n%d repositories failed to push" (count failed)))
|
||||
(System/exit 1))))))
|
||||
|
||||
;; CLI entry point
|
||||
(defn -main [& args]
|
||||
(if (empty? args)
|
||||
(do
|
||||
(println "Usage: commitly [-p] <commit-message>")
|
||||
(println "Usage: commitly <commit-message>")
|
||||
(println " commitly status")
|
||||
(println " commitly push [<commit-message>]")
|
||||
(println "")
|
||||
(println "Options:")
|
||||
(println " -p Push changes after committing (or just push if no message)")
|
||||
(println " status Show git status for all subrepos with changes")
|
||||
(println "Commands:")
|
||||
(println " status Show git status for all subrepos with changes")
|
||||
(println " push Push all repositories without committing")
|
||||
(println " push <commit-message> Commit and push changes across all modified subrepos")
|
||||
(println " <commit-message> Commit changes across all modified subrepos (no push)")
|
||||
(System/exit 1))
|
||||
(let [first-arg (first args)]
|
||||
(let [first-arg (first args)
|
||||
rest-args (rest args)]
|
||||
(cond
|
||||
;; Status command
|
||||
(= "status" first-arg)
|
||||
(status-all)
|
||||
|
||||
;; Commit/push command
|
||||
;; Push command
|
||||
(= "push" first-arg)
|
||||
(if (empty? rest-args)
|
||||
;; Push only (no commit)
|
||||
(push-all)
|
||||
;; Commit and push
|
||||
(let [commit-message (str/join " " rest-args)]
|
||||
(commitly commit-message :push? true)))
|
||||
|
||||
;; Commit command (no push)
|
||||
:else
|
||||
(let [push? (some #(= "-p" %) args)
|
||||
message-args (remove #(= "-p" %) args)
|
||||
commit-message (str/join " " message-args)]
|
||||
(if (and (str/blank? commit-message) push?)
|
||||
;; If -p is enabled and no message, just push without committing
|
||||
(do
|
||||
(println "No commit message provided with -p flag. Pushing only...")
|
||||
(let [current-dir (fs/cwd)
|
||||
subrepos (find-subrepos current-dir)]
|
||||
(println "\nPushing changes...")
|
||||
(let [push-results (map push-changes subrepos)]
|
||||
(doseq [result push-results]
|
||||
(if (:success result)
|
||||
(println (format "✓ %s" (fs/file-name (:repo result))))
|
||||
(println (format "✗ %s: %s" (fs/file-name (:repo result)) (:error result)))))
|
||||
(let [failed (filter #(not (:success %)) push-results)]
|
||||
(when (seq failed)
|
||||
(println (format "\n%d repositories failed to push" (count failed)))
|
||||
(System/exit 1))))))
|
||||
;; Otherwise, require commit message
|
||||
(do
|
||||
(when (str/blank? commit-message)
|
||||
(println "Error: commit message cannot be empty")
|
||||
(System/exit 1))
|
||||
(commitly commit-message :push? push?))))))))
|
||||
(let [commit-message (str/join " " args)]
|
||||
(when (str/blank? commit-message)
|
||||
(println "Error: commit message cannot be empty")
|
||||
(System/exit 1))
|
||||
(commitly commit-message :push? false))))))
|
||||
|
||||
(when (= *file* (System/getProperty "babashka.file"))
|
||||
(apply -main *command-line-args*))
|
||||
|
||||
@ -4,40 +4,54 @@ Use this skill when you need to commit and/or push changes across multiple git r
|
||||
|
||||
## What is Commitly?
|
||||
|
||||
Commitly is a Babashka script located at `commitly/commitly` that commits and pushes changes across all modified git subrepositories in the ajet-industries monorepo.
|
||||
Commitly is a Babashka CLI tool that commits and pushes changes across all modified git subrepositories in the ajet-industries monorepo.
|
||||
|
||||
## Installation
|
||||
|
||||
```bash
|
||||
# Install via bbin (recommended)
|
||||
bbin install git@git.ajet.fyi:ajet-industries/commitly.git
|
||||
```
|
||||
|
||||
This installs `commitly` to `~/.local/bin/commitly` (ensure `~/.local/bin` is in your PATH).
|
||||
|
||||
## Usage
|
||||
|
||||
**Note:** These examples assume `commitly` is in your PATH.
|
||||
|
||||
```bash
|
||||
./commitly/commitly status # Show status of modified repos
|
||||
./commitly/commitly [-p] <commit-message> # Commit (and push) changes
|
||||
commitly status # Show status of modified repos
|
||||
commitly <commit-message> # Commit changes (no push)
|
||||
commitly push [<commit-message>] # Push (and optionally commit) changes
|
||||
```
|
||||
|
||||
### Options
|
||||
### Commands
|
||||
|
||||
- `status` - Show git status for all modified repositories
|
||||
- `-p` - Push changes after committing. If no commit message is provided with `-p`, it will skip committing and just push all subrepos.
|
||||
- `<commit-message>` - Commit changes across all modified repositories (no push)
|
||||
- `push` - Push all repositories without committing
|
||||
- `push <commit-message>` - Commit and push changes across all modified repositories
|
||||
|
||||
### Examples
|
||||
|
||||
**Show status of all modified repos:**
|
||||
```bash
|
||||
./commitly/commitly status
|
||||
commitly status
|
||||
```
|
||||
|
||||
**Commit all modified repos with a message:**
|
||||
**Commit all modified repos with a message (no push):**
|
||||
```bash
|
||||
./commitly/commitly "fix: update configuration"
|
||||
commitly "fix: update configuration"
|
||||
```
|
||||
|
||||
**Commit and push all modified repos:**
|
||||
```bash
|
||||
./commitly/commitly -p "feat: add new feature"
|
||||
commitly push "feat: add new feature"
|
||||
```
|
||||
|
||||
**Just push all repos (no commit):**
|
||||
```bash
|
||||
./commitly/commitly -p
|
||||
commitly push
|
||||
```
|
||||
|
||||
## How It Works
|
||||
@ -46,9 +60,9 @@ Commitly is a Babashka script located at `commitly/commitly` that commits and pu
|
||||
2. **Detection**: Checks each repository for uncommitted changes using `git status --porcelain`
|
||||
3. **Action**: Depending on the command:
|
||||
- `status`: Shows full `git status` output for each modified repo
|
||||
- `<message>`: Runs `git add -A` and `git commit -m "<message>"` for each modified repo
|
||||
- `-p <message>`: Commits and then runs `git push` for each successfully committed repo
|
||||
- `-p` (no message): Runs `git push` for all repos without committing
|
||||
- `<message>`: Runs `git add -A` and `git commit -m "<message>"` for each modified repo (no push)
|
||||
- `push <message>`: Commits and then runs `git push` for each successfully committed repo
|
||||
- `push` (no message): Runs `git push` for all repos without committing
|
||||
|
||||
## When to Use
|
||||
|
||||
@ -68,11 +82,11 @@ Each has its own `.git` directory and is deployed independently via Gitea Action
|
||||
## Error Handling
|
||||
|
||||
- If any repository fails to commit, commitly exits with code 1 and reports which repos failed
|
||||
- If any repository fails to push (when `-p` is used), commitly exits with code 1 and reports which repos failed
|
||||
- If any repository fails to push (when `push` subcommand is used), commitly exits with code 1 and reports which repos failed
|
||||
- Repos are processed independently - one failure doesn't stop others from being processed
|
||||
|
||||
## Requirements
|
||||
|
||||
- Babashka must be installed (`bb` command available)
|
||||
- The script must be executable: `chmod +x commitly/commitly`
|
||||
- `commitly` must be in your PATH (install via bbin or manual symlink)
|
||||
- Each subrepo must have a git remote configured for pushing
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user