dblsaiko/pijul - Change 32G3GOK752NTSULBH6KYGD3ZC2YC4B2X7O73G7BT3AJVMIUIFHXQC

Migrate from `dialoguer` to `pijul-interaction`

Please note that while this code compiles, it does NOT run successfully in many contexts as InteractiveContext is not set and any interaction produces a panic. I am still investigating how to handle setting InteractiveContext in an elegant way.

Created by finchie on July 25, 2023

32G3GOK752NTSULBH6KYGD3ZC2YC4B2X7O73G7BT3AJVMIUIFHXQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 131 [7.25380]

B:BD[5.138] → [6.0:63]

                if self.auth_pk(&mut h, &mut key_path).await {

[5.138]

[6.63]

                if self.auth_pk(&mut h, &mut key_path).await? {

Replacement in pijul/src/remote/ssh.rs at line 228 [7.25380]
B:BD[6.678] → [6.678:694]
```
    ) -> bool {
```
[6.678]
[6.694]
```
    ) -> Result<bool, anyhow::Error> {
```
Replacement in pijul/src/remote/ssh.rs at line 230 [7.25380]
B:BD[6.721] → [6.721:747]
```
            return false;
```
[6.721]
[6.747]
```
            return Ok(false);
```

Replacement in pijul/src/remote/ssh.rs at line 245 [7.25380]

B:BD[6.1251] → [6.1251:1319]

B:BD[6.1319] → [4.119:170]

∅:D[4.170] → [6.1371:1493]

B:BD[6.1371] → [6.1371:1493]

B:BD[6.1493] → [8.0:192]

                    let password = dialoguer::Password::with_theme(
                        pijul_config::load_theme()
                            .expect("Could not load config")
                            .as_ref(),
                    )
                    .with_prompt(format!("Password for encrypted private key"))
                    .allow_empty_password(false)
                    .interact()
                    .unwrap();

[6.1251]

[6.1701]

                    let password = pijul_interaction::Password::new()?
                        .with_prompt(format!("Password for encrypted private key"))
                        .with_allow_empty(false)
                        .interact()?;

Replacement in pijul/src/remote/ssh.rs at line 268 [7.25380]
B:BD[6.2302] → [6.2302:2331]
```
                return true;
```
[6.2302]
[6.2331]
```
                return Ok(true);
```
Replacement in pijul/src/remote/ssh.rs at line 271 [7.25380]
B:BD[6.2355] → [6.2355:2369]
```
        false
```
[6.2355]
[7.31112]
```
        Ok(false)
```
Replacement in pijul/src/remote/ssh.rs at line 278 [7.25380]
B:BD[9.577] → [9.577:617]
```
    ) -> Result<bool, thrussh::Error> {
```
[9.577]
[10.64]
```
    ) -> Result<bool, anyhow::Error> {
```

Replacement in pijul/src/remote/ssh.rs at line 297 [7.25380]

B:BD[11.2923] → [11.2923:2983]

B:BD[11.2983] → [4.171:214]

∅:D[4.214] → [11.3027:3273]

B:BD[11.3027] → [11.3027:3273]

            let password = dialoguer::Password::with_theme(
                pijul_config::load_theme()
                    .expect("Could not load config")
                    .as_ref(),
            )
            .with_prompt(format!("Password for {username}"))
            .allow_empty_password(true)
            .interact()
            .unwrap();

[11.2923]

[11.3273]

            let password = pijul_interaction::Password::new()?
                .with_prompt(format!("Password for {username}"))
                .with_allow_empty(true)
                .interact()?;

Insertion in pijul/src/main.rs at line 144 [7.83981]

[12.20]

[2.0]

    pijul_interaction::set_context(pijul_interaction::InteractiveContext::Terminal);

Replacement in pijul/src/identity/mod.rs at line 56 [13.15627]
B:BD[13.17274] → [13.17274:17299]
```
use dialoguer::Password;
```
[13.17274]
[14.2104]
```
use pijul_interaction::Password;
```

Replacement in pijul/src/identity/mod.rs at line 142 [13.15627]

B:BD[14.4463] → [14.4463:4551]

                password_attempt = Password::with_theme(config::load_theme()?.as_ref())

[14.4463]

[14.4551]

                password_attempt = Password::new()?

Replacement in pijul/src/identity/mod.rs at line 144 [13.15627]

B:BD[14.4611] → [14.4611:4659]

                    .allow_empty_password(true)

[14.4611]

[14.4659]

                    .with_allow_empty(true)

Replacement in pijul/src/identity/mod.rs at line 262 [13.15627]

B:BD[14.7233] → [14.7233:7314]

        let user_password = Password::with_theme(config::load_theme()?.as_ref())

[14.7233]

[14.7314]

        let user_password = Password::new()?

Replacement in pijul/src/identity/mod.rs at line 264 [13.15627]
B:BD[14.7355] → [14.7355:7395]
```
            .allow_empty_password(true)
```
[14.7355]
[14.7395]
```
            .with_allow_empty(true)
```
Replacement in pijul/src/identity/load.rs at line 11 [13.22387]
B:BD[13.22629] → [13.22629:22657]
```
use dialoguer::FuzzySelect;
```
[13.22629]
[15.240]
```
use pijul_interaction::Select;
```

Replacement in pijul/src/identity/load.rs at line 87 [13.22387]

B:BD[13.25168] → [13.25168:25244]

        let index = FuzzySelect::with_theme(config::load_theme()?.as_ref())

[13.25168]

[13.25244]

        let index = Select::new()?

Replacement in pijul/src/identity/load.rs at line 89 [13.22387]

B:BD[13.25288] → [13.25288:25353]

            .items(&possible_identities)
            .default(0)

[13.25288]

[13.25353]

            .with_items(&possible_identities)
            .with_default(0 as usize)

Deletion in pijul/src/identity/create.rs at line 10 [13.28175]
B:BD[13.28431] → [14.8689:8735]
```
use dialoguer::{Confirm, FuzzySelect, Input};
```
Replacement in pijul/src/identity/create.rs at line 12 [13.28175]
B:BD[16.101] → [4.629:657]
```
use pijul_config as config;
```
[16.101]
[15.327]
```
use pijul_interaction::{Confirm, Input, Select};
```
Replacement in pijul/src/identity/create.rs at line 25 [13.28175]
B:BD[14.8903] → [16.102:139]
```
        to_replace: Option<&String>,
```
[14.8903]
[14.8934]
```
        to_replace: Option<String>,
```
Replacement in pijul/src/identity/create.rs at line 29 [13.28175]
∅:D[14.9045] → [13.29225:29269]
B:BD[13.29225] → [13.29225:29269]
```
        let config = config::load_theme()?;
```
[14.9045]
[13.29269]
```
        let will_replace = to_replace.is_some();
```

Replacement in pijul/src/identity/create.rs at line 31 [13.28175]

B:BD[13.29270] → [14.9046:9109]

        new_identity.name = Input::with_theme(config.as_ref())

[13.29270]

[13.29341]

        new_identity.name = Input::new()?

Replacement in pijul/src/identity/create.rs at line 33 [13.28175]

B:BD[13.29390] → [13.29390:29468]

B:BD[13.29468] → [16.140:197]

            .default(String::from("default"))
            .allow_empty(false)
            .with_initial_text(if to_replace.is_some() {

[13.29390]

[14.9110]

            .with_default(String::from("default"))
            .with_allow_empty(false)
            .with_initial_text(if will_replace {

Replacement in pijul/src/identity/create.rs at line 40 [13.28175]

B:BD[13.29612] → [13.29612:29685]

            .validate_with(move |input: &String| -> Result<(), String> {

[13.29612]

[3.0]

            .with_validator(move |input: &String| -> Result<(), String> {

Replacement in pijul/src/identity/create.rs at line 47 [13.28175]

B:BD[13.29774] → [16.198:255]

                        if let Some(name) = to_replace {

[13.29774]

[17.223]

                        if let Some(name) = &to_replace {

Replacement in pijul/src/identity/create.rs at line 63 [13.28175]
B:BD[13.30180] → [13.30180:30211]
```
            .interact_text()?;
```
[13.30180]
[13.30211]
```
            .interact()?;
```

Replacement in pijul/src/identity/create.rs at line 65 [13.28175]

B:BD[13.30212] → [14.9145:9230]

        new_identity.config.author.display_name = Input::with_theme(config.as_ref())

[13.30212]

[13.30279]

        new_identity.config.author.display_name = Input::new()?

Replacement in pijul/src/identity/create.rs at line 67 [13.28175]
B:BD[13.30320] → [13.30320:30351]
```
            .allow_empty(true)
```
[13.30320]
[14.9231]
```
            .with_allow_empty(true)
```
Replacement in pijul/src/identity/create.rs at line 69 [13.28175]
∅:D[14.9296] → [13.30565:30596]
B:BD[13.30565] → [13.30565:30596]
```
            .interact_text()?;
```
[14.9296]
[13.30596]
```
            .interact()?;
```

Replacement in pijul/src/identity/create.rs at line 71 [13.28175]

B:BD[13.30597] → [14.9297:9375]

        new_identity.config.author.email = Input::with_theme(config.as_ref())

[13.30597]

[13.30665]

        new_identity.config.author.email = Input::new()?

Replacement in pijul/src/identity/create.rs at line 73 [13.28175]
B:BD[13.30722] → [13.30722:30753]
```
            .allow_empty(true)
```
[13.30722]
[14.9376]
```
            .with_allow_empty(true)
```

Replacement in pijul/src/identity/create.rs at line 75 [13.28175]

∅:D[14.9434] → [13.30825:30896]

B:BD[13.30825] → [13.30825:30896]

            .validate_with(move |input: &String| -> Result<(), &str> {

[14.9434]

[13.30896]

            .with_validator(move |input: &String| -> Result<(), &str> {

Replacement in pijul/src/identity/create.rs at line 82 [13.28175]
B:BD[13.31104] → [13.31104:31135]
```
            .interact_text()?;
```
[13.31104]
[14.9435]
```
            .interact()?;
```
Replacement in pijul/src/identity/create.rs at line 84 [13.28175]
B:BD[14.9436] → [14.9436:9484]
```
        if Confirm::with_theme(config.as_ref())
```
[14.9436]
[14.9484]
```
        if Confirm::new()?
```
Replacement in pijul/src/identity/create.rs at line 94 [13.28175]
B:BD[14.10316] → [14.10316:10344]
```
            .default(false)
```
[14.10316]
[14.10344]
```
            .with_default(false)
```
Replacement in pijul/src/identity/create.rs at line 103 [13.28175]
B:BD[14.10537] → [14.10537:10585]
```
        if Confirm::with_theme(config.as_ref())
```
[14.10537]
[14.10585]
```
        if Confirm::new()?
```
Replacement in pijul/src/identity/create.rs at line 105 [13.28175]
B:BD[14.10660] → [14.10660:10687]
```
            .default(true)
```
[14.10660]
[14.10687]
```
            .with_default(true)
```
Replacement in pijul/src/identity/create.rs at line 114 [13.28175]
B:BD[16.492] → [16.492:528]
```
            if to_replace.is_none()
```
[16.492]
[16.528]
```
            if !will_replace
```

Replacement in pijul/src/identity/create.rs at line 149 [13.28175]

B:BD[14.11181] → [14.11181:11261]

        let selection = FuzzySelect::with_theme(config::load_theme()?.as_ref())

[14.11181]

[14.11261]

        let selection = Select::new()?

Replacement in pijul/src/identity/create.rs at line 151 [13.28175]
B:BD[14.11300] → [14.11300:11320]
```
            .items(
```
[14.11300]
[14.11320]
```
            .with_items(
```
Replacement in pijul/src/identity/create.rs at line 170 [13.28175]
B:BD[14.12083] → [14.12083:12107]
```
            .default(0)
```
[14.12083]
[14.12107]
```
            .with_default(0 as usize)
```

Replacement in pijul/src/identity/create.rs at line 182 [13.28175]

∅:D[16.1589] → [14.12500:12545]

B:BD[14.12500] → [14.12500:12545]

B:BD[14.12545] → [18.3959:4032]

        let config = config::load_theme()?;
        self.config.author.username = Input::with_theme(config.as_ref())

[16.1589]

[14.12619]

        self.config.author.username = Input::new()?

Replacement in pijul/src/identity/create.rs at line 184 [13.28175]
B:BD[14.12663] → [14.12663:12704]
```
            .default(whoami::username())
```
[14.12663]
[18.4033]
```
            .with_default(whoami::username())
```
Replacement in pijul/src/identity/create.rs at line 186 [13.28175]
∅:D[18.4094] → [14.12766:12818]
B:BD[14.12766] → [14.12766:12818]
```
            .interact_text()
            .unwrap();
```
[18.4094]
[14.12818]
```
            .interact()?;
```

Replacement in pijul/src/identity/create.rs at line 188 [13.28175]

B:BD[14.12819] → [14.12819:12890]

        self.config.author.origin = Input::with_theme(config.as_ref())

[14.12819]

[14.12890]

        self.config.author.origin = Input::new()?

Replacement in pijul/src/identity/create.rs at line 191 [13.28175]

B:BD[14.12988] → [14.12988:13092]

            .default(String::from("ssh.pijul.com"))
            .interact_text()
            .unwrap();

[14.12988]

[14.13092]

            .with_default(String::from("ssh.pijul.com"))
            .interact()?;

Replacement in pijul/src/identity/create.rs at line 194 [13.28175]
B:BD[14.13093] → [18.4095:4143]
```
        if Confirm::with_theme(config.as_ref())
```
[14.13093]
[18.4143]
```
        if Confirm::new()?
```

Replacement in pijul/src/identity/create.rs at line 203 [13.28175]

B:BD[18.4458] → [18.4458:4532]

            .default(false)
            .interact()
            .unwrap()

[18.4458]

[18.4532]

            .with_default(false)
            .interact()?

Deletion in pijul/src/identity/create.rs at line 215 [13.28175]
B:BD[14.13473] → [14.13473:13518]
```
        let config = config::load_theme()?;
```

Replacement in pijul/src/identity/create.rs at line 220 [13.28175]

B:BD[13.31446] → [14.13519:13593]

        self.public_key.expires = if Confirm::with_theme(config.as_ref())

[13.31446]

[13.31507]

        self.public_key.expires = if Confirm::new()?

Replacement in pijul/src/identity/create.rs at line 227 [13.28175]
B:BD[13.31750] → [13.31750:31778]
```
            .default(false)
```
[13.31750]
[13.31778]
```
            .with_default(false)
```

Replacement in pijul/src/identity/create.rs at line 230 [13.28175]

B:BD[13.31813] → [13.31813:31885]

            let time_stamp: String = Input::with_theme(config.as_ref())

[13.31813]

[13.31885]

            let time_stamp: String = Input::new()?

Replacement in pijul/src/identity/create.rs at line 233 [13.28175]

B:BD[13.32013] → [13.32013:32088]

                .validate_with(move |input: &String| -> Result<(), &str> {

[13.32013]

[13.32088]

                .with_validator(move |input: &String| -> Result<(), &str> {

Replacement in pijul/src/identity/create.rs at line 246 [13.28175]
B:BD[13.32611] → [13.32611:32646]
```
                .interact_text()?;
```
[13.32611]
[13.32646]
```
                .interact()?;
```
Deletion in pijul/src/commands/identity.rs at line 9 [13.40825]
B:BD[13.41054] → [13.41054:41078]
```
use dialoguer::Confirm;
```
Insertion in pijul/src/commands/identity.rs at line 11 [13.40825]
[19.15]
[13.41098]
```
use pijul_interaction::Confirm;
```

Replacement in pijul/src/commands/identity.rs at line 208 [13.40825]

B:BD[13.47572] → [13.47572:47648]

            dialoguer::Password::with_theme(config::load_theme()?.as_ref())

[13.47572]

[18.5338]

            pijul_interaction::Password::new()?

Replacement in pijul/src/commands/identity.rs at line 400 [13.40825]

B:BD[17.1054] → [17.1054:1138]

                        .prompt_changes(Some(&old_identity.name), !options.no_link)

[17.1054]

[17.1138]

                        .prompt_changes(Some(old_identity.name.clone()), !options.no_link)

Replacement in pijul/src/commands/identity.rs at line 428 [13.40825]

B:BD[13.56342] → [13.56342:56418]

                    && !Confirm::with_theme(config::load_theme()?.as_ref())

[13.56342]

[13.56418]

                    && !Confirm::new()?

Replacement in pijul/src/commands/identity.rs at line 430 [13.40825]

B:BD[13.56483] → [13.56483:56523]

                        .default(false)

[13.56483]

[13.56523]

                        .with_default(false)

Deletion in pijul/Cargo.toml at line 102 [7.196374]
B:BD[20.400] → [20.400:466]
```
dialoguer = { version = "0.10.4", features = [ "fuzzy-select" ] }
```
Deletion in Cargo.lock at line 2201 [21.35]
B:BD[21.48225] → [21.48225:48239]
```
 "dialoguer",
```

Migrate from `dialoguer` to `pijul-interaction`

Dependencies

In channels

Change contents

Replacement in pijul/src/remote/ssh.rs at line 131 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 228 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 230 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 245 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 268 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 271 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 278 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 297 [7.25380]

Insertion in pijul/src/main.rs at line 144 [7.83981]

Replacement in pijul/src/identity/mod.rs at line 56 [13.15627]

Replacement in pijul/src/identity/mod.rs at line 142 [13.15627]

Replacement in pijul/src/identity/mod.rs at line 144 [13.15627]

Replacement in pijul/src/identity/mod.rs at line 262 [13.15627]

Replacement in pijul/src/identity/mod.rs at line 264 [13.15627]

Replacement in pijul/src/identity/load.rs at line 11 [13.22387]

Replacement in pijul/src/identity/load.rs at line 87 [13.22387]

Replacement in pijul/src/identity/load.rs at line 89 [13.22387]

Deletion in pijul/src/identity/create.rs at line 10 [13.28175]

Replacement in pijul/src/identity/create.rs at line 12 [13.28175]

Replacement in pijul/src/identity/create.rs at line 25 [13.28175]

Replacement in pijul/src/identity/create.rs at line 29 [13.28175]

Replacement in pijul/src/identity/create.rs at line 31 [13.28175]

Replacement in pijul/src/identity/create.rs at line 33 [13.28175]

Replacement in pijul/src/identity/create.rs at line 40 [13.28175]

Replacement in pijul/src/identity/create.rs at line 47 [13.28175]

Replacement in pijul/src/identity/create.rs at line 63 [13.28175]

Replacement in pijul/src/identity/create.rs at line 65 [13.28175]

Replacement in pijul/src/identity/create.rs at line 67 [13.28175]

Replacement in pijul/src/identity/create.rs at line 69 [13.28175]

Replacement in pijul/src/identity/create.rs at line 71 [13.28175]

Replacement in pijul/src/identity/create.rs at line 73 [13.28175]

Replacement in pijul/src/identity/create.rs at line 75 [13.28175]

Replacement in pijul/src/identity/create.rs at line 82 [13.28175]

Replacement in pijul/src/identity/create.rs at line 84 [13.28175]

Replacement in pijul/src/identity/create.rs at line 94 [13.28175]

Replacement in pijul/src/identity/create.rs at line 103 [13.28175]

Replacement in pijul/src/identity/create.rs at line 105 [13.28175]

Replacement in pijul/src/identity/create.rs at line 114 [13.28175]

Replacement in pijul/src/identity/create.rs at line 149 [13.28175]

Replacement in pijul/src/identity/create.rs at line 151 [13.28175]

Replacement in pijul/src/identity/create.rs at line 170 [13.28175]

Replacement in pijul/src/identity/create.rs at line 182 [13.28175]

Replacement in pijul/src/identity/create.rs at line 184 [13.28175]

Replacement in pijul/src/identity/create.rs at line 186 [13.28175]

Replacement in pijul/src/identity/create.rs at line 188 [13.28175]

Replacement in pijul/src/identity/create.rs at line 191 [13.28175]

Replacement in pijul/src/identity/create.rs at line 194 [13.28175]

Replacement in pijul/src/identity/create.rs at line 203 [13.28175]

Deletion in pijul/src/identity/create.rs at line 215 [13.28175]

Replacement in pijul/src/identity/create.rs at line 220 [13.28175]

Replacement in pijul/src/identity/create.rs at line 227 [13.28175]

Replacement in pijul/src/identity/create.rs at line 230 [13.28175]

Replacement in pijul/src/identity/create.rs at line 233 [13.28175]

Replacement in pijul/src/identity/create.rs at line 246 [13.28175]

Deletion in pijul/src/commands/identity.rs at line 9 [13.40825]

Insertion in pijul/src/commands/identity.rs at line 11 [13.40825]

Replacement in pijul/src/commands/identity.rs at line 208 [13.40825]

Replacement in pijul/src/commands/identity.rs at line 400 [13.40825]

Replacement in pijul/src/commands/identity.rs at line 428 [13.40825]

Replacement in pijul/src/commands/identity.rs at line 430 [13.40825]

Deletion in pijul/Cargo.toml at line 102 [7.196374]

Deletion in Cargo.lock at line 2201 [21.35]