diff --git a/radicle-cli/examples/rad-auth.md b/radicle-cli/examples/rad-auth.md index 82698913..521b58dc 100644 --- a/radicle-cli/examples/rad-auth.md +++ b/radicle-cli/examples/rad-auth.md @@ -4,7 +4,7 @@ The example below is run with `RAD_PASSPHRASE` set. ``` $ rad auth -Initializing your radicle ๐ŸŒฑ identity +Initializing your radicle ๐Ÿ‘พ identity โœ“ Creating your Ed25519 keypair... ! Adding your radicle key to ssh-agent... diff --git a/radicle-cli/examples/rad-id-rebase.md b/radicle-cli/examples/rad-id-rebase.md index c15ea064..db41ce88 100644 --- a/radicle-cli/examples/rad-id-rebase.md +++ b/radicle-cli/examples/rad-id-rebase.md @@ -6,7 +6,7 @@ delegates creating proposals concurrently. ``` $ rad id edit --title "Add Alice" --description "Add Alice as a delegate" --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm -โœ“ Identity proposal '04603c0d3ea4d137487024a51c9360adfc511114' created ๐ŸŒฑ +โœ“ Identity proposal '04603c0d3ea4d137487024a51c9360adfc511114' created title: Add Alice description: Add Alice as a delegate status: โฒopenโณ @@ -48,7 +48,7 @@ Quorum Reached ``` $ rad id edit --title "Add Bob" --description "Add Bob as a delegate" --delegates did:key:z6MkjchhfUsD6mmvni8mCdXHw216Xrm9bQe2mBH1P5RDjVJG --no-confirm -โœ“ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' created ๐ŸŒฑ +โœ“ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' created title: Add Bob description: Add Bob as a delegate status: โฒopenโณ @@ -138,7 +138,7 @@ Quorum Reached ``` $ rad id commit 04603c0d3ea4d137487024a51c9360adfc511114 --no-confirm -โœ“ Committed new identity '29ae4b72f5a315328f06fbd68dc1c396a2d5c45e' ๐ŸŒฑ +โœ“ Committed new identity '29ae4b72f5a315328f06fbd68dc1c396a2d5c45e' title: Add Alice description: Add Alice as a delegate status: โฒcommittedโณ @@ -249,7 +249,7 @@ So, let's fix this by running a rebase on the proposal's revision: ``` $ rad id rebase 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --no-confirm -โœ“ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' rebased ๐ŸŒฑ +โœ“ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' rebased โœ“ Revision 'a6db848f8dba4ef2a9c16301e7d21ad87b707f1e' title: Add Bob description: Add Bob as a delegate @@ -294,7 +294,7 @@ We can now update the proposal to have both keys in the delegates set: ``` $ rad id update 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev a6db848f8dba4ef2a9c16301e7d21ad87b707f1e --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm -โœ“ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' updated ๐ŸŒฑ +โœ“ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' updated โœ“ Revision '4bac5e3ef20e412e9421886fbb76dc7a64d6b5dc' title: Add Bob description: Add Bob as a delegate @@ -386,7 +386,7 @@ Quorum Reached ``` $ rad id commit 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev 4bac5e3ef20e412e9421886fbb76dc7a64d6b5dc --no-confirm -โœ“ Committed new identity '60de897bc24898f6908fd1272633c0b15aa4096f' ๐ŸŒฑ +โœ“ Committed new identity '60de897bc24898f6908fd1272633c0b15aa4096f' title: Add Bob description: Add Bob as a delegate status: โฒcommittedโณ diff --git a/radicle-cli/examples/rad-id.md b/radicle-cli/examples/rad-id.md index 32b01dc5..27c3f432 100644 --- a/radicle-cli/examples/rad-id.md +++ b/radicle-cli/examples/rad-id.md @@ -14,7 +14,7 @@ Let's add Bob as a delegate using their DID ``` $ rad id edit --title "Add Bob" --description "Add Bob as a delegate" --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm -โœ“ Identity proposal '0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8' created ๐ŸŒฑ +โœ“ Identity proposal '0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8' created title: Add Bob description: Add Bob as a delegate status: โฒopenโณ @@ -208,7 +208,7 @@ At this point, we can commit the proposal and update the identity: ``` $ rad id commit 0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8 --no-confirm -โœ“ Committed new identity 'c96e764965aaeff1c6ea3e5b97e2b9828773c8b0' ๐ŸŒฑ +โœ“ Committed new identity 'c96e764965aaeff1c6ea3e5b97e2b9828773c8b0' title: Add Bob description: Add Bob as a delegate status: โฒcommittedโณ @@ -255,7 +255,7 @@ the `--threshold` option: ``` $ rad id edit --title "Update threshold" --description "Update to safer threshold" --threshold 2 --no-confirm -โœ“ Identity proposal 'f435d6e89c8f922ede691287c0d8b7f82afa591e' created ๐ŸŒฑ +โœ“ Identity proposal 'f435d6e89c8f922ede691287c0d8b7f82afa591e' created title: Update threshold description: Update to safer threshold status: โฒopenโณ diff --git a/radicle-cli/examples/rad-init-sync.md b/radicle-cli/examples/rad-init-sync.md index 3ae61837..6a9cde81 100644 --- a/radicle-cli/examples/rad-init-sync.md +++ b/radicle-cli/examples/rad-init-sync.md @@ -5,13 +5,13 @@ the `init` command: ``` $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --announce -Initializing local ๐ŸŒฑ project in . +Initializing radicle ๐Ÿ‘พ project in . โœ“ Project heartwood created โœ“ Syncing inventory.. โœ“ Announcing inventory.. -Your project id is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji. You can show it any time by running: +Your project's Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji. +You can show it any time by running: rad . - ``` diff --git a/radicle-cli/examples/rad-init.md b/radicle-cli/examples/rad-init.md index 3929460c..2a107afc 100644 --- a/radicle-cli/examples/rad-init.md +++ b/radicle-cli/examples/rad-init.md @@ -1,11 +1,11 @@ -To create your first radicle project, navigate to a git repository, and run -the `init` command: +To create your first radicle project, navigate to a git repository, and run the +`init` command. Make sure you have [authenticated](../rad-auth.md) beforehand. ``` $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --no-track -v -Initializing local ๐ŸŒฑ project in . +Initializing radicle ๐Ÿ‘พ project in . โœ“ Project heartwood created { @@ -14,12 +14,12 @@ Initializing local ๐ŸŒฑ project in . "defaultBranch": "master" } -Your project id is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji. You can show it any time by running: +Your project's Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji. +You can show it any time by running: rad . To publish your project to the network, run: git push - ``` Projects can be listed with the `ls` command: diff --git a/radicle-cli/examples/rad-patch.md b/radicle-cli/examples/rad-patch.md index 5f0a66b5..cd083f92 100644 --- a/radicle-cli/examples/rad-patch.md +++ b/radicle-cli/examples/rad-patch.md @@ -31,7 +31,7 @@ master <- z6MknSLโ€ฆStBU8Vi/flux-capacitor-power (3e674d1) 3e674d1 Define power requirements -โœ“ Patch 191a14e520f2eeff7c0e3ee0a5523c5217eecb89 created ๐ŸŒฑ +โœ“ Patch 191a14e520f2eeff7c0e3ee0a5523c5217eecb89 created To publish your patch to the network, run: git push rad diff --git a/radicle-cli/examples/workflow/1-new-project.md b/radicle-cli/examples/workflow/1-new-project.md deleted file mode 100644 index 519c4c36..00000000 --- a/radicle-cli/examples/workflow/1-new-project.md +++ /dev/null @@ -1,30 +0,0 @@ -To create your first radicle project, navigate to a git repository, and run the -`init` command. Make sure you have [created your user and authenticated](../rad-auth.md) -beforehand! - -``` -$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --no-track -v - -Initializing local ๐ŸŒฑ project in . - -โœ“ Project heartwood created -{ - "name": "heartwood", - "description": "Radicle Heartwood Protocol & Stack", - "defaultBranch": "master" -} - -Your project id is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji. You can show it any time by running: - rad . - -To publish your project to the network, run: - git push - -``` - -Projects can be listed with the `ls` command: - -``` -$ rad ls -heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji f2de534 Radicle Heartwood Protocol & Stack -``` diff --git a/radicle-cli/examples/workflow/1-new-project.md b/radicle-cli/examples/workflow/1-new-project.md new file mode 120000 index 00000000..e2094cdd --- /dev/null +++ b/radicle-cli/examples/workflow/1-new-project.md @@ -0,0 +1 @@ +../rad-init.md \ No newline at end of file diff --git a/radicle-cli/examples/workflow/4-patching-contributor.md b/radicle-cli/examples/workflow/4-patching-contributor.md index 79b54f3c..f20da2a7 100644 --- a/radicle-cli/examples/workflow/4-patching-contributor.md +++ b/radicle-cli/examples/workflow/4-patching-contributor.md @@ -31,7 +31,7 @@ master <- z6Mkt67โ€ฆv4N1tRk/flux-capacitor-power (3e674d1) 3e674d1 Define power requirements -โœ“ Patch a07ef7743a32a2e902672ea3526d1db6ee08108a created ๐ŸŒฑ +โœ“ Patch a07ef7743a32a2e902672ea3526d1db6ee08108a created To publish your patch to the network, run: git push rad @@ -44,7 +44,7 @@ $ rad patch โ•ญโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฎ โ”‚ Define power requirements a07ef77 R0 3e674d1 (flux-capacitor-power) ahead 1, behind 0 โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ โ— opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [.. ]โ”‚ +โ”‚ โ— opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [ ... ]โ”‚ โ•ฐโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฏ $ rad patch show a07ef7743a32a2e902672ea3526d1db6ee08108a โ•ญโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฎ @@ -55,7 +55,7 @@ $ rad patch show a07ef7743a32a2e902672ea3526d1db6ee08108a โ”‚ โ”‚ โ”‚ See details. โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ โ— opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [.. ]โ”‚ +โ”‚ โ— opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [ ... ]โ”‚ โ•ฐโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ•ฏ ``` diff --git a/radicle-cli/src/commands/auth.rs b/radicle-cli/src/commands/auth.rs index 91d44bb7..89df8ccb 100644 --- a/radicle-cli/src/commands/auth.rs +++ b/radicle-cli/src/commands/auth.rs @@ -67,10 +67,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { } pub fn init(options: Options) -> anyhow::Result<()> { - term::headline(format!( - "Initializing your {} ๐ŸŒฑ identity", - term::format::highlight("radicle") - )); + term::headline("Initializing your radicle ๐Ÿ‘พ identity"); if let Ok(version) = radicle::git::version() { if version < radicle::git::VERSION_REQUIRED { @@ -120,7 +117,7 @@ pub fn authenticate(profile: &Profile, options: Options) -> anyhow::Result<()> { // TODO: Only show this if we're not authenticated. term::headline(format!( - "๐ŸŒฑ Authenticating as {}", + "Authenticating as {}", term::format::Identity::new(profile).styled() )); diff --git a/radicle-cli/src/commands/id.rs b/radicle-cli/src/commands/id.rs index 82d6489e..adc6060a 100644 --- a/radicle-cli/src/commands/id.rs +++ b/radicle-cli/src/commands/id.rs @@ -297,7 +297,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { &signer, )?; term::success!( - "Identity proposal '{}' created ๐ŸŒฑ", + "Identity proposal '{}' created", term::format::highlight(proposal.id) ); print(&proposal, &previous, None)?; @@ -343,7 +343,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { proposal.edit(update.title, update.description, &signer)?; let revision = proposal.update(previous.current, update.proposed, &signer)?; term::success!( - "Identity proposal '{}' updated ๐ŸŒฑ", + "Identity proposal '{}' updated", term::format::highlight(proposal.id) ); term::success!( @@ -363,7 +363,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { let revision = proposal.update(previous.current, revision.proposed.clone(), &signer)?; term::success!( - "Identity proposal '{}' rebased ๐ŸŒฑ", + "Identity proposal '{}' rebased", term::format::highlight(proposal.id) ); term::success!( @@ -416,7 +416,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { if yes { let id = Proposal::commit(&proposal, &rid, signer.public_key(), &repo, &signer)?; proposal.commit(&signer)?; - term::success!("Committed new identity '{}' ๐ŸŒฑ", id.current); + term::success!("Committed new identity '{}'", id.current); print(&proposal, &previous, None)?; } } diff --git a/radicle-cli/src/commands/init.rs b/radicle-cli/src/commands/init.rs index a3e4c558..74d9e473 100644 --- a/radicle-cli/src/commands/init.rs +++ b/radicle-cli/src/commands/init.rs @@ -165,7 +165,7 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()> let interactive = options.interactive; term::headline(format!( - "Initializing local ๐ŸŒฑ project in {}", + "Initializing radicle ๐Ÿ‘พ project in {}", if path == cwd { term::format::highlight(".").to_string() } else { @@ -272,9 +272,11 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()> term::blank(); term::info!( - "Your project id is {}. You can show it any time by running:", + "Your project's Repository ID {} is {}.", + term::format::dim("(RID)"), term::format::highlight(id.urn()) ); + term::info!("You can show it any time by running:"); term::indented(term::format::secondary("rad .")); if !options.announce { @@ -282,11 +284,9 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()> term::info!("To publish your project to the network, run:"); term::indented(term::format::secondary(push_cmd)); } - term::blank(); } Err(err) => { spinner.failed(); - term::blank(); anyhow::bail!(err); // TODO: Handle error: "this repository is already initialized with remote {}" @@ -309,13 +309,13 @@ pub fn setup_signing( let key = ssh::fmt::fingerprint(node_id); let yes = if !git::is_signing_configured(repo)? { term::headline(format!( - "Configuring ๐ŸŒฑ signing key {}...", + "Configuring radicle signing key {}...", term::format::tertiary(key) )); true } else if interactive.yes() { term::confirm(format!( - "Configure ๐ŸŒฑ signing key {} in local checkout?", + "Configure radicle signing key {} in local checkout?", term::format::tertiary(key), )) } else { diff --git a/radicle-cli/src/commands/patch/create.rs b/radicle-cli/src/commands/patch/create.rs index 8d804118..c38587fe 100644 --- a/radicle-cli/src/commands/patch/create.rs +++ b/radicle-cli/src/commands/patch/create.rs @@ -126,7 +126,7 @@ pub fn run( &signer, )?; - term::success!("Patch {} created ๐ŸŒฑ", term::format::highlight(patch.id)); + term::success!("Patch {} created", term::format::highlight(patch.id)); term::blank(); if options.announce {