Skip to content

Commit 2e0e51a

Browse files
committed
Refactor output messages for consistency and clarity across commands
1 parent dd847bc commit 2e0e51a

File tree

21 files changed

+242
-242
lines changed

21 files changed

+242
-242
lines changed

.github/workflows/test-status.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323

2424
- name: Run tests and generate summary
2525
run: |
26-
echo "# 🧪 Test Results Summary" >> $GITHUB_STEP_SUMMARY
26+
echo "# Test Results Summary" >> $GITHUB_STEP_SUMMARY
2727
echo "" >> $GITHUB_STEP_SUMMARY
2828
2929
# Run tests and capture output
3030
if go test -v ./... > test_output.log 2>&1; then
31-
echo "All tests passed!" >> $GITHUB_STEP_SUMMARY
31+
echo "All tests passed." >> $GITHUB_STEP_SUMMARY
3232
else
33-
echo "Some tests failed!" >> $GITHUB_STEP_SUMMARY
33+
echo "Some tests failed." >> $GITHUB_STEP_SUMMARY
3434
fi
3535
3636
echo "" >> $GITHUB_STEP_SUMMARY
@@ -40,7 +40,7 @@ jobs:
4040
go test -coverprofile=coverage.out ./... > /dev/null 2>&1
4141
if [ -f coverage.out ]; then
4242
COVERAGE=$(go tool cover -func=coverage.out | grep total | awk '{print $3}')
43-
echo "📊 Total Coverage: **$COVERAGE**" >> $GITHUB_STEP_SUMMARY
43+
echo "Total Coverage: **$COVERAGE**" >> $GITHUB_STEP_SUMMARY
4444
fi
4545
4646
echo "" >> $GITHUB_STEP_SUMMARY
@@ -52,8 +52,8 @@ jobs:
5252
- name: Set test status
5353
run: |
5454
if go test ./... > /dev/null 2>&1; then
55-
echo "TEST_STATUS=PASSING" >> $GITHUB_ENV
55+
echo "TEST_STATUS=PASSING" >> $GITHUB_ENV
5656
else
57-
echo "TEST_STATUS=FAILING" >> $GITHUB_ENV
57+
echo "TEST_STATUS=FAILING" >> $GITHUB_ENV
5858
exit 1
5959
fi

docs/public/install.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ NC='\033[0m'
1414

1515

1616
print_info() {
17-
echo -e "${BLUE}ℹ️ $1${NC}"
17+
echo -e "${BLUE}info: $1${NC}"
1818
}
1919

2020
print_success() {
21-
echo -e "${GREEN} $1${NC}"
21+
echo -e "${GREEN}ok: $1${NC}"
2222
}
2323

2424
print_warning() {
25-
echo -e "${YELLOW}⚠️ $1${NC}"
25+
echo -e "${YELLOW}warning: $1${NC}"
2626
}
2727

2828
print_error() {
29-
echo -e "${RED} $1${NC}"
29+
echo -e "${RED}error: $1${NC}"
3030
}
3131

