Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Install node and nvm#968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
levkk merged 3 commits intomasterfromlevkk-install-node
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionpgml-apps/cargo-pgml-components/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

2 changes: 1 addition & 1 deletionpgml-apps/cargo-pgml-components/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-pgml-components"
version = "0.1.7"
version = "0.1.8"
edition = "2021"
authors = ["PostgresML <team@postgresml.org>"]
license = "MIT"
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@ use std::process::Command;

use convert_case::{Case, Casing};

use crate::util::{execute_command, info, unwrap_or_exit, warn};
use crate::frontend::tools::execute_with_nvm;
use crate::util::{info, unwrap_or_exit, warn};

/// The name of the JS file that imports all other JS files
/// created in the modules.
Expand DownExpand Up@@ -99,7 +100,7 @@ pub fn bundle() {
assemble_modules();

// Bundle JavaScript.
unwrap_or_exit!(execute_command(
unwrap_or_exit!(execute_with_nvm(
Command::new(JS_COMPILER)
.arg(MODULES_FILE)
.arg("--file")
Expand Down
6 changes: 6 additions & 0 deletionspgml-apps/cargo-pgml-components/src/frontend/nvm.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion

${@}
5 changes: 3 additions & 2 deletionspgml-apps/cargo-pgml-components/src/frontend/sass.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,8 @@ use std::fs::{copy, read_to_string, remove_file, File};
use std::io::Write;
use std::process::Command;

use crate::util::{execute_command, info, unwrap_or_exit, warn};
use crate::frontend::tools::execute_with_nvm;
use crate::util::{info, unwrap_or_exit, warn};

/// The name of the SASS file that imports all other SASS files
/// created in the modules.
Expand DownExpand Up@@ -77,7 +78,7 @@ pub fn bundle() {
cleanup_old_bundles();

// Build Sass.
unwrap_or_exit!(execute_command(
unwrap_or_exit!(execute_with_nvm(
Command::new(SASS_COMPILER).arg(SASS_FILE).arg(CSS_FILE),
));

Expand Down
91 changes: 82 additions & 9 deletionspgml-apps/cargo-pgml-components/src/frontend/tools.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,102 @@
//! Tools required by us to build stuff.

use crate::util::{error, execute_command, unwrap_or_exit, warn};
use crate::util::{debug1, error, execute_command, unwrap_or_exit, warn};
use std::fs::File;
use std::io::Write;
use std::process::{exit, Command};

/// Required tools.
static TOOLS: &[&str] = &["sass", "rollup"];
static NVM_EXEC: &'static str = "/tmp/pgml-components-nvm.sh";
static NVM_SOURCE: &'static str = "https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh";
static NVM_SOURCE_DOWNLOADED: &'static str = "/tmp/pgml-components-nvm-source.sh";

/// Install any missing tools.
pub fn install() {
if let Err(err) = execute_command(Command::new("node").arg("--version")) {
error("Node is not installed. Install it with nvm or your system package manager.");
debug!("{}", err);
exit(1);
}
install_nvm_entrypoint();
debug!("installed node entrypoint");
install_node();
debug!("installed node");

for tool in TOOLS {
matchexecute_command(Command::new(tool).arg("--version")) {
matchexecute_with_nvm(Command::new(tool).arg("--version")) {
Ok(_) => (),
Err(err) => {
debug!("{}",err);
debug1!(err);
warn(&format!("installing {}", tool));
unwrap_or_exit!(execute_command(
unwrap_or_exit!(execute_with_nvm(
Command::new("npm").arg("install").arg("-g").arg(tool)
));
}
}
}
}

/// Execute a command making sure that nvm is available.
pub fn execute_with_nvm(command: &mut Command) -> std::io::Result<String> {
let mut cmd = Command::new(NVM_EXEC);
cmd.arg(command.get_program());
for arg in command.get_args() {
cmd.arg(arg);
}
execute_command(&mut cmd)
}

/// Install the nvm entrypoint we provide into /tmp
fn install_nvm_entrypoint() {
let mut file = unwrap_or_exit!(File::create(NVM_EXEC));
unwrap_or_exit!(writeln!(&mut file, "{}", include_str!("nvm.sh")));
drop(file);

unwrap_or_exit!(execute_command(
Command::new("chmod").arg("+x").arg(NVM_EXEC)
));
}

/// Install node using nvm
fn install_node() {
debug!("installing node");
// Node is already installed.
if let Ok(_) = execute_with_nvm(Command::new("node").arg("--version")) {
debug!("node is available");
return;
}

warn("installing node using nvm");

debug!("node is not available");

if let Err(err) = execute_command(Command::new("nvm").arg("--version")) {
debug!("nvm is not available");
debug1!(err);
// Install Node Version Manager.
if let Err(err) = execute_command(
Command::new("curl")
.arg("-Ls")
.arg(NVM_SOURCE)
.arg("-o")
.arg(NVM_SOURCE_DOWNLOADED),
) {
debug!("curl is not available");
error("couldn't not download nvm from Github, please do so manually before proceeding");
debug1!(err);
exit(1);
} else {
if let Err(err) = execute_command(Command::new("bash").arg(NVM_SOURCE_DOWNLOADED)) {
error("couldn't install nvm, please do so manually before proceeding");
debug1!(err);
exit(1);
} else {
warn("installed nvm");
}
}
}

if let Err(err) = execute_with_nvm(Command::new("nvm").arg("install").arg("stable")) {
error("couldn't install Node, please do so manually before proceeding");
debug1!(err);
exit(1);
} else {
warn("installed node")
}
}
30 changes: 20 additions & 10 deletionspgml-apps/cargo-pgml-components/src/main.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

use clap::{Args, Parser, Subcommand};
use std::env::{current_dir, set_current_dir};
use std::fs::{create_dir_all};
use std::fs::create_dir_all;
use std::path::Path;

#[macro_use]
Expand DownExpand Up@@ -62,17 +62,23 @@ fn main() {
let cli = Cli::parse();

match cli.subcomand {
CargoSubcommands::PgmlComponents(pgml_commands) => match pgml_commands.command {
Commands::Bundle {} => bundle(pgml_commands.project_path),
Commands::Add(command) => match command {
AddCommands::Component { name } => crate::frontend::components::add(&name, pgml_commands.overwrite),
},
},
CargoSubcommands::PgmlComponents(pgml_commands) => {
validate_project(pgml_commands.project_path);
match pgml_commands.command {
Commands::Bundle {} => bundle(),
Commands::Add(command) => match command {
AddCommands::Component { name } => {
crate::frontend::components::add(&name, pgml_commands.overwrite)
}
},
}
}
}
}

/// Bundle SASS and JavaScript into neat bundle files.
fn bundle(project_path: Option<String>) {
fn validate_project(project_path: Option<String>) {
debug!("validating project directory");

// Validate that the required project paths exist.
let cwd = if let Some(project_path) = project_path {
project_path
Expand All@@ -92,9 +98,13 @@ fn bundle(project_path: Option<String>) {
}

unwrap_or_exit!(set_current_dir(path));
}

/// Bundle SASS and JavaScript into neat bundle files.
fn bundle() {
frontend::sass::bundle();
frontend::#"38bed86c64674e77a825abb758b0054870b6c415f1ade52c91a97b381bb3b58a"> frontend::components::update_modules();

info("Bundle complete");
info("bundle complete");
}
19 changes: 14 additions & 5 deletionspgml-apps/cargo-pgml-components/src/util.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
use owo_colors::OwoColorize;
use std::fs::File;
use std::io::Write;
use std::io::{ErrorKind,Write};
use std::path::Path;
use std::process::{exit,Command};
use std::process::Command;

macro_rules! unwrap_or_exit {
($i:expr) => {
Expand All@@ -17,6 +17,13 @@ macro_rules! unwrap_or_exit {
};
}

macro_rules! debug1 {
($e:expr) => {
debug!("{}:{}:{} {}", file!(), line!(), column!(), $e);
};
}

pub(crate) use debug1;
pub(crate) use unwrap_or_exit;

pub fn info(value: &str) {
Expand All@@ -43,12 +50,14 @@ pub fn execute_command(command: &mut Command) -> std::io::Result<String> {
let stdout = String::from_utf8_lossy(&output.stderr).to_string();

if !output.status.success() {
error!(
let error = String::from_utf8_lossy(&output.stderr).to_string();
debug!(
"{} failed: {}",
command.get_program().to_str().unwrap(),
String::from_utf8_lossy(&output.stderr).to_string(),
error,
);
exit(1);

return Err(std::io::Error::new(ErrorKind::Other, error));
}

if !stderr.is_empty() {
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp