mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Replace seedling emoji with alien invader 

To match the new branding, we remove seedlings and sometimes replace
them with alien invaders.
This commit is contained in:
Alexis Sellier 2023-04-24 14:51:52 +02:00
parent 045d201916
commit 3ea7541d55
No known key found for this signature in database
12 changed files with 36 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-cli/examples/rad-auth.md
View File

@ -4,7 +4,7 @@ The example below is run with `RAD_PASSPHRASE` set.
``` ```
$ rad auth $ rad auth
Initializing your radicle 🌱 identity Initializing your radicle 👾 identity
✓ Creating your Ed25519 keypair... ✓ Creating your Ed25519 keypair...
! Adding your radicle key to ssh-agent... ! Adding your radicle key to ssh-agent...

12
radicle-cli/examples/rad-id-rebase.md
View File

@ -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 $ 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 title: Add Alice
description: Add Alice as a delegate description: Add Alice as a delegate
status: ❲open❳ 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 $ 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 title: Add Bob
description: Add Bob as a delegate description: Add Bob as a delegate
status: ❲open❳ status: ❲open❳
@ -138,7 +138,7 @@ Quorum Reached
``` ```
$ rad id commit 04603c0d3ea4d137487024a51c9360adfc511114 --no-confirm $ rad id commit 04603c0d3ea4d137487024a51c9360adfc511114 --no-confirm
✓ Committed new identity '29ae4b72f5a315328f06fbd68dc1c396a2d5c45e' 🌱 ✓ Committed new identity '29ae4b72f5a315328f06fbd68dc1c396a2d5c45e'
title: Add Alice title: Add Alice
description: Add Alice as a delegate description: Add Alice as a delegate
status: ❲committed❳ 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 $ rad id rebase 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --no-confirm
✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' rebased 🌱 ✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' rebased
✓ Revision 'a6db848f8dba4ef2a9c16301e7d21ad87b707f1e' ✓ Revision 'a6db848f8dba4ef2a9c16301e7d21ad87b707f1e'
title: Add Bob title: Add Bob
description: Add Bob as a delegate 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 $ rad id update 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev a6db848f8dba4ef2a9c16301e7d21ad87b707f1e --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm
✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' updated 🌱 ✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' updated
✓ Revision '4bac5e3ef20e412e9421886fbb76dc7a64d6b5dc' ✓ Revision '4bac5e3ef20e412e9421886fbb76dc7a64d6b5dc'
title: Add Bob title: Add Bob
description: Add Bob as a delegate description: Add Bob as a delegate
@ -386,7 +386,7 @@ Quorum Reached
``` ```
$ rad id commit 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev 4bac5e3ef20e412e9421886fbb76dc7a64d6b5dc --no-confirm $ rad id commit 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev 4bac5e3ef20e412e9421886fbb76dc7a64d6b5dc --no-confirm
✓ Committed new identity '60de897bc24898f6908fd1272633c0b15aa4096f' 🌱 ✓ Committed new identity '60de897bc24898f6908fd1272633c0b15aa4096f'
title: Add Bob title: Add Bob
description: Add Bob as a delegate description: Add Bob as a delegate
status: ❲committed❳ status: ❲committed❳

6
radicle-cli/examples/rad-id.md
View File

@ -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 $ 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 title: Add Bob
description: Add Bob as a delegate description: Add Bob as a delegate
status: ❲open❳ status: ❲open❳
@ -208,7 +208,7 @@ At this point, we can commit the proposal and update the identity:
``` ```
$ rad id commit 0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8 --no-confirm $ rad id commit 0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8 --no-confirm
✓ Committed new identity 'c96e764965aaeff1c6ea3e5b97e2b9828773c8b0' 🌱 ✓ Committed new identity 'c96e764965aaeff1c6ea3e5b97e2b9828773c8b0'
title: Add Bob title: Add Bob
description: Add Bob as a delegate description: Add Bob as a delegate
status: ❲committed❳ status: ❲committed❳
@ -255,7 +255,7 @@ the `--threshold` option:
``` ```
$ rad id edit --title "Update threshold" --description "Update to safer threshold" --threshold 2 --no-confirm $ 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 title: Update threshold
description: Update to safer threshold description: Update to safer threshold
status: ❲open❳ status: ❲open❳

