bugfix: generate autocompletions without the need of shuru.toml file …

…to be present

src/completions/bash.sh

@@ -1,17 +1,17 @@
-# Bash completion for shuru
 _shuru() {
-  local cur prev words cword
-  _init_completion -n : || return
+    local cur prev words cword
+    _init_completion -n : || return
 
-  case "$prev" in
-    -h|--help)
-      COMPREPLY=( $( compgen -W "$(shuru --help)" -- "$cur" ) )
-      return 0
-    ;;
-  esac
+    local options="-h --help -V --version --completions --list-commands"
+
+    if [[ "$prev" == -* ]]; then
+        COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
+        return 0
+    fi
 
-  local tasks=$(shuru --list-commands)
-  COMPREPLY=( $( compgen -W "${tasks}" -- "$cur" ) )
+    local tasks
+    tasks=$(shuru --list-commands)
+    COMPREPLY=( $( compgen -W "$tasks" -- "$cur" ) )
 }
 
 complete -F _shuru shuru

src/completions/shuru.fish

@@ -3,11 +3,9 @@ function __fish_shuru_list_commands
 end
 
 function __fish_shuru_complete
-    if test (commandline -t) = "-h" -o (commandline -t) = "--help"
-        shuru --help
-        return 0
-    end
+    set -l options "-h" "--help" "-V" "--version" "--completions" "--list-commands"
 
+    echo $options
     __fish_shuru_list_commands
 end
 

src/completions/zsh.sh

@@ -4,6 +4,20 @@ _shuru() {
     local commands
     commands=($(shuru --list-commands))
 
+    local completions_options
+    completions_options=(bash zsh fish)
+
+    local -a options
+    options=(
+        '--completions[The shell to generate completions for]: :($(printf "%s\n" "${completions_options[@]}"))'
+        '--list-commands[Show available commands]'
+        '-h[Print help]'
+        '--help[Print help]'
+        '-V[Print version]'
+        '--version[Print version]'
+    )
+
+    _arguments -s $options
     _describe -t commands 'shuru commands' commands "$@"
 }
 

src/main.rs

@@ -39,14 +39,6 @@ fn load_config() -> Result<Config, Error> {
 
 fn run() -> Result<std::process::ExitStatus, Error> {
     let cli = Cli::parse();
-    let config = load_config()?;
-
-    if cli.list_commands {
-        for task in &config.tasks {
-            println!("{}", task.name);
-        }
-        std::process::exit(0);
-    }
 
     if let Some(shell) = cli.completions {
         let completion_script = match shell {
@@ -58,6 +50,15 @@ fn run() -> Result<std::process::ExitStatus, Error> {
         std::process::exit(0);
     }
 
+    let config = load_config()?;
+
+    if cli.list_commands {
+        for task in &config.tasks {
+            println!("{}", task.name);
+        }
+        std::process::exit(0);
+    }
+
     let runner = CommandRunner::new(config);
 
     match cli.command {