Merge pull request #16 from tj-actions/chore/update-test

Author: jackton1

.github/workflows/test.yml

@@ -108,5 +108,25 @@ jobs:
         uses: ./
         with:
           outputs: ${{ toJSON(steps.changed-files.outputs) }}
-          directory: test/output
-          keys: "added_files copied_files deleted_files modified_files"
+          keys: |
+            added_files
+            copied_files
+            deleted_files
+            modified_files
+            renamed_files
+            all_old_new_renamed_files
+            type_changed_files
+            unmerged_files
+            unknown_files
+            all_changed_and_modified_files
+            all_changed_files
+            any_changed
+            only_changed
+            other_changed_files
+            all_modified_files
+            any_modified
+            only_modified
+            other_modified_files
+            any_deleted
+            only_deleted
+            other_deleted_files

.gitignore

@@ -12,4 +12,6 @@ Cargo.lock
 **/*.rs.bk
 
 # JetBrains IDEs
-.idea/
+.idea/
+
+test/

action.yml

@@ -5,12 +5,12 @@ inputs:
   directory:
     description: "Directory to write to"
     required: true
-    default: "outputs"
+    default: ".github/outputs"
   outputs:
     description: "JSON string"
     required: true
   keys:
-    description: "List of Keys to read from the outputs. Example: foo,bar"
+    description: "List of Keys to read from the outputs."
     required: true
   extension:
     description: "File extension to use"

entrypoint.sh

@@ -2,20 +2,20 @@
 set -euo pipefail
 
 INPUT_OUTPUTS="$(echo "$INPUT_OUTPUTS" | jq -r @json)"
+INPUT_KEYS="$(echo "$INPUT_KEYS" |  tr '\n' ' ' | xargs)"
 
 if [[ -z "$INPUT_BIN_PATH" ]]; then
   ## TODO: use "curl -sf https://[github releases - latest]] | PREFIX=. sh"
   exit 1;
 fi
 
-echo "::debug::Generating output using $INPUT_BIN_PATH..."
+echo "Generating output using $INPUT_BIN_PATH..."
 
-$INPUT_BIN_PATH --keys="$INPUT_KEYS" --outputs="$INPUT_OUTPUTS" \
-  --directory="$INPUT_DIRECTORY" --extension="$INPUT_EXTENSION" && exit_status=$? || exit_status=$?
+$INPUT_BIN_PATH --keys="$INPUT_KEYS" --outputs="$INPUT_OUTPUTS" --directory="$INPUT_DIRECTORY" --extension="$INPUT_EXTENSION" && exit_status=$? || exit_status=$?
 
 rm -f "$INPUT_BIN_PATH"
 
 if [[ $exit_status -ne 0 ]]; then
   echo "::error::Error generating output files from JSON"
-  exit $exit_status;
+  exit 1;
 fi

src/main.rs

@@ -87,17 +87,27 @@ fn get_args_as_bool(pattern: &str) -> bool {
 fn parse_keys() -> Result<Vec<String>, String> {
     let keys: Vec<String> = get_args_as_vec(r"^(--keys|-k)=");
     // Split the keys by commas or spaces or newlines
-    let re: regex::Regex = regex::Regex::new(r"[,\s\\n]+").unwrap();
+    let re: regex::Regex = regex::Regex::new(r"[[:space:]]+").unwrap();
     let mut output: Vec<String> = Vec::new();
 
+    println!("Keys: {:?}", keys);
+
     if keys.is_empty() {
         Err("No keys provided, Please specify at least one key using --key=[KEY_NAME] or -k=[KEY_NAME].".to_string())
     } else {
         for key in keys {
-            if re.is_match(&key) {
-                output.extend(re.split(&key).map(|s| s.trim().to_string()));
-            } else if !key.is_empty() {
-                output.push(key.trim().to_string());
+            if !key.is_empty() {
+                output.extend(re.split(&key).filter_map(|s| {
+                    if s.is_empty() {
+                        None
+                    } else {
+                        Some(s.trim().to_string())
+                    }
+                }));
+
+                println!("Output: {:?}", output);
+            } else {
+                Err("Invalid key provided, Please specify at least one key using --key=[KEY_NAME] or -k=[KEY_NAME].".to_string())?;
             }
         }
         Ok(output)
@@ -207,6 +217,17 @@ fn options_valid() -> bool {
     true
 }
 
+// TODO: Switch to use https://rust-cli.github.io/book/tutorial/index.html
+// #[derive(Parser)]
+// struct Options {
+//     help: bool,
+//     version: bool,
+//     keys: Vec<String>,
+//     outputs: String,
+//     directory: String,
+//     extension: String,
+// }
+
 fn main() {
     if !options_valid() {
         std::process::exit(1);