3232
print_header() {
@@ -124,7 +124,7 @@ fi
124124

125125
print_next_steps() {
126126
echo
127-
print_success "🎉 devbox installation completed successfully!"
127+
print_success "devbox installation completed successfully."
128128
echo
129129
print_info "Next steps:"
130130
echo " 1. If Docker group permissions are needed, log out and log back in"
@@ -158,31 +158,31 @@ sudo usermod -aG docker "$USER"
158158

159159
print_info "Verifying installations..."
160160
if command_exists git; then
161-
print_success "git: $(git --version | head -n1)"
161+
print_success "git: $(git --version | head -n1)"
162162
else
163-
print_error "git installation failed"
163+
print_error "git installation failed"
164164
exit 1
165165
fi
166166

167167
if command_exists make; then
168-
print_success "make: $(make --version | head -n1)"
168+
print_success "make: $(make --version | head -n1)"
169169
else
170-
print_error "make installation failed"
170+
print_error "make installation failed"
171171
exit 1
172172
fi
173173

174174
if command_exists go; then
175-
print_success "go: $(go version)"
175+
print_success "go: $(go version)"
176176
else
177-
print_error "go installation failed"
177+
print_error "go installation failed"
178178
exit 1
179179
fi
180180

181181
if command_exists docker; then
182-
print_success "docker: $(docker --version)"
182+
print_success "docker: $(docker --version)"
183183
print_warning "You may need to log out and log back in for Docker group permissions to take effect"
184184
else
185-
print_error "docker installation failed"
185+
print_error "docker installation failed"
186186
exit 1
187187
fi
188188

install.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ NC='\033[0m'
1414

1515

1616
print_info() {
17-
echo -e "${BLUE}ℹ️ $1${NC}"
17+
echo -e "${BLUE}info: $1${NC}"
1818
}
1919

2020
print_success() {
21-
echo -e "${GREEN} $1${NC}"
21+
echo -e "${GREEN}ok: $1${NC}"
2222
}
2323

2424
print_warning() {
25-
echo -e "${YELLOW}⚠️ $1${NC}"
25+
echo -e "${YELLOW}warning: $1${NC}"
2626
}
2727

2828
print_error() {
29-
echo -e "${RED} $1${NC}"
29+
echo -e "${RED}error: $1${NC}"
3030
}
3131

3232
print_header() {
@@ -124,7 +124,7 @@ fi
124124

125125
print_next_steps() {
126126
echo
127-
print_success "🎉 devbox installation completed successfully!"
127+
print_success "devbox installation completed successfully."
128128
echo
129129
print_info "Next steps:"
130130
echo " 1. If Docker group permissions are needed, log out and log back in"
@@ -158,31 +158,31 @@ sudo usermod -aG docker "$USER"
158158

159159
print_info "Verifying installations..."
160160
if command_exists git; then
161-
print_success "git: $(git --version | head -n1)"
161+
print_success "git: $(git --version | head -n1)"
162162
else
163-
print_error "git installation failed"
163+
print_error "git installation failed"
164164
exit 1
165165
fi
166166

167167
if command_exists make; then
168-
print_success "make: $(make --version | head -n1)"
168+
print_success "make: $(make --version | head -n1)"
169169
else
170-
print_error "make installation failed"
170+
print_error "make installation failed"
171171
exit 1
172172
fi
173173

174174
if command_exists go; then
175-
print_success "go: $(go version)"
175+
print_success "go: $(go version)"
176176
else
177-
print_error "go installation failed"
177+
print_error "go installation failed"
178178
exit 1
179179
fi
180180

181181
if command_exists docker; then
182-
print_success "docker: $(docker --version)"
182+
print_success "docker: $(docker --version)"
183183
print_warning "You may need to log out and log back in for Docker group permissions to take effect"
184184
else
185-
print_error "docker installation failed"
185+
print_error "docker installation failed"
186186
exit 1
187187
fi
188188

internal/commands/apply.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ var applyCmd = &cobra.Command{
126126

127127
_ = WriteLockFileForBox(proj.BoxName, projectName, proj.WorkspacePath, proj.BaseImage, "")
128128

129-
fmt.Println("Applied lockfile: registries/sources configured and packages reconciled")
129+
fmt.Println("Applied lockfile: registries/sources configured and packages reconciled")
130130
return nil
131131
},
132132
}

internal/commands/backup.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ var backupCmd = &cobra.Command{
9999
return fmt.Errorf("failed to write metadata: %w", err)
100100
}
101101

102-
fmt.Printf("Backup complete\n")
103-
fmt.Printf("📦 Directory: %s\n", outDir)
104-
fmt.Printf("🖼️ Image tag: %s\n", imageTag)
105-
fmt.Printf("📄 Files: image.tar, metadata.json\n")
102+
fmt.Printf("Backup complete\n")
103+
fmt.Printf("Directory: %s\n", outDir)
104+
fmt.Printf("Image tag: %s\n", imageTag)
105+
fmt.Printf("Files: image.tar, metadata.json\n")
106106
return nil
107107
},
108108
}

internal/commands/cleanup.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This command helps maintain a clean system by removing:
2727
2828
- Orphaned devbox boxes (not tracked in config)
2929
- Unused Docker images
30-
- Unused Docker volumes
30+
- Unused Docker volumes
3131
- Unused Docker networks
3232
- Dangling build artifacts
3333
@@ -81,15 +81,15 @@ Examples:
8181
}
8282

