pijul/pijul - Change SAJU2DYI55I6XLB7HFBVCWKP3R33MLAJ5BPJEOPUXCXQXKLJAPIAC

Tweak CLI flags for `pijul identity`

These are very minor changes, but should help the sub-commands and various flags make some more sense! :^)

Created by finchie on August 12, 2022

SAJU2DYI55I6XLB7HFBVCWKP3R33MLAJ5BPJEOPUXCXQXKLJAPIAC

Dependencies

In discussions

#673 DRAFT: Improved identity management

Change contents

Replacement in pijul/tests/common/identity.rs at line 25 [4.80]
B:BD[3.7289] → [3.7289:7334]
```
    pub const FULL_NAME: &str = "Full name";
```
[3.7289]
[3.7334]
```
    pub const FULL_NAME: &str = "Display name";
```

Replacement in pijul/tests/common/identity.rs at line 248 [4.80]

B:BD[5.6185] → [5.6185:6242]

            pijul_cmd.arg("--full-name").arg(full_name);

[5.6185]

[5.6242]

            pijul_cmd.arg("--display-name").arg(full_name);

Replacement in pijul/tests/common/identity.rs at line 257 [4.80]

B:BD[5.6558] → [5.6558:6624]

            pijul_cmd.arg("--login").arg(login.get_input(valid));

[5.6558]

[5.6624]

            pijul_cmd.arg("--username").arg(login.get_input(valid));

Replacement in pijul/tests/common/identity.rs at line 260 [4.80]

B:BD[5.6686] → [5.6686:6754]

            pijul_cmd.arg("--origin").arg(origin.get_input(valid));

[5.6686]

[5.6754]

            pijul_cmd.arg("--remote").arg(origin.get_input(valid));

Replacement in pijul/src/main.rs at line 130 [8.83981]

B:BD[6.23] → [7.0:131]

    /// A collection of commands to aid in managing the user's identity.
    /// This replaces the deprecated `pijul key` command.

[6.23]

[7.131]

    /// A collection of tools for interactively managing the user's identities.
    /// This may be useful if you use Pijul in multiple contexts, for example
    /// both work & personal projects.

Replacement in pijul/src/identity/create.rs at line 61 [6.14159]
B:BD[9.1463] → [9.1463:1501]
```
            .with_prompt("Full name")
```
[9.1463]
[9.1501]
```
            .with_prompt("Display name")
```

Insertion in pijul/src/commands/identity.rs at line 72 [10.379]

[7.921]

    #[clap(group(
        ArgGroup::new("edit-data")
            .multiple(true)
            .requires("no-prompt")
            .args(&["display-name", "email", "expiry", "username", "remote", "name"]),
    ))]

Replacement in pijul/src/commands/identity.rs at line 79 [10.379]

B:BD[7.942] → [7.942:995]

B:BD[7.995] → [11.4816:4898]

∅:D[11.4898] → [7.1062:1105]

B:BD[7.1062] → [7.1062:1105]

B:BD[7.1105] → [12.9498:9638]

        /// Set the name used to create the identity
        #[clap(long = "name", group("name"), value_parser = name_does_not_exist)]
        pub identity_name: Option<String>,
        /// If enabled, the program should not automatically prove the identity with given remote details
        #[clap(long = "no-link")]

[7.942]

[12.9638]

        /// Do not automatically link keys with the remote
        #[clap(long = "no-link", display_order = 1)]

Replacement in pijul/src/commands/identity.rs at line 82 [10.379]

∅:D[12.9665] → [7.1105:1271]

B:BD[7.1105] → [7.1105:1271]

B:BD[7.1271] → [11.4899:4953]

        /// If enabled, the program should never prompt the user. If information is missing, the program will
        /// list the missing information and then exit.
        #[clap(long = "no-prompt", requires("name"))]

[12.9665]

[7.1365]

        /// Abort rather than prompt for input
        #[clap(long = "no-prompt", requires("edit-data"), display_order = 1)]

Replacement in pijul/src/commands/identity.rs at line 85 [10.379]

B:BD[7.1394] → [7.1394:1473]

B:BD[7.1473] → [12.9666:9698]

∅:D[11.5039] → [7.1505:1778]

∅:D[12.9698] → [7.1505:1778]

B:BD[7.1505] → [7.1505:1778]

B:BD[7.1778] → [12.9699:9732]

∅:D[11.5126] → [7.1811:1989]

∅:D[12.9732] → [7.1811:1989]

B:BD[7.1811] → [7.1811:1989]

        /// If no-prompt is enabled, set the login used to create the identity
        #[clap(long = "login")]
        pub login: Option<String>,
        /// If no-prompt is enabled, set the full name used to create the identity
        #[clap(long = "full-name")]
        pub full_name: Option<String>,
        /// If no-prompt is enabled, set the origin used to create the identity
        #[clap(long = "origin")]
        pub origin: Option<String>,
        /// If no-prompt is enabled, set the email used to create the identity
        #[clap(long = "email", value_parser = validate_email)]

