Merge pull request #138 from tdejager/feat/test-harness

Feat/test harness

.github/workflows/rust.yml

@@ -21,6 +21,8 @@ env:
   RUSTFLAGS: "-D warnings"
   CARGO_TERM_COLOR: always
   CICD_INTERMEDIATES_DIR: "_cicd-intermediates"
+  TEST_FEATURES: "slow_integration_tests"
+  XDG_CACHE_HOME: ${{ github.workspace }}/.cache
 
 jobs:
   check-rustdoc-links:
@@ -118,7 +120,7 @@ jobs:
       - name: Setup | Install cargo-wix [Windows]
         continue-on-error: true
         # aarch64 is only supported in wix 4.0 development builds
-        if: matrix.os == 'windows-latest' && matrix.target != 'aarch64-pc-windows-msvc'
+        if: matrix.job.os == 'windows-latest' && matrix.target != 'aarch64-pc-windows-msvc'
         run: cargo install --version 0.3.4 cargo-wix
         env:
           # cargo-wix does not require static crt
@@ -130,6 +132,12 @@ jobs:
         with:
           tool: cross
 
+      - name: Ensure cache directory exists
+        shell: bash
+        if: matrix.job.os == 'ubuntu-20.04' && matrix.job.use-cross
+        run: |
+          mkdir -p ${XDG_CACHE_HOME}
+
       - name: Overwrite build command env variable
         if: matrix.job.use-cross
         shell: bash
@@ -211,6 +219,7 @@ jobs:
           # test only library unit tests and binary for arm-type targets
           unset CARGO_TEST_OPTIONS
           unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*) CARGO_TEST_OPTIONS="--bin ${{ needs.crate_metadata.outputs.name }}" ;; esac;
+          CARGO_TEST_OPTIONS="${CARGO_TEST_OPTIONS} --features ${{ env.TEST_FEATURES }}"
           echo "CARGO_TEST_OPTIONS=${CARGO_TEST_OPTIONS}" >> $GITHUB_OUTPUT
 
       - name: Run tests
@@ -333,7 +342,7 @@ jobs:
 
       - name: "Artifact upload: windows installer"
         continue-on-error: true
-        if: matrix.os == 'windows-latest' && matrix.job.target != 'aarch64-pc-windows-msvc'
+        if: matrix.job.os == 'windows-latest' && matrix.job.target != 'aarch64-pc-windows-msvc'
         uses: actions/upload-artifact@v3
         with:
           name: pixi-${{ matrix.job.target }}.msi

Cargo.toml

@@ -13,6 +13,7 @@ readme = "docs/README.md"
 default = ["native-tls"]
 native-tls = ["reqwest/native-tls", "rattler_repodata_gateway/native-tls", "rattler/native-tls"]
 rustls-tls = ["reqwest/rustls-tls", "rattler_repodata_gateway/rustls-tls", "rattler/rustls-tls"]
+slow_integration_tests = []
 
 [dependencies]
 anyhow = "1.0.70"

Cross.toml

@@ -0,0 +1,7 @@
+[target.x86_64-unknown-linux-musl.env]
+volumes = [
+    "XDG_CACHE_HOME",
+]
+passthrough = [
+    "XDG_CACHE_HOME",
+]

pixi.toml

@@ -1,7 +1,7 @@
 [project]
 name = "pixi"
 version = "0.0.5"
-description = "Package manamgent made easy!"
+description = "Package management made easy!"
 authors = ["Wolf Vollprecht <wolf@prefix.dev>", "Bas Zalmstra <bas@prefix.dev>", "Tim de Jager <tim@prefix.dev>", "Ruben Arts <ruben@prefix.dev>"]
 channels = ["conda-forge"]
 platforms = ["linux-64", "win-64", "osx-64", "osx-arm64"]

src/cli/add.rs

@@ -15,7 +15,7 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 
 /// Adds a dependency to the project
-#[derive(Parser, Debug)]
+#[derive(Parser, Debug, Default)]
 #[clap(arg_required_else_help = true)]
 pub struct Args {
     /// Specify the dependencies you wish to add to the project.
@@ -34,22 +34,27 @@ pub struct Args {
     /// Adding multiple dependencies at once is also supported:
     ///
     /// - `pixi add python pytest`: This will add both `python` and `pytest` to the project's dependencies.
-    specs: Vec<MatchSpec>,
+    pub specs: Vec<MatchSpec>,
 
     /// The path to 'pixi.toml'
     #[arg(long)]
-    manifest_path: Option<PathBuf>,
+    pub manifest_path: Option<PathBuf>,
 }
 
 pub async fn execute(args: Args) -> anyhow::Result<()> {
     let mut project = match args.manifest_path {
         Some(path) => Project::load(path.as_path())?,
         None => Project::discover()?,
     };
+    add_specs_to_project(&mut project, args.specs).await
+}
 
+pub async fn add_specs_to_project(
+    project: &mut Project,
+    specs: Vec<MatchSpec>,
+) -> anyhow::Result<()> {
     // Split the specs into package name and version specifier
-    let new_specs = args
-        .specs
+    let new_specs = specs
         .into_iter()
         .map(|spec| match &spec.name {
             Some(name) => Ok((name.clone(), spec.into())),
@@ -119,10 +124,14 @@ pub async fn execute(args: Args) -> anyhow::Result<()> {
         added_specs.push(spec);
     }
 
+    // TODO why is this only needed in the test?
+    // project.save()?;
+    // project.reload()?;
+
     // Update the lock file and write to disk
     update_lock_file(
-        &project,
-        load_lock_file(&project).await?,
+        project,
+        load_lock_file(project).await?,
         Some(sparse_repo_data),
     )
     .await?;
@@ -135,7 +144,6 @@ pub async fn execute(args: Args) -> anyhow::Result<()> {
             spec
         );
     }
-
     Ok(())
 }
 

src/cli/init.rs

@@ -9,7 +9,7 @@ use std::{fs, path::PathBuf};
 pub struct Args {
     /// Where to place the project (defaults to current path)
     #[arg(default_value = ".")]
-    path: PathBuf,
+    pub path: PathBuf,
 }
 
 /// The pixi.toml template

src/cli/mod.rs

@@ -7,13 +7,13 @@ use crate::progress;
 use anyhow::Error;
 use tracing_subscriber::{filter::LevelFilter, util::SubscriberInitExt, EnvFilter};
 
-mod add;
-mod auth;
-mod global;
-mod init;
-mod install;
-mod run;
-mod shell;
+pub mod add;
+pub mod auth;
+pub mod global;
+pub mod init;
+pub mod install;
+pub mod run;
+pub mod shell;
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
@@ -37,7 +37,7 @@ pub struct CompletionCommand {
 }
 
 #[derive(Parser, Debug)]
-enum Command {
+pub enum Command {
     Completion(CompletionCommand),
     Init(init::Args),
     #[clap(alias = "a")]
@@ -89,7 +89,13 @@ pub async fn execute() -> anyhow::Result<()> {
         .finish()
         .try_init()?;
 
-    match args.command {
+    // Execute the command
+    execute_command(args.command).await
+}
+
+/// Execute the actual command
+pub async fn execute_command(command: Command) -> Result<(), Error> {
+    match command {
         Command::Completion(cmd) => completion(cmd),
         Command::Init(cmd) => init::execute(cmd).await,
         Command::Add(cmd) => add::execute(cmd).await,

src/cli/run.rs

@@ -1,42 +1,51 @@
 use std::collections::{HashSet, VecDeque};
 use std::path::Path;
+use std::string::String;
 use std::{fmt::Write, path::PathBuf};
 
-use crate::Project;
 use clap::Parser;
 use is_executable::IsExecutable;
 use rattler_conda_types::Platform;
 
-use crate::command::{CmdArgs, Command, ProcessCmd};
-use crate::environment::get_up_to_date_prefix;
-use crate::project::environment::add_metadata_as_env_vars;
-use rattler_shell::activation::ActivationResult;
+use crate::{
+    command::{CmdArgs, Command, ProcessCmd},
+    environment::get_up_to_date_prefix,
+    project::environment::add_metadata_as_env_vars,
+    Project,
+};
 use rattler_shell::{
+    activation::ActivationResult,
     activation::{ActivationVariables, Activator},
     shell::{Shell, ShellEnum},
 };
 
 /// Runs command in project.
-#[derive(Parser, Debug)]
+#[derive(Parser, Debug, Default)]
 #[clap(trailing_var_arg = true, arg_required_else_help = true)]
 pub struct Args {
     /// The command you want to run in the projects environment.
-    command: Vec<String>,
+    pub command: Vec<String>,
 
     /// The path to 'pixi.toml'
     #[arg(long)]
-    manifest_path: Option<PathBuf>,
+    pub manifest_path: Option<PathBuf>,
 }
 
-pub async fn execute(args: Args) -> anyhow::Result<()> {
+pub struct RunScriptCommand {
+    /// The command to execute
+    pub command: std::process::Command,
+    /// Tempfile to keep a handle on, otherwise it is dropped and deleted
+    _script: tempfile::NamedTempFile,
+}
+
+pub async fn create_command(args: Args) -> anyhow::Result<RunScriptCommand> {
+    let command: Vec<_> = args.command.iter().map(|c| c.to_string()).collect();
     let project = match args.manifest_path {
         Some(path) => Project::load(path.as_path())?,
         None => Project::discover()?,
     };
 
-    // Get the script to execute from the command line.
-    let (command_name, command) = args
-        .command
+    let (command_name, command) = command
         .first()
         .and_then(|cmd_name| {
             project
@@ -125,12 +134,19 @@ pub async fn execute(args: Args) -> anyhow::Result<()> {
     std::io::Write::write_all(&mut temp_file, script.as_bytes())?;
 
     // Execute the script with the shell
-    let mut command = shell
-        .create_run_script_command(temp_file.path())
-        .spawn()
-        .expect("failed to execute process");
+    let command = shell.create_run_script_command(temp_file.path());
 
-    std::process::exit(command.wait()?.code().unwrap_or(1));
+    Ok(RunScriptCommand {
+        command,
+        _script: temp_file,
+    })
+}
+
+/// CLI entry point for `pixi run`
+pub async fn execute(args: Args) -> anyhow::Result<()> {
+    let mut script_command = create_command(args).await?;
+    let status = script_command.command.spawn()?.wait()?.code().unwrap_or(1);
+    std::process::exit(status);
 }
 
 /// Given a command and arguments to invoke it, format it so that it is as generalized as possible.

src/environment.rs

@@ -105,6 +105,11 @@ pub async fn get_up_to_date_prefix(project: &Project) -> anyhow::Result<Prefix>
     Ok(prefix)
 }
 
+/// Loads the lockfile for the specified project or returns a dummy one if none could be found.
+pub async fn load_lock_for_manifest_path(path: &Path) -> anyhow::Result<CondaLock> {
+    load_lock_file(&Project::load(path)?).await
+}
+
 /// Loads the lockfile for the specified project or returns a dummy one if none could be found.
 pub async fn load_lock_file(project: &Project) -> anyhow::Result<CondaLock> {
     let lock_file_path = project.lock_file_path();

src/lib.rs

@@ -0,0 +1,14 @@
+pub mod cli;
+pub mod command;
+pub mod config;
+pub mod consts;
+pub mod environment;
+pub mod prefix;
+pub mod progress;
+pub mod project;
+pub mod repodata;
+pub mod report_error;
+pub mod util;
+pub mod virtual_packages;
+
+pub use project::Project;

src/main.rs

@@ -1,19 +1,6 @@
 use console::style;
-
-mod cli;
-mod command;
-mod config;
-mod consts;
-mod environment;
-mod prefix;
-mod progress;
-mod project;
-mod repodata;
-mod report_error;
-mod util;
-mod virtual_packages;
-
-pub use project::Project;
+use pixi::cli;
+use pixi::report_error;
 
 #[tokio::main]
 pub async fn main() {

src/project/mod.rs

@@ -52,6 +52,14 @@ impl Project {
         })
     }
 
+    pub fn reload(&mut self) -> anyhow::Result<()> {
+        let project = Self::load(self.root().join(consts::PROJECT_MANIFEST).as_path())?;
+        self.root = project.root;
+        self.doc = project.doc;
+        self.manifest = project.manifest;
+        Ok(())
+    }
+
     /// Loads a project manifest.
     pub fn from_manifest_str(root: &Path, contents: impl Into<String>) -> anyhow::Result<Self> {
         let contents = contents.into();