Skip to content

Commit b64f5af

Browse files
committed
corrected some more incorrect commands in the new readme and contributing.md; prepped for first release
1 parent 84fddcd commit b64f5af

File tree

3 files changed

+59
-29
lines changed

3 files changed

+59
-29
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Changelog
2+
3+
## v0.1.2 - 2025-06-22
4+
5+
- **First Release**: Initial release of the submodule management tool.
6+
- **Core Features**:
7+
- Basic submodule management using gitoxide.
8+
- Support for TOML configuration files.
9+
- Command-line interface with basic commands.
10+
- Integration with git2 for fallback operations.
11+
- **Documentation**:
12+
- Initial documentation for core modules.
13+
- Solid README with setup instructions.
14+
- **Testing**:
15+
- Good integration test coverage; all passing.
16+
- **Linting**:
17+
- Strict linting configuration with clippy.
18+
- Hk/Mise integration for git hooks, tool management, task running

CONTRIBUTING.md

Lines changed: 36 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,12 @@ mise run release # Cut a new release (maintainers only)
155155

156156
```bash
157157
# Hook commands
158-
hk pre-commit # Run pre-commit checks
159-
hk pre-push # Run pre-push checks
160-
hk check # Run all linters
161-
hk fix # Auto-fix issues where possible
162-
hk test # Run tests only
163-
hk ci # Run CI checks
158+
hk run pre-commit # Run pre-commit checks
159+
hk run pre-push # Run pre-push checks
160+
hk check # Run all linters
161+
hk fix # Auto-fix issues where possible
162+
hk run test # Run tests only
163+
hk run ci # Run CI checks
164164
```
165165

166166
### Automated Quality Checks
@@ -178,9 +178,10 @@ The pre-commit hooks automatically run these tools on every commit:
178178
### Tool Integration
179179

180180
Both tools work together seamlessly:
181+
181182
- **mise** handles tool installation and version management
182183
- **hk** uses the tools installed by mise for git hooks
183-
- Both can run the same underlying commands (e.g., `mise run test` and `hk test`)
184+
- Both can run the same underlying commands (e.g., `mise run test` and `hk run test`)
184185
- CI uses the same tools for consistency between local and remote environments
185186