8383
if len(cleanupTasks) > 0 {
84-
fmt.Printf("\n✅ Cleanup completed successfully!\n")
84+
fmt.Printf("\nCleanup completed successfully.\n")
8585
}
8686

8787
return nil
8888
},
8989
}
9090

9191
func runInteractiveCleanup() error {
92-
fmt.Printf("🧹 Devbox Cleanup Menu\n\n")
92+
fmt.Printf("Devbox cleanup\n\n")
9393
fmt.Printf("Available cleanup options:\n")
9494
fmt.Printf(" 1. Clean up orphaned devbox boxes\n")
9595
fmt.Printf(" 2. Remove unused Docker images\n")
@@ -135,7 +135,7 @@ func runInteractiveCleanup() error {
135135
return err
136136
}
137137
}
138-
fmt.Printf("\n✅ Comprehensive cleanup completed!\n")
138+
fmt.Printf("\nComprehensive cleanup completed.\n")
139139
return nil
140140
case "7":
141141
return showSystemStatus()
@@ -149,7 +149,7 @@ func runInteractiveCleanup() error {
149149
}
150150

151151
func cleanupOrphanedFromCleanup() error {
152-
fmt.Printf("🔍 Scanning for orphaned devbox boxes...\n")
152+
fmt.Printf("Scanning for orphaned devbox boxes...\n")
153153

154154
if dryRunFlag {
155155
fmt.Printf("DRY RUN - No boxes will be removed\n")
@@ -181,13 +181,13 @@ func cleanupOrphanedFromCleanup() error {
181181
}
182182

183183
if len(orphanedboxes) == 0 {
184-
fmt.Printf("No orphaned boxes found.\n")
184+
fmt.Printf("No orphaned boxes found.\n")
185185
return nil
186186
}
187187

188188
fmt.Printf("Found %d orphaned devbox box(s):\n", len(orphanedboxes))
189189
for _, boxName := range orphanedboxes {
190-
fmt.Printf(" %s\n", boxName)
190+
fmt.Printf(" - %s\n", boxName)
191191
}
192192

193193
if dryRunFlag {
@@ -214,10 +214,10 @@ func cleanupOrphanedFromCleanup() error {
214214
for _, boxName := range orphanedboxes {
215215
fmt.Printf("Removing %s...\n", boxName)
216216
if err := dockerClient.RemoveBox(boxName); err != nil {
217-
fmt.Printf("❌ Failed to remove %s: %v\n", boxName, err)
217+
fmt.Printf("error: failed to remove %s: %v\n", boxName, err)
218218
failed++
219219
} else {
220-
fmt.Printf("Removed %s\n", boxName)
220+
fmt.Printf("Removed %s\n", boxName)
221221
removed++
222222
}
223223
}
@@ -231,7 +231,7 @@ func cleanupOrphanedFromCleanup() error {
231231
}
232232

233233
func cleanupUnusedImages() error {
234-
fmt.Printf("🔍 Scanning for unused Docker images...\n")
234+
fmt.Printf("Scanning for unused Docker images...\n")
235235

236236
if dryRunFlag {
237237
fmt.Printf("DRY RUN - No images will be removed\n")
@@ -258,14 +258,14 @@ func cleanupUnusedImages() error {
258258
if err := dockerClient.RunDockerCommand([]string{"image", "prune", "-f"}); err != nil {
259259
return fmt.Errorf("failed to prune images: %w", err)
260260
}
261-
fmt.Printf("Unused images removed.\n")
261+
fmt.Printf("Unused images removed.\n")
262262
}
263263

264264
return nil
265265
}
266266

267267
func cleanupUnusedVolumes() error {
268-
fmt.Printf("🔍 Scanning for unused Docker volumes...\n")
268+
fmt.Printf("Scanning for unused Docker volumes...\n")
269269

270270
if dryRunFlag {
271271
fmt.Printf("DRY RUN - No volumes will be removed\n")
@@ -292,14 +292,14 @@ func cleanupUnusedVolumes() error {
292292
if err := dockerClient.RunDockerCommand([]string{"volume", "prune", "-f"}); err != nil {
293293
return fmt.Errorf("failed to prune volumes: %w", err)
294294
}
295-
fmt.Printf("Unused volumes removed.\n")
295+
fmt.Printf("Unused volumes removed.\n")
296296
}
297297

298298
return nil
299299
}
300300

301301
func cleanupUnusedNetworks() error {
302-
fmt.Printf("🔍 Scanning for unused Docker networks...\n")
302+
fmt.Printf("Scanning for unused Docker networks...\n")
303303

304304
if dryRunFlag {
305305
fmt.Printf("DRY RUN - No networks will be removed\n")
@@ -326,14 +326,14 @@ func cleanupUnusedNetworks() error {
326326
if err := dockerClient.RunDockerCommand([]string{"network", "prune", "-f"}); err != nil {
327327
return fmt.Errorf("failed to prune networks: %w", err)
328328
}
329-
fmt.Printf("Unused networks removed.\n")
329+
fmt.Printf("Unused networks removed.\n")
330330
}
331331

332332
return nil
333333
}
334334

335335
func runSystemPrune() error {
336-
fmt.Printf("🔍 Running comprehensive Docker system cleanup...\n")
336+
fmt.Printf("Running comprehensive Docker system cleanup...\n")
337337

338338
if dryRunFlag {
339339
fmt.Printf("DRY RUN - No resources will be removed\n")
@@ -360,48 +360,48 @@ func runSystemPrune() error {
360360
if err := dockerClient.RunDockerCommand([]string{"system", "prune", "-f"}); err != nil {
361361
return fmt.Errorf("failed to run system prune: %w", err)
362362
}
363-
fmt.Printf("System prune completed.\n")
363+
fmt.Printf("System prune completed.\n")
364364
}
365365

366366
return nil
367367
}
368368

369369
func showSystemStatus() error {
370-
fmt.Printf("📊 Docker System Status\n\n")
370+
fmt.Printf("Docker system status\n\n")
371371

372372
fmt.Printf("=== Disk Usage ===\n")
373373
if err := dockerClient.RunDockerCommand([]string{"system", "df"}); err != nil {
374-
fmt.Printf("❌ Failed to get disk usage: %v\n", err)
374+
fmt.Printf("error: failed to get disk usage: %v\n", err)
375375
}
376376

377377
fmt.Printf("\n=== Devbox boxes ===\n")
378378
boxes, err := dockerClient.ListBoxes()
379379
if err != nil {
380-
fmt.Printf("❌ Failed to list boxes: %v\n", err)
380+
fmt.Printf("error: failed to list boxes: %v\n", err)
381381
} else {
382382
fmt.Printf("Active devbox boxes: %d\n", len(boxes))
383383
for _, box := range boxes {
384384
for _, name := range box.Names {
385-
fmt.Printf(" %s (%s)\n", strings.TrimPrefix(name, "/"), box.Status)
385+
fmt.Printf(" - %s (%s)\n", strings.TrimPrefix(name, "/"), box.Status)
386386
}
387387
}
388388
}
389389

390390
fmt.Printf("\n=== Tracked Projects ===\n")
391391
cfg, err := configManager.Load()
392392
if err != nil {
393-
fmt.Printf("❌ Failed to load config: %v\n", err)
393+
fmt.Printf("error: failed to load config: %v\n", err)
394394
} else {
395395
projects := cfg.GetProjects()
396396
fmt.Printf("Tracked projects: %d\n", len(projects))
397397
for name, project := range projects {
398-
fmt.Printf(" %s -> %s\n", name, project.BoxName)
398+
fmt.Printf(" - %s -> %s\n", name, project.BoxName)
399399
}
400400
}
401401

402402
fmt.Printf("\n=== Docker Version ===\n")
403403
if err := dockerClient.RunDockerCommand([]string{"version", "--format", "{{.Server.Version}}"}); err != nil {
404-
fmt.Printf("❌ Failed to get Docker version: %v\n", err)
404+
fmt.Printf("error: failed to get Docker version: %v\n", err)
405405
}
406406

407407
return nil

0 commit comments

Comments
 (0)