@ahqstore/cli 0.5.2 → 0.6.0

package/src/app/create/inquire.rs

@@ -1,142 +1,114 @@
-use std::process;
-
-use ahqstore_types::AppRepo;
-use inquire::{
-  validator::{ErrorMessage, Validation},
-  Editor, Text,
-};
-use serde::{Deserialize, Serialize};
-
-use crate::app::{
-  shared::{Config, IMetadata, IPlatform},
-  ERR, INFO,
-};
-
-#[derive(Serialize, Deserialize)]
-struct ServerUserResp {
-  pub linked_acc: Vec<String>,
-}
-
-pub fn inquire<'a>() -> (String, Config<'a>) {
-  INFO.println(&"Generating a random Application ID");
-  let Ok(app_id) = Text::new("Application ID:")
-    .with_default(&gen_appid())
-    .prompt()
-  else {
-    ERR.println(&"Must Enter an ID");
-    process::exit(1);
-  };
-
-  let Ok(app_name) = Text::new("Start menu entry name:")
-    .with_default("Application")
-    .prompt()
-  else {
-    ERR.println(&"Must Enter a name");
-    process::exit(1);
-  };
-
-  let Ok(display_name) = Text::new("Application Display Name:")
-    .with_default("My Cool App")
-    .prompt()
-  else {
-    ERR.println(&"Must Enter a name");
-    process::exit(1);
-  };
-
-  let Ok(user_id) = Text::new("Your AHQ Store Author ID:").prompt() else {
-    ERR.println(&"Must Enter an ID");
-    process::exit(1);
-  };
-
-  let Ok(desc) = Editor::new("Enter your app description").prompt() else {
-    ERR.println(&"Must Enter a description");
-    process::exit(1);
-  };
-
-  let Ok(repo) = Text::new("Enter your app repository:")
-    .with_default("owner/repoName")
-    .with_validator(|string: &str| {
-      if string.split("/").collect::<Vec<_>>().len() == 2 {
-        Ok(Validation::Valid)
-      } else {
-        Ok(Validation::Invalid(ErrorMessage::Custom(
-          "Must be in the format owner/repoName".into(),
-        )))
-      }
-    })
-    .prompt()
-  else {
-    ERR.println(&"Must Enter a repository");
-    process::exit(1);
-  };
-
-  let [owner, repo] = repo.split("/").collect::<Vec<_>>()[..] else {
-    panic!("Repo Parsing Failed")
-  };
-
-  INFO.println(&"Validating author id & repo");
-
-//   let val: Option<()> = (|| {
-//     let data: ServerUserResp = CLIENT
-//       .get(format!(
-//         "https://ahqstore-server.onrender.com/users/{}",
-//         &user_id
-//       ))
-//       .send()
-//       .ok()?
-//       .json()
-//       .ok()?;
-
-//     if data.linked_acc.contains(&owner.into()) {
-//       return Some(());
-//     }
-//     None
-//   })();
-
-//   if let None = val {
-//     ERR.println(
-//       &r#"Could not validate author id with github username. It may be because:
-// - The account id provided is not valid
-// - The account id has developer mode disabled
-// - The GitHub repo owner doesn't seem to be in the list of linked_accounts
-// - The GitHub repo is invalid"#,
-//     );
-//     process::exit(1);
-//   }
-
-  (
-    app_id.clone(),
-    IMetadata::new(
-      app_id,
-      app_name,
-      display_name,
-      user_id,
-      desc,
-      AppRepo {
-        author: owner.into(),
-        repo: repo.into(),
-      },
-      IPlatform::new()
-    ),
-  )
-}
-
-fn gen_appid() -> String {
-  let mut string = String::new();
-
-  use rand::seq::SliceRandom;
-
-  let val = vec![
-    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
-    "t", "u", "v", "w", "s", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
-    "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "S", "Y", "Z", "0", "1", "2", "3", "4",
-    "5", "6", "7", "8", "9"
-  ];
-
-  for _ in 0..40 {
-    let val = val.choose(&mut rand::thread_rng()).unwrap();
-    string.push_str(val);
-  }
-
-  string
-}
+use std::process;
+
+use ahqstore_types::AppRepo;
+use inquire::{
+  validator::{ErrorMessage, Validation},
+  Editor, Text,
+};
+use serde::{Deserialize, Serialize};
+
+use crate::app::{
+  shared::{Config, IMetadata, IPlatform},
+  ERR, INFO,
+};
+
+#[derive(Serialize, Deserialize)]
+struct ServerUserResp {
+  pub linked_acc: Vec<String>,
+}
+
+pub fn inquire<'a>() -> (String, Config<'a>) {
+  INFO.println(&"Generating a random Application ID");
+  let Ok(app_id) = Text::new("Application ID:")
+    .with_default(&gen_appid())
+    .prompt()
+  else {
+    ERR.println(&"Must Enter an ID");
+    process::exit(1);
+  };
+
+  let Ok(app_name) = Text::new("Start menu entry name:")
+    .with_default("Application")
+    .prompt()
+  else {
+    ERR.println(&"Must Enter a name");
+    process::exit(1);
+  };
+
+  let Ok(display_name) = Text::new("Application Display Name:")
+    .with_default("My Cool App")
+    .prompt()
+  else {
+    ERR.println(&"Must Enter a name");
+    process::exit(1);
+  };
+
+  let Ok(user_id) = Text::new("Your AHQ Store Author ID:").prompt() else {
+    ERR.println(&"Must Enter an ID");
+    process::exit(1);
+  };
+
+  let Ok(desc) = Editor::new("Enter your app description").prompt() else {
+    ERR.println(&"Must Enter a description");
+    process::exit(1);
+  };
+
+  let Ok(repo) = Text::new("Enter your app repository:")
+    .with_default("owner/repoName")
+    .with_validator(|string: &str| {
+      if string.split("/").collect::<Vec<_>>().len() == 2 {
+        Ok(Validation::Valid)
+      } else {
+        Ok(Validation::Invalid(ErrorMessage::Custom(
+          "Must be in the format owner/repoName".into(),
+        )))
+      }
+    })
+    .prompt()
+  else {
+    ERR.println(&"Must Enter a repository");
+    process::exit(1);
+  };
+
+  let [owner, repo] = repo.split("/").collect::<Vec<_>>()[..] else {
+    panic!("Repo Parsing Failed")
+  };
+
+  INFO.println(&"Validating author id & repo");
+  
+  (
+    app_id.clone(),
+    IMetadata::new(
+      app_id,
+      app_name,
+      display_name,
+      user_id,
+      desc,
+      AppRepo {
+        author: owner.into(),
+        repo: repo.into(),
+      },
+      IPlatform::new()
+    ),
+  )
+}
+
+fn gen_appid() -> String {
+  let mut string = String::new();
+
+  use rand::seq::SliceRandom;
+
+  let val = vec![
+    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
+    "t", "u", "v", "w", "s", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
+    "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "S", "Y", "Z", "0", "1", "2", "3", "4",
+    "5", "6", "7", "8", "9"
+  ];
+
+  for _ in 0..40 {
+    let val = val.choose(&mut rand::thread_rng()).unwrap();
+    string.push_str(val);
+  }
+
+  string
+}

