tenseleyflow/gitswitch / 97dd06c

Browse files

feat: improve account switch status messages

Show detailed progress when switching accounts:
- Account name and email being switched to
- Git config scope (local/global) with warning if falling back
- SSH key load status
- SSH connection verification status (when successful)
- GPG signing status (when enabled)
- Clear error indicators [!!] for failures
- Dry run mode indicators [--]
Authored by espadonne
SHA
97dd06c6af80104793fcc7b85935996f213d7e00
Parents
1049f51
Tree
10463c2

2 changed files

StatusFile+-
M src/accounts.c 49 32
M src/main.c 6 5
src/accounts.cmodified
@@ -44,144 +44,161 @@ int accounts_init(gitswitch_ctx_t *ctx) {
4444
 /* Switch to specified account with SSH isolation and validation */
4545
 int accounts_switch(gitswitch_ctx_t *ctx, const char *identifier) {
4646
     account_t *account;
47
-
47
+    const char *scope_str;
48
+    bool ssh_ok = false;
49
+    bool gpg_ok = false;
50
+
4851
     if (!ctx || !identifier) {
4952
         set_error(ERR_INVALID_ARGS, "Invalid arguments to accounts_switch");
5053
         return -1;
5154
     }
52
-
55
+
5356
     /* Find the account */
5457
     account = config_find_account(ctx, identifier);
5558
     if (!account) {
5659
         set_error(ERR_ACCOUNT_NOT_FOUND, "Account not found: %s", identifier);
5760
         return -1;
5861
     }
59
-
62
+
6063
     /* Basic validation */
6164
     if (!validate_name(account->name) || !validate_email(account->email)) {
6265
         set_error(ERR_ACCOUNT_INVALID, "Account has invalid name or email");
6366
         return -1;
6467
     }
65
-
68
+
6669
     /* Determine git scope - use account preference or context default */
6770
     git_scope_t scope = account->preferred_scope;
6871
     if (scope == GIT_SCOPE_LOCAL && !git_is_repository()) {
69
-        log_warning("Account prefers local scope, but not in git repository. Using global scope.");
72
+        display_warning("Not in a git repository, using global scope instead of local");
7073
         scope = GIT_SCOPE_GLOBAL;
7174
     }
72
-
75
+    scope_str = (scope == GIT_SCOPE_LOCAL) ? "local" : "global";
76
+
7377
     /* Initialize git operations if not already done */
7478
     if (git_ops_init() != 0) {
7579
         set_error(ERR_GIT_CONFIG_FAILED, "Failed to initialize git operations");
7680
         return -1;
7781
     }
78
-
82
+
83
+    /* Show what we're doing */
84
+    printf("\nSwitching to account: %s <%s>\n", account->name, account->email);
85
+
7986
     /* If not in dry-run mode, actually set git configuration */
8087
     if (!ctx->config.dry_run) {
81
-        log_info("Setting git configuration for account: %s (%s scope)",
82
-                 account->name, scope == GIT_SCOPE_LOCAL ? "local" : "global");
83
-
88
+        log_info("Setting git configuration for account: %s (%s scope)",
89
+                 account->name, scope_str);
90
+
8491
         if (git_set_config(account, scope) != 0) {
85
-            set_error(ERR_GIT_CONFIG_FAILED, "Failed to set git configuration: %s",
92
+            set_error(ERR_GIT_CONFIG_FAILED, "Failed to set git configuration: %s",
8693
                       get_last_error()->message);
8794
             return -1;
8895
         }
89
-
96
+        printf("  [OK] Git config set (%s scope)\n", scope_str);
97
+
9098
         /* Validate the configuration was set correctly */
9199
         if (git_test_config(account, scope) != 0) {
92100
             log_warning("Git configuration validation failed: %s", get_last_error()->message);
93101
             /* Don't fail completely, just warn */
94102
         }
95
-
103
+
96104
         /* Handle SSH agent isolation if SSH is enabled */
97105
         if (account->ssh_enabled && strlen(account->ssh_key_path) > 0) {
98106
             log_info("Setting up SSH isolation for account: %s", account->name);
99
-
107
+
100108
             /* Initialize SSH manager with isolated agents */
101109
             ssh_config_t ssh_config = {0};
102110
             if (ssh_manager_init(&ssh_config, SSH_AGENT_ISOLATED) != 0) {
111
+                printf("  [!!] SSH agent failed to start\n");
103112
                 log_warning("Failed to initialize SSH manager: %s", get_last_error()->message);
104113
             } else {
105114
                 /* Switch to account's SSH configuration */
106115
                 if (ssh_switch_account(&ssh_config, account) != 0) {
116
+                    printf("  [!!] SSH key failed to load\n");
107117
                     log_warning("Failed to switch SSH configuration: %s", get_last_error()->message);
108118
                     /* Clean up SSH manager on failure */
109119
                     ssh_manager_cleanup(&ssh_config);
110120
                 } else {
121
+                    ssh_ok = true;
122
+                    printf("  [OK] SSH key loaded\n");
111123
                     log_info("SSH isolation activated for account: %s", account->name);
112
-
124
+
113125
                     /* Test SSH connection if connection testing is available */
114126
                     if (strlen(account->ssh_host_alias) > 0) {
115127
                         if (ssh_test_connection(account, account->ssh_host_alias) == 0) {
116
-                            log_info("SSH connection test passed for %s", account->ssh_host_alias);
128
+                            printf("  [OK] SSH connection verified (%s)\n", account->ssh_host_alias);
117129
                         } else {
118
-                            log_warning("SSH connection test failed for %s", account->ssh_host_alias);
130
+                            printf("  [--] SSH connection test skipped (%s unreachable)\n", account->ssh_host_alias);
119131
                         }
120132
                     } else {
121133
                         /* Test with default GitHub host (git@ is required for GitHub SSH) */
122134
                         if (ssh_test_connection(account, "git@github.com") == 0) {
123
-                            log_info("SSH connection test passed for github.com");
124
-                        } else {
125
-                            log_debug("SSH connection test failed for github.com (this may be normal)");
135
+                            printf("  [OK] SSH connection verified (github.com)\n");
126136
                         }
137
+                        /* Silently skip if GitHub unreachable - not an error */
127138
                     }
128139
                 }
129140
             }
130141
         }
131
-
142
+
132143
         /* Handle GPG environment isolation if GPG is enabled */
133144
         if (account->gpg_enabled && strlen(account->gpg_key_id) > 0) {
134145
             log_info("Setting up GPG isolation for account: %s", account->name);
135
-
146
+
136147
             /* Initialize GPG manager with isolated environments */
137148
             gpg_config_t gpg_config = {0};
138149
             if (gpg_manager_init(&gpg_config, GPG_MODE_ISOLATED) != 0) {
150
+                printf("  [!!] GPG manager failed to initialize\n");
139151
                 log_warning("Failed to initialize GPG manager: %s", get_last_error()->message);
140152
             } else {
141153
                 /* Switch to account's GPG configuration */
142154
                 if (gpg_switch_account(&gpg_config, account) != 0) {
155
+                    printf("  [!!] GPG key failed to activate\n");
143156
                     log_warning("Failed to switch GPG configuration: %s", get_last_error()->message);
144157
                     /* Clean up GPG manager on failure */
145158
                     gpg_manager_cleanup(&gpg_config);
146159
                 } else {
147160
                     log_info("GPG isolation activated for account: %s", account->name);
148
-
161
+
149162
                     /* Configure git GPG signing */
150163
                     if (gpg_configure_git_signing(&gpg_config, account, scope) != 0) {
164
+                        printf("  [!!] GPG signing config failed\n");
151165
                         log_warning("Failed to configure git GPG signing: %s", get_last_error()->message);
152166
                     } else {
167
+                        gpg_ok = true;
168
+                        printf("  [OK] GPG signing enabled (key: %s)\n", account->gpg_key_id);
153169
                         log_info("Git GPG signing configured for account: %s", account->name);
154170
                     }
155171
                 }
156172
             }
157173
         }
158174
     } else {
159
-        display_info("DRY RUN: Would set git configuration for %s", account->name);
175
+        printf("  [--] DRY RUN: Would set git config (%s scope)\n", scope_str);
160176
         if (account->ssh_enabled && strlen(account->ssh_key_path) > 0) {
161
-            display_info("DRY RUN: Would activate SSH isolation for %s", account->ssh_key_path);
177
+            printf("  [--] DRY RUN: Would load SSH key\n");
162178
         }
163179
         if (account->gpg_enabled && strlen(account->gpg_key_id) > 0) {
164
-            display_info("DRY RUN: Would activate GPG isolation for key %s", account->gpg_key_id);
180
+            printf("  [--] DRY RUN: Would enable GPG signing\n");
165181
         }
166182
     }
167
-
183
+
168184
     /* Test SSH functionality if enabled (basic validation) */
169
-    if (account->ssh_enabled && strlen(account->ssh_key_path) > 0) {
185
+    if (account->ssh_enabled && strlen(account->ssh_key_path) > 0 && !ssh_ok) {
170186
         if (test_ssh_key_functionality(account) != 0) {
171187
             log_warning("SSH key test failed for account: %s", account->name);
172188
         }
173189
     }
174
-
190
+
175191
     /* Test GPG functionality if enabled */
176
-    if (account->gpg_enabled && strlen(account->gpg_key_id) > 0) {
192
+    if (account->gpg_enabled && strlen(account->gpg_key_id) > 0 && !gpg_ok) {
177193
         if (test_gpg_key_functionality(account) != 0) {
178194
             log_warning("GPG key test failed for account: %s", account->name);
179195
         }
180196
     }
181
-
197
+
182198
     /* Set as current account */
183199
     ctx->current_account = account;
184
-
200
+
201
+    printf("\n");
185202
     log_info("Successfully switched to account: %s (%s)", account->name, account->description);
186203
     return 0;
187204
 }
src/main.cmodified
@@ -305,18 +305,19 @@ static int handle_status_command(gitswitch_ctx_t *ctx) {
305305
306306
 static int handle_switch_command(gitswitch_ctx_t *ctx, const char *identifier) {
307307
     if (!ctx || !identifier) return EXIT_FAILURE;
308
-
308
+
309309
     if (ctx->config.dry_run) {
310310
         display_info("DRY RUN MODE - No actual changes will be made");
311311
     }
312
-
312
+
313313
     if (accounts_switch(ctx, identifier) != 0) {
314314
         display_error("Failed to switch account", get_last_error()->message);
315315
         return EXIT_FAILURE;
316316
     }
317
-
318
-    display_success("Successfully switched to account: %s", ctx->current_account->name);
319
-
317
+
318
+    /* accounts_switch already prints detailed status, just confirm success */
319
+    display_success("Switched to: %s", ctx->current_account->name);
320
+
320321
     return EXIT_SUCCESS;
321322
 }
322323