186187
## 🔄 Making Changes
@@ -219,15 +220,15 @@ feat: Add support for super-unicorn submodules :unicorn:
219220
220221
## 🧪 Testing
221222
222-
My philosophy on testing is to "test what matters." Tests focus on integration and output -- if the tool performs as expected in realistic tests, then it's good. I'm not a fan of a flurry of unit tests that test implementation details and create a maintenance burden.
223+
My philosophy on testing is "test what matters." Tests focus on integration and output -- if the tool performs as expected in realistic tests, then it's good. I'm not a fan of a flurry of unit tests that test implementation details and create a maintenance burden.
223224
224225
### Test Categories
225226
226227
1. **Unit Tests** - We currently don't have unit tests, but they can be added in the future for critical functionality.
227228
228229
```bash
229230
cargo test --test unit_tests
230-
````
231+
```
231232
232233
2. **Integration Tests** - Test complete workflows
233234
@@ -261,14 +262,14 @@ mise run test # Quick test run
261262
mise run ci # Full CI suite (build + lint + test)
262263
263264
# Using hk
264-
hk test # Run tests only
265-
hk ci # Run CI checks
266-
hk check # Run all linters and checks
265+
hk run test # Run tests only
266+
hk run ci # Run CI checks
267+
hk check # Run all linters and checks
267268
268269
# Using cargo directly
269270
cargo test # Quick test run
270271
271-
# Using the test script
272+
# Using the test script -- more granular control
272273
./scripts/run-tests.sh --verbose # Comprehensive test suite with reporting
273274
./scripts/run-tests.sh --performance # Include performance tests
274275
./scripts/run-tests.sh --filter sparse_checkout # Filter specific tests
@@ -328,15 +329,16 @@ fn test_submod_init_command() {
328329
Before submitting your PR, ensure:
329330
330331
- [ ] **Code compiles** without warnings
331-
- [ ] **All tests pass** (`mise run ci` or `hk ci`)
332-
- [ ] **Pre-commit hooks pass** (automatically run on commit, or manually with `hk pre-commit`)
332+
- [ ] **All tests pass** (will run in pre-commit and pre-push)
333+
- [ ] **Pre-commit hooks pass** (automatically run on commit, or manually with `hk run pre-commit`)
333334
- [ ] **Documentation is updated** if needed
334335
- [ ] **CHANGELOG is updated** for user-facing changes
335336
- [ ] **Commit messages follow conventions**
336337
337338
**Note**: If you're using the recommended mise/hk setup, many checks are automated:
339+
338340
- **Code formatting** (`cargo fmt`) - Auto-fixed by pre-commit hooks
339-
- **Linting** (`cargo clippy`) - Checked by pre-commit hooks
341+
- **Linting** (`cargo clippy`) - Checked by pre-commit hooks
340342
- **Spell checking** (`typos`) - Checked and auto-fixed by pre-commit hooks
341343
- **TOML/YAML formatting** (`prettier`) - Auto-fixed by pre-commit hooks
342344
- **Security auditing** (`cargo deny`) - Checked by pre-commit hooks
@@ -347,7 +349,6 @@ Before submitting your PR, ensure:
347349
# Push your branch
348350
git push origin feature/your-feature-name
349351
350-
# Create PR through GitHub web interface
351352
```
352353
353354
### 3. PR Description Template
@@ -398,21 +399,32 @@ We follow standard Rust conventions with some project-specific guidelines:
398399
399400
#### Code Formatting
400401
402+
Just use `mise` or `hk`
401403
```bash
402404
# Format all code
405+
mise run fix
406+
# or
407+
hk fix
408+
409+
# if you're really anti-mise/hk, then you can use cargo directly
403410
cargo fmt
411+
```
404412
405413
# Check formatting without changing files
406-
cargo fmt -- --check
414+
```bash
415+
mise run check
416+
# or
417+
hk check
418+
419+
# or if you're really anti-mise/hk, then you can use cargo directly
420+
cargo fmt --check
407421
```
408422
409423
#### Linting
410424
411425
```bash
412-
# Run clippy with strict settings
413-
cargo clippy -- -D warnings
414-
415-
# Run clippy on all targets
426+
# the above mise and hk commands also run clippy
427+
# Again, if you're a purist:
416428
cargo clippy --all-targets --all-features -- -D warnings
417429
```
418430
@@ -510,8 +522,8 @@ impl SubmoduleConfig {
510522

511523
Common sense documentation style applies. If a function's purpose is obvious and it's well-typed, a sentence is probably enough. If it has complex logic or side effects, provide a detailed explanation.
512524

513-
````rust
514-
/// Short one-line description.
525+
````rust,ignore
526+
/// Short one-line description. // <-- stop here for obvious functions
515527
///
516528
/// Longer description explaining the purpose, behavior, and any important
517529
/// details about the function or type.
@@ -591,7 +603,6 @@ A clear description of what you expected to happen.
591603
# If you have super secret private repos on it
592604
# feel free to censor/change them
593605
```
594-
````
595606

596607
**Additional context**
597608
Add any other context about the problem here.

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ This project uses [hk](https://github.com/jdx/hk) for automated git hooks that e
296296
hk install
297297
298298
# Run pre-commit checks manually
299-
hk pre-commit
299+
hk run pre-commit
300300
301301
# Run all linters and checks
302302
hk check
@@ -305,7 +305,7 @@ hk check
305305
hk fix
306306
307307
# Run CI checks locally
308-
hk ci
308+
hk run ci
309309
```
310310
311311
The pre-commit hooks automatically run:
@@ -333,6 +333,7 @@ cargo build
333333
334334
# Run tests
335335
cargo test
336+
# or hk run test
336337
337338
# Or use the comprehensive test runner
338339
./scripts/run-tests.sh --verbose
@@ -346,8 +347,8 @@ mise run test # Run all tests
346347
mise run ci # Run full CI suite
347348
348349
# Using hk
349-
hk test # Run tests only
350-
hk ci # Run CI checks
350+
hk run test # Run tests only
351+
hk run ci # Run CI checks
351352
352353
# Using cargo directly
353354
cargo test # Run all tests

0 commit comments

Comments
 (0)