6
radicle-cli/examples/rad-init-sync.md
View File

@ -5,13 +5,13 @@ the `init` command:
``` ```
$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --announce $ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --announce
Initializing local 🌱 project in . Initializing radicle 👾 project in .
✓ Project heartwood created ✓ Project heartwood created
✓ Syncing inventory.. ✓ Syncing inventory..
✓ Announcing 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 . rad .
``` ```

10
radicle-cli/examples/rad-init.md
View File

@ -1,11 +1,11 @@
To create your first radicle project, navigate to a git repository, and run To create your first radicle project, navigate to a git repository, and run the
the `init` command: `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 $ 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 ✓ Project heartwood created
{ {
@ -14,12 +14,12 @@ Initializing local 🌱 project in .
"defaultBranch": "master" "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 . rad .
To publish your project to the network, run: To publish your project to the network, run:
git push git push
``` ```
Projects can be listed with the `ls` command: Projects can be listed with the `ls` command:

2
radicle-cli/examples/rad-patch.md
View File

@ -31,7 +31,7 @@ master <- z6MknSL…StBU8Vi/flux-capacitor-power (3e674d1)
3e674d1 Define power requirements 3e674d1 Define power requirements
✓ Patch 191a14e520f2eeff7c0e3ee0a5523c5217eecb89 created 🌱 ✓ Patch 191a14e520f2eeff7c0e3ee0a5523c5217eecb89 created
To publish your patch to the network, run: To publish your patch to the network, run:
git push rad git push rad

30
radicle-cli/examples/workflow/1-new-project.md
View File

@ -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
```

1
radicle-cli/examples/workflow/1-new-project.md Symbolic link
View File

@ -0,0 +1 @@
../rad-init.md

6
radicle-cli/examples/workflow/4-patching-contributor.md
View File

@ -31,7 +31,7 @@ master <- z6Mkt67…v4N1tRk/flux-capacitor-power (3e674d1)
3e674d1 Define power requirements 3e674d1 Define power requirements
✓ Patch a07ef7743a32a2e902672ea3526d1db6ee08108a created 🌱 ✓ Patch a07ef7743a32a2e902672ea3526d1db6ee08108a created
To publish your patch to the network, run: To publish your patch to the network, run:
git push rad git push rad
@ -44,7 +44,7 @@ $ rad patch
╭─────────────────────────────────────────────────────────────────────────────────────────╮ ╭─────────────────────────────────────────────────────────────────────────────────────────╮
│ Define power requirements a07ef77 R0 3e674d1 (flux-capacitor-power) ahead 1, behind 0 │ │ 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 $ rad patch show a07ef7743a32a2e902672ea3526d1db6ee08108a
╭─────────────────────────────────────────────────────────────────────────────────────────╮ ╭─────────────────────────────────────────────────────────────────────────────────────────╮
@ -55,7 +55,7 @@ $ rad patch show a07ef7743a32a2e902672ea3526d1db6ee08108a
│ │ │ │
│ See details. │ │ See details. │
├─────────────────────────────────────────────────────────────────────────────────────────┤ ├─────────────────────────────────────────────────────────────────────────────────────────┤
│ ● opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [.. ]│ │ ● opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [ ... ]│
╰─────────────────────────────────────────────────────────────────────────────────────────╯ ╰─────────────────────────────────────────────────────────────────────────────────────────╯
``` ```

7
radicle-cli/src/commands/auth.rs
View File

@ -67,10 +67,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
} }
pub fn init(options: Options) -> anyhow::Result<()> { pub fn init(options: Options) -> anyhow::Result<()> {
term::headline(format!( term::headline("Initializing your radicle 👾 identity");
"Initializing your {} 🌱 identity",
term::format::highlight("radicle")
));
if let Ok(version) = radicle::git::version() { if let Ok(version) = radicle::git::version() {
if version < radicle::git::VERSION_REQUIRED { 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. // TODO: Only show this if we're not authenticated.
term::headline(format!( term::headline(format!(
"🌱 Authenticating as {}", "Authenticating as {}",
term::format::Identity::new(profile).styled() term::format::Identity::new(profile).styled()
)); ));

8
radicle-cli/src/commands/id.rs
View File

@ -297,7 +297,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
&signer, &signer,
)?; )?;
term::success!( term::success!(
"Identity proposal '{}' created 🌱", "Identity proposal '{}' created",
term::format::highlight(proposal.id) term::format::highlight(proposal.id)
); );
print(&proposal, &previous, None)?; 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)?; proposal.edit(update.title, update.description, &signer)?;
let revision = proposal.update(previous.current, update.proposed, &signer)?; let revision = proposal.update(previous.current, update.proposed, &signer)?;
term::success!( term::success!(
"Identity proposal '{}' updated 🌱", "Identity proposal '{}' updated",
term::format::highlight(proposal.id) term::format::highlight(proposal.id)
); );
term::success!( term::success!(
@ -363,7 +363,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
let revision = let revision =
proposal.update(previous.current, revision.proposed.clone(), &signer)?; proposal.update(previous.current, revision.proposed.clone(), &signer)?;
term::success!( term::success!(
"Identity proposal '{}' rebased 🌱", "Identity proposal '{}' rebased",
term::format::highlight(proposal.id) term::format::highlight(proposal.id)
); );
term::success!( term::success!(
@ -416,7 +416,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
if yes { if yes {
let id = Proposal::commit(&proposal, &rid, signer.public_key(), &repo, &signer)?; let id = Proposal::commit(&proposal, &rid, signer.public_key(), &repo, &signer)?;
proposal.commit(&signer)?; proposal.commit(&signer)?;
term::success!("Committed new identity '{}' 🌱", id.current); term::success!("Committed new identity '{}'", id.current);
print(&proposal, &previous, None)?; print(&proposal, &previous, None)?;
} }
} }

12
radicle-cli/src/commands/init.rs
View File

@ -165,7 +165,7 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()>
let interactive = options.interactive; let interactive = options.interactive;
term::headline(format!( term::headline(format!(
"Initializing local 🌱 project in {}", "Initializing radicle 👾 project in {}",
if path == cwd { if path == cwd {
term::format::highlight(".").to_string() term::format::highlight(".").to_string()
} else { } else {
@ -272,9 +272,11 @@ pub fn init(options: Options, profile: &profile::Profile) -> anyhow::Result<()>
term::blank(); term::blank();
term::info!( 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::format::highlight(id.urn())
); );
term::info!("You can show it any time by running:");
term::indented(term::format::secondary("rad .")); term::indented(term::format::secondary("rad ."));
if !options.announce { 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::info!("To publish your project to the network, run:");
term::indented(term::format::secondary(push_cmd)); term::indented(term::format::secondary(push_cmd));
} }
term::blank();
} }
Err(err) => { Err(err) => {
spinner.failed(); spinner.failed();
term::blank();
anyhow::bail!(err); anyhow::bail!(err);
// TODO: Handle error: "this repository is already initialized with remote {}" // 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 key = ssh::fmt::fingerprint(node_id);
let yes = if !git::is_signing_configured(repo)? { let yes = if !git::is_signing_configured(repo)? {
term::headline(format!( term::headline(format!(
"Configuring 🌱 signing key {}...", "Configuring radicle signing key {}...",
term::format::tertiary(key) term::format::tertiary(key)
)); ));
true true
} else if interactive.yes() { } else if interactive.yes() {
term::confirm(format!( term::confirm(format!(
"Configure 🌱 signing key {} in local checkout?", "Configure radicle signing key {} in local checkout?",
term::format::tertiary(key), term::format::tertiary(key),
)) ))
} else { } else {

2
radicle-cli/src/commands/patch/create.rs
View File

@ -126,7 +126,7 @@ pub fn run(
&signer, &signer,
)?; )?;
term::success!("Patch {} created 🌱", term::format::highlight(patch.id)); term::success!("Patch {} created", term::format::highlight(patch.id));
term::blank(); term::blank();
if options.announce { if options.announce {