Skip to content

Commit 380a78e

Browse files
committed
Update library name to yeet
1 parent 67871f0 commit 380a78e

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ smol_str = "=0.1.16"
3535

3636

3737
[lib]
38-
name = "deploy"
38+
name = "yeet"
3939
path = "src/lib.rs"

src/bin/activate.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ pub async fn activation_confirmation(
235235
confirm_timeout: u16,
236236
closure: String,
237237
) -> Result<(), ActivationConfirmationError> {
238-
let lock_path = deploy::make_lock_path(&temp_path, &closure);
238+
let lock_path = yeet::make_lock_path(&temp_path, &closure);
239239

240240
debug!("Ensuring parent directory exists for canary file");
241241

@@ -298,7 +298,7 @@ pub enum WaitError {
298298
Waiting(#[from] DangerZoneError),
299299
}
300300
pub async fn wait(temp_path: String, closure: String) -> Result<(), WaitError> {
301-
let lock_path = deploy::make_lock_path(&temp_path, &closure);
301+
let lock_path = yeet::make_lock_path(&temp_path, &closure);
302302

303303
let (created, done) = mpsc::channel(1);
304304

@@ -468,13 +468,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
468468

469469
let opts: Opts = Opts::parse();
470470

471-
deploy::init_logger(
471+
yeet::init_logger(
472472
opts.debug_logs,
473473
opts.log_dir.as_deref(),
474474
match opts.subcmd {
475-
SubCommand::Activate(_) => deploy::LoggerType::Activate,
476-
SubCommand::Wait(_) => deploy::LoggerType::Wait,
477-
SubCommand::Revoke(_) => deploy::LoggerType::Revoke,
475+
SubCommand::Activate(_) => yeet::LoggerType::Activate,
476+
SubCommand::Wait(_) => yeet::LoggerType::Wait,
477+
SubCommand::Revoke(_) => yeet::LoggerType::Revoke,
478478
},
479479
)?;
480480

src/bin/yeet.rs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::io::{stdin, stdout, Write};
88

99
use clap::Clap;
1010

11-
use deploy::{DeployFlake, ParseFlakeError};
11+
use yeet::{DeployFlake, ParseFlakeError};
1212
use futures_util::stream::{StreamExt, TryStreamExt};
1313
use log::{debug, error, info, warn};
1414
use serde::Serialize;
@@ -169,9 +169,9 @@ enum GetDeploymentDataError {
169169
/// Evaluates the Nix in the given `repo` and return the processed Data from it
170170
async fn get_deployment_data(
171171
supports_flakes: bool,
172-
flakes: &[deploy::DeployFlake<'_>],
172+
flakes: &[yeet::DeployFlake<'_>],
173173
extra_build_args: &[String],
174-
) -> Result<Vec<deploy::data::Data>, GetDeploymentDataError> {
174+
) -> Result<Vec<yeet::data::Data>, GetDeploymentDataError> {
175175
futures_util::stream::iter(flakes).then(|flake| async move {
176176

177177
info!("Evaluating flake in {}", flake.repo);
@@ -273,9 +273,9 @@ struct PromptPart<'a> {
273273

274274
fn print_deployment(
275275
parts: &[(
276-
&deploy::DeployFlake<'_>,
277-
deploy::DeployData,
278-
deploy::DeployDefs,
276+
&yeet::DeployFlake<'_>,
277+
yeet::DeployData,
278+
yeet::DeployDefs,
279279
)],
280280
) -> Result<(), toml::ser::Error> {
281281
let mut part_map: HashMap<String, HashMap<String, PromptPart>> = HashMap::new();
@@ -316,9 +316,9 @@ enum PromptDeploymentError {
316316

317317
fn prompt_deployment(
318318
parts: &[(
319-
&deploy::DeployFlake<'_>,
320-
deploy::DeployData,
321-
deploy::DeployDefs,
319+
&yeet::DeployFlake<'_>,
320+
yeet::DeployData,
321+
yeet::DeployDefs,
322322
)],
323323
) -> Result<(), PromptDeploymentError> {
324324
print_deployment(parts)?;
@@ -369,39 +369,39 @@ fn prompt_deployment(
369369
#[derive(Error, Debug)]
370370
enum RunDeployError {
371371
#[error("Failed to deploy profile: {0}")]
372-
DeployProfile(#[from] deploy::deploy::DeployProfileError),
372+
DeployProfile(#[from] yeet::deploy::DeployProfileError),
373373
#[error("Failed to push profile: {0}")]
374-
PushProfile(#[from] deploy::push::PushProfileError),
374+
PushProfile(#[from] yeet::push::PushProfileError),
375375
#[error("No profile named `{0}` was found")]
376376
ProfileNotFound(String),
377377
#[error("No node named `{0}` was found")]
378378
NodeNotFound(String),
379379
#[error("Profile was provided without a node name")]
380380
ProfileWithoutNode,
381381
#[error("Error processing deployment definitions: {0}")]
382-
DeployDataDefs(#[from] deploy::DeployDataDefsError),
382+
DeployDataDefs(#[from] yeet::DeployDataDefsError),
383383
#[error("Failed to make printable TOML of deployment: {0}")]
384384
TomlFormat(#[from] toml::ser::Error),
385385
#[error("{0}")]
386386
PromptDeployment(#[from] PromptDeploymentError),
387387
#[error("Failed to revoke profile: {0}")]
388-
RevokeProfile(#[from] deploy::deploy::RevokeProfileError),
388+
RevokeProfile(#[from] yeet::deploy::RevokeProfileError),
389389
}
390390

391391
type ToDeploy<'a> = Vec<(
392-
&'a deploy::DeployFlake<'a>,
393-
&'a deploy::data::Data,
394-
(&'a str, &'a deploy::data::Node),
395-
(&'a str, &'a deploy::data::Profile),
392+
&'a yeet::DeployFlake<'a>,
393+
&'a yeet::data::Data,
394+
(&'a str, &'a yeet::data::Node),
395+
(&'a str, &'a yeet::data::Profile),
396396
)>;
397397

398398
async fn run_deploy(
399-
deploy_flakes: Vec<deploy::DeployFlake<'_>>,
400-
data: Vec<deploy::data::Data>,
399+
deploy_flakes: Vec<yeet::DeployFlake<'_>>,
400+
data: Vec<yeet::data::Data>,
401401
supports_flakes: bool,
402402
check_sigs: bool,
403403
interactive: bool,
404-
cmd_overrides: &deploy::CmdOverrides,
404+
cmd_overrides: &yeet::CmdOverrides,
405405
keep_result: bool,
406406
result_path: Option<&str>,
407407
extra_build_args: &[String],
@@ -438,7 +438,7 @@ async fn run_deploy(
438438
None => return Err(RunDeployError::NodeNotFound(node_name.to_owned())),
439439
};
440440

441-
let mut profiles_list: Vec<(&str, &deploy::data::Profile)> = Vec::new();
441+
let mut profiles_list: Vec<(&str, &yeet::data::Profile)> = Vec::new();
442442

443443
for profile_name in [
444444
node.node_settings.profiles_order.iter().collect(),
@@ -469,7 +469,7 @@ async fn run_deploy(
469469
let mut l = Vec::new();
470470

471471
for (node_name, node) in &data.nodes {
472-
let mut profiles_list: Vec<(&str, &deploy::data::Profile)> = Vec::new();
472+
let mut profiles_list: Vec<(&str, &yeet::data::Profile)> = Vec::new();
473473

474474
for profile_name in [
475475
node.node_settings.profiles_order.iter().collect(),
@@ -511,13 +511,13 @@ async fn run_deploy(
511511
.collect();
512512

513513
let mut parts: Vec<(
514-
&deploy::DeployFlake<'_>,
515-
deploy::DeployData,
516-
deploy::DeployDefs,
514+
&yeet::DeployFlake<'_>,
515+
yeet::DeployData,
516+
yeet::DeployDefs,
517517
)> = Vec::new();
518518

519519
for (deploy_flake, data, (node_name, node), (profile_name, profile)) in to_deploy {
520-
let deploy_data = deploy::make_deploy_data(
520+
let deploy_data = yeet::make_deploy_data(
521521
&data.generic_settings,
522522
node,
523523
node_name,
@@ -540,7 +540,7 @@ async fn run_deploy(
540540
}
541541

542542
for (deploy_flake, deploy_data, deploy_defs) in &parts {
543-
deploy::push::push_profile(deploy::push::PushProfileData {
543+
yeet::push::push_profile(yeet::push::PushProfileData {
544544
supports_flakes,
545545
check_sigs,
546546
repo: deploy_flake.repo,
@@ -553,14 +553,14 @@ async fn run_deploy(
553553
.await?;
554554
}
555555

556-
let mut succeeded: Vec<(&deploy::DeployData, &deploy::DeployDefs)> = vec![];
556+
let mut succeeded: Vec<(&yeet::DeployData, &yeet::DeployDefs)> = vec![];
557557

558558
// Run all deployments
559559
// In case of an error rollback any previoulsy made deployment.
560560
// Rollbacks adhere to the global seeting to auto_rollback and secondary
561561
// the profile's configuration
562562
for (_, deploy_data, deploy_defs) in &parts {
563-
if let Err(e) = deploy::deploy::deploy_profile(deploy_data, deploy_defs, dry_activate).await
563+
if let Err(e) = yeet::deploy::deploy_profile(deploy_data, deploy_defs, dry_activate).await
564564
{
565565
error!("{}", e);
566566
if dry_activate {
@@ -573,7 +573,7 @@ async fn run_deploy(
573573
// the command line)
574574
for (deploy_data, deploy_defs) in &succeeded {
575575
if deploy_data.merged_settings.auto_rollback.unwrap_or(true) {
576-
deploy::deploy::revoke(*deploy_data, *deploy_defs).await?;
576+
yeet::deploy::revoke(*deploy_data, *deploy_defs).await?;
577577
}
578578
}
579579
}
@@ -588,17 +588,17 @@ async fn run_deploy(
588588
#[derive(Error, Debug)]
589589
enum RunError {
590590
#[error("Failed to deploy profile: {0}")]
591-
DeployProfile(#[from] deploy::deploy::DeployProfileError),
591+
DeployProfile(#[from] yeet::deploy::DeployProfileError),
592592
#[error("Failed to push profile: {0}")]
593-
PushProfile(#[from] deploy::push::PushProfileError),
593+
PushProfile(#[from] yeet::push::PushProfileError),
594594
#[error("Failed to test for flake support: {0}")]
595595
FlakeTest(std::io::Error),
596596
#[error("Failed to check deployment: {0}")]
597597
CheckDeployment(#[from] CheckDeploymentError),
598598
#[error("Failed to evaluate deployment data: {0}")]
599599
GetDeploymentData(#[from] GetDeploymentDataError),
600600
#[error("Error parsing flake: {0}")]
601-
ParseFlake(#[from] deploy::ParseFlakeError),
601+
ParseFlake(#[from] yeet::ParseFlakeError),
602602
#[error("Error initiating logger: {0}")]
603603
Logger(#[from] flexi_logger::FlexiLoggerError),
604604
#[error("{0}")]
@@ -608,10 +608,10 @@ enum RunError {
608608
async fn run() -> Result<(), RunError> {
609609
let opts: Opts = Opts::parse();
610610

611-
deploy::init_logger(
611+
yeet::init_logger(
612612
opts.debug_logs,
613613
opts.log_dir.as_deref(),
614-
deploy::LoggerType::Deploy,
614+
yeet::LoggerType::Deploy,
615615
)?;
616616

617617
let deploys = opts
@@ -621,10 +621,10 @@ async fn run() -> Result<(), RunError> {
621621

622622
let deploy_flakes: Vec<DeployFlake> = deploys
623623
.iter()
624-
.map(|f| deploy::parse_flake(f.as_str()))
624+
.map(|f| yeet::parse_flake(f.as_str()))
625625
.collect::<Result<Vec<DeployFlake>, ParseFlakeError>>()?;
626626

627-
let cmd_overrides = deploy::CmdOverrides {
627+
let cmd_overrides = yeet::CmdOverrides {
628628
ssh_user: opts.ssh_user,
629629
profile_user: opts.profile_user,
630630
ssh_opts: opts.ssh_opts,

0 commit comments

Comments
 (0)