[7.1394]

[7.1989]

        /// Set the username
        #[clap(long = "username", display_order = 3)]
        pub username: Option<String>,
        /// Set the default remote
        #[clap(long = "remote", display_order = 3)]
        pub remote: Option<String>,
        /// Set the display name
        #[clap(long = "display-name", display_order = 3)]
        pub display_name: Option<String>,
        /// Set the email
        #[clap(long = "email", value_parser = validate_email, display_order = 3)]

Replacement in pijul/src/commands/identity.rs at line 97 [10.379]

B:BD[7.2024] → [11.5127:5241]

        /// If no-prompt is enabled, set the expiry
        #[clap(long = "expiry", value_parser = parse_expiry)]

[7.2024]

[11.5241]

        /// Set the new identity name
        #[clap(long = "name", value_parser = name_does_not_exist, display_order = 3)]
        pub name: Option<String>,
        /// Set the expiry
        #[clap(long = "expiry", value_parser = parse_expiry, display_order = 3)]

Replacement in pijul/src/commands/identity.rs at line 103 [10.379]

B:BD[11.5284] → [12.9733:9835]

        /// If no-prompt is enabled, read password from stdin
        #[clap(long = "read-password")]

[11.5284]

[12.9835]

        /// Encrypt using a password from standard input
        #[clap(long = "read-password", display_order = 2)]

Replacement in pijul/src/commands/identity.rs at line 112 [10.379]

B:BD[13.4166] → [13.4166:4232]

            .args(&["full-name", "email", "new-name", "expiry"]),

[13.4166]

[13.4232]

            .requires("no-prompt")
            .args(&["display-name", "email", "new-name", "expiry", "username", "remote"]),

Replacement in pijul/src/commands/identity.rs at line 117 [10.379]

B:BD[7.2138] → [13.4241:4315]

        #[clap(long = "name", group("name"), value_parser = name_exists)]

[7.2138]

[7.2169]

        #[clap(long = "name", group("name"), value_parser = name_exists, display_order = 2)]

Replacement in pijul/src/commands/identity.rs at line 119 [10.379]

B:BD[7.2207] → [5.7149:7289]

        /// If enabled, the program should not automatically prove the identity with given remote details
        #[clap(long = "no-link")]

[7.2207]

[5.7289]

        /// Do not automatically link keys with the remote
        #[clap(long = "no-link", display_order = 1)]

Replacement in pijul/src/commands/identity.rs at line 122 [10.379]

∅:D[5.7316] → [7.2207:2363]

B:BD[7.2207] → [7.2207:2363]

B:BD[7.2363] → [13.4316:4393]

        /// If enabled, the program should never prompt the user. The program will exit if this is enabled
        /// but no flags have been used to edit.
        #[clap(long = "no-prompt", requires("name"), requires("edit-data"))]

[5.7316]

[7.2422]

        /// Abort rather than prompt for input
        #[clap(
            long = "no-prompt",
            requires("name"),
            requires("edit-data"),
            display_order = 1
        )]

Replacement in pijul/src/commands/identity.rs at line 130 [10.379]

B:BD[7.2451] → [7.2451:2506]

B:BD[7.2506] → [13.4394:4426]

∅:D[13.4426] → [7.2558:2649]

B:BD[7.2558] → [7.2558:2649]

B:BD[7.2649] → [13.4427:4460]

∅:D[13.4460] → [7.2702:2797]

B:BD[7.2702] → [7.2702:2797]

B:BD[7.2797] → [13.4461:4497]

∅:D[13.4497] → [7.2853:2943]

B:BD[7.2853] → [7.2853:2943]

B:BD[7.2943] → [13.4498:4561]

        /// If no-prompt is enabled, set the new login
        #[clap(long = "login")]
        pub login: Option<String>,
        /// If no-prompt is enabled, set the new origin
        #[clap(long = "origin")]
        pub origin: Option<String>,
        /// If no-prompt is enabled, set the new full name
        #[clap(long = "full-name")]
        pub full_name: Option<String>,
        /// If no-prompt is enabled, set new email
        #[clap(long = "email", value_parser = validate_email)]

[7.2451]

[7.3026]

        /// Set the username
        #[clap(long = "username", display_order = 3)]
        pub username: Option<String>,
        /// Set the default remote
        #[clap(long = "remote", display_order = 3)]
        pub remote: Option<String>,
        /// Set the display name
        #[clap(long = "display-name", display_order = 3)]
        pub display_name: Option<String>,
        /// Set the email
        #[clap(long = "email", value_parser = validate_email, display_order = 3)]

Replacement in pijul/src/commands/identity.rs at line 142 [10.379]

B:BD[7.3061] → [7.3061:3115]

B:BD[7.3115] → [13.4562:4597]

        /// If no-prompt is enabled, set the new name
        #[clap(long = "new-name")]