package/src/app/create/mod.rs

@@ -1,80 +1,74 @@
-mod inquire;
-use std::{fs, process};
-
-use inquire::*;
-use serde_json::to_string_pretty;
-
-use super::{ERR, INFO, WARN};
-
-pub fn create(force: bool) {
-  let (id, config) = inquire();
-
-  create_dir(force);
-
-  let succ = (|| {
-    let config_file = to_string_pretty(&config).ok()?;
-    fs::write("./.ahqstore/config.json", config_file).ok()?;
-
-    let base_img = format!("./.ahqstore/images/{}", &id);
-
-    fs::create_dir_all(&base_img).ok()?;
-
-    let icon = include_bytes!("./icon.png");
-    fs::write(format!("{}/icon.png", &base_img), icon).ok()?;
-
-    let readme = include_str!("./readme.md");
-    fs::write("./.ahqstore/README.md", readme).ok()?;
-
-    let readme = include_str!("./readme.es.md");
-    fs::write("./.ahqstore/README.es.md", readme).ok()?;
-
-    let readme = include_str!("./readme.hi.md");
-    fs::write("./.ahqstore/README.hi.md", readme).ok()
-  })()
-  .is_some();
-
-  if !succ {
-    ERR.println(&"Failed to populate .ahqstore");
-    process::exit(1);
-  } else {
-    println!("🇩​​​​​🇴​​​​​🇳​​​​​🇪​​​​​");
-    println!(
-      r#"████████████████████████████████████████████████████████████████▀█
-█─█─██▀▄─██▄─▄▄─█▄─▄▄─█▄─█─▄███─▄▄▄─█─▄▄─█▄─▄▄▀█▄─▄█▄─▀█▄─▄█─▄▄▄▄█
-█─▄─██─▀─███─▄▄▄██─▄▄▄██▄─▄████─███▀█─██─██─██─██─███─█▄▀─██─██▄─█
-▀▄▀▄▀▄▄▀▄▄▀▄▄▄▀▀▀▄▄▄▀▀▀▀▄▄▄▀▀▀▀▄▄▄▄▄▀▄▄▄▄▀▄▄▄▄▀▀▄▄▄▀▄▄▄▀▀▄▄▀▄▄▄▄▄▀
-"#
-    );
-    INFO.println(&"Do not forget to edit config.json and finder.json\nMore details about all the files is present in README.md");
-  }
-}
-
-pub fn create_dir(force: bool) {
-  if let Err(_) = fs::create_dir("./.ahqstore") {
-    if force {
-      WARN.println(&"--force detected\nRemoving dir .ahqstore");
-
-      let succ = (|| {
-        fs::remove_dir_all("./.ahqstore").ok()?;
-        fs::create_dir_all("./.ahqstore").ok()?;
-
-        Some(())
-      })()
-      .is_some();
-
-      if succ {
-        INFO.println(&".ahqstore directory created, initializing data...");
-      } else {
-        ERR.println(&"Failed to create .ahqstore directory");
-        process::exit(1);
-      }
-    } else {
-      ERR.println(
-        &"Failed to create .ahqstore directory\nHint: Use --force option to ignore this error",
-      );
-      process::exit(1);
-    }
-  } else {
-    INFO.println(&"Created .ahqstore directory, initializing data...");
-  }
+mod inquire;
+use std::{fs, process};
+
+use inquire::*;
+use serde_json::to_string_pretty;
+
+use super::{ERR, INFO, WARN};
+
+pub fn create(force: bool) {
+  let (id, config) = inquire();
+
+  create_dir(force);
+
+  let succ = (|| {
+    let config_file = to_string_pretty(&config).ok()?;
+    fs::write("./.ahqstore/config.json", config_file).ok()?;
+
+    let base_img = format!("./.ahqstore/images/{}", &id);
+
+    fs::create_dir_all(&base_img).ok()?;
+
+    let icon = include_bytes!("./icon.png");
+    fs::write(format!("{}/icon.png", &base_img), icon).ok()?;
+
+    let readme = include_str!("./readme.md");
+    fs::write("./.ahqstore/README.md", readme).ok()
+  })()
+  .is_some();
+
+  if !succ {
+    ERR.println(&"Failed to populate .ahqstore");
+    process::exit(1);
+  } else {
+    println!("🇩​​​​​🇴​​​​​🇳​​​​​🇪​​​​​");
+    println!(
+      r#"████████████████████████████████████████████████████████████████▀█
+█─█─██▀▄─██▄─▄▄─█▄─▄▄─█▄─█─▄███─▄▄▄─█─▄▄─█▄─▄▄▀█▄─▄█▄─▀█▄─▄█─▄▄▄▄█
+█─▄─██─▀─███─▄▄▄██─▄▄▄██▄─▄████─███▀█─██─██─██─██─███─█▄▀─██─██▄─█
+▀▄▀▄▀▄▄▀▄▄▀▄▄▄▀▀▀▄▄▄▀▀▀▀▄▄▄▀▀▀▀▄▄▄▄▄▀▄▄▄▄▀▄▄▄▄▀▀▄▄▄▀▄▄▄▀▀▄▄▀▄▄▄▄▄▀
+"#
+    );
+    INFO.println(&"Do not forget to edit config.json and finder.json\nMore details about all the files is present in README.md");
+  }
+}
+
+pub fn create_dir(force: bool) {
+  if let Err(_) = fs::create_dir("./.ahqstore") {
+    if force {
+      WARN.println(&"--force detected\nRemoving dir .ahqstore");
+
+      let succ = (|| {
+        fs::remove_dir_all("./.ahqstore").ok()?;
+        fs::create_dir_all("./.ahqstore").ok()?;
+
+        Some(())
+      })()
+      .is_some();
+
+      if succ {
+        INFO.println(&".ahqstore directory created, initializing data...");
+      } else {
+        ERR.println(&"Failed to create .ahqstore directory");
+        process::exit(1);
+      }
+    } else {
+      ERR.println(
+        &"Failed to create .ahqstore directory\nHint: Use --force option to ignore this error",
+      );
+      process::exit(1);
+    }
+  } else {
+    INFO.println(&"Created .ahqstore directory, initializing data...");
+  }
 }

package/src/app/create/readme.md

@@ -1,80 +1,13 @@
-# AHQ Store Cli
-
-Do edit the config.json
-
-The schema has been shown below
-
-## config.json
-
-```ts
-type Platform =
-  // Windows Platforms + Updater & Uninstaller Support
-  | "WindowsZip"
-  | "WindowsInstallerMsi"
-
-  // Not Implemented
-  | "WindowsInstallerExe"
-  | "WindowsUWPMsix"
-
-  // Linux Platform + Updater & Uninstaller Support
-  | "LinuxAppImage"
-
-  // Android (Under Development)
-  | "AndroidLinuxZip";
-
-interface ConfigJSON {
-  [key: string]: {
-    appId: string; //application id provided by AHQ Store DEVS
-    appInstalledName: string; //App Start Menu Entry + Desktop Shortcut Name
-    appDisplayName: string; //App display name
-    authorId: string; //Your User ID
-    shortDesc: string; //Short Description (max 48words)
-    description: string; //MultiLine App Description
-    repo: {
-      author: string; //Your GitHub username
-      repo: string; //Repo URL
-    };
-    finder: {
-      [platform: ""]: {
-        startsWith?: string; // The Bundled app should startWith?
-        contains?: string; // The Bundled app should include?
-        endsWith?: string; // The Bundled app should endWith?
-      };
-    };
-    platform: {
-      // Must be "WindowsZip"| "WindowsInstallerMsi" |"WindowsInstallerExe" | "WindowsUWPMsix"
-      winAmd64Platform?: Platform; // What type of binary does your app provide to AHQ Store
-      winArm64Platform?: Platform; // <-- Same as winAmd64Platform -->
-
-      linuxAmd64Platform?: Platform; // Must be LinuxAppImage
-      linuxArm64Platform?: Platform; // Must be LinuxAppImage
-      linuxArm64Platform?: Platform; // Must be LinuxAppImage
-      linuxArm32Platform?: Platform; // Must be LinuxAppImage
-
-      androidUniversalPlatform?: Platform; // Must be AndroidApkZip
-
-      winAmd64Options?: {
-        zip_file_exec?: string; // Exe to Link via our installer (WindowsZIP)
-        exe_installer_args?: string[]; // Args to run to your custom installer (WindowsInstallerExe)
-      };
-
-      winArm64Options?: {
-        zip_file_exec?: string; // Exe to Link via our installer (WindowsZIP)
-        exe_installer_args?: string[]; // Args to run to your custom installer (WindowsInstallerExe)
-      };
-    };
-    site?: string; // Your app's website
-    source?: string; // Your app's website (that contains source code)
-    redistributed?: string; // You just **cannot** set this
-    license_or_tos?: string; // Name of License or site of TOS
-  };
-}
-```
-
-## images/<app-id>/icon.png
-
-Your application icon that'll be bundled in the app metadata file
-
-## images/<app-id>/\*
-
-Place any image(s) [upto 10] that will be placed in the app modal in AHQ Store
+# AHQ Store Cli
+
+## config.json
+
+Follows the schema as presented [here](https://docs.rs/ahqstore_cli_rs/latest/ahqstore_cli_rs/shared/struct.IMetadata.html)
+
+## images/<app-id>/icon.png
+
+Your application icon that'll be bundled in the app metadata file
+
+## images/<app-id>/\*
+
+Place any image(s) [upto 10] that will be placed in the app modal in AHQ Store

package/src/app/help.rs

@@ -1,77 +1,77 @@
-use chalk_rs::Chalk;
-
-pub fn main_help() -> String {
-  let mut chalk = Chalk::new();
-
-  let cli = chalk.blue().bold().string(&"AHQ Store CLI");
-
-  let usage = chalk.green().bold().string(&"Usage:");
-
-  let cmds = chalk.green().bold().string(&"Commands:");
-  let help = chalk.cyan().bold().string(&"help");
-  let create = chalk.cyan().bold().string(&"create");
-  let build = chalk.cyan().bold().string(&"build");
-  let upload = chalk.cyan().bold().string(&"build");
-
-  let opt = chalk.yellow().bold().string(&"Options:");
-  let force = chalk.cyan().bold().string(&"--force, -f");
-
-  let env = chalk.yellow().bold().string(&"Required ENV:");
-  let app_id = chalk.cyan().bold().string(&"APP_ID");
-  let gh_token = chalk.cyan().bold().string(&"GH_TOKEN");
-  let gh_repo = chalk.cyan().bold().string(&"GITHUB_REPOSITORY");
-  let gh_action = chalk.cyan().bold().string(&"GITHUB_ACTION");
-  let r_id = chalk.cyan().bold().string(&"RELEASE_ID");
-
-  let optional = chalk.yellow().bold().string(&"(Optional)");
-
-  format!(
-    r#"{cli}
-Ship your apps to the ahq store quickly and efficiently
-
-{usage}
-  ahqstore (command) [options]
-{cmds}
-  {help}
-    Shows the help menu
-  {create}
-    Generates AHQ Store config files required to ship your apps
-    {opt}
-      {force} Override Existing contents if .ahqstore dir isn't empty
-  {upload}
-    Build & Upload ahqstore config file
-    {env}
-    {app_id} {optional} Application Id (required if your config has more than 1 appIds)
-    {r_id} GitHub Release Id
-    {gh_token} GitHub Token
-    {gh_repo} GitHub owner & repo name, eg ahqstore/app
-                      (Equivalent to GITHUB_REPOSITORY variable in GitHub actions)
-    {gh_action} {optional} Set this env to anything to specify that it is running in an GitHub Action
-                      (Outputs AHQ_STORE_FILE_URL=<url>)
-  {build}
-    Build the ahqstore config file
-    {env}
-      {app_id} {optional} Application Id (required if your config has more than 1 appIds)
-      {r_id} GitHub Release Id
-      {gh_token} GitHub Token
-      {gh_repo} GitHub owner & repo name, eg ahqstore/app
-                        (Equivalent to GITHUB_REPOSITORY variable in GitHub actions)
-      {gh_action} {optional} Set this env to anything to specify that it is running in an GitHub Action
-                        (Outputs AHQ_STORE_FILE_URL=<url>)"#
-  )
-}
-
-pub fn not_found(name: &str) -> String {
-  let mut chalk = Chalk::new();
-
-  let cmd = chalk.red().bold().string(&"Command not found:");
-  let tip = chalk.green().bold().string(&"Tip:");
-  let astore = chalk.cyan().bold().string(&"ahqstore");
-
-  format!(
-    r#"{cmd} {name}
-
-{tip}
-  Write {astore} to view the help menu"#
-  )
-}
+use chalk_rs::Chalk;
+
+pub fn main_help() -> String {
+  let mut chalk = Chalk::new();
+
+  let cli = chalk.blue().bold().string(&"AHQ Store CLI");
+
+  let usage = chalk.green().bold().string(&"Usage:");
+
+  let cmds = chalk.green().bold().string(&"Commands:");
+  let help = chalk.cyan().bold().string(&"help");
+  let create = chalk.cyan().bold().string(&"create");
+  let build = chalk.cyan().bold().string(&"build");
+  let upload = chalk.cyan().bold().string(&"build");
+
+  let opt = chalk.yellow().bold().string(&"Options:");
+  let force = chalk.cyan().bold().string(&"--force, -f");
+
+  let env = chalk.yellow().bold().string(&"Required ENV:");
+  let app_id = chalk.cyan().bold().string(&"APP_ID");
+  let gh_token = chalk.cyan().bold().string(&"GH_TOKEN");
+  let gh_repo = chalk.cyan().bold().string(&"GITHUB_REPOSITORY");
+  let gh_action = chalk.cyan().bold().string(&"GITHUB_ACTION");
+  let r_id = chalk.cyan().bold().string(&"RELEASE_ID");
+
+  let optional = chalk.yellow().bold().string(&"(Optional)");
+
+  format!(
+    r#"{cli}
+Ship your apps to the ahq store quickly and efficiently
+
+{usage}
+  ahqstore (command) [options]
+{cmds}
+  {help}
+    Shows the help menu
+  {create}
+    Generates AHQ Store config files required to ship your apps
+    {opt}
+      {force} Override Existing contents if .ahqstore dir isn't empty
+  {upload}
+    Build & Upload ahqstore config file
+    {env}
+    {app_id} {optional} Application Id (required if your config has more than 1 appIds)
+    {r_id} GitHub Release Id
+    {gh_token} GitHub Token
+    {gh_repo} GitHub owner & repo name, eg ahqstore/app
+                      (Equivalent to GITHUB_REPOSITORY variable in GitHub actions)
+    {gh_action} {optional} Set this env to anything to specify that it is running in an GitHub Action
+                      (Outputs AHQ_STORE_FILE_URL=<url>)
+  {build}
+    Build the ahqstore config file
+    {env}
+      {app_id} {optional} Application Id (required if your config has more than 1 appIds)
+      {r_id} GitHub Release Id
+      {gh_token} GitHub Token
+      {gh_repo} GitHub owner & repo name, eg ahqstore/app
+                        (Equivalent to GITHUB_REPOSITORY variable in GitHub actions)
+      {gh_action} {optional} Set this env to anything to specify that it is running in an GitHub Action
+                        (Outputs AHQ_STORE_FILE_URL=<url>)"#
+  )
+}
+
+pub fn not_found(name: &str) -> String {
+  let mut chalk = Chalk::new();
+
+  let cmd = chalk.red().bold().string(&"Command not found:");
+  let tip = chalk.green().bold().string(&"Tip:");
+  let astore = chalk.cyan().bold().string(&"ahqstore");
+
+  format!(
+    r#"{cmd} {name}
+
+{tip}
+  Write {astore} to view the help menu"#
+  )
+}