Add lock ability to pgml-components

levkk · levkk · commit 7225d9f38e9d · 2023-10-20T17:42:21.000-07:00
diff --git a/packages/cargo-pgml-components/Cargo.lock b/packages/cargo-pgml-components/Cargo.lock
diff --git a/packages/cargo-pgml-components/Cargo.toml b/packages/cargo-pgml-components/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-pgml-components"
-version = "0.1.18-alpha.2"
+version = "0.1.19"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"
@@ -21,6 +21,7 @@ sailfish = "0.8"
 regex = "1"
 toml = "0.7"
 serde = { version = "1", features = ["derive"] }
+file-lock = "2"
 
 [dev-dependencies]
 assert_cmd = "2"
diff --git a/packages/cargo-pgml-components/src/frontend/sass.rs b/packages/cargo-pgml-components/src/frontend/sass.rs
@@ -72,8 +72,6 @@ fn cleanup_old_bundles() {
 
 /// Entrypoint.
 pub fn bundle() {
-    crate::frontend::tools::install();
-
     assemble_modules();
     cleanup_old_bundles();
 
diff --git a/packages/cargo-pgml-components/src/frontend/tools.rs b/packages/cargo-pgml-components/src/frontend/tools.rs
@@ -116,3 +116,13 @@ fn install_node() {
         warn("installed node")
     }
 }
+
+pub fn debug() {
+    let node = unwrap_or_exit!(execute_with_nvm(Command::new("which").arg("node")));
+    println!("node: {}", node.trim());
+
+    for tool in TOOLS {
+        let output = unwrap_or_exit!(execute_with_nvm(Command::new("which").arg(tool)));
+        println!("{}: {}", tool, output.trim());
+    }
+}
diff --git a/packages/cargo-pgml-components/src/main.rs b/packages/cargo-pgml-components/src/main.rs
@@ -1,8 +1,10 @@
 //! A tool to assemble and bundle our frontend components.
 
 use clap::{Args, Parser, Subcommand};
+use file_lock::{FileLock, FileOptions};
 use std::env::{current_dir, set_current_dir};
-use std::fs::create_dir_all;
+use std::fs::{create_dir_all, File};
+use std::io::Write;
 use std::path::Path;
 
 #[macro_use]
@@ -58,6 +60,12 @@ enum Commands {
     Bundle {
         #[arg(short, long, default_value = "false")]
         minify: bool,
+
+        #[arg(short, long, default_value = "false")]
+        debug: bool,
+
+        #[arg(short, long, default_value = "false")]
+        lock: bool,
     },
 
     /// Add new elements to the project.
@@ -91,7 +99,11 @@ fn main() {
         CargoSubcommands::PgmlComponents(pgml_commands) => {
             validate_project(pgml_commands.project_path);
             match pgml_commands.command {
-                Commands::Bundle { minify } => bundle(config, minify),
+                Commands::Bundle {
+                    minify,
+                    debug,
+                    lock,
+                } => bundle(config, minify, debug, lock),
                 Commands::Add(command) => match command {
                     AddCommands::Component { name } => {
                         crate::frontend::components::add(&Path::new(&name), pgml_commands.overwrite)
@@ -131,10 +143,45 @@ fn validate_project(project_path: Option<String>) {
 }
 
 /// Bundle SASS and JavaScript into neat bundle files.
-fn bundle(config: Config, minify: bool) {
+fn bundle(config: Config, minify: bool, debug: bool, lock: bool) {
+    let lock = if lock { Some(acquire_lock()) } else { None };
+
+    if debug {
+        frontend::tools::debug();
+    }
+
+    frontend::tools::install();
+
+    if debug {
+        frontend::tools::debug();
+    }
+
     frontend::sass::bundle();
     frontend::javascript::bundle(config, minify);
     frontend::components::update_modules();
 
     info("bundle complete");
+
+    if let Some(lock) = lock {
+        unwrap_or_exit!(lock.unlock());
+    }
+}
+
+fn acquire_lock() -> FileLock {
+    print!("acquiring lock...");
+    unwrap_or_exit!(std::io::stdout().flush());
+
+    let file = "/tmp/pgml-components-lock";
+
+    // Create file if not exists
+    if !Path::new(file).exists() {
+        unwrap_or_exit!(File::create(file));
+    }
+
+    let options = FileOptions::new().write(true).create(true).append(true);
+
+    let lock = unwrap_or_exit!(FileLock::lock(file, true, options));
+
+    info("ok");
+    lock
 }

Original file line number	Diff line number	Diff line change
`@@ -116,3 +116,13 @@ fn install_node() {`
`116`	`116`	`warn("installed node")`
`117`	`117`	`}`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+pub fn debug() {`
	`121`	`+ let node = unwrap_or_exit!(execute_with_nvm(Command::new("which").arg("node")));`
	`122`	`+ println!("node: {}", node.trim());`
	`123`	`+`
	`124`	`+ for tool in TOOLS {`
	`125`	`+ let output = unwrap_or_exit!(execute_with_nvm(Command::new("which").arg(tool)));`
	`126`	`+ println!("{}: {}", tool, output.trim());`
	`127`	`+ }`
	`128`	`+}`