Create final tarball

Author: morr0ne

src/commands/build.rs

@@ -16,7 +16,7 @@ use tracing::info;
 use xz2::read::XzDecoder;
 
 use crate::{
-    check_hash,
+    check_hash, create_tarball,
     package::{Info, Package, Source, StepVariant},
 };
 
@@ -29,7 +29,7 @@ pub async fn build() -> Result<()> {
 
     let package = Package::parse(&fs::read_to_string(package_path)?)?;
 
-    let info = package.info;
+    let info = &package.info;
     info!(
         "Building package \"{}\" version {}",
         &info.name, &info.version
@@ -45,17 +45,17 @@ pub async fn build() -> Result<()> {
         fs::remove_dir_all("sources")?;
     }
 
-    for source in package.sources {
-        let file_path = fetch_and_verify_source(&client, &source, &info).await?;
+    for source in &package.sources {
+        let file_path = fetch_and_verify_source(&client, source, &info).await?;
         extract_source(&file_path)?;
     }
 
     let mut working_dir = current_dir()?;
 
-    for step in package.steps {
+    for step in &package.steps {
         info!("Running step: {}", step.name);
 
-        match step.variant {
+        match &step.variant {
             StepVariant::Command { command, runner } => {
                 let result = runner
                     .into_command()
@@ -75,7 +75,7 @@ pub async fn build() -> Result<()> {
         }
     }
 
-    // create_tarball(path, &package)?;
+    create_tarball(current_dir()?.join("package"), &package)?;
 
     info!("Package '{}' built successfully!", info.name);
     Ok(())

src/lib.rs

@@ -1,5 +1,6 @@
 use std::{
     borrow::Cow,
+    env::current_dir,
     fs::{self, File},
     path::Path,
     sync::LazyLock,
@@ -34,15 +35,15 @@ pub fn check_hash<P: AsRef<Path>>(path: P, hash: &str) -> Result<bool> {
     Ok(hash == computed_hash)
 }
 
-fn _create_tarball<P: AsRef<Path>>(package_path: P, package: &Package) -> Result<()> {
-    let tarball_name = format!("{}_{}.peach", package.info.name, package.info.version);
-    let tarball_path = package_path.as_ref().join(&tarball_name);
+pub fn create_tarball<P: AsRef<Path>>(package_path: P, package: &Package) -> Result<()> {
+    let tarball_name = format!("{}-{}.peach", package.info.name, package.info.version);
+    let tarball_path = current_dir()?.join(&tarball_name);
     let tar_gz = File::create(&tarball_path)?;
     let enc = GzEncoder::new(tar_gz, Compression::default());
     let mut tar = tar::Builder::new(enc);
 
     tar.append_dir_all(".", package_path)?;
 
-    info!("Created tarball: {}", tarball_name);
+    info!("Created package: {}", tarball_name);
     Ok(())
 }