Merge pull request #64 from volllly/fix/windows-shell-command

Fix the default windows shell command

Author: volllly

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.1] - 2022-08-18
+
+### Changed
+
+- The repo level config file now uses the key `global` instead of `default`
+- The default `shell_command` on windows now correctly uses PowerShell instead of PowerShell Core.
+
+### Fixed
+
+- The repo level config file can now override config default values
+
 ## [0.6.0] - 2022-07-29
 
 ### Added
@@ -117,7 +128,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Dotfile linking
 - Error handling
 
-[Unreleased]: https://github.com/volllly/rotz/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/volllly/rotz/compare/v0.6.1...HEAD
+[0.6.1]: https://github.com/volllly/rotz/releases/tag/v0.6.1
 [0.6.0]: https://github.com/volllly/rotz/releases/tag/v0.6.0
 [0.5.0]: https://github.com/volllly/rotz/releases/tag/v0.5.0
 [0.4.1]: https://github.com/volllly/rotz/releases/tag/v0.4.1

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rotz"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 authors = ["Paul Volavsek <paul.volavsek@gmail.com>"]
 license = "MIT"

Cargo.toml

@@ -21,7 +21,7 @@ This settig allows to specify how Rotz should launch the install command.
 If this is not set the default values are used.
 
 ```yaml title="Windows"
-shell_command: pwsh -NoProfile -C {{ quote "" cmd }}
+shell_command: powershell -NoProfile -C {{ quote "" cmd }}
 ```
 
 ```yaml title="Linux"
@@ -49,7 +49,7 @@ variables:
 It is possible to put a config file in your repo conatining default values depending on the OS. These are overridden by the config file on the machine.
 
 ```yaml title=".dotfiles/config.yaml"
-default:
+global:
   link_type: <globalDefault>
 
 windows:

docs/docs/configuration/config.yaml.md

@@ -15,17 +15,17 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-rc.1",
-    "@docusaurus/preset-classic": "2.0.0-rc.1",
-    "@easyops-cn/docusaurus-search-local": "0.30.2",
+    "@docusaurus/core": "2.0.1",
+    "@docusaurus/preset-classic": "2.0.1",
+    "@easyops-cn/docusaurus-search-local": "0.31.0",
     "@mdx-js/react": "1.6.22",
     "clsx": "1.2.1",
     "prism-react-renderer": "1.3.5",
     "react": "17.0.2",
     "react-dom": "17.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-rc.1",
+    "@docusaurus/module-type-aliases": "2.0.1",
     "@tsconfig/docusaurus": "1.0.6",
     "typescript": "4.7.4"
   },
@@ -41,4 +41,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

docs/package-lock.json

@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 
 use crossterm::style::{Attribute, Stylize};
 use indexmap::IndexSet;
-use miette::{Diagnostic, Result};
+use miette::{Diagnostic, Report, Result};
 use serde_json::json;
 use somok::Somok;
 
@@ -100,8 +100,18 @@ impl Install {
       println!("{}{}{}\n", Attribute::Italic, inner_cmd, Attribute::Reset);
 
       if let Err(err) = helpers::run_command(&cmd[0], &cmd[1..], false, globals.dry_run) {
+        if let helpers::RunError::Spawn(err) = &err {
+          if let std::io::ErrorKind::NotFound = err.kind() {
+            println!("kek");
+          }
+        }
+
+        let error = Error::InstallExecute(entry.0.to_string(), err);
+
         if !install_command.continue_on_error {
-          return Error::InstallExecute(entry.0.to_string(), err).error();
+          return error.error();
+        } else {
+          eprintln!("\n Error: {:?}", Report::new(error));
         }
       }
 

docs/package.json

@@ -17,7 +17,7 @@ use somok::Somok;
 use crate::USER_DIRS;
 
 #[derive(Debug, ArgEnum, Clone, Display, Deserialize, Serialize, IsVariant)]
-#[cfg_attr(test, derive(Dummy, PartialEq))]
+#[cfg_attr(test, derive(Dummy, PartialEq, Eq))]
 pub enum LinkType {
   /// Uses symbolic links for linking
   Symbolic,
@@ -42,7 +42,7 @@ impl Dummy<ValueFaker> for HashMap<String, serde_json::Value> {
 }
 
 #[derive(Deserialize, Serialize, Debug)]
-#[cfg_attr(test, derive(Dummy, PartialEq))]
+#[cfg_attr(test, derive(Dummy, PartialEq, Eq))]
 pub struct Config {
   /// Path to the local dotfiles
   pub(crate) dotfiles: PathBuf,
@@ -66,7 +66,7 @@ impl Default for Config {
       dotfiles: USER_DIRS.home_dir().join(".dotfiles"),
       link_type: LinkType::Symbolic,
       #[cfg(windows)]
-      shell_command: Some("pwsh -NoProfile -C {{ quote \"\" cmd }}".to_string()),
+      shell_command: Some("powershell -NoProfile -C {{ quote \"\" cmd }}".to_string()),
       #[cfg(all(not(target_os = "macos"), unix))]
       shell_command: Some("bash -c {{ quote \"\" cmd }}".to_string()),
       #[cfg(target_os = "macos")]

src/commands/install.rs

@@ -55,7 +55,7 @@ pub(crate) mod os {
 
 #[derive(thiserror::Error, Diagnostic, Debug)]
 pub(crate) enum RunError {
-  #[error("Cloud not spawn command")]
+  #[error("Could not spawn command")]
   #[diagnostic(code(process::command::spawn))]
   Spawn(#[source] io::Error),
 

src/config.rs

@@ -91,8 +91,13 @@ fn main() -> Result<(), miette::Report> {
     iter.next();
     config.dotfiles = USER_DIRS.home_dir().iter().chain(iter).collect();
   }
-  config = join_repo_config(&config.dotfiles.join(format!("config.{FILE_EXTENSION}")), config_figment)?
-    .select(os::OS.to_string().to_ascii_lowercase())
+
+  config_figment = join_repo_config(&config.dotfiles.join(format!("config.{FILE_EXTENSION}")), config_figment)?;
+
+  config = config_figment
+    .clone()
+    .select("global")
+    .merge(config_figment.select(os::OS.to_string().to_ascii_lowercase()))
     .extract()
     .map_err(Error::ParsingConfig)?;