- Add support for clean multiline commands (auto-joined with &&)

Author: DannyBen

op

@@ -47,10 +47,14 @@ opcode_context() {
     fi
   }
 
+  abort() {
+    echo "$1" >&2
+    exit "${2:-1}"
+  }
+
   need_config() {
     if [[ ! -f $CONFIG_FILE ]]; then
-      echo "Cannot find config file ($CONFIG_FILE)"
-      exit 1
+      abort "Cannot find config file ($CONFIG_FILE)"
     fi
   }
 
@@ -63,28 +67,63 @@ opcode_context() {
       exit 1
     fi
 
-    exact="^${CODE}:[[:space:]]*(.+)$"
-    fuzzy="^${CODE}[^\:]*:[[:space:]]*(.+)$"
+    COMMAND=$(get_command_from_file "exact")
+    if [[ -z $COMMAND ]]; then
+      COMMAND=$(get_command_from_file "fuzzy")
+    fi
+  }
 
-    # shellcheck disable=SC2162
-    while IFS= read line || [ -n "$line" ]; do
-      if [[ $line =~ $exact ]]; then
-        COMMAND="${BASH_REMATCH[1]}"
-        break
-      fi
-    done <"$CONFIG_FILE"
+  get_command_from_file() {
+    local pattern
 
-    if [[ -n "$COMMAND" ]]; then
-      return
+    if [[ $1 == "fuzzy" ]]; then
+      pattern="^${CODE}[^:]*:[[:space:]]*(.*)$"
+    else
+      pattern="^${CODE}:[[:space:]]*(.*)$"
     fi
 
-    # shellcheck disable=SC2162
-    while IFS= read line || [ -n "$line" ]; do
-      if [[ $line =~ $fuzzy ]]; then
-        COMMAND="${BASH_REMATCH[1]}"
-        break
+    local command=""
+    local collect_command=false
+    local temp_line=""
+
+    while IFS= read -r line || [[ -n $line ]]; do
+      if [[ -n "$temp_line" ]]; then
+        trimmed_line=${line#"${line%%[![:space:]]*}"}
+        temp_line="${temp_line%\\}$trimmed_line"
+        if [[ "$line" =~ \\$ ]]; then
+          continue
+        else
+          line="$temp_line"
+          temp_line=""
+        fi
+      fi
+
+      if [[ "$line" =~ \\$ ]]; then
+        trimmed_line=${line#"${line%%[![:space:]]*}"}
+        temp_line="${temp_line%\\}$trimmed_line"
+        continue
+      fi
+
+      if $collect_command; then
+        if [[ -z "${line}" || ! "${line}" =~ ^[[:space:]]+ ]]; then
+          break
+        fi
+
+        trimmed_line="${line#"${line%%[![:space:]]*}"}"
+        command="${command:+$command && }$trimmed_line"
+      else
+        if [[ $line =~ $pattern ]]; then
+          command="${BASH_REMATCH[1]}"
+          if [[ -n $command ]]; then
+            break
+          fi
+
+          collect_command=true
+        fi
       fi
     done <"$CONFIG_FILE"
+
+    echo "$command"
   }
 
   run_command() {
@@ -97,8 +136,7 @@ opcode_context() {
         eval "$COMMAND" "$@"
       fi
     else
-      echo "Code not found: $CODE"
-      exit 1
+      abort "Code not found: $CODE"
     fi
   }
 
@@ -135,7 +173,7 @@ opcode_context() {
 
   list_codes() {
     need_config
-    regex="^([^#:]+):"
+    regex="^([a-zA-Z0-9_-]+):"
     break_regex="^[[:space:]]*private[[:space:]]*$"
 
     # shellcheck disable=SC2162
@@ -199,8 +237,7 @@ opcode_context() {
         # shellcheck disable=SC2086
         echo $COMMAND
       else
-        echo "Code not found: $CODE"
-        exit 1
+        abort "Code not found: $CODE"
       fi
 
     fi
@@ -270,7 +307,7 @@ opcode_context() {
   bold() { printf "\e[1m%b\e[0m\n" "$*"; }
 
   opcode_initialize() {
-    VERSION="0.6.5"
+    VERSION="0.7.0"
     LONG_USAGE=false
     set_config_file
     set -e

op.conf

@@ -1,16 +1,25 @@
-test: op approvals && op shellcheck && op shfmt
+test:
+  op approvals
+  op shellcheck
+  op shfmt
 #? Run all tests
 
 approvals: test/approve
 #? Run approval tests
 
-shellcheck: shellcheck op setup && green "PASS: shellcheck"
+shellcheck:
+  shellcheck op setup
+  green "PASS: shellcheck"
 #? Run approval tests
 
-shfmt: shfmt -ci -i 2 -d op setup && green "PASS: shfmt"
+shfmt:
+  shfmt -ci -i 2 -d op setup
+  green "PASS: shfmt"
 #? Run shfmt tests
 
-spell: codespell && green "PASS: codespell"
+spell:
+  codespell
+  green "PASS: codespell"
 #? Run spell checker
 
 man-show: op man | man -l
@@ -19,18 +28,19 @@ man-show: op man | man -l
 man-save: op man > doc/op.1
 #? Convert the markdown man page to man
 
-version: \
-  sed -i "s/$(op --version)/$1/g" op README.md doc/op.md && \
-  op man-save && \
-  git commit -am "version bump $1" && \
+version:
+  [[ -n $1 ]] || abort 'Usage: op version NEW_VERSION'
+  sed -i "s/$(op --version)/$1/g" op README.md doc/op.md
+  op man-save
+  git commit -am "version bump $1"
   git tag v$1
 #? Update version, regenerate and tag
-#? usage: op version NEW_VERSION
+#? Usage: op version NEW_VERSION
 
 private
 
-man: \
-  export DATE=$(date "+%B %Y") && \
-  export VERSION=$(op --version) && \
+man:
+  export DATE=$(date "+%B %Y")
+  export VERSION=$(op --version)
   envsubst <doc/op.md |pandoc -f markdown-smart -s --to man 
 #? Generate man to stdout after substituting template vars

test/execute_spec.sh

@@ -56,7 +56,12 @@ describe "op <command>"
 
   context "with multiline config"
     cd ./fixtures/multiline
-    approve "op who"
+    approve "op multi"
+    cd ../../
+
+  context "with concatenated config"
+    cd ./fixtures/multiline
+    approve "op concat"
     cd ../../
 
   context "with a private command"

test/fixtures/empty-dir/approvals/op_help

@@ -1,4 +1,4 @@
-opcode 0.6.5 - local command shortcuts
+opcode 0.7.0 - local command shortcuts
 
 Usage:
   op CODE [ARGS]

test/fixtures/empty-dir/approvals/op_version

@@ -1 +1 @@
-0.6.5
+0.7.0

test/fixtures/multiline/approvals/op

@@ -1 +1 @@
-why   who   what   
+one   multi   concat   advanced-multi   two   

test/fixtures/multiline/approvals/op_who …t/fixtures/multiline/approvals/op_concattest/fixtures/multiline/approvals/op_who renamed to test/fixtures/multiline/approvals/op_concat test/fixtures/multiline/approvals/op_who renamed to test/fixtures/multiline/approvals/op_concat

@@ -0,0 +1,3 @@
+one
+two
+three

test/fixtures/multiline/approvals/op_multi

@@ -0,0 +1 @@
+echo one && echo two && echo three