[7.3061]

[7.3170]

        /// Set the identity name
        #[clap(long = "new-name", display_order = 3)]

Replacement in pijul/src/commands/identity.rs at line 145 [10.379]

B:BD[7.3208] → [13.4598:4712]

        /// If no-prompt is enabled, set the expiry
        #[clap(long = "expiry", value_parser = parse_expiry)]

[7.3208]

[13.4712]

        /// Set the expiry
        #[clap(long = "expiry", value_parser = parse_expiry, display_order = 3)]

Replacement in pijul/src/commands/identity.rs at line 148 [10.379]

B:BD[13.4755] → [5.7317:7419]

        /// If no-prompt is enabled, read password from stdin
        #[clap(long = "read-password")]

[13.4755]

[5.7419]

        /// Encrypt using a password from standard input
        #[clap(long = "read-password", display_order = 2)]

Replacement in pijul/src/commands/identity.rs at line 160 [10.379]

B:BD[7.3374] → [7.3374:3530]

        /// If enabled, the program should never prompt the user. If the existing identity is encrypted with a password,
        /// the program will exit.

[7.3374]

[7.3530]

        /// Abort rather than prompt for input

Replacement in pijul/src/commands/identity.rs at line 164 [10.379]
B:BD[14.2935] → [7.3592:3633]
```
    /// Prove an identity to the server.
```
[14.2935]
[15.1924]
```
    /// Prove an identity to the server
```

Replacement in pijul/src/commands/identity.rs at line 169 [10.379]

B:BD[15.2006] → [7.3687:3866]

        /// If enabled, the program should never prompt the user. If the identity is encrypted with a password,
        /// and not stored on the keychain, the program will exit.

[15.2006]

[7.3866]

        /// Abort rather than prompt for input

Replacement in pijul/src/commands/identity.rs at line 173 [10.379]
B:BD[15.2013] → [7.3928:3972]
```
    /// Pretty-print all identities on disk
```
[15.2013]
[16.1460]
```
    /// Pretty-print all valid identities on disk
```

Replacement in pijul/src/commands/identity.rs at line 182 [10.379]

B:BD[17.304] → [7.4120:4217]

B:BD[7.4217] → [2.3184:3220]

∅:D[2.3220] → [7.4276:4301]

B:BD[7.4276] → [7.4276:4301]

        /// If enabled, the program will remove the matching identity without user confirmation.
        #[clap(long = "no-prompt")]
        no_prompt: bool,

[17.304]

        /// Remove the matching identity without confirmation
        #[clap(long = "no-confirm")]
        no_confirm: bool,

Replacement in pijul/src/commands/identity.rs at line 192 [10.379]

∅:D[14.3121] → [15.2014:2277]

B:BD[18.18077] → [15.2014:2277]

    /// If enabled, proving a key will not check for self-signed certificates in the certificate chain.
    /// This is generally useful if you are behind a managed network, for example at work or school, and
    /// Pijul is unable to perform network operations

[14.3121]

[15.2277]

    /// Do not verify certificates (use with caution)

Replacement in pijul/src/commands/identity.rs at line 201 [10.379]
B:BD[14.4415] → [14.4415:4446]
```
    full_name: Option<String>,
```
[14.4415]
[14.4446]
```
    display_name: Option<String>,
```

Replacement in pijul/src/commands/identity.rs at line 226 [10.379]

B:BD[14.4827] → [14.4827:4882]

            name: full_name.or(default.identity.name),

[14.4827]

[14.4882]

            name: display_name.or(default.identity.name),

Replacement in pijul/src/commands/identity.rs at line 249 [10.379]

B:BD[19.5423] → [7.4453:4622]

                        options.identity_name,
                        options.login,
                        options.full_name,
                        options.origin,

[19.5423]

[7.4622]

                        options.name,
                        options.username,
                        options.display_name,
                        options.remote,

Insertion in pijul/src/commands/identity.rs at line 275 [10.379]

[19.5629]

[16.1615]


                if identities.is_empty() {
                    let mut stderr = std::io::stderr();
                    writeln!(
                        stderr,
                        "No identities found. Use `pijul identity new` to create one."
                    )?;
                    writeln!(stderr, "If you have created a key in the past, you may need to migrate via `pijul identity repair`")?;

Insertion in pijul/src/commands/identity.rs at line 284 [10.379]

[16.1616]

[20.459]

                    return Ok(());
                }

Replacement in pijul/src/commands/identity.rs at line 386 [10.379]

B:BD[7.5379] → [7.5379:5501]

                        options.login,
                        options.full_name,
                        options.origin,

[7.5379]

[7.5501]

                        options.username,
                        options.display_name,
                        options.remote,

Replacement in pijul/src/commands/identity.rs at line 402 [10.379]
B:BD[7.5605] → [7.5605:5632]
```
                no_prompt,
```
[7.5605]
[7.5632]
```
                no_confirm: no_prompt,
```