@repokit/core 1.1.0 → 1.2.0

package/{install.sh → installation/install.sh}

@@ -6,7 +6,7 @@ REPO_ROOT=$(git rev-parse --show-toplevel)
 cd $REPO_ROOT
 
 command_exists() {
-    command -v "$1"
+    command -v "$1" > /dev/null 2>&1
 }
 
 if command_exists rustc && command_exists cargo; then

package/internals/configuration/configuration.rs

@@ -12,7 +12,8 @@ impl Configuration {
             return;
         }
         Configuration::welcome();
-        let template_path = InternalFileSystem::resolve_template("configuration_template.ts");
+        let template_path =
+            InternalFileSystem::new(root).resolve_template("configuration_template.ts");
         let mut source = File::open(template_path).expect("Template");
         let mut target = File::create(path_buf).expect("creating");
         io::copy(&mut source, &mut target).expect("writing");

package/internals/external_commands/external_commands.rs

@@ -64,7 +64,7 @@ impl ExternalCommands {
             }
         }
         pool.pool.shutdown_background();
-        TypescriptCommand::new(self.root.clone()).parse_commands(paths)
+        TypescriptCommand::new(&self.root).parse_commands(paths)
     }
 
     fn read(path: &Path) -> bool {

package/internals/internal_commands/register_command.rs

@@ -93,7 +93,8 @@ impl InternalExecutable for RegisterCommand {
     fn run(&self, args: Vec<String>, _: &HashMap<String, Box<dyn InternalExecutable>>) {
         Logger::info("Registering a new command");
         let command_path = self.validate_path(args);
-        let template_path = InternalFileSystem::resolve_template("command_template.ts");
+        let template_path =
+            InternalFileSystem::new(&self.root).resolve_template("command_template.ts");
         let mut source = File::open(template_path).expect("Template");
         let mut target = File::create(&command_path).expect("creating");
         io::copy(&mut source, &mut target).expect("writing");

package/internals/internal_commands/typescript_command.rs

@@ -14,12 +14,15 @@ pub struct TypescriptCommand {
 }
 
 impl TypescriptCommand {
-    pub fn new(root: String) -> TypescriptCommand {
-        TypescriptCommand { root }
+    pub fn new(root: &str) -> TypescriptCommand {
+        TypescriptCommand {
+            root: root.to_string(),
+        }
     }
 
     pub fn parse_configuration(&self) -> RepoKitConfig {
-        let executable = InternalFileSystem::resolve_command("parse_configuration.ts");
+        let executable =
+            InternalFileSystem::new(&self.root).resolve_command("parse_configuration.ts");
         let stdout = self.execute(format!("{executable} --root {}", &self.root).as_str());
         if stdout.is_empty() {
             Configuration::create(&self.root);
@@ -31,7 +34,7 @@ impl TypescriptCommand {
 
     pub fn parse_commands(&self, path_list: Vec<String>) -> Vec<RepoKitCommand> {
         let paths = path_list.join(",");
-        let executable = InternalFileSystem::resolve_command("parse_commands.ts");
+        let executable = InternalFileSystem::new(&self.root).resolve_command("parse_commands.ts");
         let stdout =
             self.execute(format!("{executable} --paths {paths} --root {}", self.root).as_str());
         let commands: Vec<RepoKitCommand> = serde_json::from_str(&stdout).expect("parse");

package/internals/internal_filesystem/internal_filesystem.rs

@@ -1,36 +1,47 @@
 use normalize_path::NormalizePath;
 use std::path::{Path, PathBuf};
 
-pub struct InternalFileSystem;
+pub struct InternalFileSystem {
+    root: String,
+}
 
 impl InternalFileSystem {
-    pub fn absolute(segment: &str) -> PathBuf {
-        let origin = env!("CARGO_MANIFEST_DIR");
-        let path = Path::new(origin);
+    pub fn new(root: &str) -> InternalFileSystem {
+        InternalFileSystem {
+            root: root.to_string(),
+        }
+    }
+
+    pub fn absolute(&self, segment: &str) -> PathBuf {
+        let path = Path::new(&self.root);
         path.join(segment).normalize()
     }
 
-    pub fn resolve_command(file_name: &str) -> String {
-        InternalFileSystem::path_buf_to_str(
-            InternalFileSystem::commands_directory().join(file_name),
-        )
+    pub fn resolve_command(&self, file_name: &str) -> String {
+        self.path_buf_to_str(self.commands_directory().join(file_name))
+    }
+
+    pub fn resolve_template(&self, file_name: &str) -> String {
+        self.path_buf_to_str(self.templates_directory().join(file_name))
+    }
+
+    fn commands_directory(&self) -> PathBuf {
+        self.absolute(format!("{}/commands", self.package_directory()).as_str())
     }
 
-    pub fn resolve_template(file_name: &str) -> String {
-        InternalFileSystem::path_buf_to_str(
-            InternalFileSystem::templates_directory().join(file_name),
-        )
+    fn templates_directory(&self) -> PathBuf {
+        self.absolute(format!("{}/templates", self.package_directory()).as_str())
     }
 
-    fn commands_directory() -> PathBuf {
-        InternalFileSystem::absolute("./externals/commands")
+    fn package_directory(&self) -> String {
+        format!("./node_modules/{}/externals", self.package_name())
     }
 
-    fn templates_directory() -> PathBuf {
-        InternalFileSystem::absolute("./externals/templates")
+    fn package_name(&self) -> String {
+        "@repokit/core".to_string()
     }
 
-    fn path_buf_to_str(buffer: PathBuf) -> String {
+    fn path_buf_to_str(&self, buffer: PathBuf) -> String {
         buffer
             .into_os_string()
             .into_string()

package/internals/main.rs

@@ -15,7 +15,7 @@ mod validations;
 
 fn main() {
     let root = Executor::exec("git rev-parse --show-toplevel", |cmd| cmd);
-    let config = TypescriptCommand::new(root.clone()).parse_configuration();
+    let config = TypescriptCommand::new(&root).parse_configuration();
     let kit = RepoKit::new(root, config);
     kit.invoke();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repokit/core",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A knowledgebase for your repository - wrapped in a CLI",
   "keywords": [
     "cli",
@@ -22,12 +22,14 @@
   "scripts": {
     "build:all": "yarn lint:ts && yarn lint:rust && yarn install:rust",
     "build:rust": "cargo build --release",
+    "grant:exec": "chmod -R +x ./installation",
     "install:rust": "yarn build:rust && cargo install --path .",
     "lint:rust": "cargo clippy --fix --allow-dirty",
     "lint:ts": "yarn oxlint --type-aware --type-check --report-unused-disable-directives --fix && yarn oxfmt",
-    "postinstall": "chmod +x ./install.sh && ./install.sh",
+    "postinstall": "yarn grant:exec && ./installation/install.sh",
     "repokit": "yarn install:repokit && repokit",
-    "run:dev": "cargo run --package repokit --bin repokit"
+    "run:dev": "yarn symlink && cargo run --package repokit --bin repokit",
+    "symlink": "yarn grant:exec && ./installation/symlink.sh"
   },
   "dependencies": {
     "@figliolia/event-emitter": "^1.1.6",