Merge pull request #138 from opencultureconsulting/137-check-if-stdin-is-present-sometimes-fails

add sleepy retry to stdin-check

Author: felixlohmeier

README.md

@@ -12,11 +12,10 @@ Bash script to control OpenRefine via [its HTTP API](https://docs.openrefine.org
   * allows execution of arbitrary bash scripts
   * interactive mode for playing around and debugging
   * your existing OpenRefine data will not be touched
+* supports stdin, multiple files and URLs
 * import CSV, TSV, JSON, JSONL, ~~line-based TXT, fixed-width TXT or XML~~
-  * supports stdin, multiple files and URLs
 * transform data by providing an [undo/redo](https://docs.openrefine.org/manual/running#history-undoredo) JSON file
   * orcli calls specific endpoints for each operation to provide improved error handling and logging
-  * supports stdin, multiple files and URLs
 * export to CSV, TSV, JSONL, ~~HTML, XLS, XLSX, ODS~~
 * [templating export](https://docs.openrefine.org/manual/exporting#templating-exporter) to additional formats like JSON or XML
 

help/README.md

@@ -1,4 +1,4 @@
-# orcli 0.4.1
+# orcli 0.4.2
 
 ## command help screens
 

orcli

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# This script was generated by bashly 1.2.6 (https://bashly.dannyb.co)
+# This script was generated by bashly 1.2.13 (https://bashly.dev)
 # Modifying it manually is not recommended
 
 # :wrapper.bash3_bouncer
@@ -1340,15 +1340,6 @@ inspect_args() {
     echo args: none
   fi
 
-  if ((${#other_args[@]})); then
-    echo
-    echo other_args:
-    echo "- \${other_args[*]} = ${other_args[*]}"
-    for i in "${!other_args[@]}"; do
-      echo "- \${other_args[$i]} = ${other_args[$i]}"
-    done
-  fi
-
   if ((${#deps[@]})); then
     readarray -t sorted_keys < <(printf '%s\n' "${!deps[@]}" | sort)
     echo
@@ -1774,10 +1765,15 @@ orcli_import_csv_command() {
   # call init_import function to eval args and to set basic post data
   init_import
 
-  # check if stdin is present if selected
-  if [[ ${file} == '-' ]] && ! read -u 0 -t 0; then
-      orcli_import_csv_usage
-      exit 1
+  # exit if stdin is selected but not present
+  if [[ ${file} == '-' ]]; then
+      if ! read -u 0 -t 0; then
+          sleep 1
+          if ! read -u 0 -t 0; then
+              orcli_import_csv_usage
+              exit 1
+          fi
+      fi
   fi
 
   # assemble specific post data (some options require json format)
@@ -1867,10 +1863,15 @@ orcli_import_tsv_command() {
   # call init_import function to eval args and to set basic post data
   init_import
 
-  # check if stdin is present if selected
-  if [[ ${file} == '-' ]] && ! read -u 0 -t 0; then
-      orcli_import_tsv_usage
-      exit 1
+  # exit if stdin is selected but not present
+  if [[ ${file} == '-' ]]; then
+      if ! read -u 0 -t 0; then
+          sleep 1
+          if ! read -u 0 -t 0; then
+              orcli_import_tsv_usage
+              exit 1
+          fi
+      fi
   fi
 
   # assemble specific post data (some options require json format)
@@ -1960,10 +1961,15 @@ orcli_import_json_command() {
   # call init_import function to eval args and to set basic post data
   init_import
 
-  # check if stdin is present if selected
-  if [[ ${file} == '-' ]] && ! read -u 0 -t 0; then
-      orcli_import_json_usage
-      exit 1
+  # exit if stdin is selected but not present
+  if [[ ${file} == '-' ]]; then
+      if ! read -u 0 -t 0; then
+          sleep 1
+          if ! read -u 0 -t 0; then
+              orcli_import_json_usage
+              exit 1
+          fi
+      fi
   fi
 
   # assemble specific post data (some options require json format)
@@ -2020,10 +2026,15 @@ orcli_import_jsonl_command() {
   # call init_import function to eval args and to set basic post data
   init_import
 
-  # check if stdin is present if selected
-  if [[ ${file} == '-' ]] && ! read -u 0 -t 0; then
-      orcli_import_jsonl_usage
-      exit 1
+  # exit if stdin is selected but not present
+  if [[ ${file} == '-' ]]; then
+      if ! read -u 0 -t 0; then
+          sleep 1
+          if ! read -u 0 -t 0; then
+              orcli_import_jsonl_usage
+              exit 1
+          fi
+      fi
   fi
 
   # assemble specific post data (some options require json format)
@@ -2263,11 +2274,14 @@ orcli_transform_command() {
   # src/transform_command.sh
   # shellcheck shell=bash disable=SC2154 disable=SC2155
 
-  # check if stdin is present if selected
+  # exit if stdin is selected but not present
   if [[ ${args[file]} == '-' ]] || [[ ${args[file]} == '"-"' ]]; then
       if ! read -u 0 -t 0; then
-          orcli_transform_usage
-          exit 1
+          sleep 1
+          if ! read -u 0 -t 0; then
+              orcli_transform_usage
+              exit 1
+          fi
       fi
   fi
 
@@ -2297,7 +2311,7 @@ orcli_transform_command() {
       if [[ "${files[$i]}" == '-' ]] || [[ "${files[$i]}" == '"-"' ]]; then
           # exit if stdin is selected but not present
           if ! read -u 0 -t 0; then
-              orcli_transform_usage
+              orcli_run_usage
               exit 1
           fi
       else
@@ -2553,8 +2567,11 @@ orcli_export_template_command() {
   if [[ "${args[file]}" == '-' ]] || [[ "${args[file]}" == '"-"' ]]; then
       # exit if stdin is selected but not present
       if ! read -u 0 -t 0; then
-          orcli_export_template_usage
-          exit 1
+          sleep 1
+          if ! read -u 0 -t 0; then
+              orcli_export_template_usage
+              exit 1
+          fi
       fi
   else
       # exit if file does not exist
@@ -2601,8 +2618,11 @@ orcli_run_command() {
           # exit if stdin is selected but not present
           if ! [[ ${args[--interactive]} ]]; then
               if ! read -u 0 -t 0; then
-                  orcli_run_usage
-                  exit 1
+                  sleep 1
+                  if ! read -u 0 -t 0; then
+                      orcli_run_usage
+                      exit 1
+                  fi
               fi
           fi
       else
@@ -2661,13 +2681,16 @@ orcli_run_command() {
   export OPENREFINE_TMPDIR OPENREFINE_URL OPENREFINE_PID
   if [[ ${args[file]} == '-' || ${args[file]} == '"-"' ]]; then
       if ! read -u 0 -t 0; then
-          # case 1: interactive mode if stdin is selected but not present
-          bash --rcfile <(
-              cat ~/.bashrc
-              echo "alias orcli=${scriptpath}/orcli"
-              interactive
-          ) -i </dev/tty
-          exit
+          sleep 1
+          if ! read -u 0 -t 0; then
+              # case 1: interactive mode if stdin is selected but not present
+              bash --rcfile <(
+                  cat ~/.bashrc
+                  echo "alias orcli=${scriptpath}/orcli"
+                  interactive
+              ) -i </dev/tty
+              exit
+          fi
       fi
   fi
   if [[ ${args[--interactive]} ]]; then
@@ -2728,19 +2751,26 @@ parse_requirements() {
   env_var_names+=("OPENREFINE_URL")
 
   # :command.dependencies_filter
-  if command -v curl >/dev/null 2>&1; then
-    deps['curl']="$(command -v curl | head -n1)"
-  else
+  missing_deps=
+  # :dependency.filter
+  if ! command -v curl >/dev/null 2>&1; then
     printf "missing dependency: curl\n" >&2
-    printf "%s\n" "https://curl.se" >&2
-    exit 1
+    printf "%s\n\n" "https://curl.se" >&2
+    missing_deps=1
+  else
+    deps['curl']="$(command -v curl | head -n1)"
   fi
 
-  if command -v jq >/dev/null 2>&1; then
-    deps['jq']="$(command -v jq | head -n1)"
-  else
+  # :dependency.filter
+  if ! command -v jq >/dev/null 2>&1; then
     printf "missing dependency: jq\n" >&2
-    printf "%s\n" "https://github.com/stedolan/jq" >&2
+    printf "%s\n\n" "https://github.com/stedolan/jq" >&2
+    missing_deps=1
+  else
+    deps['jq']="$(command -v jq | head -n1)"
+  fi
+
+  if [[ -n $missing_deps ]]; then
     exit 1
   fi
 
@@ -2971,6 +3001,7 @@ orcli_delete_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli delete PROJECT [OPTIONS]\n" >&2
@@ -4016,6 +4047,7 @@ orcli_info_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli info PROJECT\n" >&2
@@ -4090,6 +4122,7 @@ orcli_search_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli search PROJECT [REGEX] [OPTIONS]\n" >&2
@@ -4233,6 +4266,7 @@ orcli_sort_columns_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli sort columns PROJECT [OPTIONS]\n" >&2
@@ -4347,6 +4381,7 @@ orcli_transform_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli transform PROJECT [FILE...] [OPTIONS]\n" >&2
@@ -4573,6 +4608,7 @@ orcli_export_jsonl_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli export jsonl PROJECT [OPTIONS]\n" >&2
@@ -4732,6 +4768,7 @@ orcli_export_csv_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli export csv PROJECT [OPTIONS]\n" >&2
@@ -4878,6 +4915,7 @@ orcli_export_tsv_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli export tsv PROJECT [OPTIONS]\n" >&2
@@ -5055,6 +5093,7 @@ orcli_export_template_parse_requirements() {
 
     esac
   done
+
   # :command.required_args_filter
   if [[ -z ${args['project']+x} ]]; then
     printf "missing required argument: PROJECT\nusage: orcli export template PROJECT [FILE] [OPTIONS]\n" >&2
@@ -5178,8 +5217,7 @@ orcli_run_parse_requirements() {
 
 # :command.initialize
 initialize() {
-  version="0.4.1"
-  long_usage=''
+  declare -g version="0.4.2"
   set -e
 
   # :command.environment_variables_default
@@ -5191,11 +5229,13 @@ initialize() {
 
 # :command.run
 run() {
+  # :command.globals
+  declare -g long_usage=''
   declare -g -A args=()
   declare -g -A deps=()
-  declare -g -a other_args=()
   declare -g -a env_var_names=()
   declare -g -a input=()
+
   normalize_input "$@"
   parse_requirements "${input[@]}"
 
@@ -5223,5 +5263,7 @@ run() {
   esac
 }
 
-initialize
-run "$@"
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+  initialize
+  run "$@"
+fi

src/bashly.yml

@@ -1,6 +1,6 @@
 name: orcli
 help: OpenRefine command-line interface written in Bash
-version: 0.4.1
+version: 0.4.2
 footer: https://github.com/opencultureconsulting/orcli
 
 dependencies:

src/export_template_command.sh

@@ -19,8 +19,11 @@ fi
 if [[ "${args[file]}" == '-' ]] || [[ "${args[file]}" == '"-"' ]]; then
     # exit if stdin is selected but not present
     if ! read -u 0 -t 0; then
-        orcli_export_template_usage
-        exit 1
+        sleep 1
+        if ! read -u 0 -t 0; then
+            orcli_export_template_usage
+            exit 1
+        fi
     fi
 else
     # exit if file does not exist

src/import_csv_command.sh

@@ -3,10 +3,15 @@
 # call init_import function to eval args and to set basic post data
 init_import
 
-# check if stdin is present if selected
-if [[ ${file} == '-' ]] && ! read -u 0 -t 0; then
-    orcli_import_csv_usage
-    exit 1
+# exit if stdin is selected but not present
+if [[ ${file} == '-' ]]; then
+    if ! read -u 0 -t 0; then
+        sleep 1
+        if ! read -u 0 -t 0; then
+            orcli_import_csv_usage
+            exit 1
+        fi
+    fi
 fi
 
 # assemble specific post data (some options require json format)