From b1436832fcceca9ec734e318cf63dcf58f2a7b3d Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Mon, 2 Mar 2015 16:44:15 +0100
Subject: [PATCH 001/173] Fix #37 documentation typo

---
 README.md | 13 ++++++-------
 resty     |  8 +++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index efbbd96..4c1e340 100644
--- a/README.md
+++ b/README.md
@@ -298,13 +298,13 @@ Per-Host/Per-Method Curl Configuration Files
 
 Resty supports a per-host/per-method configuration file to help you with
 frequently used curl options. Each host (including the port) can have its
-own configuration file in the _~/.resty_ directory. The file format is
+own configuration file in the `~/.resty_ directory`. The file format is
 
-      $ GET [arg] [arg] ...
-      $ PUT [arg] [arg] ...
-      $ PATCH [arg] [arg] ...
-      $ POST [arg] [arg] ...
-      $ DELETE [arg] [arg] ...
+      GET [arg] [arg] ...
+      PUT [arg] [arg] ...
+      PATCH [arg] [arg] ...
+      POST [arg] [arg] ...
+      DELETE [arg] [arg] ...
 
 Where the `arg`s are curl command line arguments. Each line can specify
 arguments for that HTTP verb only, and all lines are optional.
@@ -403,4 +403,3 @@ scripts that make dealing with JSON data easier.
         <test>
           <deep>value</deep>
         </test>
-
diff --git a/resty b/resty
index be64ab1..12c1d57 100644
--- a/resty
+++ b/resty
@@ -31,14 +31,14 @@ function resty() {
   method="$1"; [[ $# -gt 0 ]] && shift
   h2t=$( (exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
                 || which html2text || which cat) |tail -n 1)
-  editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)
+  editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)
 
   [ "${method#P}" != "$method" ] || [ "$method" = "TRACE" ] && wantdata="yes"
 
   [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")
   [ -n "$1" ] && [ "${1#/}" != "$1" ] \
-    && _path="$1" && [[ $# -gt 0 ]] && shift
-  [ "$1" = "${1#-}" ] && dat="$1" && [[ $# -gt 0 ]] && shift
+    && _path="$1" && [[ $# > 0 ]] && shift
+  [ "$1" = "${1#-}" ] && dat="$1" && [[ $# > 0 ]] && shift
 
   j=1
   for i in "$@"; do
@@ -80,6 +80,8 @@ function resty() {
       [ -n "$dat" ] && opt="--data-binary"
       [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
 
+      ## Retrieve stored option in confidir.
+      ## §maybe: cache this when resty)
       [ -f "$confdir/$domain" ] && eval "args2=( $(cat "$confdir/$domain" 2>/dev/null |sed 's/^ *//' |grep "^$method" |cut -b $((${#method}+2))-) )"
       [ "$dry" = "yes" ] && echo "curl -sLv $opt \"$dat\" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \"${args2[@]}\" \"${curlopt2[@]}\" \"${curlopt[@]}\" \"$_path$query\"" && return 0
       # TODO: refactor function

From 2d03da6e5827981ee69973fca5218687a3d60fdf Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Mon, 2 Mar 2015 17:06:37 +0100
Subject: [PATCH 002/173] refactor: rename data -> body

---
 resty | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/resty b/resty
index 12c1d57..0766e6d 100644
--- a/resty
+++ b/resty
@@ -14,7 +14,7 @@ export _resty_path=""
 export _resty_nohistory=""
 
 function resty() {
-  local confdir datadir host cookies method h2t editor domain _path opt dat res ret out err verbose raw i j d tmpf args2 wantdata vimedit quote query maybe_query dry
+  local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query dry
   local -a curlopt
   local -a curlopt2
 
@@ -31,14 +31,14 @@ function resty() {
   method="$1"; [[ $# -gt 0 ]] && shift
   h2t=$( (exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
                 || which html2text || which cat) |tail -n 1)
-  editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)
+  editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
 
-  [ "${method#P}" != "$method" ] || [ "$method" = "TRACE" ] && wantdata="yes"
+  [ "${method#P}" != "$method" ] || [ "$method" = "TRACE" ] && hasbody="yes"
+  # hack: want data only for Put and Post
 
-  [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")
-  [ -n "$1" ] && [ "${1#/}" != "$1" ] \
-    && _path="$1" && [[ $# > 0 ]] && shift
-  [ "$1" = "${1#-}" ] && dat="$1" && [[ $# > 0 ]] && shift
+  [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
+  [ -n "$1" ] && [ "${1#/}" != "$1" ] && _path="$1" && [[ $# > 0 ]] && shift          # retrieve path
+  [ "$1" = "${1#-}" ] && body="$1" && [[ $# > 0 ]] && shift                           # retrieve data
 
   j=1
   for i in "$@"; do
@@ -65,27 +65,28 @@ function resty() {
   case "$method" in
     HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
       eval "curlopt2=(${_resty_opts[*]})"
-      dat=$( ( [ "$wantdata" = "yes" ] \
-        && ( ( [ -n "$dat" ] && echo "$dat") \
+      body=$( ( [ "$hasbody" = "yes" ] \
+        && ( ( [ -n "$body" ] && echo "$body") \
         || ([ ! -t 0 ] && echo "@-") ) ) || echo)
-      if [ "$wantdata" = "yes" ] && [ "$vimedit" = "yes" ]; then
+      if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
         tmpf=$(mktemp /tmp/resty.XXXXXX)
         [ -t 0 ] || cat > $tmpf
         (exec < /dev/tty; "$editor" $tmpf)
-        dat=$(cat $tmpf)
+        body=$(cat $tmpf)
         rm -f $tmpf
       fi
-      [ -n "$dat" ] && [ "$dat" != "@-" ] && [[ $# -gt 0 ]] && shift
-      [ "$1" = "-Z" ] && raw="yes" && [[ $# -gt 0 ]] && shift
-      [ -n "$dat" ] && opt="--data-binary"
+      [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
+      [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
+      [ -n "$body" ] && opt="--data-binary"
       [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
 
-      ## Retrieve stored option in confidir.
+      ## Retrieve stored option in config dir.
       ## §maybe: cache this when resty)
-      [ -f "$confdir/$domain" ] && eval "args2=( $(cat "$confdir/$domain" 2>/dev/null |sed 's/^ *//' |grep "^$method" |cut -b $((${#method}+2))-) )"
-      [ "$dry" = "yes" ] && echo "curl -sLv $opt \"$dat\" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \"${args2[@]}\" \"${curlopt2[@]}\" \"${curlopt[@]}\" \"$_path$query\"" && return 0
+      [ -f "$confdir/$domain" ] && eval "args2=( $(cat "$confdir/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+      [ "$dry" = "yes" ] && echo "curl -sLv $opt \"body\" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \"${args2[@]}\" \"${curlopt2[@]}\" \"${curlopt[@]}\" \"$_path$query\"" && return 0
       # TODO: refactor function
-      res=$( ( ( (curl -sLv $opt "$dat" -X $method \
+
+      res=$((((curl -sLv $opt "$body" -X $method \
               -b "$cookies/$domain" -c "$cookies/$domain" \
               "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
         |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \

From ad37bb0fca9ef65bdccbdf760e92a8761fef0006 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 10:07:21 +0100
Subject: [PATCH 003/173] refactor: convert Changes to changelog convention

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 CHANGES.md   | 29 -----------------------------
 2 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 CHANGES.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..8e06277
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,49 @@
+# Change Log
+All notable changes to *Resty* will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased][unreleased]
+### Changed
+
+- major refactor
+### Fixed
+- Documentation glitch
+
+## History Black Hole to retrieve
+
+<!-- TODO: Patch release and 1 to 2 -->
+
+## [1.5] - 2011-03-20
+### Added
+- Curl options can now be specified when calling the resty command to set
+  the URI base. These options will be passed to curl for all subsequent
+  requests, until the next time the resty command is called.
+
+## [1.4] - 2011-03-08
+### Fixed
+- several bugs fix for zsh users.
+
+## [1.3] - 2011-03-04
+
+* Attempted bug fix for zsh users that prevented options from being passed
+  correctly to curl.
+
+## [1.2] - 2011-02-06 -
+
+* Data is now optional in PUT and POST requests. If the input is not a
+  terminal and no data is specified on the command line, resty won't wait
+  for data on stdin anymore. If you liked the old behavior you can always do
+  something like `cat | POST /Somewhere` for the same effect.
+
+## [1.1] - 2011-01-07
+### Fixed
+-  bug where `-V` option required input on stdin, and would block waiting  for it.
+
+<!-- Holder history to be retrieved
+
+[unreleased]: https://github.com/micha/resty/compare/v0.10.2...HEAD
+[1.5]: https://github.com/micha/resty/compare/1.4...1.5
+[1.4]: https://github.com/micha/resty/compare/1.3...1.4
+[1.3]: https://github.com/micha/resty/compare/1.2...1.3
+[1.2]: https://github.com/micha/resty/compare/1.1...1.2
+[1.1]: https://github.com/micha/resty/compare/1.0...1.1
diff --git a/CHANGES.md b/CHANGES.md
deleted file mode 100644
index d316706..0000000
--- a/CHANGES.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Resty CHANGES
-=============
-
-### Version 1.5 (2011-03-20)
-
-* Curl options can now be specified when calling the resty command to set
-  the URI base. These options will be passed to curl for all subsequent
-  requests, until the next time the resty command is called.
-
-### Version 1.4 (2011-03-08)
-
-* Finalized bug fix for zsh users.
-
-### Version 1.3 (2011-03-04)
-
-* Attempted bug fix for zsh users that prevented options from being passed
-  correctly to curl.
-
-### Version 1.2 (2011-02-06)
-
-* Data is now optional in PUT and POST requests. If the input is not a
-  terminal and no data is specified on the command line, resty won't wait
-  for data on stdin anymore. If you liked the old behavior you can always do
-  something like `cat | POST /Somewhere` for the same effect.
-
-### Version 1.1 (2011-01-07)
-
-* Fixed bug where -V option required input on stdin, and would block waiting
-  for it.

From d8bd78d75af60f164655fb130afb8c9e1fb78314 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 10:07:53 +0100
Subject: [PATCH 004/173] refactor: changed hasbody check method. handling
 delete with payload #46

---
 resty | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resty b/resty
index 0766e6d..1f60af3 100644
--- a/resty
+++ b/resty
@@ -33,8 +33,7 @@ function resty() {
                 || which html2text || which cat) |tail -n 1)
   editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
 
-  [ "${method#P}" != "$method" ] || [ "$method" = "TRACE" ] && hasbody="yes"
-  # hack: want data only for Put and Post
+  if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then hasbody="yes" ;fi
 
   [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
   [ -n "$1" ] && [ "${1#/}" != "$1" ] && _path="$1" && [[ $# > 0 ]] && shift          # retrieve path

From bbf151b3bf1e0d368a88d371bd8a49bdb95b2147 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 10:11:23 +0100
Subject: [PATCH 005/173] refactor: reindent + add Ak to maintener

---
 resty | 228 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 115 insertions(+), 113 deletions(-)

diff --git a/resty b/resty
index 1f60af3..f99da33 100644
--- a/resty
+++ b/resty
@@ -8,149 +8,151 @@
 #   Micha Niskin <micha@thinkminimo.com>
 #   Copyright 2009, no rights reserved.
 #
+# Maintener:
+#   Adriean Khisbe <adriean.khisbe@live.com>
+#
+
 
 export _resty_host=""
 export _resty_path=""
 export _resty_nohistory=""
 
 function resty() {
-  local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query dry
-  local -a curlopt
-  local -a curlopt2
-
-  if [ -n "$XDG_CONFIG_HOME" ]; then
-    confdir="$XDG_CONFIG_HOME/resty"
-    datadir="$XDG_DATA_HOME/resty"
-  else
-    confdir="$HOME/.resty"
-    datadir="$confdir"
-  fi
-  mkdir -p "$confdir"
-  host="$datadir/host"
-  cookies="$datadir/c"
-  method="$1"; [[ $# -gt 0 ]] && shift
-  h2t=$( (exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
-                || which html2text || which cat) |tail -n 1)
-  editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
-
-  if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then hasbody="yes" ;fi
-
-  [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
-  [ -n "$1" ] && [ "${1#/}" != "$1" ] && _path="$1" && [[ $# > 0 ]] && shift          # retrieve path
-  [ "$1" = "${1#-}" ] && body="$1" && [[ $# > 0 ]] && shift                           # retrieve data
-
-  j=1
-  for i in "$@"; do
-    [ -n "$maybe_query" ] && [ -z "$query" ] && query="?$i" && continue
-    ([ "$i" = "--verbose" ] || echo "$i" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
-      && verbose="yes" && continue
-    [ "$i" = "-V" ] && vimedit="yes" && continue
-    [ "$i" = "--dry-run" ] && dry="yes" && continue
-    [ "$i" = "-Z" ] && raw="yes" && continue
-    curlopt[j]="$i" && j=$((j + 1))
-  done
-
-  [ -z "$quote" ] && _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
-
-  [ "$method" = "HEAD" ] || [ "$method" = "OPTIONS" ] && raw="yes"
-  [ -z "$_resty_host" ] && _resty_host=$(cat "$host" 2>/dev/null)
-  [ "$method" = "-v" ] && echo "$_resty_host $_resty_opts" && return
-  [ -z "$method" ] && echo "$_resty_host" && return
-  [ -n "$_path" ] && _resty_path=$_path
-  domain=$(echo -n "$_resty_host" \
-    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-  _path="${_resty_host//\*/$_resty_path}"
-
-  case "$method" in
-    HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
-      eval "curlopt2=(${_resty_opts[*]})"
-      body=$( ( [ "$hasbody" = "yes" ] \
-        && ( ( [ -n "$body" ] && echo "$body") \
-        || ([ ! -t 0 ] && echo "@-") ) ) || echo)
-      if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
-        tmpf=$(mktemp /tmp/resty.XXXXXX)
-        [ -t 0 ] || cat > $tmpf
-        (exec < /dev/tty; "$editor" $tmpf)
-        body=$(cat $tmpf)
-        rm -f $tmpf
-      fi
-      [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
-      [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
-      [ -n "$body" ] && opt="--data-binary"
-      [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
-
-      ## Retrieve stored option in config dir.
-      ## §maybe: cache this when resty)
-      [ -f "$confdir/$domain" ] && eval "args2=( $(cat "$confdir/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
-      [ "$dry" = "yes" ] && echo "curl -sLv $opt \"body\" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \"${args2[@]}\" \"${curlopt2[@]}\" \"${curlopt[@]}\" \"$_path$query\"" && return 0
-      # TODO: refactor function
-
-      res=$((((curl -sLv $opt "$body" -X $method \
-              -b "$cookies/$domain" -c "$cookies/$domain" \
-              "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
-        |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
-        |sed 's/^/ERR /' && echo) 2>&1)
-      out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
-      err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
-      ret=$(echo "$err" |sed \
-        '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' \
-        | tail -n1)
-      [ -n "$err" ] && [ -n "$verbose" ] && echo "$err" 1>&2
-      echo "$err" | grep -i '^< \s*Content-Type:  *text/html' >/dev/null \
-        && [ -z "$raw" ] && d=$h2t || d=cat
-      [ -n "$out" ] && out=$(echo "$out" |eval "$d")
-      [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
-      if [ "$ret" != "2" ]; then
-        [ -n "$out" ] && echo "$out" 1>&2
-        return $ret
-      else
-        [ -n "$out" ] && echo "$out"
-	return 0
-      fi
-      ;;
-    http://*|https://*)
-      _resty_opts=$(printf '%q ' "${curlopt[@]}")
-      export _resty_opts
-      echo "$method" |grep '\*' >/dev/null || method="${method}*"
-      (echo "$method" |tee "${_resty_nohistory:-$host}") |cat 1>&2 \
-        && _resty_host="$method"
-      ;;
-    *)
-      resty "http://$method" "${curlopt[@]}"
-      ;;
-  esac
+    local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query
+    local -a curlopt
+    local -a curlopt2
+
+    if [ -n "$XDG_CONFIG_HOME" ]; then
+	confdir="$XDG_CONFIG_HOME/resty"
+	datadir="$XDG_DATA_HOME/resty"
+    else
+	confdir="$HOME/.resty"
+	datadir="$confdir"
+    fi
+    mkdir -p "$confdir"
+    host="$datadir/host"
+    cookies="$datadir/c"
+    method="$1"; [[ $# > 0 ]] && shift
+    h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
+			  || which html2text || which cat) |tail -n 1)
+    editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
+
+    if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then hasbody="yes" ;fi
+
+    [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
+    [ -n "$1" ] && [ "${1#/}" != "$1" ] && _path="$1" && [[ $# > 0 ]] && shift          # retrieve path
+    [ "$1" = "${1#-}" ] && body="$1" && [[ $# > 0 ]] && shift                           # retrieve data
+
+    j=1
+    for i in "$@"; do
+	[ -n "$maybe_query" -a -z "$query" ] && query="?$i" && continue
+	([ "$i" = "--verbose" ] || echo "$i" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
+	    && verbose="yes" && continue
+	[ "$i" = "-V" ] && vimedit="yes" && continue
+	[ "$i" = "-Z" ] && raw="yes" && continue
+	[ "$i" = "-W" ] && continue
+	[ "$i" = "-Q" ] && quote="yes" && continue
+	[ "$i" = "-q" ] && maybe_query="yes" && continue
+	curlopt[j]="$i" && j=$((j + 1))
+    done
+
+    [ -z "$quote" ] && _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
+
+    [ "$method" = "HEAD" ] || [ "$method" = "OPTIONS" ] && raw="yes"
+    [ -z "$_resty_host" ] && _resty_host=$(cat "$host" 2>/dev/null)
+    [ "$method" = "-v" ] && echo "$_resty_host $_resty_opts" && return
+    [ -z "$method" ] && echo "$_resty_host" && return
+    [ -n "$_path" ] && _resty_path=$_path
+    domain=$(echo -n "$_resty_host" \
+		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
+    _path="${_resty_host//\*/$_resty_path}"
+
+    case "$method" in
+	HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
+	    eval "curlopt2=(${_resty_opts[*]})"
+	    body=$( ( [ "$hasbody" = "yes" ] \
+			  && ( ( [ -n "$body" ] && echo "$body") \
+				   || ([ ! -t 0 ] && echo "@-") ) ) || echo)
+	    if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
+		tmpf=$(mktemp /tmp/resty.XXXXXX)
+		[ -t 0 ] || cat > $tmpf
+		(exec < /dev/tty; "$editor" $tmpf)
+		body=$(cat $tmpf)
+		rm -f $tmpf
+	    fi
+	    [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
+	    [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
+	    [ -n "$body" ] && opt="--data-binary"
+	    [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
+
+	    ## Retrieve stored option in config dir.
+	    ## §maybe: cache this when resty)
+	    [ -f "$confdir/$domain" ] && eval "args2=( $(cat "$confdir/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+	    res=$((((curl -sLv $opt "$body" -X $method \
+			  -b "$cookies/$domain" -c "$cookies/$domain" \
+			  "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
+			    |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
+		       |sed 's/^/ERR /' && echo) 2>&1)
+	    out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
+	    err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
+	    ret=$(echo "$err" |sed \
+				   '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' \
+			 | tail -n1)
+	    [ -n "$err" -a -n "$verbose" ] && echo "$err" 1>&2
+	    echo "$err" | grep -i '^< \s*Content-Type:  *text/html' >/dev/null \
+		&& [ -z "$raw" ] && d=$h2t || d=cat
+	    [ -n "$out" ] && out=$(echo "$out" |eval "$d")
+	    [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+	    if [ "$ret" != "2" ]; then
+		[ -n "$out" ] && echo "$out" 1>&2
+		return $ret
+	    else
+		[ -n "$out" ] && echo "$out"
+	    fi
+	    ;;
+	http://*|https://*)
+	    _resty_opts=$(printf '%q ' "${curlopt[@]}")
+	    export _resty_opts
+	    echo "$method" |grep '\*' >/dev/null || method="${method}*"
+	    (echo "$method" |tee "${_resty_nohistory:-$host}") |cat 1>&2 \
+		&& _resty_host="$method"
+	    ;;
+	*)
+	    resty "http://$method" "${curlopt[@]}"
+	    ;;
+    esac
 }
 
 function HEAD() {
-  resty HEAD "$@"
+    resty HEAD "$@"
 }
 
 function OPTIONS() {
-  resty OPTIONS "$@"
+    resty OPTIONS "$@"
 }
 
 function GET() {
-  resty GET "$@"
+    resty GET "$@"
 }
 
 function POST() {
-  resty POST "$@"
+    resty POST "$@"
 }
 
 function PUT() {
-  resty PUT "$@"
+    resty PUT "$@"
 }
 
 function PATCH() {
-  resty PATCH "$@"
+    resty PATCH "$@"
 }
 
 function DELETE() {
-  resty DELETE "$@"
+    resty DELETE "$@"
 }
 
 function TRACE() {
-  resty TRACE "$@"
+    resty TRACE "$@"
 }
 
 [ "$1" = "-W" ] && export _resty_nohistory="/dev/null" && [[ $# -gt 0 ]] && shift

From ca600328b31c1e7e11a2745a49355cf19654fde3 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 10:31:02 +0100
Subject: [PATCH 006/173] refactor: tear appart monolitic resty between setting
 current host, and issuing a call

---
 resty | 163 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 93 insertions(+), 70 deletions(-)

diff --git a/resty b/resty
index f99da33..e4afb26 100644
--- a/resty
+++ b/resty
@@ -13,25 +13,59 @@
 #
 
 
-export _resty_host=""
+export _resty_host="" # TODO: to upper case!
 export _resty_path=""
 export _resty_nohistory=""
 
+
+# TODO: global var holers
+export _RESTY_DATA_DIR _RESTY_CONF_DIR;
+
+
 function resty() {
+    # todo: cleaning of locals
     local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query
     local -a curlopt
     local -a curlopt2
 
     if [ -n "$XDG_CONFIG_HOME" ]; then
-	confdir="$XDG_CONFIG_HOME/resty"
-	datadir="$XDG_DATA_HOME/resty"
+	_RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
+	_RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
     else
-	confdir="$HOME/.resty"
-	datadir="$confdir"
+	_RESTY_CONF_DIR="$HOME/.resty"
+	_RESTY_DATA_DIR="$_RESTY_CONF_DIR"
     fi
-    mkdir -p "$confdir"
-    host="$datadir/host"
-    cookies="$datadir/c"
+    mkdir -p "$_RESTY_CONF_DIR"
+
+    host="$_RESTY_DATA_DIR/host"
+
+    local url=$1
+
+    case "$url" in
+	http://*|https://*)
+	    _resty_opts=$(printf '%q ' "${curlopt[@]}")
+	    export _resty_opts
+	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
+	    (echo "$url" |tee "${_resty_nohistory:-$host}") |cat 1>&2 \
+		&& _resty_host="$url"
+	    ;;
+	*)
+	    resty "http://$url" "${curlopt[@]}"
+	    ;;
+    esac
+}
+
+
+
+function resty-call() {
+     local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query
+    local -a curlopt
+    local -a curlopt2
+
+    # TODO: local to reset
+    host="$_RESTY_DATA_DIR/host"
+    cookies="$_RESTY_DATA_DIR/c"
+
     method="$1"; [[ $# > 0 ]] && shift
     h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
 			  || which html2text || which cat) |tail -n 1)
@@ -67,92 +101,81 @@ function resty() {
 		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     _path="${_resty_host//\*/$_resty_path}"
 
-    case "$method" in
-	HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
-	    eval "curlopt2=(${_resty_opts[*]})"
-	    body=$( ( [ "$hasbody" = "yes" ] \
-			  && ( ( [ -n "$body" ] && echo "$body") \
-				   || ([ ! -t 0 ] && echo "@-") ) ) || echo)
-	    if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
-		tmpf=$(mktemp /tmp/resty.XXXXXX)
-		[ -t 0 ] || cat > $tmpf
-		(exec < /dev/tty; "$editor" $tmpf)
-		body=$(cat $tmpf)
-		rm -f $tmpf
-	    fi
-	    [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
-	    [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
-	    [ -n "$body" ] && opt="--data-binary"
-	    [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
-
-	    ## Retrieve stored option in config dir.
-	    ## §maybe: cache this when resty)
-	    [ -f "$confdir/$domain" ] && eval "args2=( $(cat "$confdir/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
-	    res=$((((curl -sLv $opt "$body" -X $method \
-			  -b "$cookies/$domain" -c "$cookies/$domain" \
-			  "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
-			    |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
-		       |sed 's/^/ERR /' && echo) 2>&1)
-	    out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
-	    err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
-	    ret=$(echo "$err" |sed \
-				   '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' \
-			 | tail -n1)
-	    [ -n "$err" -a -n "$verbose" ] && echo "$err" 1>&2
-	    echo "$err" | grep -i '^< \s*Content-Type:  *text/html' >/dev/null \
-		&& [ -z "$raw" ] && d=$h2t || d=cat
-	    [ -n "$out" ] && out=$(echo "$out" |eval "$d")
-	    [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
-	    if [ "$ret" != "2" ]; then
-		[ -n "$out" ] && echo "$out" 1>&2
-		return $ret
-	    else
-		[ -n "$out" ] && echo "$out"
-	    fi
-	    ;;
-	http://*|https://*)
-	    _resty_opts=$(printf '%q ' "${curlopt[@]}")
-	    export _resty_opts
-	    echo "$method" |grep '\*' >/dev/null || method="${method}*"
-	    (echo "$method" |tee "${_resty_nohistory:-$host}") |cat 1>&2 \
-		&& _resty_host="$method"
-	    ;;
-	*)
-	    resty "http://$method" "${curlopt[@]}"
-	    ;;
-    esac
+
+    # HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
+    eval "curlopt2=(${_resty_opts[*]})"
+    body=$( ( [ "$hasbody" = "yes" ] \
+		  && ( ( [ -n "$body" ] && echo "$body") \
+			   || ([ ! -t 0 ] && echo "@-") ) ) || echo)
+    if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
+	tmpf=$(mktemp /tmp/resty.XXXXXX)
+	[ -t 0 ] || cat > $tmpf
+	(exec < /dev/tty; "$editor" $tmpf)
+	body=$(cat $tmpf)
+	rm -f $tmpf
+    fi
+    [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
+    [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
+    [ -n "$body" ] && opt="--data-binary"
+    [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
+
+    ## Retrieve stored option in config dir.
+    ## §maybe: cache this when resty)
+    [ -f "$_RESTY_CONF_DIR/$domain" ] && eval "args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+    res=$((((curl -sLv $opt "$body" -X $method \
+		  -b "$cookies/$domain" -c "$cookies/$domain" \
+		  "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
+		    |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
+	       |sed 's/^/ERR /' && echo) 2>&1)
+    out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
+    err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
+    ret=$(echo "$err" |sed \
+			   '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' \
+		 | tail -n1)
+    [ -n "$err" -a -n "$verbose" ] && echo "$err" 1>&2
+    echo "$err" | grep -i '^< \s*Content-Type:  *text/html' >/dev/null \
+	&& [ -z "$raw" ] && d=$h2t || d=cat
+    [ -n "$out" ] && out=$(echo "$out" |eval "$d")
+    [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+    if [ "$ret" != "2" ]; then
+	[ -n "$out" ] && echo "$out" 1>&2
+	return $ret
+    else
+	[ -n "$out" ] && echo "$out"
+    fi
+
 }
 
 function HEAD() {
-    resty HEAD "$@"
+    resty-call HEAD "$@"
 }
 
 function OPTIONS() {
-    resty OPTIONS "$@"
+    resty-call OPTIONS "$@"
 }
 
 function GET() {
-    resty GET "$@"
+    resty-call GET "$@"
 }
 
 function POST() {
-    resty POST "$@"
+    resty-call POST "$@"
 }
 
 function PUT() {
-    resty PUT "$@"
+    resty-call PUT "$@"
 }
 
 function PATCH() {
-    resty PATCH "$@"
+    resty-call PATCH "$@"
 }
 
 function DELETE() {
-    resty DELETE "$@"
+    resty-call DELETE "$@"
 }
 
 function TRACE() {
-    resty TRACE "$@"
+    resty-call TRACE "$@"
 }
 
 [ "$1" = "-W" ] && export _resty_nohistory="/dev/null" && [[ $# -gt 0 ]] && shift

From b3e0521360e3fd4efed1ac082ad5b20f15933531 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 10:48:02 +0100
Subject: [PATCH 007/173] refactor: relocate locale

---
 resty | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/resty b/resty
index e4afb26..da9cc66 100644
--- a/resty
+++ b/resty
@@ -23,10 +23,6 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 
 
 function resty() {
-    # todo: cleaning of locals
-    local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query
-    local -a curlopt
-    local -a curlopt2
 
     if [ -n "$XDG_CONFIG_HOME" ]; then
 	_RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
@@ -37,7 +33,7 @@ function resty() {
     fi
     mkdir -p "$_RESTY_CONF_DIR"
 
-    host="$_RESTY_DATA_DIR/host"
+    local host="$_RESTY_DATA_DIR/host"
 
     local url=$1
 
@@ -50,7 +46,7 @@ function resty() {
 		&& _resty_host="$url"
 	    ;;
 	*)
-	    resty "http://$url" "${curlopt[@]}"
+	    resty "http://$url" "${@[@]}"
 	    ;;
     esac
 }
@@ -58,30 +54,33 @@ function resty() {
 
 
 function resty-call() {
-     local confdir datadir host cookies method h2t editor domain _path opt body res ret out err verbose raw i j d tmpf args2 hasbody vimedit quote query maybe_query
+    # maaybe: check # HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
+
     local -a curlopt
     local -a curlopt2
 
     # TODO: local to reset
-    host="$_RESTY_DATA_DIR/host"
-    cookies="$_RESTY_DATA_DIR/c"
+    local host="$_RESTY_DATA_DIR/host"
+    local cookies="$_RESTY_DATA_DIR/c"
 
-    method="$1"; [[ $# > 0 ]] && shift
-    h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
+    local method="$1"; [[ $# > 0 ]] && shift
+    local h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
 			  || which html2text || which cat) |tail -n 1)
-    editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
+    local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
 
-    if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then hasbody="yes" ;fi
+    if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 
     [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
-    [ -n "$1" ] && [ "${1#/}" != "$1" ] && _path="$1" && [[ $# > 0 ]] && shift          # retrieve path
-    [ "$1" = "${1#-}" ] && body="$1" && [[ $# > 0 ]] && shift                           # retrieve data
+    [ -n "$1" ] && [ "${1#/}" != "$1" ] && local _path="$1" && [[ $# > 0 ]] && shift          # retrieve path
+    [ "$1" = "${1#-}" ] && local body="$1" && [[ $# > 0 ]] && shift                           # retrieve data
 
+    local raw query vimedit quote maybe_query
     j=1
+    # TODO: use an option parser or a switch
     for i in "$@"; do
 	[ -n "$maybe_query" -a -z "$query" ] && query="?$i" && continue
 	([ "$i" = "--verbose" ] || echo "$i" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
-	    && verbose="yes" && continue
+	    &&  verbose="yes" && continue
 	[ "$i" = "-V" ] && vimedit="yes" && continue
 	[ "$i" = "-Z" ] && raw="yes" && continue
 	[ "$i" = "-W" ] && continue
@@ -92,28 +91,29 @@ function resty-call() {
 
     [ -z "$quote" ] && _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
 
-    [ "$method" = "HEAD" ] || [ "$method" = "OPTIONS" ] && raw="yes"
-    [ -z "$_resty_host" ] && _resty_host=$(cat "$host" 2>/dev/null)
+    if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
+    [ -z "$_resty_host" ] && local _resty_host=$(cat "$host" 2>/dev/null)
     [ "$method" = "-v" ] && echo "$_resty_host $_resty_opts" && return
     [ -z "$method" ] && echo "$_resty_host" && return
     [ -n "$_path" ] && _resty_path=$_path
-    domain=$(echo -n "$_resty_host" \
+    local domain=$(echo -n "$_resty_host" \
 		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    _path="${_resty_host//\*/$_resty_path}"
+    local _path="${_resty_host//\*/$_resty_path}"
 
-
-    # HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
     eval "curlopt2=(${_resty_opts[*]})"
-    body=$( ( [ "$hasbody" = "yes" ] \
+    # todo refactor
+    local body=$( ( [ "$hasbody" = "yes" ] \
 		  && ( ( [ -n "$body" ] && echo "$body") \
 			   || ([ ! -t 0 ] && echo "@-") ) ) || echo)
+
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
-	tmpf=$(mktemp /tmp/resty.XXXXXX)
+	loxal tmpf=$(mktemp /tmp/resty.XXXXXX)
 	[ -t 0 ] || cat > $tmpf
 	(exec < /dev/tty; "$editor" $tmpf)
 	body=$(cat $tmpf)
 	rm -f $tmpf
     fi
+
     [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
     [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
     [ -n "$body" ] && opt="--data-binary"
@@ -122,14 +122,14 @@ function resty-call() {
     ## Retrieve stored option in config dir.
     ## §maybe: cache this when resty)
     [ -f "$_RESTY_CONF_DIR/$domain" ] && eval "args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
-    res=$((((curl -sLv $opt "$body" -X $method \
+    local res=$((((curl -sLv $opt "$body" -X $method \
 		  -b "$cookies/$domain" -c "$cookies/$domain" \
 		  "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
 		    |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
 	       |sed 's/^/ERR /' && echo) 2>&1)
-    out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
-    err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
-    ret=$(echo "$err" |sed \
+    local out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
+    local err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
+    local ret=$(echo "$err" |sed \
 			   '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' \
 		 | tail -n1)
     [ -n "$err" -a -n "$verbose" ] && echo "$err" 1>&2

From ed3e520f3584b8df7a886b88704d753870ded8c9 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 11:23:00 +0100
Subject: [PATCH 008/173] refactor: more readable retrieve of data and path

---
 resty | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index da9cc66..728b9c6 100644
--- a/resty
+++ b/resty
@@ -71,8 +71,14 @@ function resty-call() {
     if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 
     [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
-    [ -n "$1" ] && [ "${1#/}" != "$1" ] && local _path="$1" && [[ $# > 0 ]] && shift          # retrieve path
-    [ "$1" = "${1#-}" ] && local body="$1" && [[ $# > 0 ]] && shift                           # retrieve data
+    if [[ "$1"  =~ "^/" ]] ; then  # retrieve path
+	local _path="$1";
+	[[ $# > 0 ]] && shift
+    fi
+    if [[ ! "$1"  =~ "^-" ]] ; then  # retrieve  data
+	local body="$1"
+	[[ $# > 0 ]] && shift
+    fi
 
     local raw query vimedit quote maybe_query
     j=1

From 8f6d21b7504cb35416916376d443918913e347bb Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 11:56:52 +0100
Subject: [PATCH 009/173] refactor: streal area

---
 resty | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/resty b/resty
index 728b9c6..d3ad69d 100644
--- a/resty
+++ b/resty
@@ -9,7 +9,7 @@
 #   Copyright 2009, no rights reserved.
 #
 # Maintener:
-#   Adriean Khisbe <adriean.khisbe@live.com>
+#   Adriean Khisbe <adriean.khisbe@live.fr>
 #
 
 
@@ -120,29 +120,39 @@ function resty-call() {
 	rm -f $tmpf
     fi
 
+    ## TODO: refactor block
     [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
     [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
-    [ -n "$body" ] && opt="--data-binary"
-    [ "$method" = "HEAD" ] && opt="-I" && raw="yes"
-
-    ## Retrieve stored option in config dir.
-    ## §maybe: cache this when resty)
-    [ -f "$_RESTY_CONF_DIR/$domain" ] && eval "args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
-    local res=$((((curl -sLv $opt "$body" -X $method \
-		  -b "$cookies/$domain" -c "$cookies/$domain" \
-		  "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
-		    |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
-	       |sed 's/^/ERR /' && echo) 2>&1)
-    local out=$(echo "$res" |sed '/^OUT /s/^....//p; d')
-    local err=$(echo "$res" |sed '/^ERR /s/^....//p; d')
-    local ret=$(echo "$err" |sed \
-			   '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' \
-		 | tail -n1)
-    [ -n "$err" -a -n "$verbose" ] && echo "$err" 1>&2
+    [ -n "$body" ] && curl_opt="--data-binary"
+    [ "$method" = "HEAD" ] && curl_opt="-I" && raw="yes" # HERE??
+
+
+    if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
+	## §maybe: cache this when resty)
+	local cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+	# echo $cmd
+	eval $cmd
+    fi
+
+    # Launch command and retrieved streams
+    local res out err ret
+    res=$((((curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
+		     "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
+				| sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) |sed 's/^/ERR /' && echo) 2>&1)
+    out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
+    err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
+    ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
+
+    if [ -n "$err" -a -n "$verbose" ]; then echo "$err" 1>&2 ; fi
+
     echo "$err" | grep -i '^< \s*Content-Type:  *text/html' >/dev/null \
 	&& [ -z "$raw" ] && d=$h2t || d=cat
+
     [ -n "$out" ] && out=$(echo "$out" |eval "$d")
+
+    # §TODO: refactor
     [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+
     if [ "$ret" != "2" ]; then
 	[ -n "$out" ] && echo "$out" 1>&2
 	return $ret

From edc5d8b9c9e551020b4bc7b3f85df708637d80a3 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 11:57:44 +0100
Subject: [PATCH 010/173] refactor: case on potential options

---
 resty | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/resty b/resty
index d3ad69d..7abb47d 100644
--- a/resty
+++ b/resty
@@ -43,7 +43,7 @@ function resty() {
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_resty_nohistory:-$host}") |cat 1>&2 \
-		&& _resty_host="$url"
+		&& export _resty_host="$url"
 	    ;;
 	*)
 	    resty "http://$url" "${@[@]}"
@@ -73,35 +73,40 @@ function resty-call() {
     [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
     if [[ "$1"  =~ "^/" ]] ; then  # retrieve path
 	local _path="$1";
-	[[ $# > 0 ]] && shift
     fi
     if [[ ! "$1"  =~ "^-" ]] ; then  # retrieve  data
 	local body="$1"
 	[[ $# > 0 ]] && shift
     fi
 
-    local raw query vimedit quote maybe_query
-    j=1
+    local raw query vimedit quote maybe_query verbose
+    local j=1 # try to replace with happened?
     # TODO: use an option parser or a switch
-    for i in "$@"; do
-	[ -n "$maybe_query" -a -z "$query" ] && query="?$i" && continue
-	([ "$i" = "--verbose" ] || echo "$i" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
-	    &&  verbose="yes" && continue
-	[ "$i" = "-V" ] && vimedit="yes" && continue
-	[ "$i" = "-Z" ] && raw="yes" && continue
-	[ "$i" = "-W" ] && continue
-	[ "$i" = "-Q" ] && quote="yes" && continue
-	[ "$i" = "-q" ] && maybe_query="yes" && continue
-	curlopt[j]="$i" && j=$((j + 1))
+    for opt in "$@"; do
+	if [ -n "$maybe_query" -a -z "$query" ] ; then query="?$opt"; continue; fi
+
+	case $opt in
+	    --verbose|-v) verbose="yes";;
+		# TODO; try adapt ; echo "$opt" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
+	    -V) vimedit="yes" ;;
+	    -Z) raw="yes" ;;
+	    -W) ;; # §todo: check why nothing?
+	    -Q) quote="yes" ;;
+	    -q) maybe_query="yes" ;;
+	    *) curlopt[j]="$opt" && j=$((j + 1))
+	esac
+	## idea: add --json, other option.
     done
 
-    [ -z "$quote" ] && _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
+    if [ -z "$quote" ]; then # replace special char with codes
+	_path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
+    fi
 
     if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
     [ -z "$_resty_host" ] && local _resty_host=$(cat "$host" 2>/dev/null)
     [ "$method" = "-v" ] && echo "$_resty_host $_resty_opts" && return
     [ -z "$method" ] && echo "$_resty_host" && return
-    [ -n "$_path" ] && _resty_path=$_path
+    [ -n "$_path" ] && local _resty_path=$_path
     local domain=$(echo -n "$_resty_host" \
 		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     local _path="${_resty_host//\*/$_resty_path}"

From 1e0395a13d42bdc1f5b1f745ba8da7affb966263 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 14:44:59 +0100
Subject: [PATCH 011/173] refactors: if refactor

---
 resty | 51 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/resty b/resty
index 7abb47d..779ef9c 100644
--- a/resty
+++ b/resty
@@ -54,7 +54,7 @@ function resty() {
 
 
 function resty-call() {
-    # maaybe: check # HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
+    # maybe: check # HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
 
     local -a curlopt
     local -a curlopt2
@@ -70,7 +70,10 @@ function resty-call() {
 
     if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 
-    [ -d "$cookies" ] || (mkdir -p "$cookies"; echo "http://localhost*" > "$host")      # retrieve cookie
+    if [ -d "$cookies" ] ; then   # retrieve cookie
+	(mkdir -p "$cookies"; echo "http://localhost*" > "$host")
+    fi
+
     if [[ "$1"  =~ "^/" ]] ; then  # retrieve path
 	local _path="$1";
     fi
@@ -103,16 +106,27 @@ function resty-call() {
     fi
 
     if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
-    [ -z "$_resty_host" ] && local _resty_host=$(cat "$host" 2>/dev/null)
-    [ "$method" = "-v" ] && echo "$_resty_host $_resty_opts" && return
-    [ -z "$method" ] && echo "$_resty_host" && return
-    [ -n "$_path" ] && local _resty_path=$_path
+    if [ -z "$_resty_host" ] ;then local _resty_host=$(cat "$host" 2>/dev/null);fi
+
+    if [ "$method" = "-v" ] ; then # ??
+	echo "$_resty_host $_resty_opts"
+	return
+    fi
+    if [ -z "$method" ] ; then # return since no method
+	echo "$_resty_host"
+	return
+    fi
+    if [ -n "$_path" ] ; then # .??
+	local _resty_path=$_path
+    fi
+
     local domain=$(echo -n "$_resty_host" \
 		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     local _path="${_resty_host//\*/$_resty_path}"
 
-    eval "curlopt2=(${_resty_opts[*]})"
-    # todo refactor
+    eval "curlopt2=(${_resty_opts[*]})"  # TODO: rename or change
+
+    # TODO: refactor
     local body=$( ( [ "$hasbody" = "yes" ] \
 		  && ( ( [ -n "$body" ] && echo "$body") \
 			   || ([ ! -t 0 ] && echo "@-") ) ) || echo)
@@ -125,11 +139,13 @@ function resty-call() {
 	rm -f $tmpf
     fi
 
-    ## TODO: refactor block
-    [ -n "$body" ] && [ "$body" != "@-" ] && [[ $# > 0 ]] && shift
-    [ "$1" = "-Z" ] && raw="yes" && [[ $# > 0 ]] && shift
-    [ -n "$body" ] && curl_opt="--data-binary"
-    [ "$method" = "HEAD" ] && curl_opt="-I" && raw="yes" # HERE??
+    if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# > 0 ]] && shift;fi
+    if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# > 0 ]] && shift ;fi
+    if [ -n "$body" ] ;then curl_opt="--data-binary" ;fi
+    if [ "$method" = "HEAD" ] ; then
+	curl_opt="-I"
+	raw="yes"
+    fi
 
 
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
@@ -150,10 +166,13 @@ function resty-call() {
 
     if [ -n "$err" -a -n "$verbose" ]; then echo "$err" 1>&2 ; fi
 
-    echo "$err" | grep -i '^< \s*Content-Type:  *text/html' >/dev/null \
-	&& [ -z "$raw" ] && d=$h2t || d=cat
+    if  grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err" &&[ -z "$raw" ]
+    then d=$h2t
+    else d=cat
+    fi
+    # TODO: rename d to output tool
 
-    [ -n "$out" ] && out=$(echo "$out" |eval "$d")
+    if [ -n "$out" ]; then  out=$(echo "$out" | "$d") ; fi
 
     # §TODO: refactor
     [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')

From 02bd297ecb80137aaebffddaf52717f1c123e4e9 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 15:02:58 +0100
Subject: [PATCH 012/173] refactor: body building (haha)

---
 resty | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 779ef9c..6e3aeab 100644
--- a/resty
+++ b/resty
@@ -75,7 +75,8 @@ function resty-call() {
     fi
 
     if [[ "$1"  =~ "^/" ]] ; then  # retrieve path
-	local _path="$1";
+	local _path="$1"
+	[[ $# > 0 ]] && shift
     fi
     if [[ ! "$1"  =~ "^-" ]] ; then  # retrieve  data
 	local body="$1"
@@ -126,10 +127,13 @@ function resty-call() {
 
     eval "curlopt2=(${_resty_opts[*]})"  # TODO: rename or change
 
-    # TODO: refactor
-    local body=$( ( [ "$hasbody" = "yes" ] \
-		  && ( ( [ -n "$body" ] && echo "$body") \
-			   || ([ ! -t 0 ] && echo "@-") ) ) || echo)
+    if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
+	if [ ! -t 0 ] ; then # retrieve what stdin hold
+	    body="@-"
+	else
+	    body=""
+	fi
+    fi
 
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
 	loxal tmpf=$(mktemp /tmp/resty.XXXXXX)

From 7c93d6c1c31032d877431a9bec30dd8969a5d946 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 15:14:14 +0100
Subject: [PATCH 013/173] refactor: display

---
 resty | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/resty b/resty
index 6e3aeab..2488358 100644
--- a/resty
+++ b/resty
@@ -65,8 +65,8 @@ function resty-call() {
 
     local method="$1"; [[ $# > 0 ]] && shift
     local h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
-			  || which html2text || which cat) |tail -n 1)
-    local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)         # editor default
+			  || which html2text || which cat) |tail -n 1) # torename
+    local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
     if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 
@@ -136,7 +136,7 @@ function resty-call() {
     fi
 
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
-	loxal tmpf=$(mktemp /tmp/resty.XXXXXX)
+	local tmpf=$(mktemp /tmp/resty.XXXXXX)
 	[ -t 0 ] || cat > $tmpf
 	(exec < /dev/tty; "$editor" $tmpf)
 	body=$(cat $tmpf)
@@ -151,7 +151,6 @@ function resty-call() {
 	raw="yes"
     fi
 
-
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
 	## §maybe: cache this when resty)
 	local cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
@@ -170,16 +169,22 @@ function resty-call() {
 
     if [ -n "$err" -a -n "$verbose" ]; then echo "$err" 1>&2 ; fi
 
+
+    local display
     if  grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err" &&[ -z "$raw" ]
-    then d=$h2t
-    else d=cat
+    then display=$h2t
+    else display=cat
     fi
     # TODO: rename d to output tool
 
-    if [ -n "$out" ]; then  out=$(echo "$out" | "$d") ; fi
+    if [ -n "$out" ]; then out=$(echo "$out" | "$display") ; fi
 
     # §TODO: refactor
-    [ "$d" != "${d##lynx}" ] && out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+    # todo: also filter elinks and co
+    if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
+	out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
+				-e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+    fi
 
     if [ "$ret" != "2" ]; then
 	[ -n "$out" ] && echo "$out" 1>&2
@@ -190,6 +195,7 @@ function resty-call() {
 
 }
 
+# TODO: option to have or not head as alias? resty-head?
 function HEAD() {
     resty-call HEAD "$@"
 }

From 74f677aec8a9c74d907a88f32da00ffd41f5dcfe Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 16:09:33 +0100
Subject: [PATCH 014/173] refactor: check valid method in resty-call

---
 resty | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index 2488358..b8bb437 100644
--- a/resty
+++ b/resty
@@ -54,7 +54,15 @@ function resty() {
 
 
 function resty-call() {
-    # maybe: check # HEAD|OPTIONS|GET|DELETE|POST|PUT|PATCH|TRACE)
+
+    if [ $# = 0 ] ; then echo "resty-call need args" >&2; return 1; fi
+
+    local method="$1"; shift
+    if [[ ! "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ "$method" ]] ; then # this is not good
+	echo "First arg must be an HTTP verb, '$method' isn't" >&2
+	return 1
+    fi
+
 
     local -a curlopt
     local -a curlopt2
@@ -63,7 +71,7 @@ function resty-call() {
     local host="$_RESTY_DATA_DIR/host"
     local cookies="$_RESTY_DATA_DIR/c"
 
-    local method="$1"; [[ $# > 0 ]] && shift
+
     local h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
 			  || which html2text || which cat) |tail -n 1) # torename
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default

From f0351edd083a49dc9d11e93d02e897fda33cc550 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 17:24:00 +0100
Subject: [PATCH 015/173] refactor: diverse cleaning

---
 resty | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/resty b/resty
index b8bb437..9dfd705 100644
--- a/resty
+++ b/resty
@@ -63,10 +63,6 @@ function resty-call() {
 	return 1
     fi
 
-
-    local -a curlopt
-    local -a curlopt2
-
     # TODO: local to reset
     local host="$_RESTY_DATA_DIR/host"
     local cookies="$_RESTY_DATA_DIR/c"
@@ -91,6 +87,7 @@ function resty-call() {
 	[[ $# > 0 ]] && shift
     fi
 
+    local -a curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose
     local j=1 # try to replace with happened?
     # TODO: use an option parser or a switch
@@ -105,7 +102,7 @@ function resty-call() {
 	    -W) ;; # §todo: check why nothing?
 	    -Q) quote="yes" ;;
 	    -q) maybe_query="yes" ;;
-	    *) curlopt[j]="$opt" && j=$((j + 1))
+	    *) curlopt_cmd[j]="$opt" && j=$((j + 1))
 	esac
 	## idea: add --json, other option.
     done
@@ -133,7 +130,7 @@ function resty-call() {
 		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     local _path="${_resty_host//\*/$_resty_path}"
 
-    eval "curlopt2=(${_resty_opts[*]})"  # TODO: rename or change
+    eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
 
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
 	if [ ! -t 0 ] ; then # retrieve what stdin hold
@@ -169,7 +166,7 @@ function resty-call() {
     # Launch command and retrieved streams
     local res out err ret
     res=$((((curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
-		     "${args2[@]}" "${curlopt2[@]}" "${curlopt[@]}" "$_path$query" \
+		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
 				| sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
@@ -179,15 +176,13 @@ function resty-call() {
 
 
     local display
-    if  grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err" &&[ -z "$raw" ]
+    if [ -z "$raw" ] && grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err"
     then display=$h2t
     else display=cat
     fi
-    # TODO: rename d to output tool
 
     if [ -n "$out" ]; then out=$(echo "$out" | "$display") ; fi
 
-    # §TODO: refactor
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
 	out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \

From 9477a175145ef5ece9c2c3e232ba34cf12ff75df Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 17:32:28 +0100
Subject: [PATCH 016/173] refactors: rename request function and add function
 to set/unset http verb as alias

---
 resty | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/resty b/resty
index 9dfd705..3032ee9 100644
--- a/resty
+++ b/resty
@@ -198,39 +198,50 @@ function resty-call() {
 
 }
 
+function resty-load-alias(){
+    alias HEAD=resty-head OPTIONS=resty-options GET=resty-get POST=resty-post PUT=resty-put
+    alias TRACE=resty-trace PATCH=resty-patch DELETE=resty-delete
+    # maybe add option?
+}
+
+function resty-unload-alias(){
+    unalias HEAD OPTIONS GET POST PUT TRACE PATCH DELETE
+}
+
 # TODO: option to have or not head as alias? resty-head?
-function HEAD() {
+function resty-head() {
     resty-call HEAD "$@"
 }
 
-function OPTIONS() {
+function resty-options() {
     resty-call OPTIONS "$@"
 }
 
-function GET() {
+function resty-get() {
     resty-call GET "$@"
 }
 
-function POST() {
+function resty-post() {
     resty-call POST "$@"
 }
 
-function PUT() {
+function resty-put() {
     resty-call PUT "$@"
 }
 
-function PATCH() {
+function resty-patch() {
     resty-call PATCH "$@"
 }
 
-function DELETE() {
+function resty-delete() {
     resty-call DELETE "$@"
 }
 
-function TRACE() {
+function resty-trace() {
     resty-call TRACE "$@"
 }
 
+# TODO: see what it does?
 [ "$1" = "-W" ] && export _resty_nohistory="/dev/null" && [[ $# -gt 0 ]] && shift
 
 resty "$@" >/dev/null 2>&1

From 4f58ea4cd7d6f7699a906f56b16b0610e04c3d8a Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 17:33:38 +0100
Subject: [PATCH 017/173] refactor: load aliases by default

---
 resty | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resty b/resty
index 3032ee9..25c5ff9 100644
--- a/resty
+++ b/resty
@@ -204,6 +204,8 @@ function resty-load-alias(){
     # maybe add option?
 }
 
+resty-load-alias # Loaded by default. Latter do an option
+
 function resty-unload-alias(){
     unalias HEAD OPTIONS GET POST PUT TRACE PATCH DELETE
 }

From c02506714aad819b7bbaeed288d32380d9362564 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 18:53:53 +0100
Subject: [PATCH 018/173] refactor: upper case global var

---
 resty | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/resty b/resty
index 25c5ff9..25f88dd 100644
--- a/resty
+++ b/resty
@@ -13,9 +13,9 @@
 #
 
 
-export _resty_host="" # TODO: to upper case!
-export _resty_path=""
-export _resty_nohistory=""
+export _RESTY_HOST="" # TODO: to upper case!
+export _RESTY_PATH=""
+export _RESTY_NO_HISTORY=""
 
 
 # TODO: global var holers
@@ -42,8 +42,8 @@ function resty() {
 	    _resty_opts=$(printf '%q ' "${curlopt[@]}")
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
-	    (echo "$url" |tee "${_resty_nohistory:-$host}") |cat 1>&2 \
-		&& export _resty_host="$url"
+	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
+		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
 	    resty "http://$url" "${@[@]}"
@@ -67,7 +67,7 @@ function resty-call() {
     local host="$_RESTY_DATA_DIR/host"
     local cookies="$_RESTY_DATA_DIR/c"
 
-
+    # §maybe cache
     local h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
 			  || which html2text || which cat) |tail -n 1) # torename
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
@@ -82,7 +82,7 @@ function resty-call() {
 	local _path="$1"
 	[[ $# > 0 ]] && shift
     fi
-    if [[ ! "$1"  =~ "^-" ]] ; then  # retrieve  data
+    if [[ ! "$1"  =~ "^-" ]] ; then  # retrieve data
 	local body="$1"
 	[[ $# > 0 ]] && shift
     fi
@@ -112,23 +112,23 @@ function resty-call() {
     fi
 
     if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
-    if [ -z "$_resty_host" ] ;then local _resty_host=$(cat "$host" 2>/dev/null);fi
+    if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
     if [ "$method" = "-v" ] ; then # ??
-	echo "$_resty_host $_resty_opts"
+	echo "$_RESTY_HOST $_resty_opts"
 	return
     fi
     if [ -z "$method" ] ; then # return since no method
-	echo "$_resty_host"
+	echo "$_RESTY_HOST"
 	return
     fi
-    if [ -n "$_path" ] ; then # .??
-	local _resty_path=$_path
+    if [ -n "$_path" ] ; then # update current path
+	_RESTY_PATH=$_path
     fi
 
-    local domain=$(echo -n "$_resty_host" \
+    local domain=$(echo -n "$_RESTY_HOST" \
 		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    local _path="${_resty_host//\*/$_resty_path}"
+    local _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
 
@@ -185,7 +185,7 @@ function resty-call() {
 
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
-	out=$(echo "$out" |perl -e "\$host='$(echo "$_resty_host" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
+	out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
 				-e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
     fi
 
@@ -244,6 +244,6 @@ function resty-trace() {
 }
 
 # TODO: see what it does?
-[ "$1" = "-W" ] && export _resty_nohistory="/dev/null" && [[ $# -gt 0 ]] && shift
+[ "$1" = "-W" ] && export _RESTY_NO_HISTORY="/dev/null" && [[ $# -gt 0 ]] && shift
 
 resty "$@" >/dev/null 2>&1

From 0fd0ef94f4cea34769cdc743836f00d413d1e661 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Wed, 4 Mar 2015 19:41:45 +0100
Subject: [PATCH 019/173] refactor: option array happending, and fix persisting
 body var

---
 resty | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/resty b/resty
index 25f88dd..357ef47 100644
--- a/resty
+++ b/resty
@@ -89,8 +89,6 @@ function resty-call() {
 
     local -a curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose
-    local j=1 # try to replace with happened?
-    # TODO: use an option parser or a switch
     for opt in "$@"; do
 	if [ -n "$maybe_query" -a -z "$query" ] ; then query="?$opt"; continue; fi
 
@@ -102,7 +100,7 @@ function resty-call() {
 	    -W) ;; # §todo: check why nothing?
 	    -Q) quote="yes" ;;
 	    -q) maybe_query="yes" ;;
-	    *) curlopt_cmd[j]="$opt" && j=$((j + 1))
+	    *) curlopt_cmd+=("$opt")
 	esac
 	## idea: add --json, other option.
     done
@@ -133,10 +131,10 @@ function resty-call() {
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
 
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
-	if [ ! -t 0 ] ; then # retrieve what stdin hold
-	    body="@-"
+	if [ -t 0 ] ; then # retrieve what stdin hold
+	   local body="@-"
 	else
-	    body=""
+	   local body=""
 	fi
     fi
 
@@ -144,13 +142,13 @@ function resty-call() {
 	local tmpf=$(mktemp /tmp/resty.XXXXXX)
 	[ -t 0 ] || cat > $tmpf
 	(exec < /dev/tty; "$editor" $tmpf)
-	body=$(cat $tmpf)
+	local body=$(cat $tmpf)
 	rm -f $tmpf
     fi
 
     if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# > 0 ]] && shift;fi
     if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# > 0 ]] && shift ;fi
-    if [ -n "$body" ] ;then curl_opt="--data-binary" ;fi
+    if [ -n "$body" ] ; then curl_opt="--data-binary" ;fi
     if [ "$method" = "HEAD" ] ; then
 	curl_opt="-I"
 	raw="yes"
@@ -168,6 +166,7 @@ function resty-call() {
     res=$((((curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
 				| sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) |sed 's/^/ERR /' && echo) 2>&1)
+
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)

From 66e220fd01bc7386e5ea4c9cf9fcd13a328d6380 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Thu, 5 Mar 2015 16:01:20 +0100
Subject: [PATCH 020/173] refactor: update readme

---
 README.md | 34 +++++++++++++++++-----------------
 resty     |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 4c1e340..20864b5 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,15 @@
 Resty
 =====
 
-*If you use resty and want to help maintain it, please let me know and I'll add you to the repo.*
-
-Resty is a tiny script wrapper for [curl](http://curl.haxx.se/). It
+*Resty* is a tiny script wrapper for [curl](http://curl.haxx.se/). It
 provides a simple, concise shell interface for interacting with
 [REST](http://en.wikipedia.org/wiki/Representational_State_Transfer) services.
 Since it is implemented as functions in your shell and not in its own separate
 command environment you have access to all the powerful shell tools, such
-as perl, awk, grep, sed, etc. You can use resty in pipelines to process data
-from REST services, and PUT, PATCH, or POST the data right back.  You can even pipe
-the data in and then edit it interactively in your text editor prior to PUT,
-PATCH, or POST.
+as `perl`, `awk`, `grep`, `sed`, etc. You can use resty in pipelines to process data
+from `REST` services, and `PUT`, `PATCH`, or `POST` the data right back.  You can even pipe
+the data in and then edit it interactively in your text editor prior to `PUT`,
+`PATCH`, or `POST`.
 
 Cookies are supported automatically and stored in a file locally. Most of
 the arguments are remembered from one call to the next to save typing. It
@@ -35,7 +33,9 @@ there. Either way works.)
 
       $ . resty
 
-Set the REST host to which you will be making your requests (you can do this
+Otherwise, if you use `zsh` and `antigen` to install resty with `antigen bundle micha/resty` in your `.zshr`
+
+Once resty is installed, set the REST host to which you will be making your requests (you can do this
 whenever you want to change hosts, anytime).
 
       $ resty http://127.0.0.1:8080/data
@@ -140,7 +140,7 @@ HTTPS URIs can be used, as well. For example:
 URI Base History
 ----------------
 
-The URI base is saved to an rc file (_${XDG_CONFIG_HOME}/resty/host_ or _~/.resty/host_)i
+The URI base is saved to an rc file (`${XDG_CONFIG_HOME}/resty/host` or `~/.resty/host`)i
 each time it's set, and the last setting is saved in an environment variable
 (`$_resty_host`).  The URI base is read from the rc file when resty starts
 up, but only if the `$_resty_host` environment variable is not set.
@@ -236,11 +236,11 @@ setting the `EDITOR` environment variable.
 Errors and Output
 =================
 
-For successful 2xx responses, the response body is printed on stdout. You
+For successful *2xx* responses, the response body is printed on stdout. You
 can pipe the output to stuff, process it, and then pipe it back to resty,
 if you want.
 
-For responses other than 2xx the response body is dumped to stderr.
+For responses other than *2xx* the response body is dumped to stderr.
 
 In either case, if the content type of the response is `text/html`, then
 resty will try to process the response through either `lynx`, `html2text`,
@@ -322,14 +322,14 @@ is a frequent pattern for you:
       ...
 
 It's annoying to add the `-H` and `-u` options to curl all the time. So
-create a file _~/.resty/localhost:8080_, like this:
+create a file `~/.resty/localhost:8080_`, like this:
 
 _~/.resty/localhost:8080_
 
       GET -H "Accept: application/json"
       POST -H "Content-Type: text/plain" -u user:pass
 
-Then any GET or POST requests to localhost:8080 will have the specified
+Then any `GET` or `POST` requests to `localhost:8080` will have the specified
 options prepended to the curl command line arguments, saving you from having
 to type them out each time, like this:
 
@@ -345,7 +345,7 @@ Sweet! Much better.
 Exit Status
 ===========
 
-Successful requests (HTTP respose with 2xx status) return zero.
+Successful requests (HTTP respose with *2xx* status) return zero.
 Otherwise, the first digit of the response status is returned (i.e., 1 for
 1xx, 3 for 3xx, 4 for 4xx, etc.) This is because the exit status is an 8 bit
 integer---it can't be greater than 255. If you want the exact status code
@@ -372,14 +372,14 @@ To assign the response of resty to a variable you can you do for example: `VAR="
 Working With JSON or XML Data
 =============================
 
-JSON REST web services require some special tools to make them accessible
+`JSON REST` web services require some special tools to make them accessible
 and easily manipulated in the shell environment. The following are a few
 scripts that make dealing with JSON data easier.
 
   * [Jsawk](http://github.com/micha/jsawk) can be used to process and filter
     JSON data from and to resty, in a shell pipeline. This takes care of
-    parsing the input JSON correctly, rather than using regexes and sed,
-    awk, perl or the like, and prints the resulting output in correct JSON
+    parsing the input JSON correctly, rather than using regexes and `sed`,
+    `awk`, `per`l or the like, and prints the resulting output in correct JSON
     format, as well.
 
     `GET /blogs.json |jsawk -n 'out(this.title)' # prints all the blog titles`
diff --git a/resty b/resty
index 357ef47..46cf393 100644
--- a/resty
+++ b/resty
@@ -242,7 +242,7 @@ function resty-trace() {
     resty-call TRACE "$@"
 }
 
-# TODO: see what it does?
+# With -W option, does not write to history file
 [ "$1" = "-W" ] && export _RESTY_NO_HISTORY="/dev/null" && [[ $# -gt 0 ]] && shift
 
 resty "$@" >/dev/null 2>&1

From cd944bde097afde36b5c9e1d154aa4a666c545df Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Thu, 6 Apr 2017 22:24:26 +0200
Subject: [PATCH 021/173] minimal api server server the simple files

---
 test/Makefile               |  6 ------
 test/{ => data}/simple.html |  0
 test/{ => data}/simple.json |  0
 test/{ => data}/simple.txt  |  0
 test/lilhttpd               | 35 -----------------------------------
 test/package.json           | 33 +++++++++++++++++++++++++++++++++
 test/runtests               | 29 -----------------------------
 test/server.js              | 22 ++++++++++++++++++++++
 8 files changed, 55 insertions(+), 70 deletions(-)
 delete mode 100644 test/Makefile
 rename test/{ => data}/simple.html (100%)
 rename test/{ => data}/simple.json (100%)
 rename test/{ => data}/simple.txt (100%)
 delete mode 100755 test/lilhttpd
 create mode 100644 test/package.json
 delete mode 100755 test/runtests
 create mode 100644 test/server.js

diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 01f748a..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-test:
-	./runtests tests |tee tests.tmp |grep -E '^# \[(REQ|OUT)\] TEST [0-9]'
-	diff tests.out tests.tmp |tee tests.log
-
-record:
-	./runtests tests |tee tests.out |grep -E '^# \[(REQ|OUT)\] TEST [0-9]'
diff --git a/test/simple.html b/test/data/simple.html
similarity index 100%
rename from test/simple.html
rename to test/data/simple.html
diff --git a/test/simple.json b/test/data/simple.json
similarity index 100%
rename from test/simple.json
rename to test/data/simple.json
diff --git a/test/simple.txt b/test/data/simple.txt
similarity index 100%
rename from test/simple.txt
rename to test/data/simple.txt
diff --git a/test/lilhttpd b/test/lilhttpd
deleted file mode 100755
index 76b53fb..0000000
--- a/test/lilhttpd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-[ "$1" = "-I" ] && reflect="yes"
-
-while read a; do
-  a=$(echo "$a" |tr -d '\r')
-  if [ -n "$r" ]; then
-    r=$(printf "%s\\n%s" "$r" "$a")
-  else
-    r="$a"
-    f=$(echo "$a" |cut -d" " -f2 |sed -e 's@^/@@' -e 's/?.*//')
-  fi
-  [ "${a/#Content-Length: /}" = "$a" ] || n=${a/#Content-Length: /}
-  [ "$a" = "" ] && break
-done
-
-[ -n "$n" ] && r=$(printf "%s\\n%s" "$r" "$(head -c $n)")
-
-if [ "$reflect" = "yes" ]; then 
-  ct="text/plain"
-else
-  r=$(cat "$f")
-  ct=$(file -b --mime "$f")
-fi
-
-cat <<EOF
-HTTP/1.0 200 OK
-Cache-Control: private
-Content-Type: $ct
-Server: lilhttpd/1.0
-Connection: close
-Content-Length: $(echo "$r" |wc -c |awk '{print $1}')
-
-$r
-EOF
diff --git a/test/package.json b/test/package.json
new file mode 100644
index 0000000..5d9f73e
--- /dev/null
+++ b/test/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "resty-server-test",
+  "version": "0.1.0",
+  "description": "Server Test for resty",
+  "main": "index.js",
+  "directories": {
+    "test": "tests"
+  },
+  "scripts": {
+    "test": "lab test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/micha/resty.git"
+  },
+  "keywords": [
+    "test"
+  ],
+  "author": "Adriean Khisbe <adriean.khisbe@live.fr> (https://github.com/AdrieanKhisbe/)",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/micha/resty/issues"
+  },
+  "homepage": "https://github.com/micha/resty#readme",
+  "dependencies": {
+    "hapi": "^16.1.1",
+    "inert": "^4.2.0"
+  },
+  "devDependencies": {
+    "code": "^4.0.0",
+    "lab": "^13.0.1"
+  }
+}
diff --git a/test/runtests b/test/runtests
deleted file mode 100755
index 53ed121..0000000
--- a/test/runtests
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-TEST=$1
-
-. ../resty -W
-
-# run tests to check that the correct request is being made
-( j=1
-  while true; do
-    gnetcat -l -w 2 -p 9090 -e './lilhttpd -I' localhost || break
-    grep '^# TEST [0-9][0-9]*' $TEST |head -$j |tail -1 |sed 's/^#/# [REQ]/'
-    j=$((j+1))
-  done )&
-
-. $TEST
-
-wait
-
-# run tests again, this time checking actual output
-( j=1
-  while true; do
-    gnetcat -l -w 2 -p 9090 -e ./lilhttpd localhost || break
-    grep '^# TEST [0-9][0-9]*' $TEST |head -$j |tail -1 |sed 's/^#/# [OUT]/'
-    j=$((j+1))
-  done )&
-
-. $TEST
-
-wait
diff --git a/test/server.js b/test/server.js
new file mode 100644
index 0000000..40003d7
--- /dev/null
+++ b/test/server.js
@@ -0,0 +1,22 @@
+const Hapi = require('hapi');
+
+
+const server = new Hapi.Server();
+server.connection({port: 4004});
+
+server.register(require('inert'), (err) => {
+
+    if (err) throw err;
+
+    server.route({
+        method: 'GET',
+        path: '/{param*}',
+        handler: {directory: {path: 'data'}}
+    })
+
+    server.start((err) => {
+        if (err) throw err;
+
+        console.log('Server running ', server.info.uri);
+    })
+})
\ No newline at end of file

From 4d9f7c1c0604b4183aef8cf1cb2f9739776fef05 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Thu, 6 Apr 2017 22:59:17 +0200
Subject: [PATCH 022/173] zsh fix to avoid parse error (( being interpredted

---
 resty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index 46cf393..69f0e0c 100644
--- a/resty
+++ b/resty
@@ -68,7 +68,7 @@ function resty-call() {
     local cookies="$_RESTY_DATA_DIR/c"
 
     # §maybe cache
-    local h2t=$((exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
+    local h2t=$( (exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
 			  || which html2text || which cat) |tail -n 1) # torename
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
@@ -163,7 +163,7 @@ function resty-call() {
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$((((curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
+    res=$( ( ( (curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
 				| sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) |sed 's/^/ERR /' && echo) 2>&1)
 

From ff498dd1cad75bac3f18aaf400e0920ab2ce2230 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Thu, 6 Apr 2017 23:23:44 +0200
Subject: [PATCH 023/173] add a basic test with shpec. shpec structure

---
 test/resty_shpec.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 test/resty_shpec.sh

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
new file mode 100644
index 0000000..b4dd40e
--- /dev/null
+++ b/test/resty_shpec.sh
@@ -0,0 +1,43 @@
+
+
+describe "Resty"
+
+    describe "Basic"
+        it "load resty function without error"
+           . ./resty -W # source resty with no history mode
+           assert equal $? 0
+        end
+
+        it "can define a target"
+            output=$(resty localhost:4004 2>&1 )
+            assert equal $? 0
+            assert equal "$output" "http://localhost:4004*"
+        end
+
+        # Launch server
+        resty localhost:4004 2>/dev/null
+
+        it "can access to it with a get"
+            output=$(GET / 2>&1)
+            assert present "$output"
+        end
+        it "get the good content"
+            output=$(GET /simple.txt)
+            assert equal "$output" "hi there"
+        end
+
+
+    end
+
+
+    describe "HTTP Verbs"
+        echo "To Be Done"
+
+    end
+
+    describe "Options"
+        echo "To be done"
+
+    end
+
+end
\ No newline at end of file

From 95d7f220ea8d005c16ad4571665a29de84fa098f Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Thu, 6 Apr 2017 23:30:41 +0200
Subject: [PATCH 024/173] travis config attempt

---
 .travis.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e61f613
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+# zsh shpec build draft
+language: zsh
+env:
+  - SHELL=zsh
+install:
+  # install antigen
+  - curl -L https://raw.githubusercontent.com/zsh-users/antigen/master/antigen.zsh > ~/antigen.zsh
+  - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
+  - echo "setop sh_word_split" > ~/.zshenv
+  - zsh ~/.zshrc
+  - export SHELL=zsh
+  - source ~/.zshrc
+
+  - $HOME/.nvm/nvm.sh
+  - nvm install 6 && nvm use 6
+  - (cd test && npm install)
+
+script:
+  - (cd test && node server.js)&
+  - zsh --version
+  - shpec
+
+before_install:
+  - sudo apt-get install zsh
+  - export SHELL=zsh
+
+notifications:
+  email: false

From 25c57f3195052f1704e289195ca957d2b16f237f Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Thu, 6 Apr 2017 23:37:08 +0200
Subject: [PATCH 025/173] modification to the travis config

---
 .travis.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e61f613..94eb2aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,8 @@
-# zsh shpec build draft
-language: zsh
+language: sh
 env:
   - SHELL=zsh
 install:
-  # install antigen
-  - curl -L https://raw.githubusercontent.com/zsh-users/antigen/master/antigen.zsh > ~/antigen.zsh
-  - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
-  - echo "setop sh_word_split" > ~/.zshenv
-  - zsh ~/.zshrc
-  - export SHELL=zsh
-  - source ~/.zshrc
+  - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6

From 0843eaf478761b1e06b30ef1b7f4c917cc071635 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 00:10:58 +0200
Subject: [PATCH 026/173] update travis with extended PATH

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 94eb2aa..abba970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ env:
   - SHELL=zsh
 install:
   - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
+  - PATH="$PATH:/usr/local/bin/"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6

From d4d45c19d34349eea418c87b9e3aed64437a30c4 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 00:22:02 +0200
Subject: [PATCH 027/173] travis config hardcode path of shpec

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index abba970..08e290a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ env:
   - SHELL=zsh
 install:
   - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
-  - PATH="$PATH:/usr/local/bin/"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6
@@ -11,8 +10,7 @@ install:
 
 script:
   - (cd test && node server.js)&
-  - zsh --version
-  - shpec
+  - /usr/local/bin/shpec
 
 before_install:
   - sudo apt-get install zsh

From f12bf03296076555b32e58f8324c5a530e63bca7 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 00:31:57 +0200
Subject: [PATCH 028/173] customize where shpec install itself

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 08e290a..dff1b85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ language: sh
 env:
   - SHELL=zsh
 install:
+  - export "BINDIR=$HOME/bin"
   - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
+  - PATH="$PATH:$BINDIR"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6
@@ -10,7 +12,7 @@ install:
 
 script:
   - (cd test && node server.js)&
-  - /usr/local/bin/shpec
+  - shpec
 
 before_install:
   - sudo apt-get install zsh

From cc5fa336f0457281231be10d0dfd95f24db36d3a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 01:04:40 +0200
Subject: [PATCH 029/173] use shpec from antigen

---
 .travis.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dff1b85..d277f05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
-language: sh
+# zsh shpec build draft
+language: zsh
 env:
   - SHELL=zsh
 install:
-  - export "BINDIR=$HOME/bin"
-  - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
-  - PATH="$PATH:$BINDIR"
+  # install antigen
+  - curl -L https://raw.githubusercontent.com/zsh-users/antigen/master/antigen.zsh > ~/antigen.zsh
+  - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
+  - echo "setopt sh_word_split" > ~/.zshenv
+  - zsh ~/.zshrc
+  - export SHELL=zsh
+  - source ~/.zshrc
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6
@@ -12,7 +17,8 @@ install:
 
 script:
   - (cd test && node server.js)&
-  - shpec
+  - zsh --version
+  - zsh -c shpec
 
 before_install:
   - sudo apt-get install zsh

From 511b72520552f1f3fb34989f69c6780777d07d38 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 01:20:34 +0200
Subject: [PATCH 030/173] path to antigen add changed!

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d277f05..f9fe5c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ env:
   - SHELL=zsh
 install:
   # install antigen
-  - curl -L https://raw.githubusercontent.com/zsh-users/antigen/master/antigen.zsh > ~/antigen.zsh
+  - curl -L https://raw.githubusercontent.com/zsh-users/antigen/master/bin/antigen.zsh > ~/antigen.zsh
   - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
   - echo "setopt sh_word_split" > ~/.zshenv
   - zsh ~/.zshrc

From 93cb55b4d3d590ecb2076d346f66ec53510411e8 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 01:25:33 +0200
Subject: [PATCH 031/173] go for shorter address hoping there wont be a syntax
 error there

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f9fe5c4..5e3aff6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ env:
   - SHELL=zsh
 install:
   # install antigen
-  - curl -L https://raw.githubusercontent.com/zsh-users/antigen/master/bin/antigen.zsh > ~/antigen.zsh
+  - curl -L git.io/antigen > ~/antigen.zsh
   - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
   - echo "setopt sh_word_split" > ~/.zshenv
   - zsh ~/.zshrc

From c045d0fdbe7bc04e165b55719f018ad31a2330fd Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 01:30:24 +0200
Subject: [PATCH 032/173] remove the sourcing of zshrc in bash

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5e3aff6..b2584bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ install:
   - echo "setopt sh_word_split" > ~/.zshenv
   - zsh ~/.zshrc
   - export SHELL=zsh
-  - source ~/.zshrc
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6

From 5b04865777ca4ffbcf80e6b91dd5ee87d5b92620 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 01:34:10 +0200
Subject: [PATCH 033/173] source zshrc before to run shpec

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b2584bc..77271b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
 script:
   - (cd test && node server.js)&
   - zsh --version
-  - zsh -c shpec
+  - (source ~/.zshrc && shpec)
 
 before_install:
   - sudo apt-get install zsh

From 8a3713ceda3ac6be8a3942dcc17cd7b600cf0e86 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 11:53:02 +0200
Subject: [PATCH 034/173] move test command into a script that is loaded

---
 .travis-test.zsh | 6 ++++++
 .travis.yml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 .travis-test.zsh

diff --git a/.travis-test.zsh b/.travis-test.zsh
new file mode 100755
index 0000000..e7f7412
--- /dev/null
+++ b/.travis-test.zsh
@@ -0,0 +1,6 @@
+#!/bin/zsh
+echo "Sourcing ZshRc"
+source ~/.zshrc
+
+echo "Launching Test"
+shpec
diff --git a/.travis.yml b/.travis.yml
index 77271b4..db9b988 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
 script:
   - (cd test && node server.js)&
   - zsh --version
-  - (source ~/.zshrc && shpec)
+  - ./.travis-test.zsh
 
 before_install:
   - sudo apt-get install zsh

From bfad865f2543dc3c3e241944f2647af022ae061b Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 11:58:04 +0200
Subject: [PATCH 035/173] launch the server in the travis test

---
 .travis-test.zsh | 7 +++++--
 .travis.yml      | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis-test.zsh b/.travis-test.zsh
index e7f7412..f71f37e 100755
--- a/.travis-test.zsh
+++ b/.travis-test.zsh
@@ -1,6 +1,9 @@
 #!/bin/zsh
-echo "Sourcing ZshRc"
+
 source ~/.zshrc
 
-echo "Launching Test"
+cd test && node server.js &
+sleep 1
+
+cd ..
 shpec
diff --git a/.travis.yml b/.travis.yml
index db9b988..4954910 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ install:
   - (cd test && npm install)
 
 script:
-  - (cd test && node server.js)&
   - zsh --version
   - ./.travis-test.zsh
 

From 84e850ea898436b5d65fbb16d47c53cf45ffd163 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 14:22:47 +0200
Subject: [PATCH 036/173] fix the display interpolation that was giving command
 not fond when lynx was present

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 69f0e0c..91f379e 100644
--- a/resty
+++ b/resty
@@ -180,7 +180,7 @@ function resty-call() {
     else display=cat
     fi
 
-    if [ -n "$out" ]; then out=$(echo "$out" | "$display") ; fi
+    if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable

From da62e953db89dbc0aa58f3602453cd4d29ecc853 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 14:33:14 +0200
Subject: [PATCH 037/173] add test for the pretty print and raw mode

---
 test/resty_shpec.sh                 | 17 +++++++++++++++-
 test/test-data/simple-html-lynx.txt | 30 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/test-data/simple-html-lynx.txt

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index b4dd40e..01e62a9 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -26,13 +26,28 @@ describe "Resty"
             assert equal "$output" "hi there"
         end
 
-
     end
 
 
     describe "HTTP Verbs"
         echo "To Be Done"
 
+    end
+
+    describe "Viewer"
+
+        it "prety format when lynx is installed"
+            output=$(GET /simple.html)
+            assert match $(which lynx) lynx
+            assert equal "$output" "$(< test/test-data/simple-html-lynx.txt)"
+        end
+        it "does not prety format on raw mode"
+            output=$(GET /simple.html -Z)
+            assert equal "$output" "$(< test/data/simple.html)"
+        end
+
+
+
     end
 
     describe "Options"
diff --git a/test/test-data/simple-html-lynx.txt b/test/test-data/simple-html-lynx.txt
new file mode 100644
index 0000000..2b29ac2
--- /dev/null
+++ b/test/test-data/simple-html-lynx.txt
@@ -0,0 +1,30 @@
+   [1]fork me on github
+
+Resty
+Test
+Page
+     __________________________________________________________________
+
+Hello There.
+
+   CAPTION: Table 1: Pets you can adopt.
+
+       #
+     name
+    species
+     price
+   available
+   1        bugs   rabbit   $1.25 Jun 24 2009
+   2        rascal dog      $3.50 Apr 1 2010
+   3        rufus  dog      $0.25 Jun 17 2009
+   4        scabby bird     $0.02 Jun 04 2009
+   5        roger  goldfish $0.02 Jun 05 2009
+
+   The table on the right has sortable columns. Click on the column
+   headings to sort and re-sort that column. The rain in Spain falls
+   mainly on the plain. Thanks!
+     __________________________________________________________________
+
+References
+
+http://github.com/micha/resty
\ No newline at end of file

From 15987dc5fef8535cb9009b6c71b4b907a7a83cc2 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 14:34:05 +0200
Subject: [PATCH 038/173] add node_modules and .idea to .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 44fa520..6a60f33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *.swo
 *~
 .DS_Store
+
+test/node_modules
+.idea

From 85f8df301c2e10d63d1a35f213980850d9a906cf Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 14:35:32 +0200
Subject: [PATCH 039/173] install lynx in travis for the test to be working

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4954910..629ac79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ script:
   - ./.travis-test.zsh
 
 before_install:
-  - sudo apt-get install zsh
+  - sudo apt-get install zsh lynx
   - export SHELL=zsh
 
 notifications:

From d3905100705da57899d96a33d3af66c88bcca6f0 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 16:40:50 +0200
Subject: [PATCH 040/173] fix attempt to protect -stdin from 'not valid in this
 context'

---
 resty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index 91f379e..d421889 100644
--- a/resty
+++ b/resty
@@ -68,8 +68,8 @@ function resty-call() {
     local cookies="$_RESTY_DATA_DIR/c"
 
     # §maybe cache
-    local h2t=$( (exec 2>&-; (which lynx >/dev/null && echo lynx -stdin -dump) \
-			  || which html2text || which cat) |tail -n 1) # torename
+    local h2t="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
+			  || which html2text || which cat) |tail -n 1)"  # html to text
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
     if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi

From d5521494c14c099ffcf739c0bb1325822b2a6648 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 16:52:16 +0200
Subject: [PATCH 041/173] print lynx version

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 629ac79..87b2841 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
   - (cd test && npm install)
 
 script:
-  - zsh --version
+  - zsh --version ; lynx --version
   - ./.travis-test.zsh
 
 before_install:

From 4f6869bb4e5fdd2f2a515306fa57936a125f10bc Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Fri, 7 Apr 2017 17:14:58 +0200
Subject: [PATCH 042/173] hack around lynx version mismatch between macos and
 travis linux

---
 test/resty_shpec.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 01e62a9..cd65bc3 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -37,9 +37,10 @@ describe "Resty"
     describe "Viewer"
 
         it "prety format when lynx is installed"
-            output=$(GET /simple.html)
+            output=$(GET /simple.html | tr -d ' ')
             assert match $(which lynx) lynx
-            assert equal "$output" "$(< test/test-data/simple-html-lynx.txt)"
+            assert equal "$output" "$(cat test/test-data/simple-html-lynx.txt | tr -d ' ')"
+            # note : hack to cope with lynx version differencies and different handling of table headers
         end
         it "does not prety format on raw mode"
             output=$(GET /simple.html -Z)

From 02ed564b1a71e7c2f3982ea27097d353202aeb61 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 11:20:43 +0200
Subject: [PATCH 043/173] add patch method to request with body

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index d421889..5d7e2e3 100644
--- a/resty
+++ b/resty
@@ -72,7 +72,7 @@ function resty-call() {
 			  || which html2text || which cat) |tail -n 1)"  # html to text
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
-    if [[ "POST PUT TRACE DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
+    if [[ "POST PUT TRACE DELETE PATCH" =~ "$method" ]]; then local hasbody="yes" ;fi
 
     if [ -d "$cookies" ] ; then   # retrieve cookie
 	(mkdir -p "$cookies"; echo "http://localhost*" > "$host")

From 4b4002ec0a26352ceddb12fafa67228482ec126d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 11:22:23 +0200
Subject: [PATCH 044/173] add test for all http method with body for the one
 that need one

---
 resty               |  3 +--
 test/package.json   |  3 ++-
 test/resty_shpec.sh | 34 +++++++++++++++++++++++++++++++++-
 test/server.js      | 29 ++++++++++++++++++++++++++++-
 4 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 5d7e2e3..062f08e 100644
--- a/resty
+++ b/resty
@@ -157,7 +157,6 @@ function resty-call() {
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
 	## §maybe: cache this when resty)
 	local cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
-	# echo $cmd
 	eval $cmd
     fi
 
@@ -179,9 +178,9 @@ function resty-call() {
     then display=$h2t
     else display=cat
     fi
-
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
+
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
 	out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
diff --git a/test/package.json b/test/package.json
index 5d9f73e..eb4922d 100644
--- a/test/package.json
+++ b/test/package.json
@@ -24,7 +24,8 @@
   "homepage": "https://github.com/micha/resty#readme",
   "dependencies": {
     "hapi": "^16.1.1",
-    "inert": "^4.2.0"
+    "inert": "^4.2.0",
+    "joi": "^10.4.1"
   },
   "devDependencies": {
     "code": "^4.0.0",
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index cd65bc3..8ddd5a8 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -30,7 +30,39 @@ describe "Resty"
 
 
     describe "HTTP Verbs"
-        echo "To Be Done"
+        data='data here'
+        it "GET"
+            output=$(GET /echo)
+            assert equal "$output" "get"
+        end
+        it "POST with data"
+            output=$(POST /echo "$data")
+            assert equal "$output" "post\n$data"
+        end
+        it "PUT with data"
+            output=$(PUT /echo "$data")
+            assert equal "$output" "put\n$data"
+        end
+        it "PATCH with data"
+            output=$(PATCH /echo "$data")
+            assert equal "$output" "patch\n$data"
+        end
+        it "DELETE"
+            output=$(DELETE /echo <<< "")
+            assert equal "$output" "delete"
+        end
+        it "DELETE with data"
+            output=$(DELETE /echo "$data")
+            assert equal "$output" "delete\n$data"
+        end
+        it "TRACE"
+            output=$(TRACE /echo "$data")
+            assert equal "$output" "trace\n$data"
+        end
+        it "OPTIONS"
+            output=$(OPTIONS /echo)
+            assert equal "$output" "options"
+        end
 
     end
 
diff --git a/test/server.js b/test/server.js
index 40003d7..7675b05 100644
--- a/test/server.js
+++ b/test/server.js
@@ -1,4 +1,5 @@
 const Hapi = require('hapi');
+const Joi = require('joi')
 
 
 const server = new Hapi.Server();
@@ -8,11 +9,37 @@ server.register(require('inert'), (err) => {
 
     if (err) throw err;
 
+    const echoHandler = function (request, reply){
+        let result = request.method
+        console.log(request.payload)
+        if(request.payload){
+            result += "\n" + request.payload
+        }
+        reply(result).header('Content-Type', 'text/plain');
+
+    };
+
+    server.route({
+        method: ['GET'],
+        path: '/echo',
+        handler: echoHandler
+    });
+    server.route({
+        method: [ 'PUT', 'PATCH', 'POST', 'DELETE', 'OPTIONS', 'TRACE'],
+        path: '/echo',
+        handler: echoHandler,
+        config: {
+          payload: { output: 'data', parse: false}
+        }
+    });
+
     server.route({
         method: 'GET',
         path: '/{param*}',
         handler: {directory: {path: 'data'}}
-    })
+    });
+
+
 
     server.start((err) => {
         if (err) throw err;

From 9a18efecfa0008ea7eb6bd957fbe681cf196f4cb Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 11:29:56 +0200
Subject: [PATCH 045/173] fix indentation

---
 resty | 68 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/resty b/resty
index 062f08e..ce9c16a 100644
--- a/resty
+++ b/resty
@@ -90,38 +90,38 @@ function resty-call() {
     local -a curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose
     for opt in "$@"; do
-	if [ -n "$maybe_query" -a -z "$query" ] ; then query="?$opt"; continue; fi
-
-	case $opt in
-	    --verbose|-v) verbose="yes";;
-		# TODO; try adapt ; echo "$opt" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
-	    -V) vimedit="yes" ;;
-	    -Z) raw="yes" ;;
-	    -W) ;; # §todo: check why nothing?
-	    -Q) quote="yes" ;;
-	    -q) maybe_query="yes" ;;
-	    *) curlopt_cmd+=("$opt")
-	esac
-	## idea: add --json, other option.
+        if [ -n "$maybe_query" -a -z "$query" ] ; then query="?$opt"; continue; fi
+
+        case $opt in
+            --verbose|-v) verbose="yes";;
+            # TODO; try adapt ; echo "$opt" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
+            -V) vimedit="yes" ;;
+            -Z) raw="yes" ;;
+            -W) ;; # §todo: check why nothing?
+            -Q) quote="yes" ;;
+            -q) maybe_query="yes" ;;
+            *) curlopt_cmd+=("$opt")
+        esac
+        ## idea: add --json, other option.
     done
 
     if [ -z "$quote" ]; then # replace special char with codes
-	_path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
+	    _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
     fi
 
     if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
     if [ "$method" = "-v" ] ; then # ??
-	echo "$_RESTY_HOST $_resty_opts"
-	return
+        echo "$_RESTY_HOST $_resty_opts"
+        return
     fi
     if [ -z "$method" ] ; then # return since no method
-	echo "$_RESTY_HOST"
-	return
+        echo "$_RESTY_HOST"
+        return
     fi
     if [ -n "$_path" ] ; then # update current path
-	_RESTY_PATH=$_path
+	    _RESTY_PATH=$_path
     fi
 
     local domain=$(echo -n "$_RESTY_HOST" \
@@ -139,25 +139,25 @@ function resty-call() {
     fi
 
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
-	local tmpf=$(mktemp /tmp/resty.XXXXXX)
-	[ -t 0 ] || cat > $tmpf
-	(exec < /dev/tty; "$editor" $tmpf)
-	local body=$(cat $tmpf)
-	rm -f $tmpf
+        local tmpf=$(mktemp /tmp/resty.XXXXXX)
+        [ -t 0 ] || cat > $tmpf
+        (exec < /dev/tty; "$editor" $tmpf)
+        local body=$(cat $tmpf)
+        rm -f $tmpf
     fi
 
     if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# > 0 ]] && shift;fi
     if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# > 0 ]] && shift ;fi
     if [ -n "$body" ] ; then curl_opt="--data-binary" ;fi
     if [ "$method" = "HEAD" ] ; then
-	curl_opt="-I"
-	raw="yes"
+        curl_opt="-I"
+        raw="yes"
     fi
 
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
-	## §maybe: cache this when resty)
-	local cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
-	eval $cmd
+        ## §maybe: cache this when resty)
+        local cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+        eval $cmd
     fi
 
     # Launch command and retrieved streams
@@ -183,15 +183,15 @@ function resty-call() {
 
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
-	out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
-				-e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+        out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
+                    -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
     fi
 
     if [ "$ret" != "2" ]; then
-	[ -n "$out" ] && echo "$out" 1>&2
-	return $ret
+        [ -n "$out" ] && echo "$out" 1>&2
+        return $ret
     else
-	[ -n "$out" ] && echo "$out"
+        [ -n "$out" ] && echo "$out"
     fi
 
 }

From 40c9a8f29c6b0755c99da208aa75cf0f4e21aa06 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 11:33:24 +0200
Subject: [PATCH 046/173] delete with option now requires a --body flag #46

---
 resty               | 3 ++-
 test/resty_shpec.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index ce9c16a..20266d1 100644
--- a/resty
+++ b/resty
@@ -72,7 +72,7 @@ function resty-call() {
 			  || which html2text || which cat) |tail -n 1)"  # html to text
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
-    if [[ "POST PUT TRACE DELETE PATCH" =~ "$method" ]]; then local hasbody="yes" ;fi
+    if [[ "POST PUT TRACE PATCH" =~ "$method" ]]; then local hasbody="yes" ;fi
 
     if [ -d "$cookies" ] ; then   # retrieve cookie
 	(mkdir -p "$cookies"; echo "http://localhost*" > "$host")
@@ -100,6 +100,7 @@ function resty-call() {
             -W) ;; # §todo: check why nothing?
             -Q) quote="yes" ;;
             -q) maybe_query="yes" ;;
+            --body) hasbody="yes";;
             *) curlopt_cmd+=("$opt")
         esac
         ## idea: add --json, other option.
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 8ddd5a8..9ff4ffd 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -48,11 +48,11 @@ describe "Resty"
             assert equal "$output" "patch\n$data"
         end
         it "DELETE"
-            output=$(DELETE /echo <<< "")
+            output=$(DELETE /echo)
             assert equal "$output" "delete"
         end
         it "DELETE with data"
-            output=$(DELETE /echo "$data")
+            output=$(DELETE /echo "$data" --body )
             assert equal "$output" "delete\n$data"
         end
         it "TRACE"

From f2d7eeee9d63688a4232de468fe015a3a6621bbe Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 11:41:08 +0200
Subject: [PATCH 047/173] add test for the HEAD method

---
 test/resty_shpec.sh | 4 ++++
 test/server.js      | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 9ff4ffd..0618762 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -63,6 +63,10 @@ describe "Resty"
             output=$(OPTIONS /echo)
             assert equal "$output" "options"
         end
+        it "HEAD"
+            output=$(HEAD /echo)
+            assert match  "$output" "200"
+        end
 
     end
 
diff --git a/test/server.js b/test/server.js
index 7675b05..38c13fe 100644
--- a/test/server.js
+++ b/test/server.js
@@ -11,7 +11,6 @@ server.register(require('inert'), (err) => {
 
     const echoHandler = function (request, reply){
         let result = request.method
-        console.log(request.payload)
         if(request.payload){
             result += "\n" + request.payload
         }
@@ -20,7 +19,7 @@ server.register(require('inert'), (err) => {
     };
 
     server.route({
-        method: ['GET'],
+        method: 'GET',
         path: '/echo',
         handler: echoHandler
     });

From 44fec6cc050602e5482a1ab5429e2dcd7bb61c5b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 11:53:32 +0200
Subject: [PATCH 048/173] add test for the query parameters (along with body)

---
 test/resty_shpec.sh | 21 +++++++++++++++++++++
 test/server.js      |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 0618762..e749c5f 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -35,18 +35,39 @@ describe "Resty"
             output=$(GET /echo)
             assert equal "$output" "get"
         end
+        it "GET with query string"
+            output=$(GET "/echo?a=b" -Q)
+            assert equal "$output" 'get\n{"a":"b"}'
+        end
+
+        it "GET with query string by argument"
+            output=$(GET /echo -q "a=b")
+            assert equal "$output" 'get\n{"a":"b"}'
+        end
         it "POST with data"
             output=$(POST /echo "$data")
             assert equal "$output" "post\n$data"
         end
+        it "POST with data and query parameter"
+            output=$(POST /echo "$data" -q "a=b")
+            assert equal "$output" 'post\n'"$data"'\n{"a":"b"}'
+        end
         it "PUT with data"
             output=$(PUT /echo "$data")
             assert equal "$output" "put\n$data"
         end
+        it "PUT with data and query parameter"
+            output=$(PUT /echo "$data" -q "a=b")
+            assert equal "$output" 'put\n'"$data"'\n{"a":"b"}'
+        end
         it "PATCH with data"
             output=$(PATCH /echo "$data")
             assert equal "$output" "patch\n$data"
         end
+        it "PATCH with data and query parameter"
+            output=$(PATCH /echo "$data" -q "a=b")
+            assert equal "$output" 'patch\n'"$data"'\n{"a":"b"}'
+        end
         it "DELETE"
             output=$(DELETE /echo)
             assert equal "$output" "delete"
diff --git a/test/server.js b/test/server.js
index 38c13fe..3a199b8 100644
--- a/test/server.js
+++ b/test/server.js
@@ -14,6 +14,9 @@ server.register(require('inert'), (err) => {
         if(request.payload){
             result += "\n" + request.payload
         }
+        if(JSON.stringify(request.query) !== '{}') {
+            result += "\n" + JSON.stringify(request.query)
+        }
         reply(result).header('Content-Type', 'text/plain');
 
     };

From 5b00b27e72967e037b2e09626e0b36432b8292ae Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 18:15:34 +0200
Subject: [PATCH 049/173] add two new tests

---
 test/resty_shpec.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index e749c5f..0f4642b 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -109,7 +109,18 @@ describe "Resty"
     end
 
     describe "Options"
-        echo "To be done"
+         it "GET with headers"
+            output=$(GET /echo -v 2> /tmp/resty-getheader-error)
+            erroroutput=$(< /tmp/resty-getheader-error)
+            assert equal "$output" "get"
+            assert match "$erroroutput" "content-type" # TODO : later once shpec better matcher pass text
+            assert match "$erroroutput" "cache-control"
+        end
+
+        it "POST with data sent in query string"
+            output=$(POST /echo -d foo=bar -G)
+            assert equal "$output" 'post\n\n{"foo":"bar"}'
+        end
 
     end
 

From 0c84f1ff832f7a47d6eca8901c433d59afce0454 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 18:16:13 +0200
Subject: [PATCH 050/173] fix mistranslated conditionnal that was inducing a
 bug on request with body (expectnig data)

---
 resty | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 20266d1..1fa5ab2 100644
--- a/resty
+++ b/resty
@@ -132,11 +132,11 @@ function resty-call() {
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
 
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
-	if [ -t 0 ] ; then # retrieve what stdin hold
-	   local body="@-"
-	else
-	   local body=""
-	fi
+        if [ ! -t 0 ] ; then # retrieve what stdin hold
+           local body="@-"
+        else
+           local body=""
+        fi
     fi
 
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then

From 58dd40d342ec95dffadf93b452595abc56313d2c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 18:18:23 +0200
Subject: [PATCH 051/173] delete with data don't need the --body flag anymore

---
 resty               | 3 +--
 test/resty_shpec.sh | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 1fa5ab2..3dffd6b 100644
--- a/resty
+++ b/resty
@@ -72,7 +72,7 @@ function resty-call() {
 			  || which html2text || which cat) |tail -n 1)"  # html to text
     local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
-    if [[ "POST PUT TRACE PATCH" =~ "$method" ]]; then local hasbody="yes" ;fi
+    if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 
     if [ -d "$cookies" ] ; then   # retrieve cookie
 	(mkdir -p "$cookies"; echo "http://localhost*" > "$host")
@@ -100,7 +100,6 @@ function resty-call() {
             -W) ;; # §todo: check why nothing?
             -Q) quote="yes" ;;
             -q) maybe_query="yes" ;;
-            --body) hasbody="yes";;
             *) curlopt_cmd+=("$opt")
         esac
         ## idea: add --json, other option.
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 0f4642b..842426a 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -73,7 +73,7 @@ describe "Resty"
             assert equal "$output" "delete"
         end
         it "DELETE with data"
-            output=$(DELETE /echo "$data" --body )
+            output=$(DELETE /echo "$data")
             assert equal "$output" "delete\n$data"
         end
         it "TRACE"

From 5bde4df6a8232afc20398e871ba80b3675fc4553 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 19:05:55 +0200
Subject: [PATCH 052/173] add new test for header, basic auth and prety
 printing

---
 test/resty_shpec.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 842426a..d501f31 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -103,9 +103,12 @@ describe "Resty"
             output=$(GET /simple.html -Z)
             assert equal "$output" "$(< test/data/simple.html)"
         end
-
-
-
+        it "json pretty-print formatting with pypp"
+            output=$(GET /simple.json | ./pypp)
+            assert equal "$output" '{\n    "bar": {
+        "cat": "meow",\n        "dog": "woof",\n        "fish": "banana"\n    },\n    "foo": [
+        1,\n        2,\n        3\n    ]\n}'
+        end
     end
 
     describe "Options"
@@ -113,8 +116,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
             assert equal "$output" "get"
-            assert match "$erroroutput" "content-type" # TODO : later once shpec better matcher pass text
-            assert match "$erroroutput" "cache-control"
+            assert match "$erroroutput" "content-type:\ text/plain\;\ charset=utf-8"
+            assert match "$erroroutput" "cache-control:\ no-cache"
         end
 
         it "POST with data sent in query string"
@@ -122,6 +125,15 @@ describe "Resty"
             assert equal "$output" 'post\n\n{"foo":"bar"}'
         end
 
+        it "POST with extra header and basic auth, data in message body"
+            output=$(POST /echo -u "user:secret" -H "Accept: application/json" \
+                     -v < test/data/simple.json 2> /tmp/resty-getheader-error)
+            erroroutput=$(< /tmp/resty-getheader-error)
+            assert equal "$output" 'post\n{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}'
+            assert match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert match "$erroroutput" "Accept:\ application/json"
+        end
+
     end
 
-end
\ No newline at end of file
+end

From 579e92f0f58b0b8198e39c57a64a16dbd50398eb Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 19:27:28 +0200
Subject: [PATCH 053/173] add test about global option setting and fix bug it
 uncovered :)

---
 resty               |  4 ++--
 test/resty_shpec.sh | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index 3dffd6b..be96c67 100644
--- a/resty
+++ b/resty
@@ -35,11 +35,11 @@ function resty() {
 
     local host="$_RESTY_DATA_DIR/host"
 
-    local url=$1
+    local url=$1; shift
 
     case "$url" in
 	http://*|https://*)
-	    _resty_opts=$(printf '%q ' "${curlopt[@]}")
+	    _resty_opts=$(printf '%q ' "${@[@]}")
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index d501f31..f4b1741 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -136,4 +136,24 @@ describe "Resty"
 
     end
 
+    describe "Resty Global options"
+        it "Setting new options"
+            resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
+            output=$(GET /echo -v 2> /tmp/resty-getheader-error)
+            erroroutput=$(< /tmp/resty-getheader-error)
+            assert equal "$output" "get"
+            assert match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert match "$erroroutput" "Accept:\ application/json"
+        end
+
+        it "Resetting options"
+            resty localhost:4004 2> /dev/null
+            output=$(GET /echo -v 2> /tmp/resty-getheader-error)
+            erroroutput=$(< /tmp/resty-getheader-error)
+            assert equal "$output" "get"
+            assert no_match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert no_match "$erroroutput" "Accept:\ application/json"
+        end
+
+    end
 end

From acd2fdbdd88676cbf11fe18ae0452f9114f5a987 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:01:37 +0200
Subject: [PATCH 054/173] remove old tests now that they have been 'translated'

---
 test/.gitignore |   2 -
 test/tests      |  68 -------
 test/tests.out  | 531 ------------------------------------------------
 3 files changed, 601 deletions(-)
 delete mode 100644 test/.gitignore
 delete mode 100644 test/tests
 delete mode 100644 test/tests.out

diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index 725cffc..0000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-tests.tmp
-tests.log
diff --git a/test/tests b/test/tests
deleted file mode 100644
index 26d3371..0000000
--- a/test/tests
+++ /dev/null
@@ -1,68 +0,0 @@
-
-resty 127.0.0.1:9090 2> /dev/null
-
-# TEST 1: basic GET request
-GET /simple.html
-sleep .25
-
-# TEST 2: basic PUT request
-PUT /simple.html 'here is some data'
-sleep .25
-
-# TEST 3: basic POST request
-POST /simple.html 'here is some data'
-sleep .25
-
-# TEST 4: basic DELETE request
-DELETE /simple.html
-sleep .25
-
-# TEST 5: basic TRACE request
-TRACE /simple.html 'here is some data'
-sleep .25
-
-# TEST 6: basic OPTIONS request
-OPTIONS /simple.html
-sleep .25
-
-# TEST 7: Raw response
-GET /simple.html -Z
-sleep .25
-
-# TEST 8: Get headers too
-GET /simple.html -v 2>&1
-sleep .25
-
-# TEST 9: POST with data sent in query string
-POST /simple.html -d foo=bar -G
-sleep .25
-
-# TEST 10: POST with data sent in message body
-POST /simple.html '{foo: "bar"}'
-sleep .25
-
-# TEST 11: POST with extra header and basic auth, data in message body
-POST /simple.html -u "user:secret" -H "Accept: application/json" < simple.json
-sleep .25
-
-# TEST 12: json pretty-print formatting
-GET /simple.json | ../pp 2>/dev/null
-sleep .25
-
-resty 127.0.0.1:9090 -H "Accept: application/json" -u user:pass 2> /dev/null
-
-# TEST 13: make sure the default options are correctly set
-GET /simple.json
-sleep .25
-
-resty 127.0.0.1:9090 2> /dev/null
-
-# TEST 14: make sure the default options are correctly unset
-GET /simple.json
-
-# TEST 15: try PUT with both data in body and query params in url, no urlencode
-echo '{"foo":"bar"}' |PUT '/simple.json?param=value&other=blah' -Q
-
-# TEST 16: try PUT with both data in body and query params in url via -q
-echo '{"foo":"bar"}' |PUT '/simple.json' -q 'param=value&other=blah'
-
diff --git a/test/tests.out b/test/tests.out
deleted file mode 100644
index 376e5e5..0000000
--- a/test/tests.out
+++ /dev/null
@@ -1,531 +0,0 @@
-# [REQ] TEST 1: basic GET request
-GET /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-# [REQ] TEST 2: basic PUT request
-PUT /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-Content-Length: 17
-Content-Type: application/x-www-form-urlencoded
-here is some data
-# [REQ] TEST 3: basic POST request
-POST /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-Content-Length: 17
-Content-Type: application/x-www-form-urlencoded
-here is some data
-# [REQ] TEST 4: basic DELETE request
-DELETE /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-# [REQ] TEST 5: basic TRACE request
-TRACE /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-Content-Length: 17
-Content-Type: application/x-www-form-urlencoded
-here is some data
-# [REQ] TEST 6: basic OPTIONS request
-HTTP/1.0 200 OK
-Cache-Control: private
-Content-Type: text/plain
-Server: lilhttpd/1.0
-Connection: close
-Content-Length: 168
-# [REQ] TEST 7: Raw response
-GET /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-# [REQ] TEST 8: Get headers too
-* <url> malformed
-* <url> malformed
-* About to connect() to 127.0.0.1 port 9090 (#0)
-*   Trying 127.0.0.1... connected
-* Connected to 127.0.0.1 (127.0.0.1) port 9090 (#0)
-> GET /simple.html HTTP/1.1
-> User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-> Host: 127.0.0.1:9090
-> Accept: */*
-> 
-* HTTP 1.0, assume close after body
-< HTTP/1.0 200 OK
-< Cache-Control: private
-< Content-Type: text/plain
-< Server: lilhttpd/1.0
-< Connection: close
-< Content-Length: 164
-< 
-{ [data not shown]
-* Closing connection #0
-GET /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-# [REQ] TEST 9: POST with data sent in query string
-POST /simple.html?foo=bar HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-# [REQ] TEST 10: POST with data sent in message body
-POST /simple.html HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-Content-Length: 12
-Content-Type: application/x-www-form-urlencoded
-{foo: "bar"}
-# [REQ] TEST 11: POST with extra header and basic auth, data in message body
-POST /simple.html HTTP/1.1
-Authorization: Basic dXNlcjpzZWNyZXQ=
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: application/json
-Content-Length: 66
-Content-Type: application/x-www-form-urlencoded
-{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}
-# [REQ] TEST 12: json pretty-print formatting
-# [REQ] TEST 13: make sure the default options are correctly set
-GET /simple.json HTTP/1.1
-Authorization: Basic dXNlcjpwYXNz
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: application/json
-# [REQ] TEST 14: make sure the default options are correctly unset
-GET /simple.json HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-# [REQ] TEST 15: try PUT with both data in body and query params in url, no urlencode
-PUT /simple.json?param=value&other=blah HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-Content-Length: 14
-Content-Type: application/x-www-form-urlencoded
-{"foo":"bar"}
-# [REQ] TEST 16: try PUT with both data in body and query params in url via -q
-PUT /simple.json?param=value&other=blah HTTP/1.1
-User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-Host: 127.0.0.1:9090
-Accept: */*
-Content-Length: 14
-Content-Type: application/x-www-form-urlencoded
-{"foo":"bar"}
-# [OUT] TEST 1: basic GET request
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 2: basic PUT request
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 3: basic POST request
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 4: basic DELETE request
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 5: basic TRACE request
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 6: basic OPTIONS request
-HTTP/1.0 200 OK
-Cache-Control: private
-Content-Type: text/html; charset=us-ascii
-Server: lilhttpd/1.0
-Connection: close
-Content-Length: 2340
-# [OUT] TEST 7: Raw response
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
-<html lang="en"> 
-  <head> 
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> 
-    <title>jQuery Tablesort Demo</title> 
-  </head> 
-  <body> 
-    <div class="container"> 
-      <div> 
-        <div class="nav"> 
-          <a href="http://github.com/micha/resty">fork me on github</a> 
-        </div> 
-        <h2>Resty<br />Test<br />Page</h2> 
-      </div> 
-      <hr/> 
-      <div class="container">
-        <h3>Hello There.</h3>
-        <table class="demo jquery-tablesort" cellspacing="0" cellpadding="0">
-          <caption>Table 1: Pets you can adopt.</caption>
-          <colgroup>
-            <col>
-            <col>
-            <col>
-            <col>
-            <col>
-          </colgroup>
-          <thead>
-            <tr>
-              <th><div>#</div></th>
-              <th><div>name</div></th>
-              <th><div>species</div></th>
-              <th><div>price</div></th>
-              <th><div>available</div></th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr class="even">
-              <td>1</td>
-              <td>bugs</td>
-              <td>rabbit</td>
-              <td>$1.25</td>
-              <td>Jun 24 2009</td>
-            </tr>
-            <tr class="odd">
-              <td>2</td>
-              <td>rascal</td>
-              <td>dog</td>
-              <td>$3.50</td>
-              <td>Apr 1 2010</td>
-            </tr>
-            <tr class="even">
-              <td>3</td>
-              <td>rufus</td>
-              <td>dog</td>
-              <td>$0.25</td>
-              <td>Jun 17 2009</td>
-            </tr>
-            <tr class="odd">
-              <td>4</td>
-              <td>scabby</td>
-              <td>bird</td>
-              <td>$0.02</td>
-              <td>Jun 04 2009</td>
-            </tr>
-            <tr class="even">
-              <td>5</td>
-              <td>roger</td>
-              <td>goldfish</td>
-              <td>$0.02</td>
-              <td>Jun 05 2009</td>
-            </tr>
-          </tbody>
-        </table>
-        <p>The table on the right has sortable columns. Click on the
-        column headings to sort and re-sort that column. The rain in
-        Spain falls mainly on the plain. Thanks!</p>
-      </div>
-      <hr /> 
-    </div> 
-  </body> 
-</html>
-# [OUT] TEST 8: Get headers too
-* <url> malformed
-* <url> malformed
-* About to connect() to 127.0.0.1 port 9090 (#0)
-*   Trying 127.0.0.1... connected
-* Connected to 127.0.0.1 (127.0.0.1) port 9090 (#0)
-> GET /simple.html HTTP/1.1
-> User-Agent: curl/7.21.7 (x86_64-apple-darwin10.7.0) libcurl/7.21.7 OpenSSL/1.0.0d zlib/1.2.5 libidn/1.22
-> Host: 127.0.0.1:9090
-> Accept: */*
-> 
-* HTTP 1.0, assume close after body
-< HTTP/1.0 200 OK
-< Cache-Control: private
-< Content-Type: text/html; charset=us-ascii
-< Server: lilhttpd/1.0
-< Connection: close
-< Content-Length: 2340
-< 
-{ [data not shown]
-* Closing connection #0
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 9: POST with data sent in query string
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 10: POST with data sent in message body
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 11: POST with extra header and basic auth, data in message body
-   [1]fork me on github
-
-Resty
-Test
-Page
-     __________________________________________________________________
-
-Hello There.
-
-   CAPTION: Table 1: Pets you can adopt.
-
-       #
-     name
-    species
-     price
-   available
-   1        bugs   rabbit   $1.25 Jun 24 2009
-   2        rascal dog      $3.50 Apr 1 2010
-   3        rufus  dog      $0.25 Jun 17 2009
-   4        scabby bird     $0.02 Jun 04 2009
-   5        roger  goldfish $0.02 Jun 05 2009
-
-   The table on the right has sortable columns. Click on the column
-   headings to sort and re-sort that column. The rain in Spain falls
-   mainly on the plain. Thanks!
-     __________________________________________________________________
-
-References
-
-http://github.com/micha/resty
-# [OUT] TEST 12: json pretty-print formatting
-{
-   "bar" : {
-      "cat" : "meow",
-      "dog" : "woof",
-      "fish" : "banana"
-   },
-   "foo" : [
-      1,
-      2,
-      3
-   ]
-}
-
-# [OUT] TEST 13: make sure the default options are correctly set
-{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}
-# [OUT] TEST 14: make sure the default options are correctly unset
-{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}
-# [OUT] TEST 15: try PUT with both data in body and query params in url, no urlencode
-{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}
-# [OUT] TEST 16: try PUT with both data in body and query params in url via -q
-{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}

From a7989140c38e86cf354f60a7f363f78f002767a7 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:16:00 +0200
Subject: [PATCH 055/173] clone array to avoid in bash: : bad substitution

---
 resty | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index be96c67..e545879 100644
--- a/resty
+++ b/resty
@@ -36,17 +36,21 @@ function resty() {
     local host="$_RESTY_DATA_DIR/host"
 
     local url=$1; shift
+    local args=() j=1
+    for i in "$@"; do
+        args[j]="$i" && j=$((j + 1))
+    done
 
     case "$url" in
 	http://*|https://*)
-	    _resty_opts=$(printf '%q ' "${@[@]}")
+	    _resty_opts=$(printf '%q ' "${args[@]}")
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
 		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
-	    resty "http://$url" "${@[@]}"
+	    resty "http://$url" "${args[@]}"
 	    ;;
     esac
 }

From 2c6527e1f8720b5f0e11aa701f1912b8150c1d7a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:26:24 +0200
Subject: [PATCH 056/173] fix shellcheck pointed syntax error $(( that was not
 a $(()) mathsubstition

---
 resty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index e545879..3e02a07 100644
--- a/resty
+++ b/resty
@@ -73,8 +73,8 @@ function resty-call() {
 
     # §maybe cache
     local h2t="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
-			  || which html2text || which cat) |tail -n 1)"  # html to text
-    local editor=$((exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
+			  || which html2text || which cat) |tail -n 1)" brew install shellcheck
+    local editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
     if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 

From 86fa3a15e2022a5371c0b55e735f172734375636 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:29:00 +0200
Subject: [PATCH 057/173] add cache to apt install

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 87b2841..fe3cefd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,5 +22,7 @@ before_install:
   - sudo apt-get install zsh lynx
   - export SHELL=zsh
 
+cache: apt
+
 notifications:
   email: false

From f70d02cd4e92262a1c5bc56ecc4770d96de9dd51 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:45:08 +0200
Subject: [PATCH 058/173] attempt to have test run on bash

---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fe3cefd..d5fd1ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,17 @@
 # zsh shpec build draft
-language: zsh
+language: sh
 env:
-  - SHELL=zsh
+  matrix:
+    - SHELL=bash
+    - SHELL=zsh
+
 install:
   # install antigen
   - curl -L git.io/antigen > ~/antigen.zsh
   - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
   - echo "setopt sh_word_split" > ~/.zshenv
   - zsh ~/.zshrc
-  - export SHELL=zsh
+  - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6
@@ -16,7 +19,8 @@ install:
 
 script:
   - zsh --version ; lynx --version
-  - ./.travis-test.zsh
+  - [[ $SHELL -eq "zsh" ]] && ./.travis-test.zsh
+  - [[ $SHELL -eq "bash" ]] && /usr/local/bin/shpec
 
 before_install:
   - sudo apt-get install zsh lynx

From bc6d759e527429b86663268cb5fd9ca1ad0d64f5 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:49:38 +0200
Subject: [PATCH 059/173] new attempt to have test run on bash

---
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5fd1ac..9d00eaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,14 @@ install:
   - (cd test && npm install)
 
 script:
-  - zsh --version ; lynx --version
-  - [[ $SHELL -eq "zsh" ]] && ./.travis-test.zsh
-  - [[ $SHELL -eq "bash" ]] && /usr/local/bin/shpec
-
+  - lynx --version
+  - |
+        $SHELL --version
+        if [ "$SHELL" = "zsh" ]; then
+          ./.travis-test.zsh
+        elif [ "$SHELL" = "bash"]]; then
+          /usr/local/bin/shpec
+        fi
 before_install:
   - sudo apt-get install zsh lynx
   - export SHELL=zsh

From 8f831369205e37650067000e8a90fc453b5dd144 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 21:55:58 +0200
Subject: [PATCH 060/173] remove SHELL affectation to zsh

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9d00eaa..a42870c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,6 @@ script:
         fi
 before_install:
   - sudo apt-get install zsh lynx
-  - export SHELL=zsh
 
 cache: apt
 

From ce734dcd0e5adeb52be45d7bd0d2f3bbea368d4a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 22:14:28 +0200
Subject: [PATCH 061/173] add travis debuging informations

---
 .travis.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a42870c..890d6a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,21 @@ install:
   - nvm install 6 && nvm use 6
   - (cd test && npm install)
 
-script:
   - lynx --version
+
+script:
+  - (cd test && node server.js &)
   - |
-        $SHELL --version
+        echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then
-          ./.travis-test.zsh
+          echo "Run Zsh test"
+
+          source ~/.zshrc
+          which shpec
+          shpec
         elif [ "$SHELL" = "bash"]]; then
+          echo "Run Bash test"
+          which shpec
           /usr/local/bin/shpec
         fi
 before_install:

From c523285cc76115f07e7be478e0235aaf75e41688 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 22:19:12 +0200
Subject: [PATCH 062/173] fix typo in bash script with an extra ]

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 890d6a5..75de996 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ script:
           source ~/.zshrc
           which shpec
           shpec
-        elif [ "$SHELL" = "bash"]]; then
+        elif [ "$SHELL" = "bash" ]; then
           echo "Run Bash test"
           which shpec
           /usr/local/bin/shpec

From ff3be7f65928ee36778f3d46689e8f4d17caae2a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 22:26:31 +0200
Subject: [PATCH 063/173] travis config tweaks

---
 .travis-test.zsh | 2 --
 .travis.yml      | 9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.travis-test.zsh b/.travis-test.zsh
index f71f37e..de45be2 100755
--- a/.travis-test.zsh
+++ b/.travis-test.zsh
@@ -2,8 +2,6 @@
 
 source ~/.zshrc
 
-cd test && node server.js &
 sleep 1
 
-cd ..
 shpec
diff --git a/.travis.yml b/.travis.yml
index 75de996..74228d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ install:
   - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
   - echo "setopt sh_word_split" > ~/.zshenv
   - zsh ~/.zshrc
-  - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
+  - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh` $HOME"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6
@@ -25,14 +25,11 @@ script:
         echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then
           echo "Run Zsh test"
-
-          source ~/.zshrc
-          which shpec
-          shpec
+          ./.travis-test.zsh
         elif [ "$SHELL" = "bash" ]; then
           echo "Run Bash test"
           which shpec
-          /usr/local/bin/shpec
+          $HOME/shpec
         fi
 before_install:
   - sudo apt-get install zsh lynx

From ddebea547f94b96a8eb2b877d8812860eb643adc Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 22:33:05 +0200
Subject: [PATCH 064/173] tweaks to shpec install

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 74228d3..47bf3bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ install:
   - echo "source ~/antigen.zsh; antigen bundle rylnd/shpec; antigen apply" > ~/.zshrc
   - echo "setopt sh_word_split" > ~/.zshenv
   - zsh ~/.zshrc
-  - sh -c "`curl -L https://raw.github.com/rylnd/shpec/master/install.sh` $HOME"
+  - sh -c "export BINDIR=$HOME ; `curl -L https://raw.github.com/rylnd/shpec/master/install.sh`"
 
   - $HOME/.nvm/nvm.sh
   - nvm install 6 && nvm use 6

From 8f6b83f825697f4939f22e07b0d9aef96ceaa85d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 22:40:45 +0200
Subject: [PATCH 065/173] add sleep to ensure server is running when launching
 the tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 47bf3bf..e1358f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ install:
   - lynx --version
 
 script:
-  - (cd test && node server.js &)
+  - (cd test && node server.js && sleep 1 &)
   - |
         echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then

From 6b543cef0b8669ef6716acee7b0dbe679664ab82 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 23:28:07 +0200
Subject: [PATCH 066/173] batch tweak for the regexp to be working

---
 resty | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resty b/resty
index 3e02a07..e06e2fb 100644
--- a/resty
+++ b/resty
@@ -82,13 +82,13 @@ function resty-call() {
 	(mkdir -p "$cookies"; echo "http://localhost*" > "$host")
     fi
 
-    if [[ "$1"  =~ "^/" ]] ; then  # retrieve path
-	local _path="$1"
-	[[ $# > 0 ]] && shift
+    if [[ "$1" =~ ^/ ]] ; then  # retrieve path
+        local _path="$1"
+        [[ $# > 0 ]] && shift
     fi
-    if [[ ! "$1"  =~ "^-" ]] ; then  # retrieve data
-	local body="$1"
-	[[ $# > 0 ]] && shift
+    if [[ ! "$1" =~ ^- ]] ; then  # retrieve data
+        local body="$1"
+        [[ $# > 0 ]] && shift
     fi
 
     local -a curlopt_cmd curlopt_file

From f740703a5eaa22d10b4d3189d83e460b8de10f64 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 23:35:43 +0200
Subject: [PATCH 067/173] indentation and conditional shopt in shpec file

---
 resty               | 15 +++++++--------
 test/resty_shpec.sh |  6 ++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/resty b/resty
index e06e2fb..08a7739 100644
--- a/resty
+++ b/resty
@@ -25,11 +25,11 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 function resty() {
 
     if [ -n "$XDG_CONFIG_HOME" ]; then
-	_RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
-	_RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
+        _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
+        _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
     else
-	_RESTY_CONF_DIR="$HOME/.resty"
-	_RESTY_DATA_DIR="$_RESTY_CONF_DIR"
+        _RESTY_CONF_DIR="$HOME/.resty"
+        _RESTY_DATA_DIR="$_RESTY_CONF_DIR"
     fi
     mkdir -p "$_RESTY_CONF_DIR"
 
@@ -58,13 +58,12 @@ function resty() {
 
 
 function resty-call() {
-
     if [ $# = 0 ] ; then echo "resty-call need args" >&2; return 1; fi
 
     local method="$1"; shift
     if [[ ! "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ "$method" ]] ; then # this is not good
-	echo "First arg must be an HTTP verb, '$method' isn't" >&2
-	return 1
+        echo "First arg must be an HTTP verb, '$method' isn't" >&2
+        return 1
     fi
 
     # TODO: local to reset
@@ -129,7 +128,7 @@ function resty-call() {
     fi
 
     local domain=$(echo -n "$_RESTY_HOST" \
-		    |perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
+		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     local _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index f4b1741..f51d95a 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -1,13 +1,14 @@
-
+[[ "$SHELL" == "bash" ]] && shopt -s expand_aliases # needed for bash
 
 describe "Resty"
 
     describe "Basic"
         it "load resty function without error"
-           . ./resty -W # source resty with no history mode
+           source ./resty -W # source resty with no history mode
            assert equal $? 0
         end
 
+
         it "can define a target"
             output=$(resty localhost:4004 2>&1 )
             assert equal $? 0
@@ -155,5 +156,6 @@ describe "Resty"
             assert no_match "$erroroutput" "Accept:\ application/json"
         end
 
+
     end
 end

From 417f5ad722c8fca7b9361c40e0d8bc548ca9f1f9 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 23:39:14 +0200
Subject: [PATCH 068/173] increase the sleep duration to be sure the server run
 before the test

---
 .travis-test.zsh | 2 --
 .travis.yml      | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis-test.zsh b/.travis-test.zsh
index de45be2..e874117 100755
--- a/.travis-test.zsh
+++ b/.travis-test.zsh
@@ -2,6 +2,4 @@
 
 source ~/.zshrc
 
-sleep 1
-
 shpec
diff --git a/.travis.yml b/.travis.yml
index e1358f8..a603b5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ install:
   - lynx --version
 
 script:
-  - (cd test && node server.js && sleep 1 &)
+  - (cd test && node server.js && sleep 2 &)
   - |
         echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then
@@ -28,7 +28,6 @@ script:
           ./.travis-test.zsh
         elif [ "$SHELL" = "bash" ]; then
           echo "Run Bash test"
-          which shpec
           $HOME/shpec
         fi
 before_install:

From 2283b6bb93a235e57d0c3e9ceef5e7db161393ee Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 23:52:24 +0200
Subject: [PATCH 069/173] debuging attempt of zsh build

---
 resty | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resty b/resty
index 08a7739..8f13b9a 100644
--- a/resty
+++ b/resty
@@ -50,6 +50,7 @@ function resty() {
 		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
+	echo yo
 	    resty "http://$url" "${args[@]}"
 	    ;;
     esac

From 98b240a7efe1c781121d963596275e14476861bc Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 23:56:36 +0200
Subject: [PATCH 070/173] fix sleep pause

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a603b5b..126d624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,8 @@ install:
   - lynx --version
 
 script:
-  - (cd test && node server.js && sleep 2 &)
+  - (cd test && node server.js &)
+  - sleep 1
   - |
         echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then

From 53ecf5b23e921040fb5e093d1833299b3c57dc6a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 8 Apr 2017 23:57:30 +0200
Subject: [PATCH 071/173] change debuging information to see where inifinite
 loop is coming

---
 resty | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 8f13b9a..dd9652c 100644
--- a/resty
+++ b/resty
@@ -23,7 +23,7 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 
 
 function resty() {
-
+    echo args: $@
     if [ -n "$XDG_CONFIG_HOME" ]; then
         _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
         _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
@@ -35,7 +35,8 @@ function resty() {
 
     local host="$_RESTY_DATA_DIR/host"
 
-    local url=$1; shift
+    local url="$1"; shift
+    echo url: $url
     local args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
@@ -50,7 +51,7 @@ function resty() {
 		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
-	echo yo
+
 	    resty "http://$url" "${args[@]}"
 	    ;;
     esac

From 51d7d0bd6522f035da1f7b81f093bdc31ac810f1 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:13:17 +0200
Subject: [PATCH 072/173] hack attempt to access $1

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index dd9652c..3de0031 100644
--- a/resty
+++ b/resty
@@ -35,7 +35,7 @@ function resty() {
 
     local host="$_RESTY_DATA_DIR/host"
 
-    local url="$1"; shift
+    local url="${@:1:1}"; shift
     echo url: $url
     local args=() j=1
     for i in "$@"; do

From 6ef5c52b6a064443b5d8174c515602fa6042d748 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:17:22 +0200
Subject: [PATCH 073/173] try to have shift on other line

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 3de0031..aec06bb 100644
--- a/resty
+++ b/resty
@@ -35,7 +35,7 @@ function resty() {
 
     local host="$_RESTY_DATA_DIR/host"
 
-    local url="${@:1:1}"; shift
+    url=$1; shift
     echo url: $url
     local args=() j=1
     for i in "$@"; do

From f71385dc988c1359463eef42641b79917f11b064 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:23:45 +0200
Subject: [PATCH 074/173] remove debugging information

---
 resty | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resty b/resty
index aec06bb..20010bd 100644
--- a/resty
+++ b/resty
@@ -23,7 +23,6 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 
 
 function resty() {
-    echo args: $@
     if [ -n "$XDG_CONFIG_HOME" ]; then
         _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
         _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
@@ -35,8 +34,8 @@ function resty() {
 
     local host="$_RESTY_DATA_DIR/host"
 
-    url=$1; shift
-    echo url: $url
+    local url=$1
+    shift
     local args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
@@ -51,7 +50,6 @@ function resty() {
 		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
-
 	    resty "http://$url" "${args[@]}"
 	    ;;
     esac

From e24aebeabada9338d9ee2ce856c87b191d7c084a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:35:08 +0200
Subject: [PATCH 075/173] restore debugging information

---
 resty | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resty b/resty
index 20010bd..ce6a3c0 100644
--- a/resty
+++ b/resty
@@ -23,6 +23,7 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 
 
 function resty() {
+    echo args: $@  >&2
     if [ -n "$XDG_CONFIG_HOME" ]; then
         _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
         _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
@@ -36,6 +37,7 @@ function resty() {
 
     local url=$1
     shift
+    echo url: $url >&2
     local args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
@@ -50,6 +52,7 @@ function resty() {
 		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
+
 	    resty "http://$url" "${args[@]}"
 	    ;;
     esac

From a54c00b88717fd65747ab2ecd94491c69123039e Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:39:20 +0200
Subject: [PATCH 076/173] try to protect "$1"

---
 resty | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index ce6a3c0..cb8ba4a 100644
--- a/resty
+++ b/resty
@@ -34,9 +34,10 @@ function resty() {
     mkdir -p "$_RESTY_CONF_DIR"
 
     local host="$_RESTY_DATA_DIR/host"
-
-    local url=$1
+    echo '$1' $1
+    local url="$1"
     shift
+    echo '$1' $1
     echo url: $url >&2
     local args=() j=1
     for i in "$@"; do

From 57f6317866daec624479e9fb96098634edb8e8ca Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:48:21 +0200
Subject: [PATCH 077/173] separate local and affectation of url in resty

---
 resty | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index cb8ba4a..0acd013 100644
--- a/resty
+++ b/resty
@@ -35,9 +35,9 @@ function resty() {
 
     local host="$_RESTY_DATA_DIR/host"
     echo '$1' $1
-    local url="$1"
-    shift
-    echo '$1' $1
+    local url
+    url="$1"; shift
+    echo 'host' $host
     echo url: $url >&2
     local args=() j=1
     for i in "$@"; do

From 3cdd80570d1faddb103c4f4b4a5a4cc110a55364 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:51:45 +0200
Subject: [PATCH 078/173] remove debugging informations

---
 resty | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resty b/resty
index 0acd013..f156f06 100644
--- a/resty
+++ b/resty
@@ -23,7 +23,6 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 
 
 function resty() {
-    echo args: $@  >&2
     if [ -n "$XDG_CONFIG_HOME" ]; then
         _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
         _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
@@ -34,11 +33,8 @@ function resty() {
     mkdir -p "$_RESTY_CONF_DIR"
 
     local host="$_RESTY_DATA_DIR/host"
-    echo '$1' $1
     local url
     url="$1"; shift
-    echo 'host' $host
-    echo url: $url >&2
     local args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))

From 9674dccb11ae97b6970302b2aeb33eb41e7115fa Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 00:59:23 +0200
Subject: [PATCH 079/173] remove a damn typo

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index f156f06..4a9b28f 100644
--- a/resty
+++ b/resty
@@ -72,7 +72,7 @@ function resty-call() {
 
     # §maybe cache
     local h2t="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
-			  || which html2text || which cat) |tail -n 1)" brew install shellcheck
+			  || which html2text || which cat) |tail -n 1)"
     local editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
     if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi

From 7f2910fe8727092f32c0eda2718119ebbca1af5b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 01:16:17 +0200
Subject: [PATCH 080/173] add debugging information to the test script

---
 resty               | 3 ++-
 test/resty_shpec.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index 4a9b28f..50ad65f 100644
--- a/resty
+++ b/resty
@@ -159,7 +159,8 @@ function resty-call() {
 
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
         ## §maybe: cache this when resty)
-        local cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+        local cmd
+        cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
         eval $cmd
     fi
 
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index f51d95a..f6e6cd8 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -17,7 +17,8 @@ describe "Resty"
 
         # Launch server
         resty localhost:4004 2>/dev/null
-
+        GET /
+        GET / -V
         it "can access to it with a get"
             output=$(GET / 2>&1)
             assert present "$output"

From d39135761a40e7c53cb991f36de010e7ac72450c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 01:36:34 +0200
Subject: [PATCH 081/173] and the same trick to split local definition

damnit
---
 resty | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index 50ad65f..f93abf9 100644
--- a/resty
+++ b/resty
@@ -60,7 +60,8 @@ function resty() {
 function resty-call() {
     if [ $# = 0 ] ; then echo "resty-call need args" >&2; return 1; fi
 
-    local method="$1"; shift
+    local method
+    method="$1"; shift
     if [[ ! "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ "$method" ]] ; then # this is not good
         echo "First arg must be an HTTP verb, '$method' isn't" >&2
         return 1

From 4e9f8a68896820551d5b9610099ef23f1e112813 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 01:42:25 +0200
Subject: [PATCH 082/173] change all the local affectation that were not
 working

---
 resty | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/resty b/resty
index f93abf9..a0e698c 100644
--- a/resty
+++ b/resty
@@ -60,8 +60,7 @@ function resty() {
 function resty-call() {
     if [ $# = 0 ] ; then echo "resty-call need args" >&2; return 1; fi
 
-    local method
-    method="$1"; shift
+    local method; method="$1"; shift
     if [[ ! "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ "$method" ]] ; then # this is not good
         echo "First arg must be an HTTP verb, '$method' isn't" >&2
         return 1
@@ -72,9 +71,9 @@ function resty-call() {
     local cookies="$_RESTY_DATA_DIR/c"
 
     # §maybe cache
-    local h2t="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
+    local h2t;h2t="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
 			  || which html2text || which cat) |tail -n 1)"
-    local editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
+    local editor;editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
     if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
 
@@ -83,11 +82,11 @@ function resty-call() {
     fi
 
     if [[ "$1" =~ ^/ ]] ; then  # retrieve path
-        local _path="$1"
+        local _path; _path="$1"
         [[ $# > 0 ]] && shift
     fi
     if [[ ! "$1" =~ ^- ]] ; then  # retrieve data
-        local body="$1"
+        local body; body="$1"
         [[ $# > 0 ]] && shift
     fi
 
@@ -128,25 +127,25 @@ function resty-call() {
 	    _RESTY_PATH=$_path
     fi
 
-    local domain=$(echo -n "$_RESTY_HOST" \
+    local domain; domain=$(echo -n "$_RESTY_HOST" \
 		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    local _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
+    local _path; _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
 
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
         if [ ! -t 0 ] ; then # retrieve what stdin hold
-           local body="@-"
+           local body; body="@-"
         else
-           local body=""
+           local body; body=""
         fi
     fi
 
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
-        local tmpf=$(mktemp /tmp/resty.XXXXXX)
+        local tmpf; tmpf=$(mktemp /tmp/resty.XXXXXX)
         [ -t 0 ] || cat > $tmpf
         (exec < /dev/tty; "$editor" $tmpf)
-        local body=$(cat $tmpf)
+        local body; body=$(cat $tmpf)
         rm -f $tmpf
     fi
 

From f7252b3e89d869511652a40f3d3028b08c46121a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 02:00:53 +0200
Subject: [PATCH 083/173] desperate attempt tomake zsh build work ^^

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 126d624..3444f8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,9 @@ script:
         echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then
           echo "Run Zsh test"
+          $HOME/shpec
+          echo attempt
+          rm $HOME/shpec
           ./.travis-test.zsh
         elif [ "$SHELL" = "bash" ]; then
           echo "Run Bash test"

From 2bbe46dc4c811c63d6d965e9e8724fe0c5b01523 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 02:05:32 +0200
Subject: [PATCH 084/173] tweak in the tests

---
 .travis.yml         |  3 ---
 resty               | 12 ++++++------
 test/resty_shpec.sh | 15 +++++++--------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3444f8c..126d624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,9 +26,6 @@ script:
         echo $SHELL && $SHELL --version
         if [ "$SHELL" = "zsh" ]; then
           echo "Run Zsh test"
-          $HOME/shpec
-          echo attempt
-          rm $HOME/shpec
           ./.travis-test.zsh
         elif [ "$SHELL" = "bash" ]; then
           echo "Run Bash test"
diff --git a/resty b/resty
index a0e698c..39a6f76 100644
--- a/resty
+++ b/resty
@@ -32,10 +32,10 @@ function resty() {
     fi
     mkdir -p "$_RESTY_CONF_DIR"
 
-    local host="$_RESTY_DATA_DIR/host"
+    local host; host="$_RESTY_DATA_DIR/host"
     local url
     url="$1"; shift
-    local args=() j=1
+    local args j; args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
     done
@@ -75,10 +75,10 @@ function resty-call() {
 			  || which html2text || which cat) |tail -n 1)"
     local editor;editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
-    if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody="yes" ;fi
+    if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody; hasbody="yes" ;fi
 
     if [ -d "$cookies" ] ; then   # retrieve cookie
-	(mkdir -p "$cookies"; echo "http://localhost*" > "$host")
+	    (mkdir -p "$cookies"; echo "http://localhost*" > "$host")
     fi
 
     if [[ "$1" =~ ^/ ]] ; then  # retrieve path
@@ -129,10 +129,10 @@ function resty-call() {
 
     local domain; domain=$(echo -n "$_RESTY_HOST" \
 		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    local _path; _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
+    local _path
+    _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
-
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
         if [ ! -t 0 ] ; then # retrieve what stdin hold
            local body; body="@-"
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index f6e6cd8..f80cb10 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -17,8 +17,7 @@ describe "Resty"
 
         # Launch server
         resty localhost:4004 2>/dev/null
-        GET /
-        GET / -V
+
         it "can access to it with a get"
             output=$(GET / 2>&1)
             assert present "$output"
@@ -118,8 +117,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
             assert equal "$output" "get"
-            assert match "$erroroutput" "content-type:\ text/plain\;\ charset=utf-8"
-            assert match "$erroroutput" "cache-control:\ no-cache"
+            assert match "$erroroutput" "content-type:"
+            assert match "$erroroutput" "cache-control:"
         end
 
         it "POST with data sent in query string"
@@ -141,8 +140,8 @@ describe "Resty"
     describe "Resty Global options"
         it "Setting new options"
             resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
-            output=$(GET /echo -v 2> /tmp/resty-getheader-error)
-            erroroutput=$(< /tmp/resty-getheader-error)
+            output=$(GET /echo -v 2> /tmp/resty-newopt-error)
+            erroroutput=$(< /tmp/resty-newopt-error)
             assert equal "$output" "get"
             assert match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
             assert match "$erroroutput" "Accept:\ application/json"
@@ -150,8 +149,8 @@ describe "Resty"
 
         it "Resetting options"
             resty localhost:4004 2> /dev/null
-            output=$(GET /echo -v 2> /tmp/resty-getheader-error)
-            erroroutput=$(< /tmp/resty-getheader-error)
+            output=$(GET /echo -v 2> /tmp/resty-resetopt-error)
+            erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" "get"
             assert no_match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
             assert no_match "$erroroutput" "Accept:\ application/json"

From 48225c781c071c7c264427b4a7f048280f10144a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 03:12:06 +0200
Subject: [PATCH 085/173] dichotomy identification attempt of where the _path
 come from

---
 resty | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/resty b/resty
index 39a6f76..bca4f01 100644
--- a/resty
+++ b/resty
@@ -114,7 +114,7 @@ function resty-call() {
 
     if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
-
+echo a
     if [ "$method" = "-v" ] ; then # ??
         echo "$_RESTY_HOST $_resty_opts"
         return
@@ -126,11 +126,10 @@ function resty-call() {
     if [ -n "$_path" ] ; then # update current path
 	    _RESTY_PATH=$_path
     fi
-
+echo b
     local domain; domain=$(echo -n "$_RESTY_HOST" \
 		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    local _path
-    _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
+    local _path; $_path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
@@ -140,7 +139,7 @@ function resty-call() {
            local body; body=""
         fi
     fi
-
+echo c
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
         local tmpf; tmpf=$(mktemp /tmp/resty.XXXXXX)
         [ -t 0 ] || cat > $tmpf
@@ -148,7 +147,7 @@ function resty-call() {
         local body; body=$(cat $tmpf)
         rm -f $tmpf
     fi
-
+echo d
     if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# > 0 ]] && shift;fi
     if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# > 0 ]] && shift ;fi
     if [ -n "$body" ] ; then curl_opt="--data-binary" ;fi
@@ -156,14 +155,14 @@ function resty-call() {
         curl_opt="-I"
         raw="yes"
     fi
-
+echo e
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
         ## §maybe: cache this when resty)
         local cmd
         cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
         eval $cmd
     fi
-
+echo f
     # Launch command and retrieved streams
     local res out err ret
     res=$( ( ( (curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
@@ -175,7 +174,7 @@ function resty-call() {
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
 
     if [ -n "$err" -a -n "$verbose" ]; then echo "$err" 1>&2 ; fi
-
+echo g
 
     local display
     if [ -z "$raw" ] && grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err"
@@ -183,14 +182,14 @@ function resty-call() {
     else display=cat
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
-
+echo h
 
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                     -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
     fi
-
+echo i
     if [ "$ret" != "2" ]; then
         [ -n "$out" ] && echo "$out" 1>&2
         return $ret

From c9eb077c1ecdf87544a91cc3dc25d36d3b0972cc Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 03:16:00 +0200
Subject: [PATCH 086/173] final fix (I hope so)

---
 resty | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/resty b/resty
index bca4f01..e9967c6 100644
--- a/resty
+++ b/resty
@@ -114,7 +114,7 @@ function resty-call() {
 
     if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
-echo a
+
     if [ "$method" = "-v" ] ; then # ??
         echo "$_RESTY_HOST $_resty_opts"
         return
@@ -126,10 +126,12 @@ echo a
     if [ -n "$_path" ] ; then # update current path
 	    _RESTY_PATH=$_path
     fi
-echo b
+
+
     local domain; domain=$(echo -n "$_RESTY_HOST" \
 		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    local _path; $_path="${_RESTY_HOST//\*/$_RESTY_PATH}"
+    [ -z "$_path" ] && local _path;
+    _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
@@ -139,7 +141,7 @@ echo b
            local body; body=""
         fi
     fi
-echo c
+
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
         local tmpf; tmpf=$(mktemp /tmp/resty.XXXXXX)
         [ -t 0 ] || cat > $tmpf
@@ -147,7 +149,7 @@ echo c
         local body; body=$(cat $tmpf)
         rm -f $tmpf
     fi
-echo d
+
     if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# > 0 ]] && shift;fi
     if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# > 0 ]] && shift ;fi
     if [ -n "$body" ] ; then curl_opt="--data-binary" ;fi
@@ -155,14 +157,14 @@ echo d
         curl_opt="-I"
         raw="yes"
     fi
-echo e
+
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
         ## §maybe: cache this when resty)
         local cmd
         cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
         eval $cmd
     fi
-echo f
+
     # Launch command and retrieved streams
     local res out err ret
     res=$( ( ( (curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
@@ -174,7 +176,7 @@ echo f
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
 
     if [ -n "$err" -a -n "$verbose" ]; then echo "$err" 1>&2 ; fi
-echo g
+
 
     local display
     if [ -z "$raw" ] && grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err"
@@ -182,14 +184,14 @@ echo g
     else display=cat
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
-echo h
+
 
     # todo: also filter elinks and co
     if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                     -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
     fi
-echo i
+
     if [ "$ret" != "2" ]; then
         [ -n "$out" ] && echo "$out" 1>&2
         return $ret

From e068c907e800141e54a2c6b0df95161a9cf577e6 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 03:28:57 +0200
Subject: [PATCH 087/173] fix : local on already defined variable print the
 binding :/

---
 resty | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resty b/resty
index e9967c6..9f95202 100644
--- a/resty
+++ b/resty
@@ -85,8 +85,9 @@ function resty-call() {
         local _path; _path="$1"
         [[ $# > 0 ]] && shift
     fi
+    local body
     if [[ ! "$1" =~ ^- ]] ; then  # retrieve data
-        local body; body="$1"
+         body="$1"
         [[ $# > 0 ]] && shift
     fi
 
@@ -136,9 +137,9 @@ function resty-call() {
     eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
         if [ ! -t 0 ] ; then # retrieve what stdin hold
-           local body; body="@-"
+           body="@-"
         else
-           local body; body=""
+           body=""
         fi
     fi
 
@@ -146,7 +147,7 @@ function resty-call() {
         local tmpf; tmpf=$(mktemp /tmp/resty.XXXXXX)
         [ -t 0 ] || cat > $tmpf
         (exec < /dev/tty; "$editor" $tmpf)
-        local body; body=$(cat $tmpf)
+        body=$(cat $tmpf)
         rm -f $tmpf
     fi
 

From a729e64621c9b02722d9333034f9f9b56d4632c1 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 14:36:19 +0200
Subject: [PATCH 088/173] attempt to make test pass for ksh and dash

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 126d624..d066758 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ env:
   matrix:
     - SHELL=bash
     - SHELL=zsh
+    - SHELL=dash
+    - SHELL=ksh
 
 install:
   # install antigen
@@ -27,8 +29,8 @@ script:
         if [ "$SHELL" = "zsh" ]; then
           echo "Run Zsh test"
           ./.travis-test.zsh
-        elif [ "$SHELL" = "bash" ]; then
-          echo "Run Bash test"
+        else
+          echo "Run $SHELL test"
           $HOME/shpec
         fi
 before_install:

From fbff89da6c7a666a35695c0b2b7a50fc4864dc0b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 14:57:35 +0200
Subject: [PATCH 089/173] Revert "attempt to make test pass for ksh and dash"

This reverts commit 86fe28cda3bab5779a71deabeb93c32db3b087e5.

expand_alias opt not foundand syntax error on resty function
array not suported by dash
---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d066758..126d624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,6 @@ env:
   matrix:
     - SHELL=bash
     - SHELL=zsh
-    - SHELL=dash
-    - SHELL=ksh
 
 install:
   # install antigen
@@ -29,8 +27,8 @@ script:
         if [ "$SHELL" = "zsh" ]; then
           echo "Run Zsh test"
           ./.travis-test.zsh
-        else
-          echo "Run $SHELL test"
+        elif [ "$SHELL" = "bash" ]; then
+          echo "Run Bash test"
           $HOME/shpec
         fi
 before_install:

From 84833296d163bb619d67f4195cc34c47d9c27ec9 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:05:40 +0200
Subject: [PATCH 090/173] attempt to have test run both on linux and on osx

---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 126d624..accbf23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ env:
   matrix:
     - SHELL=bash
     - SHELL=zsh
+os:
+  - linux
+  - osx
 
 install:
   # install antigen
@@ -32,7 +35,11 @@ script:
           $HOME/shpec
         fi
 before_install:
-  - sudo apt-get install zsh lynx
+  - |
+      [ "${TRAVIS_OS_NAME}" = "linux" ] && sudo apt-get install zsh lynx
+  - |
+      [ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx
+
 
 cache: apt
 

From 355a4ce26d942de0043bc897d99326c1671147fa Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:14:18 +0200
Subject: [PATCH 091/173] tweaks to config so that the build don't fail

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index accbf23..43bd3dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,9 @@ script:
         fi
 before_install:
   - |
-      [ "${TRAVIS_OS_NAME}" = "linux" ] && sudo apt-get install zsh lynx
+      ([ "${TRAVIS_OS_NAME}" = "linux" ] && sudo apt-get install zsh lynx) || echo "osx, skipping apt-get"
   - |
-      [ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx
+      ([ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx) || echo "linux, skipping brew"
 
 
 cache: apt

From cb450ee0c54b7c2839070e523d2341c3d50f43e0 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:22:18 +0200
Subject: [PATCH 092/173] add debugging information to check what is going on
 for the filing test on osx

---
 test/resty_shpec.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index f80cb10..a143290 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -122,7 +122,8 @@ describe "Resty"
         end
 
         it "POST with data sent in query string"
-            output=$(POST /echo -d foo=bar -G)
+            output=$(POST /echo -d foo=bar -G )
+            POST /echo -d foo=bar -G -v
             assert equal "$output" 'post\n\n{"foo":"bar"}'
         end
 

From 05443ef1fd264d4c58c4b7a268e78c63f88cdb9f Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:39:39 +0200
Subject: [PATCH 093/173] print curl version which might be the answer to the
 bug

---
 .travis.yml         | 1 +
 test/resty_shpec.sh | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 43bd3dd..402631d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ install:
   - nvm install 6 && nvm use 6
   - (cd test && npm install)
 
+  - curl --version
   - lynx --version
 
 script:
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index a143290..f80cb10 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -122,8 +122,7 @@ describe "Resty"
         end
 
         it "POST with data sent in query string"
-            output=$(POST /echo -d foo=bar -G )
-            POST /echo -d foo=bar -G -v
+            output=$(POST /echo -d foo=bar -G)
             assert equal "$output" 'post\n\n{"foo":"bar"}'
         end
 

From 1fa17efec16dfbba6a2ee133d72adbebbfd1b30b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:47:17 +0200
Subject: [PATCH 094/173] install latest curl on osx

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 402631d..fda9e27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_install:
   - |
       ([ "${TRAVIS_OS_NAME}" = "linux" ] && sudo apt-get install zsh lynx) || echo "osx, skipping apt-get"
   - |
-      ([ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx) || echo "linux, skipping brew"
+      ([ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx curl) || echo "linux, skipping brew"
 
 
 cache: apt

From cb2e9332337f759e1b61f914dbed2ba5043b8d39 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:50:17 +0200
Subject: [PATCH 095/173] add cache for brew

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fda9e27..868df63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,10 @@ before_install:
       ([ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx curl) || echo "linux, skipping brew"
 
 
-cache: apt
+cache:
+  apt: true
+  directories:
+    - $HOME/Library/Caches/Homebrew
 
 notifications:
   email: false

From 9ffa7919fb7d4d03f7988057821a81907bb8156c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 15:59:01 +0200
Subject: [PATCH 096/173] try to quote protect the param to avoid the
 '&foo=bar'

---
 test/resty_shpec.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index f80cb10..9a53b29 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -122,7 +122,7 @@ describe "Resty"
         end
 
         it "POST with data sent in query string"
-            output=$(POST /echo -d foo=bar -G)
+            output=$(POST /echo -d 'foo=bar' -G)
             assert equal "$output" 'post\n\n{"foo":"bar"}'
         end
 

From 6a47cefdd8f7a0683bc8a17e5908dc4721f91254 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 16:14:59 +0200
Subject: [PATCH 097/173] hack on the server to avoid empty query string to be
 printed because of '&a=b' being sent by curl

---
 test/resty_shpec.sh | 1 +
 test/server.js      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 9a53b29..eb06ba3 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -124,6 +124,7 @@ describe "Resty"
         it "POST with data sent in query string"
             output=$(POST /echo -d 'foo=bar' -G)
             assert equal "$output" 'post\n\n{"foo":"bar"}'
+            echo "     note a strange behavior on osx where query send has a '&' in it"
         end
 
         it "POST with extra header and basic auth, data in message body"
diff --git a/test/server.js b/test/server.js
index 3a199b8..a55c2d1 100644
--- a/test/server.js
+++ b/test/server.js
@@ -15,7 +15,8 @@ server.register(require('inert'), (err) => {
             result += "\n" + request.payload
         }
         if(JSON.stringify(request.query) !== '{}') {
-            result += "\n" + JSON.stringify(request.query)
+            result += "\n" + JSON.stringify(request.query).replace('"":"",', '')
+            // note: hack to avoid empty query string to be printed: '&a=b'
         }
         reply(result).header('Content-Type', 'text/plain');
 

From 8eb9e87eb7aff4a853d81db4ceea321fc3aa40ac Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 22:25:29 +0200
Subject: [PATCH 098/173] applied refactors suggested by @soyo42

---
 resty | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 9f95202..5577e3c 100644
--- a/resty
+++ b/resty
@@ -83,7 +83,7 @@ function resty-call() {
 
     if [[ "$1" =~ ^/ ]] ; then  # retrieve path
         local _path; _path="$1"
-        [[ $# > 0 ]] && shift
+        shift
     fi
     local body
     if [[ ! "$1" =~ ^- ]] ; then  # retrieve data
@@ -168,9 +168,9 @@ function resty-call() {
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$( ( ( (curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
+    res=$(curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
-				| sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) |sed 's/^/ERR /' && echo) 2>&1)
+		     2> >(sed -E 's/^/ERR /') > >(sed -E 's/^/OUT /') )
 
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )

From 3cac99dcaa40519ad30499970b4712381b3c368a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 22:37:46 +0200
Subject: [PATCH 099/173] remove the flag to sed so that there is no handling
 with sed compatibilities

---
 resty | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resty b/resty
index 5577e3c..277848a 100644
--- a/resty
+++ b/resty
@@ -170,8 +170,7 @@ function resty-call() {
     local res out err ret
     res=$(curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
-		     2> >(sed -E 's/^/ERR /') > >(sed -E 's/^/OUT /') )
-
+		     2> >(sed 's/^/ERR /') > >(sed 's/^/OUT /') )
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)

From b42f6293b3328ac0930bc3da73284bf2c36de37a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 22:47:51 +0200
Subject: [PATCH 100/173] restore the echo after the sed to have an carriage
 return at the end of the feed

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 277848a..fdcbdbe 100644
--- a/resty
+++ b/resty
@@ -170,7 +170,7 @@ function resty-call() {
     local res out err ret
     res=$(curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
-		     2> >(sed 's/^/ERR /') > >(sed 's/^/OUT /') )
+		     2> >(sed 's/^/ERR /' ; echo) > >(sed 's/^/OUT /' ; echo) )
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)

From 0ee50fb3cc2e8e1113a40e8f39409a4ffbd390a2 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 23:10:53 +0200
Subject: [PATCH 101/173] applied the changes that occured on master since. (to
 simplify merge to come)

---
 resty | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index fdcbdbe..22a7b0b 100644
--- a/resty
+++ b/resty
@@ -162,7 +162,8 @@ function resty-call() {
     if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
         ## §maybe: cache this when resty)
         local cmd
-        cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null |sed 's/^ *//' |grep ^$method |cut -b $((${#method}+2))-) )"
+        cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+                      | grep ^$method | cut -b $((${#method}+2))-) )"
         eval $cmd
     fi
 
@@ -197,6 +198,7 @@ function resty-call() {
         return $ret
     else
         [ -n "$out" ] && echo "$out"
+        return 0
     fi
 
 }

From fff9e6e99c5c7b8e4b524e4346e81fd2c78ae55b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 23:18:55 +0200
Subject: [PATCH 102/173] applied shellcheck recommandations (except the
 'false' alerts)

---
 resty | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resty b/resty
index 22a7b0b..74d4863 100644
--- a/resty
+++ b/resty
@@ -61,7 +61,7 @@ function resty-call() {
     if [ $# = 0 ] ; then echo "resty-call need args" >&2; return 1; fi
 
     local method; method="$1"; shift
-    if [[ ! "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ "$method" ]] ; then # this is not good
+    if [[ ! "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ $method ]] ; then # this is not good
         echo "First arg must be an HTTP verb, '$method' isn't" >&2
         return 1
     fi
@@ -75,7 +75,7 @@ function resty-call() {
 			  || which html2text || which cat) |tail -n 1)"
     local editor;editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
-    if [[ "POST PUT TRACE PATCH DELETE" =~ "$method" ]]; then local hasbody; hasbody="yes" ;fi
+    if [[ "POST PUT TRACE PATCH DELETE" =~ $method ]]; then local hasbody; hasbody="yes" ;fi
 
     if [ -d "$cookies" ] ; then   # retrieve cookie
 	    (mkdir -p "$cookies"; echo "http://localhost*" > "$host")
@@ -88,13 +88,13 @@ function resty-call() {
     local body
     if [[ ! "$1" =~ ^- ]] ; then  # retrieve data
          body="$1"
-        [[ $# > 0 ]] && shift
+        [[ $# -gt 0 ]] && shift
     fi
 
     local -a curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose
     for opt in "$@"; do
-        if [ -n "$maybe_query" -a -z "$query" ] ; then query="?$opt"; continue; fi
+        if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi
 
         case $opt in
             --verbose|-v) verbose="yes";;
@@ -113,7 +113,7 @@ function resty-call() {
 	    _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
     fi
 
-    if [[ "HEAD OPTIONS" =~ "$method" ]] ; then raw="yes" ; fi
+    if [[ "HEAD OPTIONS" =~ $method ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
     if [ "$method" = "-v" ] ; then # ??
@@ -145,14 +145,14 @@ function resty-call() {
 
     if [ "$hasbody" = "yes" ] && [ "$vimedit" = "yes" ]; then
         local tmpf; tmpf=$(mktemp /tmp/resty.XXXXXX)
-        [ -t 0 ] || cat > $tmpf
-        (exec < /dev/tty; "$editor" $tmpf)
-        body=$(cat $tmpf)
-        rm -f $tmpf
+        [ -t 0 ] || cat > "$tmpf"
+        (exec < /dev/tty; "$editor" "$tmpf")
+        body=$(cat "$tmpf")
+        rm -f "$tmpf"
     fi
 
-    if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# > 0 ]] && shift;fi
-    if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# > 0 ]] && shift ;fi
+    if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# -gt 0 ]] && shift;fi
+    if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# -gt 0 ]] && shift ;fi
     if [ -n "$body" ] ; then curl_opt="--data-binary" ;fi
     if [ "$method" = "HEAD" ] ; then
         curl_opt="-I"
@@ -163,20 +163,20 @@ function resty-call() {
         ## §maybe: cache this when resty)
         local cmd
         cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
-                      | grep ^$method | cut -b $((${#method}+2))-) )"
-        eval $cmd
+                      | grep "^$method" | cut -b $((${#method}+2))-) )"
+        eval "$cmd"
     fi
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$(curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
+    res=$(curl -sLv $curl_opt "$body" -X "$method" -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
 		     2> >(sed 's/^/ERR /' ; echo) > >(sed 's/^/OUT /' ; echo) )
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
 
-    if [ -n "$err" -a -n "$verbose" ]; then echo "$err" 1>&2 ; fi
+    if [ -n "$err" ] && [ -n "$verbose" ]; then echo "$err" 1>&2 ; fi
 
 
     local display
@@ -188,14 +188,14 @@ function resty-call() {
 
 
     # todo: also filter elinks and co
-    if  [[ ! "lynx" =~ "$display" ]] ; then # perlicize to make it more readable
+    if  [[ ! "lynx" =~ $display ]] ; then # perlicize to make it more readable
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                     -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
     fi
 
     if [ "$ret" != "2" ]; then
         [ -n "$out" ] && echo "$out" 1>&2
-        return $ret
+        return "$ret"
     else
         [ -n "$out" ] && echo "$out"
         return 0

From 5e41aa8d6dee17f155ac7b92acbc4015ecf4fc6d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 23:42:14 +0200
Subject: [PATCH 103/173] cleanup and attept to fix the strage bug on zsh

---
 resty | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 74d4863..b35c015 100644
--- a/resty
+++ b/resty
@@ -13,12 +13,12 @@
 #
 
 
-export _RESTY_HOST="" # TODO: to upper case!
+export _RESTY_HOST=""
 export _RESTY_PATH=""
 export _RESTY_NO_HISTORY=""
 
 
-# TODO: global var holers
+# TODO: global var holders
 export _RESTY_DATA_DIR _RESTY_CONF_DIR;
 
 
@@ -49,7 +49,6 @@ function resty() {
 		&& export _RESTY_HOST="$url"
 	    ;;
 	*)
-
 	    resty "http://$url" "${args[@]}"
 	    ;;
     esac
@@ -101,7 +100,7 @@ function resty-call() {
             # TODO; try adapt ; echo "$opt" | grep '^-[a-zA-Z]*v[a-zA-Z]*$' >/dev/null) \
             -V) vimedit="yes" ;;
             -Z) raw="yes" ;;
-            -W) ;; # §todo: check why nothing?
+            -W) ;;
             -Q) quote="yes" ;;
             -q) maybe_query="yes" ;;
             *) curlopt_cmd+=("$opt")
@@ -169,7 +168,7 @@ function resty-call() {
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$(curl -sLv $curl_opt "$body" -X "$method" -b "$cookies/$domain" -c "$cookies/$domain" \
+    res=$(curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
 		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
 		     2> >(sed 's/^/ERR /' ; echo) > >(sed 's/^/OUT /' ; echo) )
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )

From cd0ec4aceb966b64098be1cb2502f3c395a82640 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 9 Apr 2017 23:48:02 +0200
Subject: [PATCH 104/173] give up simplification suggested by @soyo42 as it
 induce instability on zsh

---
 resty | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index b35c015..5d7e161 100644
--- a/resty
+++ b/resty
@@ -168,9 +168,11 @@ function resty-call() {
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$(curl -sLv $curl_opt "$body" -X $method -b "$cookies/$domain" -c "$cookies/$domain" \
-		     "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
-		     2> >(sed 's/^/ERR /' ; echo) > >(sed 's/^/OUT /' ; echo) )
+    res=$( ( ( (curl -sLv $curl_opt "$body" -X $method \
+              -b "$cookies/$domain" -c "$cookies/$domain" \
+              "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
+        |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
+        |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)

From 27f6636ac8e995d3e566356a031c27dc3e7907a3 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 30 Sep 2017 01:29:12 +0200
Subject: [PATCH 105/173] doc: README formating tweaking

---
 README.md | 81 ++++++++++++++++++++++---------------------------------
 1 file changed, 32 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index 20864b5..18ca987 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Resty
 =====
 
-*Resty* is a tiny script wrapper for [curl](http://curl.haxx.se/). It
+**Resty** is a tiny script wrapper for [curl](http://curl.haxx.se/). It
 provides a simple, concise shell interface for interacting with
 [REST](http://en.wikipedia.org/wiki/Representational_State_Transfer) services.
 Since it is implemented as functions in your shell and not in its own separate
@@ -14,14 +14,13 @@ the data in and then edit it interactively in your text editor prior to `PUT`,
 Cookies are supported automatically and stored in a file locally. Most of
 the arguments are remembered from one call to the next to save typing. It
 has pretty good defaults for most purposes. Additionally, resty allows you
-to easily provide your own options to be passed directly to curl, so even
+to easily provide your own options to be passed directly to ``curl, so even
 the most complex requests can be accomplished with the minimum amount of
 command line pain.
 
 [Here is a nice screencast showing resty in action](http://jpmens.net/2010/04/26/resty/) (by Jan-Piet Mens).
 
-Quick Start
-===========
+## Quick Start
 
 You have `curl`, right? Okay.
 
@@ -54,8 +53,7 @@ Make some HTTP requests.
       $ POST /blogs.json '{"title" : "new post", "body" : "This is the new new."}'
       {"id" : 204, "title" : "new post", "body" : "This is the new new."}
 
-Usage
-=====
+## Usage
 
       source resty [-W] [remote]              # load functions into shell
       resty [-v]                              # prints current request URI base
@@ -87,14 +85,14 @@ Usage
       --dry-run     Just output the curl command.
       <curl opt>    Any curl options will be passed down to curl.
 
-Configuration, Data File Locations
-==================================
+## Configuration, Data File Locations
+
 
 Resty creates a few files in either your `${XDG_CONFIG_HOME}` and `${XDG_DATA_HOME}`
 directory (if your linux uses the XDG directory standard) or in the `~/.resty`
 directory, otherwise.
 
-### Using Existing, Pre-v2.1 Configuration Files With v2.1 ###
+#### Using Existing, Pre-v2.1 Configuration Files With v2.1 ####
 
 If you had resty installed before version 2.1 and your system uses the XDG
 config directory standard and you want to continue using your existing
@@ -105,8 +103,7 @@ and then do:
       $ mv ~/.resty/c "${XDG_DATA_HOME}/resty"
       $ mv ~/.resty/* "${XDG_CONFIG_HOME}/resty"
 
-Request URI Base
-================
+## Request URI Base
 
 The request URI base is what the eventual URI to which the requests will be
 made is based on. Specifically, it is a URI that may contain the `*` character
@@ -129,18 +126,16 @@ would result in a `GET` request to the URI `http://127.0.0.1:8080/data/5.json`.
 If no `*` character is specified when setting the base URI, it's just added
 onto the end for you automatically.
 
-HTTPS URIs
-----------
+### HTTPS URIs
 
 HTTPS URIs can be used, as well. For example:
 
       $ resty 'https://example.com/doit'
       https://example.com/doit*
 
-URI Base History
-----------------
+### URI Base History
 
-The URI base is saved to an rc file (`${XDG_CONFIG_HOME}/resty/host` or `~/.resty/host`)i
+The URI base is saved to an rc file (`${XDG_CONFIG_HOME}/resty/host` or `~/.resty/host`)
 each time it's set, and the last setting is saved in an environment variable
 (`$_resty_host`).  The URI base is read from the rc file when resty starts
 up, but only if the `$_resty_host` environment variable is not set.
@@ -150,8 +145,7 @@ separate terminals, and have a different URI base for each terminal.
 If you want to see what the current URI base is, just run `resty` with no
 arguments. The URI base will be printed to stdout.
 
-The Optional Path Parameter
-===========================
+## The Optional Path Parameter
 
 The HTTP verbs (`OPTIONS`, `HEAD`, `GET`, `POST`, `PUT`, `PATCH`, and `DELETE`)
 first argument is always an optional URI path. This path must always start with a
@@ -161,8 +155,7 @@ environment variable (`$_resty_path`), so each terminal basically has its
 own "last path".
 
 
-URL Encoding Of Path Parameter
-------------------------------
+### URL Encoding Of Path Parameter
 
 Resty will always [URL encode]
 (http://www.blooberry.com/indexdot/html/topics/urlencoding.htm) the path,
@@ -171,8 +164,8 @@ except for slashes. (Slashes in path elements need to be manually encoded as
 well as some other problematic characters. To disable this behavior use the
 `-Q` option.
 
-Query Strings, POST Parameters, And Both At The Same Time
----------------------------------------------------------
+### Query Strings, POST Parameters, And Both At The Same Time
+
 
 There are three ways to add a query string to the path. The first, mentioned
 above, is to disable URL encoding with the `-Q` option, and include the
@@ -190,14 +183,13 @@ Finally, you can use the curl `-d` and `-G` options, like this:
       $ GET /blogs/47 -d 'param=foo' -d 'otherparam=bar' -G
 
 However, if you want to pass both GET parameters in the query string _and_
-POST parameters in the request body, curl cannot support this by itself.
+`POST` parameters in the request body, curl cannot support this by itself.
 Using the `-q` or `-Q` resty options with the `-d` curl option will accomplish
 this, like so:
 
       $ POST '/blogs/47?param=foo&otherparam=bar' -Q -d 'postparam=baz'
 
-POST/PUT/PATCH Requests and Data
-================================
+## POST/PUT/PATCH Requests and Data
 
 Normally you would probably want to provide the request body data right on
 the command line like this:
@@ -220,8 +212,7 @@ Or, interestingly, as a filter pipeline with
 
 Notice how the `path` argument is omitted from the `PUT` command.
 
-Edit PUT/PATCH/POST Data In Vi
-------------------------------
+### Edit PUT/PATCH/POST Data In Vi
 
 With the `-V` options you can pipe data into `PUT`, `PATCH`, or `POST`, edit
 it in vi, save the data (using `:wq` in vi, as normal) and the resulting data
@@ -233,8 +224,7 @@ This fetches the data and lets you edit it, and then does a PUT on the
 resource. If you don't like vi you can specify your preferred editor by
 setting the `EDITOR` environment variable.
 
-Errors and Output
-=================
+## Errors and Output
 
 For successful *2xx* responses, the response body is printed on stdout. You
 can pipe the output to stuff, process it, and then pipe it back to resty,
@@ -247,14 +237,12 @@ resty will try to process the response through either `lynx`, `html2text`,
 or, finally, `cat`, depending on which of those programs are available on
 your system.
 
-Raw Output (-Z option)
-----------------------
+### Raw Output (-Z option)
 
 If you don't want resty to process the output through lynx or html2text you
 can use the `-Z` option, and get the raw output.
 
-Passing Command Line Options To Curl
-====================================
+## Passing Command Line Options To Curl
 
 Anything after the (optional) `path` and `data` arguments is passed on to
 `curl`.
@@ -273,18 +261,17 @@ In this example the `path` and `data` arguments were left off, but `-v` and
 
 Here are some useful options to try:
 
-  * **-v** verbose output, shows HTTP headers and status on stderr
-  * **-j** junk session cookies (refresh cookie-based session)
-  * **-u \<username:password\>** HTTP basic authentication
-  * **-H \<header\>** add request header (this option can be added more than
+  - **-v** verbose output, shows HTTP headers and status on stderr
+  - **-j** junk session cookies (refresh cookie-based session)
+  - **-u \<username:password\>** HTTP basic authentication
+  - **-H \<header\>** add request header (this option can be added more than
     once)
 
-Setting The Default Curl Options
---------------------------------
+### Setting The Default Curl Options
 
 Sometimes you want to send some options to curl for every request. It
 would be tedious to have to repeat these options constantly. To tell
-resty to always add certain curl options you can specify those options
+*resty* to always add certain curl options you can specify those options
 when you call resty to set the URI base. For example:
 
       $ resty example.com:8080 -H "Accept: application/json" -u user:pass
@@ -293,10 +280,9 @@ Every subsequent request will have the `-H "Accept:..."` and `-u user:...`
 options automatically added. Each time resty is called this option list
 is reset.
 
-Per-Host/Per-Method Curl Configuration Files
---------------------------------------------
+### Per-Host/Per-Method Curl Configuration Files
 
-Resty supports a per-host/per-method configuration file to help you with
+*Resty* supports a *per-host/per-method configuration* file to help you with
 frequently used curl options. Each host (including the port) can have its
 own configuration file in the `~/.resty_ directory`. The file format is
 
@@ -342,8 +328,7 @@ to type them out each time, like this:
 
 Sweet! Much better.
 
-Exit Status
-===========
+## Exit Status
 
 Successful requests (HTTP respose with *2xx* status) return zero.
 Otherwise, the first digit of the response status is returned (i.e., 1 for
@@ -351,8 +336,7 @@ Otherwise, the first digit of the response status is returned (i.e., 1 for
 integer---it can't be greater than 255. If you want the exact status code
 you can always just pass the `-v` option to curl.
 
-Using Resty In Shell Scripts
-============================
+## Using Resty In Shell Scripts
 
 Since resty creates the REST verb functions in the shell, when using it from a script you must `source` it before you use any of the functions. However, it's likely that you don't want it to be overwriting the resty host history file, and you will almost always want to set the URI base explicitly.
 
@@ -369,8 +353,7 @@ Here the `-W` option was used when loading the script to prevent writing to the
 
 To assign the response of resty to a variable you can you do for example: `VAR="$(GET /some/request)"`. Note that the quote symbol (`"`) around the subcommand is necessary if the output contains spaces.
 
-Working With JSON or XML Data
-=============================
+## Working With JSON or XML Data
 
 `JSON REST` web services require some special tools to make them accessible
 and easily manipulated in the shell environment. The following are a few

From 83ce3114f8837fe9babf016cfd4b1208fa6b6d4d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 30 Sep 2017 01:32:08 +0200
Subject: [PATCH 106/173] doc: add build status badge (pointing on my work for
 now)

---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 18ca987..0db145b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
 Resty
 =====
 
-**Resty** is a tiny script wrapper for [curl](http://curl.haxx.se/). It
-provides a simple, concise shell interface for interacting with
+[![Build Status](https://travis-ci.org/AdrieanKhisbe/resty.svg?branch=master)](https://travis-ci.org/AdrieanKhisbe/resty)
+
+
+**Resty** is a tiny script wrapper for [curl](http://curl.haxx.se/).
+
+It provides a simple, concise shell interface for interacting with
 [REST](http://en.wikipedia.org/wiki/Representational_State_Transfer) services.
 Since it is implemented as functions in your shell and not in its own separate
 command environment you have access to all the powerful shell tools, such
@@ -13,8 +17,8 @@ the data in and then edit it interactively in your text editor prior to `PUT`,
 
 Cookies are supported automatically and stored in a file locally. Most of
 the arguments are remembered from one call to the next to save typing. It
-has pretty good defaults for most purposes. Additionally, resty allows you
-to easily provide your own options to be passed directly to ``curl, so even
+has pretty good defaults for most purposes. Additionally, **resty** allows you
+to easily provide your own options to be passed directly to `curl`, so even
 the most complex requests can be accomplished with the minimum amount of
 command line pain.
 

From 75e64984fe01260c18dfe10c1cdc2bdd62f051c8 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 30 Sep 2017 01:35:48 +0200
Subject: [PATCH 107/173] update test due to shpec breaking changes...
 match->glob

---
 test/resty_shpec.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index eb06ba3..eade06c 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -87,7 +87,7 @@ describe "Resty"
         end
         it "HEAD"
             output=$(HEAD /echo)
-            assert match  "$output" "200"
+            assert glob  "$output" "200"
         end
 
     end
@@ -96,7 +96,7 @@ describe "Resty"
 
         it "prety format when lynx is installed"
             output=$(GET /simple.html | tr -d ' ')
-            assert match $(which lynx) lynx
+            assert glob $(which lynx) lynx
             assert equal "$output" "$(cat test/test-data/simple-html-lynx.txt | tr -d ' ')"
             # note : hack to cope with lynx version differencies and different handling of table headers
         end
@@ -117,8 +117,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
             assert equal "$output" "get"
-            assert match "$erroroutput" "content-type:"
-            assert match "$erroroutput" "cache-control:"
+            assert glob "$erroroutput" "content-type:"
+            assert glob "$erroroutput" "cache-control:"
         end
 
         it "POST with data sent in query string"
@@ -132,8 +132,8 @@ describe "Resty"
                      -v < test/data/simple.json 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
             assert equal "$output" 'post\n{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}'
-            assert match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
-            assert match "$erroroutput" "Accept:\ application/json"
+            assert glob "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert glob "$erroroutput" "Accept:\ application/json"
         end
 
     end
@@ -144,8 +144,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-newopt-error)
             erroroutput=$(< /tmp/resty-newopt-error)
             assert equal "$output" "get"
-            assert match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
-            assert match "$erroroutput" "Accept:\ application/json"
+            assert glob "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert glob "$erroroutput" "Accept:\ application/json"
         end
 
         it "Resetting options"
@@ -153,8 +153,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-resetopt-error)
             erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" "get"
-            assert no_match "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
-            assert no_match "$erroroutput" "Accept:\ application/json"
+            assert no_glob "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert no_glob "$erroroutput" "Accept:\ application/json"
         end
 
 

From 76048c70ea0a1945c485d3d2cc26b43fbeabc4f9 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 30 Sep 2017 01:50:35 +0200
Subject: [PATCH 108/173] add package.json and Makefile for bpkg install

---
 Makefile     | 11 +++++++++++
 package.json |  8 ++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 Makefile
 create mode 100644 package.json

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..4e04784
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+
+PREFIX ?= /usr/local
+
+install:
+	mkdir -p $(HOME)/.bashrc.d
+	cp resty $(HOME)/.bashrc.d
+	cp pypp pp $(PREFIX)/bin/
+	@echo "You should add 'source ~/.bashrc.d/resty' to your bashrc"
+
+uninstall:
+	rm -f $(PREFIX)/bin/{pp,pypp} $(HOME)/.bashrc.d/resty
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..c1842e6
--- /dev/null
+++ b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "resty",
+  "version": "3.0.0-beta",
+  "description": "Terminal utility functions",
+  "scripts": [ "resty", "pypp", "pp" ],
+  "global": "true",
+  "install": "make install"
+}

From a5759f794d1958a0d0dab42c57d9a66d3cfc63c4 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 30 Sep 2017 02:26:21 +0200
Subject: [PATCH 109/173] use grep matcher rather than glob

---
 test/resty_shpec.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index eade06c..1ef304b 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -87,7 +87,7 @@ describe "Resty"
         end
         it "HEAD"
             output=$(HEAD /echo)
-            assert glob  "$output" "200"
+            assert grep "$output" "200"
         end
 
     end
@@ -96,7 +96,7 @@ describe "Resty"
 
         it "prety format when lynx is installed"
             output=$(GET /simple.html | tr -d ' ')
-            assert glob $(which lynx) lynx
+            assert grep $(which lynx) lynx
             assert equal "$output" "$(cat test/test-data/simple-html-lynx.txt | tr -d ' ')"
             # note : hack to cope with lynx version differencies and different handling of table headers
         end
@@ -117,8 +117,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
             assert equal "$output" "get"
-            assert glob "$erroroutput" "content-type:"
-            assert glob "$erroroutput" "cache-control:"
+            assert grep "$erroroutput" "content-type:"
+            assert grep "$erroroutput" "cache-control:"
         end
 
         it "POST with data sent in query string"
@@ -132,20 +132,20 @@ describe "Resty"
                      -v < test/data/simple.json 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
             assert equal "$output" 'post\n{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}'
-            assert glob "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
-            assert glob "$erroroutput" "Accept:\ application/json"
+            assert grep "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert grep "$erroroutput" "Accept:\ application/json"
         end
 
     end
 
-    describe "Resty Global options"
+    describe "Resty Grepal options"
         it "Setting new options"
             resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
             output=$(GET /echo -v 2> /tmp/resty-newopt-error)
             erroroutput=$(< /tmp/resty-newopt-error)
             assert equal "$output" "get"
-            assert glob "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
-            assert glob "$erroroutput" "Accept:\ application/json"
+            assert grep "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert grep "$erroroutput" "Accept:\ application/json"
         end
 
         it "Resetting options"
@@ -153,8 +153,8 @@ describe "Resty"
             output=$(GET /echo -v 2> /tmp/resty-resetopt-error)
             erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" "get"
-            assert no_glob "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
-            assert no_glob "$erroroutput" "Accept:\ application/json"
+            assert no_grep "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert no_grep "$erroroutput" "Accept:\ application/json"
         end
 
 

From 867837d9080eab6c04aada706bb67a098e6056a0 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 2 Oct 2017 21:00:17 +0200
Subject: [PATCH 110/173] update installation notes in README

---
 README.md | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0db145b..1187307 100644
--- a/README.md
+++ b/README.md
@@ -30,21 +30,16 @@ You have `curl`, right? Okay.
 
       $ curl -L https://raw.githubusercontent.com/micha/resty/master/resty > resty
 
-Source the script before using it. (You can put this line in your `~/.bashrc`
-file if you want, or just paste the contents of the `resty` script right in
-there. Either way works.)
+Source the script before using it.
 
       $ . resty
 
-Otherwise, if you use `zsh` and `antigen` to install resty with `antigen bundle micha/resty` in your `.zshr`
-
-Once resty is installed, set the REST host to which you will be making your requests (you can do this
-whenever you want to change hosts, anytime).
+Once **resty** is installed, set your REST host to which you will be making your requests.
 
       $ resty http://127.0.0.1:8080/data
       http://127.0.0.1:8080/data*
 
-Make some HTTP requests.
+And now you can Make some HTTP requests.
 
       $ GET /blogs.json
       [ {"id" : 1, "title" : "first post", "body" : "This is the first post"}, ... ]
@@ -57,6 +52,17 @@ Make some HTTP requests.
       $ POST /blogs.json '{"title" : "new post", "body" : "This is the new new."}'
       {"id" : 204, "title" : "new post", "body" : "This is the new new."}
 
+## Installation
+
+There are several way to install **resty** other than `curl`ing it and sourcing it.
+
+Here are some shell package manager that are supported:
+
+- **Bpkg** : with [`bpkg`](http://www.bpkg.sh/) installed just run `bpkg install -g micha/resty`,
+   then follow the instruction by adding `source ~/.bashrc.d/resty` to your `bashrc`
+- **Antigen** : with [`antigen`](https://github.com/zsh-users/antigen) for zsh, just add `antigen bundle micha/resty` in your `.zshrc`
+- **Zplug**: with [`zplug`](https://github.com/zplug/zplug) installed, just add `zplug micha/resty, use:'resty'` in your `.zshrc`
+
 ## Usage
 
       source resty [-W] [remote]              # load functions into shell

From 0090ede71f9d8891bb40699f2dee1a26f4962ac3 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 2 Oct 2017 21:47:26 +0200
Subject: [PATCH 111/173] cache the computation of the editor, and html to text
 program

---
 resty | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/resty b/resty
index 5d7e161..c57d089 100644
--- a/resty
+++ b/resty
@@ -16,10 +16,11 @@
 export _RESTY_HOST=""
 export _RESTY_PATH=""
 export _RESTY_NO_HISTORY=""
+export _RESTY_H2T="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
+			  || which html2text || which cat) |tail -n 1)"
+export _RESTY_EDITOR=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
 
-
-# TODO: global var holders
-export _RESTY_DATA_DIR _RESTY_CONF_DIR;
+export _RESTY_DATA_DIR _RESTY_CONF_DIR
 
 
 function resty() {
@@ -69,11 +70,8 @@ function resty-call() {
     local host="$_RESTY_DATA_DIR/host"
     local cookies="$_RESTY_DATA_DIR/c"
 
-    # §maybe cache
-    local h2t;h2t="$( (exec 2>&-; (which lynx >/dev/null && echo "lynx -stdin -dump") \
-			  || which html2text || which cat) |tail -n 1)"
-    local editor;editor=$( (exec 2>&-; which "$EDITOR" || which vim || echo "vi") |tail -n 1)    # editor default
-
+    local h2t="$_RESTY_H2T"
+    local editor="$_RESTY_EDITOR"
     if [[ "POST PUT TRACE PATCH DELETE" =~ $method ]]; then local hasbody; hasbody="yes" ;fi
 
     if [ -d "$cookies" ] ; then   # retrieve cookie

From 50bb12cea1658cb499d6ecf66162ef5b113e6af5 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 2 Oct 2017 21:53:29 +0200
Subject: [PATCH 112/173] few comment and a magic comment mode at the top

---
 resty | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/resty b/resty
index c57d089..f37dd70 100644
--- a/resty
+++ b/resty
@@ -1,4 +1,4 @@
-#
+#  -*-  mode: sh -*-
 # resty - A tiny command line REST interface for bash and zsh.
 #
 # Fork me on github:
@@ -186,7 +186,7 @@ function resty-call() {
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
 
-    # todo: also filter elinks and co
+    # §todo: also filter elinks and co
     if  [[ ! "lynx" =~ $display ]] ; then # perlicize to make it more readable
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                     -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
@@ -208,13 +208,12 @@ function resty-load-alias(){
     # maybe add option?
 }
 
-resty-load-alias # Loaded by default. Latter do an option
+resty-load-alias # Loaded by default. §maybe: Latter do an option (opt-in or opt-out)
 
 function resty-unload-alias(){
     unalias HEAD OPTIONS GET POST PUT TRACE PATCH DELETE
 }
 
-# TODO: option to have or not head as alias? resty-head?
 function resty-head() {
     resty-call HEAD "$@"
 }

From db443a2cb3bdd9529022aa7255342e08b4be4bf4 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 10:57:29 +0100
Subject: [PATCH 113/173] develop the perl script

---
 pp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pp b/pp
index e413b26..90fd3f4 100755
--- a/pp
+++ b/pp
@@ -1 +1,10 @@
-perl -0007 -MJSON -ne'print to_json(from_json($_, {allow_nonref=>1}),{pretty=>1})."\n"'
+#!/usr/bin/env perl -0007
+
+use JSON;
+while (<>) {
+  print to_json(from_json($_, {allow_nonref=>1}),{pretty=>1})."\n";
+}
+
+# about:
+# was orignaly a one liner:
+# perl -0007 -MJSON -ne'print to_json(from_json($_, {allow_nonref=>1}),{pretty=>1})."\n"'

From 3ed8e1133f6b7ff1a6f8d60268819eaab2977dba Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 11:09:46 +0100
Subject: [PATCH 114/173] add a help section to the pp script

---
 pp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pp b/pp
index 90fd3f4..3b181a7 100755
--- a/pp
+++ b/pp
@@ -1,5 +1,10 @@
 #!/usr/bin/env perl -0007
 
+if( $ARGV[0] eq '-h' || $ARGV[0] eq '--help') {
+  print "pp: Pretty print json piped as stdin or provided as file argument.\n";
+  exit;
+}
+
 use JSON;
 while (<>) {
   print to_json(from_json($_, {allow_nonref=>1}),{pretty=>1})."\n";

From 5a5495023eabb913e24ec180adb6a8ebf409f87c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 11:13:35 +0100
Subject: [PATCH 115/173] transform python oneliner in a script with a shebang

---
 pypp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pypp b/pypp
index c3dc90e..75a7f7f 100755
--- a/pypp
+++ b/pypp
@@ -1 +1,7 @@
-python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ': '))"
\ No newline at end of file
+#!/usr/bin/env python
+import sys
+import json
+
+data = sys.stdin.read()
+
+print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ': '))

From 33abb9c841289a13549a14a5df0ff818125bea4c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 11:16:44 +0100
Subject: [PATCH 116/173] use print function in python pp script to be
 compatible with python3

---
 pypp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pypp b/pypp
index 75a7f7f..59e8803 100755
--- a/pypp
+++ b/pypp
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
+from __future__ import print_function
 import sys
 import json
 
 data = sys.stdin.read()
 
-print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ': '))
+print(json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ': ')))

From 53f8315ae00fc0b5809f9f5314a340b88777dd23 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 11:18:59 +0100
Subject: [PATCH 117/173] support help flag in the python script

---
 pypp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pypp b/pypp
index 59e8803..f988d2d 100755
--- a/pypp
+++ b/pypp
@@ -3,6 +3,10 @@ from __future__ import print_function
 import sys
 import json
 
+if "-h" in sys.argv or "--help" in sys.argv:
+    print("pypp: Pretty print json piped as stdin")
+    sys.exit(0)
+
 data = sys.stdin.read()
 
 print(json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ': ')))

From 5ee6ca1649fe6797cba238facfd82dd29bf20385 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 11:30:20 +0100
Subject: [PATCH 118/173] add mention of jq json command line processor

---
 README.md | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 1187307..bbc9781 100644
--- a/README.md
+++ b/README.md
@@ -369,19 +369,15 @@ To assign the response of resty to a variable you can you do for example: `VAR="
 and easily manipulated in the shell environment. The following are a few
 scripts that make dealing with JSON data easier.
 
-  * [Jsawk](http://github.com/micha/jsawk) can be used to process and filter
-    JSON data from and to resty, in a shell pipeline. This takes care of
-    parsing the input JSON correctly, rather than using regexes and `sed`,
-    `awk`, `per`l or the like, and prints the resulting output in correct JSON
-    format, as well.
-
-    `GET /blogs.json |jsawk -n 'out(this.title)' # prints all the blog titles`
-
   * The included `pp` script will pretty-print JSON for you. You just need to
-    install the JSON perl module from CPAN or you can use `pypp` if you have
-    python 2.6 installed.
+    install the JSON perl module from CPAN (included with brew install)
+    or you can use `pypp` if you have python installed.
+
+    `GET /blogs.json | pp   # pretty-prints the JSON output from resty`
 
-    `GET /blogs.json |pp # pretty-prints the JSON output from resty`
+  * You can use powerful [jq](https://stedolan.github.io/jq/) Json command line
+    processor to perform operations on the received json. just pyping to `jq .`
+    will pretty print the json in color
 
   * Another way to format JSON output:
 
@@ -390,6 +386,15 @@ scripts that make dealing with JSON data easier.
           "json": "obj"
         }
 
+  * [Jsawk](http://github.com/micha/jsawk) can be used to process and filter
+    JSON data from and to resty, in a shell pipeline. This takes care of
+    parsing the input JSON correctly, rather than using regexes and `sed`,
+    `awk`, `per`l or the like, and prints the resulting output in correct JSON
+    format, as well.
+
+    `GET /blogs.json | jsawk -n 'out(this.title)' # prints all the blog titles`
+
+
   * The `tidy` tool can be used to format HTML/XML:
 
         $ ~$ echo "<test><deep>value</deep></test>" | tidy -xml -q -i

From c4c739e50e8acbe6a5a68cf0add5bb0a7fa43b21 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 12:15:35 +0100
Subject: [PATCH 119/173] add --json/--xml options to set both Accept and
 ContentType header

---
 resty               |  3 ++-
 test/resty_shpec.sh | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index f37dd70..57164f0 100644
--- a/resty
+++ b/resty
@@ -101,9 +101,10 @@ function resty-call() {
             -W) ;;
             -Q) quote="yes" ;;
             -q) maybe_query="yes" ;;
+            --json) curlopt_cmd+=(-H "Accept: application/json" -H "Content-Type: application/json") ;;
+            --xml) curlopt_cmd+=(-H "Accept: application/xml" -H "Content-Type: application/xml") ;;
             *) curlopt_cmd+=("$opt")
         esac
-        ## idea: add --json, other option.
     done
 
     if [ -z "$quote" ]; then # replace special char with codes
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 1ef304b..29f1187 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -10,7 +10,7 @@ describe "Resty"
 
 
         it "can define a target"
-            output=$(resty localhost:4004 2>&1 )
+            output=$(resty localhost:4004 2>&1)
             assert equal $? 0
             assert equal "$output" "http://localhost:4004*"
         end
@@ -136,9 +136,18 @@ describe "Resty"
             assert grep "$erroroutput" "Accept:\ application/json"
         end
 
+        it "POST with extra header and basic auth, data in message body and --json option"
+            output=$(POST /echo -u "user:secret" --json \
+                     -v < test/data/simple.json 2> /tmp/resty-getheader-error)
+            erroroutput=$(< /tmp/resty-getheader-error)
+            assert equal "$output" 'post\n{"foo":[1,2,3],"bar":{"dog":"woof","cat":"meow","fish":"banana"}}'
+            assert grep "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
+            assert grep "$erroroutput" "Accept:\ application/json"
+        end
+
     end
 
-    describe "Resty Grepal options"
+    describe "Resty Global options"
         it "Setting new options"
             resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
             output=$(GET /echo -v 2> /tmp/resty-newopt-error)

From 5187de644db7561fdeae68f4d5888e5adda406ff Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 16:04:26 +0100
Subject: [PATCH 120/173] cache the resty host option

---
 resty | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/resty b/resty
index 57164f0..059a9ff 100644
--- a/resty
+++ b/resty
@@ -34,8 +34,7 @@ function resty() {
     mkdir -p "$_RESTY_CONF_DIR"
 
     local host; host="$_RESTY_DATA_DIR/host"
-    local url
-    url="$1"; shift
+    local url; url="$1"; shift
     local args j; args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
@@ -51,8 +50,25 @@ function resty() {
 	    ;;
 	*)
 	    resty "http://$url" "${args[@]}"
+	    return
 	    ;;
     esac
+
+    # compute host option
+    local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
+    echo "$_RESTY_CONF_DIR/$domain"
+    if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
+        for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
+            local cmd
+            cmd="export _RESTY_OPT_HOST_$method=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-) )"
+            eval "$cmd"
+        done
+    else
+        for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
+           eval "_RESTY_OPT_HOST_$method=( )"
+        done
+    fi
 }
 
 
@@ -157,19 +173,13 @@ function resty-call() {
         raw="yes"
     fi
 
-    if [ -f "$_RESTY_CONF_DIR/$domain" ] ; then  # Retrieve stored option in config dir.
-        ## §maybe: cache this when resty)
-        local cmd
-        cmd="args2=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
-                      | grep "^$method" | cut -b $((${#method}+2))-) )"
-        eval "$cmd"
-    fi
+    eval "local host_arg; host_arg=\$_RESTY_OPT_HOST_$method"
 
     # Launch command and retrieved streams
     local res out err ret
     res=$( ( ( (curl -sLv $curl_opt "$body" -X $method \
               -b "$cookies/$domain" -c "$cookies/$domain" \
-              "${args2[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
+              "${host_arg[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
         |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
         |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )

From 7caf690194a8196f887fe29d3a79c79f0416a137 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sat, 4 Nov 2017 16:11:12 +0100
Subject: [PATCH 121/173] extract a compute host option function

---
 resty | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 059a9ff..658710f 100644
--- a/resty
+++ b/resty
@@ -54,7 +54,11 @@ function resty() {
 	    ;;
     esac
 
-    # compute host option
+    resty-compute-host-option
+}
+
+function resty-compute-host-option () {
+    # note: extract a function so it can be manually called if edited file
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     echo "$_RESTY_CONF_DIR/$domain"
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
@@ -71,8 +75,6 @@ function resty() {
     fi
 }
 
-
-
 function resty-call() {
     if [ $# = 0 ] ; then echo "resty-call need args" >&2; return 1; fi
 

From a33f2c7d00a916d3ac759fcc6b481c8eca25fb3a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 14:57:07 +0100
Subject: [PATCH 122/173] options gets evaluated for host commands

---
 resty | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/resty b/resty
index 658710f..02241b9 100644
--- a/resty
+++ b/resty
@@ -60,7 +60,6 @@ function resty() {
 function resty-compute-host-option () {
     # note: extract a function so it can be manually called if edited file
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    echo "$_RESTY_CONF_DIR/$domain"
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
             local cmd
@@ -70,7 +69,7 @@ function resty-compute-host-option () {
         done
     else
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-           eval "_RESTY_OPT_HOST_$method=( )"
+           eval "_RESTY_OPT_HOST_$method=()"
         done
     fi
 }
@@ -106,9 +105,13 @@ function resty-call() {
         [[ $# -gt 0 ]] && shift
     fi
 
-    local -a curlopt_cmd curlopt_file
+    local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose
-    for opt in "$@"; do
+
+    eval "local host_arg; host_arg=\$_RESTY_OPT_HOST_$method"
+    all_opts+=("${@[@]}" "${host_arg[@]}")
+
+    for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi
 
         case $opt in
@@ -175,13 +178,11 @@ function resty-call() {
         raw="yes"
     fi
 
-    eval "local host_arg; host_arg=\$_RESTY_OPT_HOST_$method"
-
     # Launch command and retrieved streams
     local res out err ret
     res=$( ( ( (curl -sLv $curl_opt "$body" -X $method \
               -b "$cookies/$domain" -c "$cookies/$domain" \
-              "${host_arg[@]}" "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
+              "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
         |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
         |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )

From 91fb8b20f461dfc9f492e830420a9b3e153c0cd4 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 15:26:00 +0100
Subject: [PATCH 123/173] inline resty compute opt to avoid variable
 redefinition and printing

---
 resty | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resty b/resty
index 02241b9..c871a17 100644
--- a/resty
+++ b/resty
@@ -62,10 +62,8 @@ function resty-compute-host-option () {
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            local cmd
-            cmd="export _RESTY_OPT_HOST_$method=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+            eval "export _RESTY_OPT_HOST_$method=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
                           | grep "^$method" | cut -b $((${#method}+2))-) )"
-            eval "$cmd"
         done
     else
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do

From a3d420f1c775a5995d7791d5a0ba86400723e293 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 15:26:42 +0100
Subject: [PATCH 124/173] add tests for the host defined options

---
 test/resty_shpec.sh                 | 23 ++++++++++++++++++++++-
 test/test-data/resty/localhost:4004 |  2 ++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 test/test-data/resty/localhost:4004

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 29f1187..32b752a 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -165,7 +165,28 @@ describe "Resty"
             assert no_grep "$erroroutput" "Authorization:\ Basic\ dXNlcjpzZWNyZXQ="
             assert no_grep "$erroroutput" "Accept:\ application/json"
         end
+    end
+    describe "Host defined Options"
+        it "are setted at resty when host match"
+            XDG_CONFIG_HOME=test/test-data
+            resty localhost:4004 2> /dev/null
+            assert equal "$_RESTY_OPT_HOST_GET" "-Q"
+            assert equal "$_RESTY_OPT_HOST_POST" "--json"
+        end
+        it "are used when performing a query"
+            output=$(GET "/echo?a=b")
+            assert equal "$output" 'get\n{"a":"b"}'
 
-
+            output=$(POST /echo "{\"a\": \"b\"}"  -v 2> /tmp/resty-resetopt-error)
+            erroroutput=$(< /tmp/resty-resetopt-error)
+            assert equal "$output" 'post\n{"a": "b"}'
+            assert no_grep "$erroroutput" "Content-Type:\ application/json"
+            assert no_grep "$erroroutput" "Accept:\ application/json"
+        end
+        it "are unsetted at resty when no host match"
+            resty localhost:4005 2> /dev/null
+            assert equal "$_RESTY_OPT_HOST_GET" ""
+            assert equal "$_RESTY_OPT_HOST_POST" ""
+        end
     end
 end
diff --git a/test/test-data/resty/localhost:4004 b/test/test-data/resty/localhost:4004
new file mode 100644
index 0000000..29f1c5a
--- /dev/null
+++ b/test/test-data/resty/localhost:4004
@@ -0,0 +1,2 @@
+GET -Q
+POST --json

From 89f190dca45c99e28acc1ffc6f9ef918b03d56e3 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 15:30:58 +0100
Subject: [PATCH 125/173] show in doc it's possible to source with options,
 closes #70

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bbc9781..b80e7d4 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ Here are some shell package manager that are supported:
 
 ## Usage
 
-      source resty [-W] [remote]              # load functions into shell
+      source resty [-W] [remote] [OPTIONS]    # load functions into shell
       resty [-v]                              # prints current request URI base
       resty <remote> [OPTIONS]                # sets the base request URI
 

From a481726bf1db621d7dc48530e4371728a8d495a0 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 18:54:16 +0100
Subject: [PATCH 126/173] restore the dry-run option

---
 resty | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index c871a17..1a218f1 100644
--- a/resty
+++ b/resty
@@ -104,7 +104,7 @@ function resty-call() {
     fi
 
     local -a all_opts curlopt_cmd curlopt_file
-    local raw query vimedit quote maybe_query verbose
+    local raw query vimedit quote maybe_query verbose dry_run
 
     eval "local host_arg; host_arg=\$_RESTY_OPT_HOST_$method"
     all_opts+=("${@[@]}" "${host_arg[@]}")
@@ -120,6 +120,7 @@ function resty-call() {
             -W) ;;
             -Q) quote="yes" ;;
             -q) maybe_query="yes" ;;
+            --dry-run) dry_run="yes";;
             --json) curlopt_cmd+=(-H "Accept: application/json" -H "Content-Type: application/json") ;;
             --xml) curlopt_cmd+=(-H "Accept: application/xml" -H "Content-Type: application/xml") ;;
             *) curlopt_cmd+=("$opt")
@@ -175,6 +176,10 @@ function resty-call() {
         curl_opt="-I"
         raw="yes"
     fi
+    if [ "$dry_run" = "yes" ] ; then
+        echo "curl -sLv $curl_opt \"$body\" -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\"  \"${curlopt_file[@]}\" \"${curlopt_cmd[@]}\" \"$_path$query\""
+        return 0
+    fi
 
     # Launch command and retrieved streams
     local res out err ret

From 8b85e3ff7a4b3f259112852d3a3f3f3161fa576d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 19:10:35 +0100
Subject: [PATCH 127/173] add an help section to both resty and resty-call

---
 resty | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/resty b/resty
index 1a218f1..4a16a50 100644
--- a/resty
+++ b/resty
@@ -38,6 +38,15 @@ function resty() {
     local args j; args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
+        if [[ $i =~ ^-h\|--help$ ]] ; then
+            cat <<HELP
+resty [host] [options]:
+
+      Set the host and default options to provided values
+HELP
+            -resty-help-options
+            return 0
+        fi
     done
 
     case "$url" in
@@ -80,6 +89,18 @@ function resty-call() {
         echo "First arg must be an HTTP verb, '$method' isn't" >&2
         return 1
     fi
+    for opt in "${@[@]}"; do # print help if requested
+        if [[ $opt =~ ^-h\|--help$ ]] ; then
+            cat <<HELP
+$method [path] [options]:
+
+      Perform a $method request to host $_RESTY_HOST with path and options.
+HELP
+            -resty-help-options
+            return 0
+        fi
+    done
+
 
     # TODO: local to reset
     local host="$_RESTY_DATA_DIR/host"
@@ -263,6 +284,28 @@ function resty-trace() {
     resty-call TRACE "$@"
 }
 
+function -resty-help-options () {
+cat <<HELP
+
+      Options:
+
+      -Q            Don't URL encode the path.
+      -q <query>    Send query string with the path. A '?' is prepended to
+                    <query> and concatenated onto the <path>.
+      -W            Don't write to history file (only when sourcing script).
+      -V            Edit the input data interactively in 'vi'. (PUT, PATCH,
+                    and POST requests only, with data piped to stdin.)
+      -Z            Raw output. This disables any processing of HTML in the
+                    response.
+      -v            Verbose output. When used with the resty command itself
+                    this prints the saved curl options along with the current
+                    URI base. Otherwise this is passed to curl for verbose
+                    curl output.
+      --dry-run     Just output the curl command.
+      <curl opt>    Any curl options will be passed down to curl.
+HELP
+}
+
 # With -W option, does not write to history file
 [ "$1" = "-W" ] && export _RESTY_NO_HISTORY="/dev/null" && [[ $# -gt 0 ]] && shift
 

From 7755e154fcc38acd16a08554ef5d832e68bbdc38 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 19:14:40 +0100
Subject: [PATCH 128/173] resty forward METHOD call to resty call for backward
 compatibility

also do not mkdir restyconfdir for help
---
 resty | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/resty b/resty
index 4a16a50..b876a85 100644
--- a/resty
+++ b/resty
@@ -24,17 +24,12 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR
 
 
 function resty() {
-    if [ -n "$XDG_CONFIG_HOME" ]; then
-        _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
-        _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
-    else
-        _RESTY_CONF_DIR="$HOME/.resty"
-        _RESTY_DATA_DIR="$_RESTY_CONF_DIR"
+    local url; url="$1"; shift
+    if [[ "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ $url ]] ; then
+        resty-call $url "$@"
+        return
     fi
-    mkdir -p "$_RESTY_CONF_DIR"
 
-    local host; host="$_RESTY_DATA_DIR/host"
-    local url; url="$1"; shift
     local args j; args=() j=1
     for i in "$@"; do
         args[j]="$i" && j=$((j + 1))
@@ -49,6 +44,17 @@ HELP
         fi
     done
 
+    if [ -n "$XDG_CONFIG_HOME" ]; then
+        _RESTY_CONF_DIR="$XDG_CONFIG_HOME/resty"
+        _RESTY_DATA_DIR="$XDG_DATA_HOME/resty"
+    else
+        _RESTY_CONF_DIR="$HOME/.resty"
+        _RESTY_DATA_DIR="$_RESTY_CONF_DIR"
+    fi
+    mkdir -p "$_RESTY_CONF_DIR"
+
+    local host; host="$_RESTY_DATA_DIR/host"
+
     case "$url" in
 	http://*|https://*)
 	    _resty_opts=$(printf '%q ' "${args[@]}")

From 648de06b8c09b6288c3516fc258c116fca3d2f94 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 20:44:03 +0100
Subject: [PATCH 129/173] add default host option in resty config file to
 address #27

---
 resty | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index b876a85..0444e67 100644
--- a/resty
+++ b/resty
@@ -75,9 +75,9 @@ HELP
 function resty-compute-host-option () {
     # note: extract a function so it can be manually called if edited file
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
+    if [[ -f "$_RESTY_CONF_DIR/resty" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_HOST_$method=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+            eval "export _RESTY_OPT_HOST_$method=( $(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
                           | grep "^$method" | cut -b $((${#method}+2))-) )"
         done
     else
@@ -85,6 +85,12 @@ function resty-compute-host-option () {
            eval "_RESTY_OPT_HOST_$method=()"
         done
     fi
+    if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
+        for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
+            eval "export _RESTY_OPT_HOST_$method+=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-) )"
+        done
+    fi
 }
 
 function resty-call() {

From e595187dd9231a3f65187992a0eee22bba750bbb Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:04:21 +0100
Subject: [PATCH 130/173] fix default arg merging ensuring an array is stored
 and not a string

---
 resty                               |  4 ++--
 test/resty_shpec.sh                 | 13 ++++++++-----
 test/test-data/resty/localhost:4004 |  2 +-
 test/test-data/resty/resty          |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 test/test-data/resty/resty

diff --git a/resty b/resty
index 0444e67..ba0223e 100644
--- a/resty
+++ b/resty
@@ -87,7 +87,7 @@ function resty-compute-host-option () {
     fi
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_HOST_$method+=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+            eval "_RESTY_OPT_HOST_$method+=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
                           | grep "^$method" | cut -b $((${#method}+2))-) )"
         done
     fi
@@ -139,7 +139,7 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
-    eval "local host_arg; host_arg=\$_RESTY_OPT_HOST_$method"
+    eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
     all_opts+=("${@[@]}" "${host_arg[@]}")
 
     for opt in "${all_opts[@]}"; do
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 32b752a..ae5e94c 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -170,22 +170,25 @@ describe "Resty"
         it "are setted at resty when host match"
             XDG_CONFIG_HOME=test/test-data
             resty localhost:4004 2> /dev/null
-            assert equal "$_RESTY_OPT_HOST_GET" "-Q"
+            assert equal "$_RESTY_OPT_HOST_GET" "-Q -H Accept: text/plain"
+            assert equal "${_RESTY_OPT_HOST_GET[3]}" "Accept: text/plain"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"
-            output=$(GET "/echo?a=b")
+            output=$(GET "/echo?a=b"  -v 2> /tmp/resty-resetopt-error)
+            erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" 'get\n{"a":"b"}'
+            assert grep "$erroroutput" "Accept:\ text/plain"
 
             output=$(POST /echo "{\"a\": \"b\"}"  -v 2> /tmp/resty-resetopt-error)
             erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" 'post\n{"a": "b"}'
-            assert no_grep "$erroroutput" "Content-Type:\ application/json"
-            assert no_grep "$erroroutput" "Accept:\ application/json"
+            assert grep "$erroroutput" "Content-Type:\ application/json"
+            assert grep "$erroroutput" "Accept:\ application/json"
         end
         it "are unsetted at resty when no host match"
             resty localhost:4005 2> /dev/null
-            assert equal "$_RESTY_OPT_HOST_GET" ""
+            assert equal "$_RESTY_OPT_HOST_GET" "-Q"
             assert equal "$_RESTY_OPT_HOST_POST" ""
         end
     end
diff --git a/test/test-data/resty/localhost:4004 b/test/test-data/resty/localhost:4004
index 29f1c5a..973c99c 100644
--- a/test/test-data/resty/localhost:4004
+++ b/test/test-data/resty/localhost:4004
@@ -1,2 +1,2 @@
-GET -Q
+GET -H 'Accept: text/plain'
 POST --json
diff --git a/test/test-data/resty/resty b/test/test-data/resty/resty
new file mode 100644
index 0000000..4878fe7
--- /dev/null
+++ b/test/test-data/resty/resty
@@ -0,0 +1 @@
+GET -Q

From 420b1c0e48b618125ea4942d153fc49f16fbd767 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:10:57 +0100
Subject: [PATCH 131/173] simplify the array spreading of $@ sto avoid
 BadSubstitution in bash

---
 resty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index ba0223e..8f8ee59 100644
--- a/resty
+++ b/resty
@@ -101,7 +101,7 @@ function resty-call() {
         echo "First arg must be an HTTP verb, '$method' isn't" >&2
         return 1
     fi
-    for opt in "${@[@]}"; do # print help if requested
+    for opt in "$@"; do # print help if requested
         if [[ $opt =~ ^-h\|--help$ ]] ; then
             cat <<HELP
 $method [path] [options]:
@@ -140,7 +140,7 @@ HELP
     local raw query vimedit quote maybe_query verbose dry_run
 
     eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
-    all_opts+=("${@[@]}" "${host_arg[@]}")
+    all_opts+=("$@" "${host_arg[@]}")
 
     for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi

From f6c1f29675c9490bd905de91ea52997bab5d180c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:12:19 +0100
Subject: [PATCH 132/173] use usr/bin/env zsh in travis-test.zsh

---
 .travis-test.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis-test.zsh b/.travis-test.zsh
index e874117..de9bd13 100755
--- a/.travis-test.zsh
+++ b/.travis-test.zsh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 source ~/.zshrc
 

From ce6e2e10ccc1e704ef72127eae136ba252a1be2b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:22:47 +0100
Subject: [PATCH 133/173] change the array cloning that wasn't working anymore
 with $@

---
 resty | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index 8f8ee59..531883e 100644
--- a/resty
+++ b/resty
@@ -140,7 +140,8 @@ HELP
     local raw query vimedit quote maybe_query verbose dry_run
 
     eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
-    all_opts+=("$@" "${host_arg[@]}")
+    for opt in "$@"; do all_opts+=("$opt") ; done
+    all_opts+=("${host_arg[@]}")
 
     for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi

From 79be9deb60d6958f1c873785c041f09bc9ccb585 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:26:02 +0100
Subject: [PATCH 134/173] brew update to avoid travis error

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 868df63..6abff65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_install:
   - |
       ([ "${TRAVIS_OS_NAME}" = "linux" ] && sudo apt-get install zsh lynx) || echo "osx, skipping apt-get"
   - |
-      ([ "${TRAVIS_OS_NAME}" = "osx" ] && brew install zsh lynx curl) || echo "linux, skipping brew"
+      ([ "${TRAVIS_OS_NAME}" = "osx" ] && brew update && brew install zsh lynx curl) || echo "linux, skipping brew"
 
 
 cache:

From 1cbe50ad9fee9d8ab076ec93def280f86370a0b3 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:40:09 +0100
Subject: [PATCH 135/173] guard resty call forwarding to avoid failed to
 compile regex: empty (sub)expression

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 531883e..7818853 100644
--- a/resty
+++ b/resty
@@ -25,7 +25,7 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR
 
 function resty() {
     local url; url="$1"; shift
-    if [[ "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ $url ]] ; then
+    if [ -n $url ] && [[ "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ $url ]] ; then
         resty-call $url "$@"
         return
     fi

From b5d6172b0f2b49b420cdb78c0bfebb20b8ce2d9c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:45:12 +0100
Subject: [PATCH 136/173] temporary disable output suppression to investigate
 failure loading on CI

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 7818853..17425fd 100644
--- a/resty
+++ b/resty
@@ -322,4 +322,4 @@ HELP
 # With -W option, does not write to history file
 [ "$1" = "-W" ] && export _RESTY_NO_HISTORY="/dev/null" && [[ $# -gt 0 ]] && shift
 
-resty "$@" >/dev/null 2>&1
+resty "$@" # >/dev/null 2>&1

From 1534360168b5b6b857b258ccf3122fba85c6e242 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:49:53 +0100
Subject: [PATCH 137/173] quote protect the variable in the resty forwarding
 guard

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 17425fd..6739bcd 100644
--- a/resty
+++ b/resty
@@ -25,7 +25,7 @@ export _RESTY_DATA_DIR _RESTY_CONF_DIR
 
 function resty() {
     local url; url="$1"; shift
-    if [ -n $url ] && [[ "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ $url ]] ; then
+    if [ -n "$url" ] && [[ "HEAD OPTIONS GET PATCH POST PUT TRACE DELETE" =~ $url ]] ; then
         resty-call $url "$@"
         return
     fi

From da4e7d606b163b75f48284b69c37bb783e81b86c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 21:57:38 +0100
Subject: [PATCH 138/173] disable error suppressing for build debuging

---
 test/resty_shpec.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index ae5e94c..46b3f51 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -169,7 +169,7 @@ describe "Resty"
     describe "Host defined Options"
         it "are setted at resty when host match"
             XDG_CONFIG_HOME=test/test-data
-            resty localhost:4004 2> /dev/null
+            resty localhost:4004 # 2> /dev/null
             assert equal "$_RESTY_OPT_HOST_GET" "-Q -H Accept: text/plain"
             assert equal "${_RESTY_OPT_HOST_GET[3]}" "Accept: text/plain"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
@@ -187,7 +187,7 @@ describe "Resty"
             assert grep "$erroroutput" "Accept:\ application/json"
         end
         it "are unsetted at resty when no host match"
-            resty localhost:4005 2> /dev/null
+            resty localhost:4005 # 2> /dev/null
             assert equal "$_RESTY_OPT_HOST_GET" "-Q"
             assert equal "$_RESTY_OPT_HOST_POST" ""
         end

From 3db74e8f17fe62749334820e4c6e6f60985d8fca Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 22:06:47 +0100
Subject: [PATCH 139/173] debuging tweaks

---
 resty               | 23 +++++++++++++++++++----
 test/resty_shpec.sh |  3 ++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 6739bcd..4e65679 100644
--- a/resty
+++ b/resty
@@ -73,22 +73,37 @@ HELP
 }
 
 function resty-compute-host-option () {
+    echo "pwd: $(pwd)"
+    echo "confdir: $_RESTY_CONF_DIR"; ls -r $_RESTY_CONF_DIR
     # note: extract a function so it can be manually called if edited file
+    echo domain computation
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     if [[ -f "$_RESTY_CONF_DIR/resty" ]] ; then
+        echo Resty file is here
+        cat $_RESTY_CONF_DIR/resty
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_HOST_$method=( $(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-) )"
+            echo "_RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-))"
+            eval "_RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-))"
         done
+        echo resty file handle
     else
+        echo No Resty file is here
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
            eval "_RESTY_OPT_HOST_$method=()"
         done
     fi
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
+        echo Host file is here
+        cat $_RESTY_CONF_DIR/$domain
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "_RESTY_OPT_HOST_$method+=( $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+            eval "_RESTY_OPT_HOST_$method=( \"\${_RESTY_OPT_HOST_$method[@]}\" $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-) )"
+            echo "_RESTY_OPT_HOST_$method=( \"\${_RESTY_OPT_HOST_$method[@]}\" $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
                           | grep "^$method" | cut -b $((${#method}+2))-) )"
+            eval echo \$_RESTY_OPT_HOST_$method \${#_RESTY_OPT_HOST_$method}
+            eval echo \${(#)_RESTY_OPT_HOST_${method}[1]} 2: \${(#)_RESTY_OPT_HOST_${method}[2]}
         done
     fi
 }
@@ -322,4 +337,4 @@ HELP
 # With -W option, does not write to history file
 [ "$1" = "-W" ] && export _RESTY_NO_HISTORY="/dev/null" && [[ $# -gt 0 ]] && shift
 
-resty "$@" # >/dev/null 2>&1
+resty "$@" >/dev/null 2>&1
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 46b3f51..74c3d21 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -168,7 +168,8 @@ describe "Resty"
     end
     describe "Host defined Options"
         it "are setted at resty when host match"
-            XDG_CONFIG_HOME=test/test-data
+            XDG_CONFIG_HOME=./test/test-data
+            ls -r $XDG_CONFIG_HOME
             resty localhost:4004 # 2> /dev/null
             assert equal "$_RESTY_OPT_HOST_GET" "-Q -H Accept: text/plain"
             assert equal "${_RESTY_OPT_HOST_GET[3]}" "Accept: text/plain"

From ac2f40c660be9f23a3bbb62bc701b9b370b78749 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 23:25:54 +0100
Subject: [PATCH 140/173] use two different array for default and host based
 options

---
 resty               | 29 ++++++++++-------------------
 test/resty_shpec.sh | 11 ++++++-----
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/resty b/resty
index 4e65679..6dd2529 100644
--- a/resty
+++ b/resty
@@ -73,37 +73,26 @@ HELP
 }
 
 function resty-compute-host-option () {
-    echo "pwd: $(pwd)"
-    echo "confdir: $_RESTY_CONF_DIR"; ls -r $_RESTY_CONF_DIR
     # note: extract a function so it can be manually called if edited file
-    echo domain computation
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     if [[ -f "$_RESTY_CONF_DIR/resty" ]] ; then
-        echo Resty file is here
-        cat $_RESTY_CONF_DIR/resty
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            echo "_RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-))"
-            eval "_RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
+            eval "export _RESTY_OPT_DEFAULT_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
                           | grep "^$method" | cut -b $((${#method}+2))-))"
         done
-        echo resty file handle
     else
-        echo No Resty file is here
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-           eval "_RESTY_OPT_HOST_$method=()"
+           eval "export _RESTY_OPT_DEFAULT_$method=()"
         done
     fi
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
-        echo Host file is here
-        cat $_RESTY_CONF_DIR/$domain
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "_RESTY_OPT_HOST_$method=( \"\${_RESTY_OPT_HOST_$method[@]}\" $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-) )"
-            echo "_RESTY_OPT_HOST_$method=( \"\${_RESTY_OPT_HOST_$method[@]}\" $(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-) )"
-            eval echo \$_RESTY_OPT_HOST_$method \${#_RESTY_OPT_HOST_$method}
-            eval echo \${(#)_RESTY_OPT_HOST_${method}[1]} 2: \${(#)_RESTY_OPT_HOST_${method}[2]}
+            eval "export _RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-))"
+        done
+    else
+        for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
+           eval "export _RESTY_OPT_HOST_$method=()"
         done
     fi
 }
@@ -154,8 +143,10 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
+    eval "local -a resty_default_arg; resty_default_arg=(\${_RESTY_OPT_DEFAULT_$method[@]})"
     eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
     for opt in "$@"; do all_opts+=("$opt") ; done
+    all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
 
     for opt in "${all_opts[@]}"; do
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 74c3d21..0c410c7 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -169,10 +169,10 @@ describe "Resty"
     describe "Host defined Options"
         it "are setted at resty when host match"
             XDG_CONFIG_HOME=./test/test-data
-            ls -r $XDG_CONFIG_HOME
             resty localhost:4004 # 2> /dev/null
-            assert equal "$_RESTY_OPT_HOST_GET" "-Q -H Accept: text/plain"
-            assert equal "${_RESTY_OPT_HOST_GET[3]}" "Accept: text/plain"
+            assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
+            assert equal "$_RESTY_OPT_HOST_GET" "-H Accept: text/plain"
+            assert equal "${_RESTY_OPT_HOST_GET[2]}" "Accept: text/plain"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"
@@ -188,8 +188,9 @@ describe "Resty"
             assert grep "$erroroutput" "Accept:\ application/json"
         end
         it "are unsetted at resty when no host match"
-            resty localhost:4005 # 2> /dev/null
-            assert equal "$_RESTY_OPT_HOST_GET" "-Q"
+            resty localhost:4005 2> /dev/null
+            assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
+            assert equal "$_RESTY_OPT_HOST_GET" ""
             assert equal "$_RESTY_OPT_HOST_POST" ""
         end
     end

From f20fb8b61bfb133b9b9cdfeafaa42fb3bb5a837e Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Sun, 5 Nov 2017 23:35:05 +0100
Subject: [PATCH 141/173] parse error and folder not found fix attempt

---
 resty               | 14 ++++++++------
 test/resty_shpec.sh |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resty b/resty
index 6dd2529..92ececb 100644
--- a/resty
+++ b/resty
@@ -77,22 +77,24 @@ function resty-compute-host-option () {
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     if [[ -f "$_RESTY_CONF_DIR/resty" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_DEFAULT_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-))"
+            eval "export _RESTY_OPT_DEFAULT_$method; _RESTY_OPT_DEFAULT_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null\
+                          | sed 's/^ *//' \
+                          | grep "^$method" | cut -b $((${#method}+2))-) )"
         done
     else
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-           eval "export _RESTY_OPT_DEFAULT_$method=()"
+            eval "export _RESTY_OPT_DEFAULT_$method; _RESTY_OPT_DEFAULT_$method=()"
         done
     fi
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-))"
+            eval "export _RESTY_OPT_HOST_$method; _RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null\
+                        | sed 's/^ *//' \
+                        | grep "^$method" | cut -b $((${#method}+2))-) )"
         done
     else
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-           eval "export _RESTY_OPT_HOST_$method=()"
+           eval "export _RESTY_OPT_HOST_$method; _RESTY_OPT_HOST_$method=()"
         done
     fi
 }
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 0c410c7..564550f 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -169,7 +169,8 @@ describe "Resty"
     describe "Host defined Options"
         it "are setted at resty when host match"
             XDG_CONFIG_HOME=./test/test-data
-            resty localhost:4004 # 2> /dev/null
+            resty localhost:4004 2> /dev/null
+            export
             assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
             assert equal "$_RESTY_OPT_HOST_GET" "-H Accept: text/plain"
             assert equal "${_RESTY_OPT_HOST_GET[2]}" "Accept: text/plain"

From 3d747982b93bfb8e6ee387c96a4fe644c797ac09 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 00:15:11 +0100
Subject: [PATCH 142/173] attempt to fix indice based issues

---
 test/resty_shpec.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 564550f..dab13d5 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -170,14 +170,15 @@ describe "Resty"
         it "are setted at resty when host match"
             XDG_CONFIG_HOME=./test/test-data
             resty localhost:4004 2> /dev/null
-            export
             assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
             assert equal "$_RESTY_OPT_HOST_GET" "-H Accept: text/plain"
-            assert equal "${_RESTY_OPT_HOST_GET[2]}" "Accept: text/plain"
+            [[ "$SHELL" == "bash" ]] && assert equal "${_RESTY_OPT_HOST_GET[1]}" "Accept: text/plain" \
+                                     || assert equal "${_RESTY_OPT_HOST_GET[2]}" "Accept: text/plain"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"
-            output=$(GET "/echo?a=b"  -v 2> /tmp/resty-resetopt-error)
+            GET "/echo?a=b" -v --dry-run
+            output=$(GET "/echo?a=b" -v 2> /tmp/resty-resetopt-error)
             erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" 'get\n{"a":"b"}'
             assert grep "$erroroutput" "Accept:\ text/plain"

From 78e24c59ba0d874fff391acf8e6a9d10bf494fbd Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 00:25:03 +0100
Subject: [PATCH 143/173] tweaking the dry run to use eval

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 92ececb..1065873 100644
--- a/resty
+++ b/resty
@@ -219,7 +219,7 @@ HELP
         raw="yes"
     fi
     if [ "$dry_run" = "yes" ] ; then
-        echo "curl -sLv $curl_opt \"$body\" -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\"  \"${curlopt_file[@]}\" \"${curlopt_cmd[@]}\" \"$_path$query\""
+        eval echo "curl -sLv $curl_opt \"$body\" -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\"  \"${curlopt_file[@]}\" \"${curlopt_cmd[@]}\" \"$_path$query\""
         return 0
     fi
 

From 2fb21b06bdb1a33cdb5749841cd1a679c9b32164 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 01:10:25 +0100
Subject: [PATCH 144/173] many tweak to have quote handling in options working

---
 resty               | 10 ++++++----
 test/resty_shpec.sh |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 1065873..700b364 100644
--- a/resty
+++ b/resty
@@ -219,15 +219,17 @@ HELP
         raw="yes"
     fi
     if [ "$dry_run" = "yes" ] ; then
-        eval echo "curl -sLv $curl_opt \"$body\" -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\"  \"${curlopt_file[@]}\" \"${curlopt_cmd[@]}\" \"$_path$query\""
+        eval "echo 'curl -sLv \$curl_opt \"\$body\" -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" $(
+        printf '%s ' "${curlopt_file[@]}") $(printf '"%s" ' "${curlopt_cmd[@]}") \"$_path\$query\"'"
         return 0
     fi
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$( ( ( (curl -sLv $curl_opt "$body" -X $method \
-              -b "$cookies/$domain" -c "$cookies/$domain" \
-              "${curlopt_file[@]}" "${curlopt_cmd[@]}" "$_path$query" \
+    res=$( ( ( (eval "curl -sLv \$curl_opt \"\$body\" -X $method \
+              -b \"$cookies/$domain\" -c \"$cookies/$domain\" \
+              $(printf '"%s" ' "${curlopt_file[@]}") \
+              $(printf '"%s" ' "${curlopt_cmd[@]}") \"$_path\$query\"" \
         |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
         |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index dab13d5..7607aeb 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -171,7 +171,7 @@ describe "Resty"
             XDG_CONFIG_HOME=./test/test-data
             resty localhost:4004 2> /dev/null
             assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
-            assert equal "$_RESTY_OPT_HOST_GET" "-H Accept: text/plain"
+            assert equal "${_RESTY_OPT_HOST_GET[*]}" "-H Accept: text/plain"
             [[ "$SHELL" == "bash" ]] && assert equal "${_RESTY_OPT_HOST_GET[1]}" "Accept: text/plain" \
                                      || assert equal "${_RESTY_OPT_HOST_GET[2]}" "Accept: text/plain"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"

From 527f0c171697537443eadce68352235579e2b47a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 01:25:35 +0100
Subject: [PATCH 145/173] debuging statement added to pin out last bug and
 solution attempt

---
 resty | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 700b364..ab464ce 100644
--- a/resty
+++ b/resty
@@ -145,8 +145,8 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
-    eval "local -a resty_default_arg; resty_default_arg=(\${_RESTY_OPT_DEFAULT_$method[@]})"
-    eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
+    eval "local -a resty_default_arg; resty_default_arg=(\"\${_RESTY_OPT_DEFAULT_$method[@]}\")"
+    eval "local -a host_arg; host_arg=(\"\${_RESTY_OPT_HOST_$method[@]}\")"
     for opt in "$@"; do all_opts+=("$opt") ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
@@ -223,7 +223,8 @@ HELP
         printf '%s ' "${curlopt_file[@]}") $(printf '"%s" ' "${curlopt_cmd[@]}") \"$_path\$query\"'"
         return 0
     fi
-
+    printf '"%s" ' "${_RESTY_OPT_HOST_GET[@]}"
+    printf '"%s" ' "${curlopt_cmd[@]}"
     # Launch command and retrieved streams
     local res out err ret
     res=$( ( ( (eval "curl -sLv \$curl_opt \"\$body\" -X $method \

From 0a033f28d3efaaa5bcfb0e3a8c421bfa32e85aa0 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 13:58:32 +0100
Subject: [PATCH 146/173] several tweaks with quotes to make things work

---
 resty               | 18 +++++++++---------
 test/resty_shpec.sh |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/resty b/resty
index ab464ce..1723e01 100644
--- a/resty
+++ b/resty
@@ -145,8 +145,8 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
-    eval "local -a resty_default_arg; resty_default_arg=(\"\${_RESTY_OPT_DEFAULT_$method[@]}\")"
-    eval "local -a host_arg; host_arg=(\"\${_RESTY_OPT_HOST_$method[@]}\")"
+    eval "local -a resty_default_arg; resty_default_arg=(\${_RESTY_OPT_DEFAULT_$method[@]})"
+    eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
     for opt in "$@"; do all_opts+=("$opt") ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
@@ -219,18 +219,18 @@ HELP
         raw="yes"
     fi
     if [ "$dry_run" = "yes" ] ; then
-        eval "echo 'curl -sLv \$curl_opt \"\$body\" -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" $(
-        printf '%s ' "${curlopt_file[@]}") $(printf '"%s" ' "${curlopt_cmd[@]}") \"$_path\$query\"'"
+        eval "echo 'curl -sLv $curl_opt '"'$body'"' -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" $(\
+        [ -n "$curlopt_file" ] && printf '%s ' "${curlopt_file[@]}") $(\
+        [ -n "$curlopt_cmd" ] && printf '"%s" ' "${curlopt_cmd[@]}") \"$_path$query\"'"
         return 0
     fi
-    printf '"%s" ' "${_RESTY_OPT_HOST_GET[@]}"
-    printf '"%s" ' "${curlopt_cmd[@]}"
+
     # Launch command and retrieved streams
     local res out err ret
-    res=$( ( ( (eval "curl -sLv \$curl_opt \"\$body\" -X $method \
+    res=$( ( ( (eval "curl -sLv $curl_opt '$body' -X $method \
               -b \"$cookies/$domain\" -c \"$cookies/$domain\" \
-              $(printf '"%s" ' "${curlopt_file[@]}") \
-              $(printf '"%s" ' "${curlopt_cmd[@]}") \"$_path\$query\"" \
+              $([ -n "$curlopt_file" ] && printf '"%s" ' "${curlopt_file[@]}") \
+              $([ -n "$curlopt_cmd" ] && printf '"%s" ' "${curlopt_cmd[@]}") \"$_path$query\"" \
         |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
         |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 7607aeb..adab011 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -177,7 +177,6 @@ describe "Resty"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"
-            GET "/echo?a=b" -v --dry-run
             output=$(GET "/echo?a=b" -v 2> /tmp/resty-resetopt-error)
             erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" 'get\n{"a":"b"}'

From ccc419f8143a6218b47c7c848c2d91289177d874 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 14:02:10 +0100
Subject: [PATCH 147/173] print debuging information for the accept text plain
 query

---
 test/resty_shpec.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index adab011..ad242e3 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -177,7 +177,9 @@ describe "Resty"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"
+            GET "/echo?a=b" -v --dry-run
             output=$(GET "/echo?a=b" -v 2> /tmp/resty-resetopt-error)
+            echo $erroroutput
             erroroutput=$(< /tmp/resty-resetopt-error)
             assert equal "$output" 'get\n{"a":"b"}'
             assert grep "$erroroutput" "Accept:\ text/plain"

From 9040ce278c1c177e8075820ab93d7452ad4a4f59 Mon Sep 17 00:00:00 2001
From: Adriean Khisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 14:11:49 +0100
Subject: [PATCH 148/173] attempt to populate array in a different way to
 preserve quotes

---
 resty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index 1723e01..c8566f3 100644
--- a/resty
+++ b/resty
@@ -145,8 +145,8 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
-    eval "local -a resty_default_arg; resty_default_arg=(\${_RESTY_OPT_DEFAULT_$method[@]})"
-    eval "local -a host_arg; host_arg=(\${_RESTY_OPT_HOST_$method[@]})"
+    eval "local -a resty_default_arg;  for i in \"\${_RESTY_OPT_DEFAULT_$method}\"; do resty_default_arg+=(\"\$i\"); done"
+    eval "local -a host_arg; for i in \"\${_RESTY_OPT_HOST_$method}\"; do host_arg+=(\"\$i\") ; done"
     for opt in "$@"; do all_opts+=("$opt") ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")

From 6ef2b7a32973f01ab80a49823f607fcd1e005f9c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 23:16:43 +0100
Subject: [PATCH 149/173] unify cmd and dry-run cmd building (using an array)

---
 resty               | 16 +++++++---------
 test/resty_shpec.sh |  1 +
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/resty b/resty
index c8566f3..b4fd097 100644
--- a/resty
+++ b/resty
@@ -218,21 +218,19 @@ HELP
         curl_opt="-I"
         raw="yes"
     fi
+    local cmd
+    cmd=(curl -sLv $curl_opt $(printf "%q" "$body") -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" $(\
+        [ -n "$curlopt_file" ] && printf '"%s" ' ${curlopt_file[@]}) $(\
+        [ -n "$curlopt_cmd" ] && printf '"%s" ' ${curlopt_cmd[@]}) \"$_path$query\")
     if [ "$dry_run" = "yes" ] ; then
-        eval "echo 'curl -sLv $curl_opt '"'$body'"' -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" $(\
-        [ -n "$curlopt_file" ] && printf '%s ' "${curlopt_file[@]}") $(\
-        [ -n "$curlopt_cmd" ] && printf '"%s" ' "${curlopt_cmd[@]}") \"$_path$query\"'"
+        echo $cmd
         return 0
     fi
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$( ( ( (eval "curl -sLv $curl_opt '$body' -X $method \
-              -b \"$cookies/$domain\" -c \"$cookies/$domain\" \
-              $([ -n "$curlopt_file" ] && printf '"%s" ' "${curlopt_file[@]}") \
-              $([ -n "$curlopt_cmd" ] && printf '"%s" ' "${curlopt_cmd[@]}") \"$_path$query\"" \
-        |sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
-        |sed 's/^/ERR /' && echo) 2>&1)
+    res=$( ( ( (eval "$cmd" | sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
+                          |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index ad242e3..a61d003 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -178,6 +178,7 @@ describe "Resty"
         end
         it "are used when performing a query"
             GET "/echo?a=b" -v --dry-run
+            POST /echo "{\"a\": \"b\"}" --dry-run
             output=$(GET "/echo?a=b" -v 2> /tmp/resty-resetopt-error)
             echo $erroroutput
             erroroutput=$(< /tmp/resty-resetopt-error)

From 26c9710b09a1cf9f55338f7787b4601d53d6234a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 23:20:01 +0100
Subject: [PATCH 150/173] tweak quoting of file arguments

---
 resty               | 4 ++--
 test/resty_shpec.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index b4fd097..bbf2040 100644
--- a/resty
+++ b/resty
@@ -145,8 +145,8 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
-    eval "local -a resty_default_arg;  for i in \"\${_RESTY_OPT_DEFAULT_$method}\"; do resty_default_arg+=(\"\$i\"); done"
-    eval "local -a host_arg; for i in \"\${_RESTY_OPT_HOST_$method}\"; do host_arg+=(\"\$i\") ; done"
+    eval "local -a resty_default_arg;  for i in \${_RESTY_OPT_DEFAULT_$method}; do resty_default_arg+=(\"\$i\"); done"
+    eval "local -a host_arg; for i in \${_RESTY_OPT_HOST_$method}; do host_arg+=(\"\$i\") ; done"
     for opt in "$@"; do all_opts+=("$opt") ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index a61d003..52e168e 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -180,8 +180,8 @@ describe "Resty"
             GET "/echo?a=b" -v --dry-run
             POST /echo "{\"a\": \"b\"}" --dry-run
             output=$(GET "/echo?a=b" -v 2> /tmp/resty-resetopt-error)
-            echo $erroroutput
             erroroutput=$(< /tmp/resty-resetopt-error)
+            echo $erroroutput
             assert equal "$output" 'get\n{"a":"b"}'
             assert grep "$erroroutput" "Accept:\ text/plain"
 

From dde98f0d74889124a0cca7d3aa3cd7c3498c946a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 23:25:01 +0100
Subject: [PATCH 151/173] add debuging information for bash

---
 resty | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index bbf2040..a057422 100644
--- a/resty
+++ b/resty
@@ -254,7 +254,9 @@ HELP
 
     if [ "$ret" != "2" ]; then
         [ -n "$out" ] && echo "$out" 1>&2
-        return "$ret"
+        echo $ret
+        echo $err
+        return $ret
     else
         [ -n "$out" ] && echo "$out"
         return 0

From 439e0916ee556aa9929e224891b842c3d7c99422 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Mon, 6 Nov 2017 23:34:56 +0100
Subject: [PATCH 152/173] array expand for bash

---
 resty | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resty b/resty
index a057422..6dd4121 100644
--- a/resty
+++ b/resty
@@ -223,13 +223,13 @@ HELP
         [ -n "$curlopt_file" ] && printf '"%s" ' ${curlopt_file[@]}) $(\
         [ -n "$curlopt_cmd" ] && printf '"%s" ' ${curlopt_cmd[@]}) \"$_path$query\")
     if [ "$dry_run" = "yes" ] ; then
-        echo $cmd
+        echo "${cmd[@]}"
         return 0
     fi
 
     # Launch command and retrieved streams
     local res out err ret
-    res=$( ( ( (eval "$cmd" | sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
+    res=$( ( ( (eval "${cmd[@]}" | sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
                           |sed 's/^/ERR /' && echo) 2>&1)
     out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
     err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )

From ae59f87f013ef9f0634138e5d8cdb3c4f782aeb1 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 00:29:59 +0100
Subject: [PATCH 153/173] change the way file opt are stored using a simple
 string

---
 resty               | 30 +++++++++++++++---------------
 test/resty_shpec.sh |  4 +---
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/resty b/resty
index 6dd4121..3e911a6 100644
--- a/resty
+++ b/resty
@@ -77,24 +77,24 @@ function resty-compute-host-option () {
     local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     if [[ -f "$_RESTY_CONF_DIR/resty" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_DEFAULT_$method; _RESTY_OPT_DEFAULT_$method=($(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null\
+            eval "export _RESTY_OPT_DEFAULT_$method; _RESTY_OPT_DEFAULT_$method=\"$(cat "$_RESTY_CONF_DIR/resty" 2>/dev/null\
                           | sed 's/^ *//' \
-                          | grep "^$method" | cut -b $((${#method}+2))-) )"
+                          | grep "^$method" | cut -b $((${#method}+2))-)\""
         done
     else
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_DEFAULT_$method; _RESTY_OPT_DEFAULT_$method=()"
+            eval "export _RESTY_OPT_DEFAULT_$method; _RESTY_OPT_DEFAULT_$method=\"\""
         done
     fi
     if [[ -f "$_RESTY_CONF_DIR/$domain" ]] ; then
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-            eval "export _RESTY_OPT_HOST_$method; _RESTY_OPT_HOST_$method=($(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null\
+            eval "export _RESTY_OPT_HOST_$method; _RESTY_OPT_HOST_$method=\"$(cat "$_RESTY_CONF_DIR/$domain" 2>/dev/null\
                         | sed 's/^ *//' \
-                        | grep "^$method" | cut -b $((${#method}+2))-) )"
+                        | grep "^$method" | cut -b $((${#method}+2))-)\""
         done
     else
         for method in HEAD OPTIONS GET PATCH POST PUT TRACE DELETE ; do
-           eval "export _RESTY_OPT_HOST_$method; _RESTY_OPT_HOST_$method=()"
+           eval "export _RESTY_OPT_HOST_$method; _RESTY_OPT_HOST_$method=''"
         done
     fi
 }
@@ -145,8 +145,10 @@ HELP
     local -a all_opts curlopt_cmd curlopt_file
     local raw query vimedit quote maybe_query verbose dry_run
 
-    eval "local -a resty_default_arg;  for i in \${_RESTY_OPT_DEFAULT_$method}; do resty_default_arg+=(\"\$i\"); done"
-    eval "local -a host_arg; for i in \${_RESTY_OPT_HOST_$method}; do host_arg+=(\"\$i\") ; done"
+    local -a resty_default_arg host_arg;
+    for i in $(eval echo "\${_RESTY_OPT_DEFAULT_$method}") ; do resty_default_arg+=("$i") ; done
+    for i in $(eval echo "\${_RESTY_OPT_HOST_$method}") ; do host_arg+=("$i") ; done
+
     for opt in "$@"; do all_opts+=("$opt") ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
@@ -163,8 +165,8 @@ HELP
             -Q) quote="yes" ;;
             -q) maybe_query="yes" ;;
             --dry-run) dry_run="yes";;
-            --json) curlopt_cmd+=(-H "Accept: application/json" -H "Content-Type: application/json") ;;
-            --xml) curlopt_cmd+=(-H "Accept: application/xml" -H "Content-Type: application/xml") ;;
+            --json) curlopt_cmd+=("-H 'Accept: application/json'" "-H 'Content-Type: application/json'") ;;
+            --xml) curlopt_cmd+=("-H 'Accept: application/xml'" "-H 'Content-Type: application/xml'") ;;
             *) curlopt_cmd+=("$opt")
         esac
     done
@@ -219,9 +221,9 @@ HELP
         raw="yes"
     fi
     local cmd
-    cmd=(curl -sLv $curl_opt $(printf "%q" "$body") -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" $(\
-        [ -n "$curlopt_file" ] && printf '"%s" ' ${curlopt_file[@]}) $(\
-        [ -n "$curlopt_cmd" ] && printf '"%s" ' ${curlopt_cmd[@]}) \"$_path$query\")
+    cmd=(curl -sLv $curl_opt $(printf "%q" "$body") -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" "$(\
+        [ -n "$curlopt_file" ] && printf '%s ' ${curlopt_file[@]})" "$(\
+        [ -n "$curlopt_cmd" ] && printf '%s '  ${curlopt_cmd[@]})" \"$_path$query\")
     if [ "$dry_run" = "yes" ] ; then
         echo "${cmd[@]}"
         return 0
@@ -254,8 +256,6 @@ HELP
 
     if [ "$ret" != "2" ]; then
         [ -n "$out" ] && echo "$out" 1>&2
-        echo $ret
-        echo $err
         return $ret
     else
         [ -n "$out" ] && echo "$out"
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 52e168e..cf9bbce 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -171,9 +171,7 @@ describe "Resty"
             XDG_CONFIG_HOME=./test/test-data
             resty localhost:4004 2> /dev/null
             assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
-            assert equal "${_RESTY_OPT_HOST_GET[*]}" "-H Accept: text/plain"
-            [[ "$SHELL" == "bash" ]] && assert equal "${_RESTY_OPT_HOST_GET[1]}" "Accept: text/plain" \
-                                     || assert equal "${_RESTY_OPT_HOST_GET[2]}" "Accept: text/plain"
+            assert equal "${_RESTY_OPT_HOST_GET[*]}" "-H 'Accept: text/plain'"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"

From e9559924a8496e00d204fcd900d28e2be57d3915 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 00:50:50 +0100
Subject: [PATCH 154/173] quoting all the args

---
 resty | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/resty b/resty
index 3e911a6..077cccc 100644
--- a/resty
+++ b/resty
@@ -57,7 +57,7 @@ HELP
 
     case "$url" in
 	http://*|https://*)
-	    _resty_opts=$(printf '%q ' "${args[@]}")
+	    if [ -n "$args" ]; then _resty_opts=$(printf "%q " ${args[@]});else _resty_opts=""; fi
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
@@ -142,16 +142,17 @@ HELP
         [[ $# -gt 0 ]] && shift
     fi
 
-    local -a all_opts curlopt_cmd curlopt_file
+    local -a all_opts curlopt_cmd
     local raw query vimedit quote maybe_query verbose dry_run
 
     local -a resty_default_arg host_arg;
     for i in $(eval echo "\${_RESTY_OPT_DEFAULT_$method}") ; do resty_default_arg+=("$i") ; done
     for i in $(eval echo "\${_RESTY_OPT_HOST_$method}") ; do host_arg+=("$i") ; done
 
-    for opt in "$@"; do all_opts+=("$opt") ; done
+    for opt in "$@"; do all_opts+=($(printf '%q' "$opt")) ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
+    if [ -n "$_resty_opts" ] ; then all_opts+=("${_resty_opts[@]}") ; fi #then all_opts+=("$(printf "'%q' " "${_resty_opts[@]}")") ; fi
 
     for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi
@@ -196,7 +197,7 @@ HELP
     [ -z "$_path" ] && local _path;
     _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
 
-    eval "curlopt_file=(${_resty_opts[*]})"  # TODO: rename or change
+
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
         if [ ! -t 0 ] ; then # retrieve what stdin hold
            body="@-"

From 3092b5f1135589be9a36efa0fd0f34a7e189fa79 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 00:54:02 +0100
Subject: [PATCH 155/173] add debuging information for bash (again)

---
 resty               | 2 +-
 test/resty_shpec.sh | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index 077cccc..7631270 100644
--- a/resty
+++ b/resty
@@ -32,6 +32,7 @@ function resty() {
 
     local args j; args=() j=1
     for i in "$@"; do
+        echo i $i
         args[j]="$i" && j=$((j + 1))
         if [[ $i =~ ^-h\|--help$ ]] ; then
             cat <<HELP
@@ -223,7 +224,6 @@ HELP
     fi
     local cmd
     cmd=(curl -sLv $curl_opt $(printf "%q" "$body") -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" "$(\
-        [ -n "$curlopt_file" ] && printf '%s ' ${curlopt_file[@]})" "$(\
         [ -n "$curlopt_cmd" ] && printf '%s '  ${curlopt_cmd[@]})" \"$_path$query\")
     if [ "$dry_run" = "yes" ] ; then
         echo "${cmd[@]}"
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index cf9bbce..b2fb56a 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -128,6 +128,7 @@ describe "Resty"
         end
 
         it "POST with extra header and basic auth, data in message body"
+        POST /echo -u "user:secret" -H "Accept: application/json" --dry-run
             output=$(POST /echo -u "user:secret" -H "Accept: application/json" \
                      -v < test/data/simple.json 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
@@ -137,6 +138,7 @@ describe "Resty"
         end
 
         it "POST with extra header and basic auth, data in message body and --json option"
+            POST /echo --json  --dry-run < test/data/simple.json
             output=$(POST /echo -u "user:secret" --json \
                      -v < test/data/simple.json 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
@@ -150,6 +152,7 @@ describe "Resty"
     describe "Resty Global options"
         it "Setting new options"
             resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
+            GET /echo -v --dry-run
             output=$(GET /echo -v 2> /tmp/resty-newopt-error)
             erroroutput=$(< /tmp/resty-newopt-error)
             assert equal "$output" "get"

From 7d048d963331f8c5bdbd178a1ccfc3cdc5028f40 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 00:59:06 +0100
Subject: [PATCH 156/173] attempt to fix the bash bug

---
 resty | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resty b/resty
index 7631270..f841be2 100644
--- a/resty
+++ b/resty
@@ -32,7 +32,6 @@ function resty() {
 
     local args j; args=() j=1
     for i in "$@"; do
-        echo i $i
         args[j]="$i" && j=$((j + 1))
         if [[ $i =~ ^-h\|--help$ ]] ; then
             cat <<HELP
@@ -58,7 +57,7 @@ HELP
 
     case "$url" in
 	http://*|https://*)
-	    if [ -n "$args" ]; then _resty_opts=$(printf "%q " ${args[@]});else _resty_opts=""; fi
+	    if [ -n "${args[@]}" ]; then _resty_opts=$(printf "%q " ${args[@]});else _resty_opts=""; fi
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \

From 8df27c0d61b792012a1333673244aea4c50927eb Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 01:04:04 +0100
Subject: [PATCH 157/173] attempt to fix the bash bug

---
 resty               | 7 +++++--
 test/resty_shpec.sh | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index f841be2..1d18e78 100644
--- a/resty
+++ b/resty
@@ -57,7 +57,10 @@ HELP
 
     case "$url" in
 	http://*|https://*)
-	    if [ -n "${args[@]}" ]; then _resty_opts=$(printf "%q " ${args[@]});else _resty_opts=""; fi
+	    if [ -n "${args[@]}" ];
+	    then _resty_opts=$(printf "%q " "${args[@]}");
+	    else _resty_opts=""; fi
+	    echo _resty_opts $_resty_opts
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
@@ -152,7 +155,7 @@ HELP
     for opt in "$@"; do all_opts+=($(printf '%q' "$opt")) ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
-    if [ -n "$_resty_opts" ] ; then all_opts+=("${_resty_opts[@]}") ; fi #then all_opts+=("$(printf "'%q' " "${_resty_opts[@]}")") ; fi
+    if [ -n "${_resty_opts[@]}" ] ; then all_opts+=("${_resty_opts[@]}") ; fi
 
     for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index b2fb56a..d6a8143 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -151,7 +151,7 @@ describe "Resty"
 
     describe "Resty Global options"
         it "Setting new options"
-            resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
+            resty localhost:4004 -u "user:secret" -H "Accept: application/json" #2> /dev/null
             GET /echo -v --dry-run
             output=$(GET /echo -v 2> /tmp/resty-newopt-error)
             erroroutput=$(< /tmp/resty-newopt-error)

From 8d7b44e26673a4f65a94027aff552ea8dfd49140 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 01:22:54 +0100
Subject: [PATCH 158/173] change the way emptyness is checked

---
 resty | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 1d18e78..84b929c 100644
--- a/resty
+++ b/resty
@@ -57,10 +57,7 @@ HELP
 
     case "$url" in
 	http://*|https://*)
-	    if [ -n "${args[@]}" ];
-	    then _resty_opts=$(printf "%q " "${args[@]}");
-	    else _resty_opts=""; fi
-	    echo _resty_opts $_resty_opts
+	    if [ "${#args[@]}" -ne 0 ]; then _resty_opts=$(printf "%q " "${args[@]}"); else _resty_opts=""; fi
 	    export _resty_opts
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
@@ -155,7 +152,7 @@ HELP
     for opt in "$@"; do all_opts+=($(printf '%q' "$opt")) ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
-    if [ -n "${_resty_opts[@]}" ] ; then all_opts+=("${_resty_opts[@]}") ; fi
+    if [ "${#_resty_opts[@]}" -ne 0 ] ; then all_opts+=("${_resty_opts[@]}") ; fi
 
     for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi

From e9bdf3be455663d0187d77fe28b60319dfe21fd2 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 01:27:12 +0100
Subject: [PATCH 159/173] remove debuging dry-run command printing in the tests

---
 test/resty_shpec.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index d6a8143..66a72b3 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -128,7 +128,6 @@ describe "Resty"
         end
 
         it "POST with extra header and basic auth, data in message body"
-        POST /echo -u "user:secret" -H "Accept: application/json" --dry-run
             output=$(POST /echo -u "user:secret" -H "Accept: application/json" \
                      -v < test/data/simple.json 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
@@ -138,7 +137,6 @@ describe "Resty"
         end
 
         it "POST with extra header and basic auth, data in message body and --json option"
-            POST /echo --json  --dry-run < test/data/simple.json
             output=$(POST /echo -u "user:secret" --json \
                      -v < test/data/simple.json 2> /tmp/resty-getheader-error)
             erroroutput=$(< /tmp/resty-getheader-error)
@@ -151,8 +149,7 @@ describe "Resty"
 
     describe "Resty Global options"
         it "Setting new options"
-            resty localhost:4004 -u "user:secret" -H "Accept: application/json" #2> /dev/null
-            GET /echo -v --dry-run
+            resty localhost:4004 -u "user:secret" -H "Accept: application/json" 2> /dev/null
             output=$(GET /echo -v 2> /tmp/resty-newopt-error)
             erroroutput=$(< /tmp/resty-newopt-error)
             assert equal "$output" "get"
@@ -178,11 +175,8 @@ describe "Resty"
             assert equal "$_RESTY_OPT_HOST_POST" "--json"
         end
         it "are used when performing a query"
-            GET "/echo?a=b" -v --dry-run
-            POST /echo "{\"a\": \"b\"}" --dry-run
             output=$(GET "/echo?a=b" -v 2> /tmp/resty-resetopt-error)
             erroroutput=$(< /tmp/resty-resetopt-error)
-            echo $erroroutput
             assert equal "$output" 'get\n{"a":"b"}'
             assert grep "$erroroutput" "Accept:\ text/plain"
 

From 948d439166def7d21eeae84dff17863ea0c899aa Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 11:43:15 +0100
Subject: [PATCH 160/173] handle deletion of trailing space and add test for
 merging options

---
 resty               | 10 +++++-----
 test/resty_shpec.sh | 10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/resty b/resty
index 84b929c..804c84e 100644
--- a/resty
+++ b/resty
@@ -57,8 +57,8 @@ HELP
 
     case "$url" in
 	http://*|https://*)
-	    if [ "${#args[@]}" -ne 0 ]; then _resty_opts=$(printf "%q " "${args[@]}"); else _resty_opts=""; fi
-	    export _resty_opts
+	    if [ "${#args[@]}" -ne 0 ]; then _RESTY_OPTS=$(printf "%q " "${args[@]}"|sed 's:[[:space:]]*$::'); else _RESTY_OPTS=""; fi
+	    export _RESTY_OPTS
 	    echo "$url" |grep '\*' >/dev/null || url="${url}*"
 	    (echo "$url" |tee "${_RESTY_NO_HISTORY:-$host}") |cat 1>&2 \
 		&& export _RESTY_HOST="$url"
@@ -152,7 +152,7 @@ HELP
     for opt in "$@"; do all_opts+=($(printf '%q' "$opt")) ; done
     all_opts+=("${resty_default_arg[@]}")
     all_opts+=("${host_arg[@]}")
-    if [ "${#_resty_opts[@]}" -ne 0 ] ; then all_opts+=("${_resty_opts[@]}") ; fi
+    if [ "${#_RESTY_OPTS[@]}" -ne 0 ] ; then all_opts+=("${_RESTY_OPTS[@]}") ; fi
 
     for opt in "${all_opts[@]}"; do
         if [ -n "$maybe_query" ] && [ -z "$query" ] ; then query="?$opt"; continue; fi
@@ -180,7 +180,7 @@ HELP
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
     if [ "$method" = "-v" ] ; then # ??
-        echo "$_RESTY_HOST $_resty_opts"
+        echo "$_RESTY_HOST $_RESTY_OPTS"
         return
     fi
     if [ -z "$method" ] ; then # return since no method
@@ -223,7 +223,7 @@ HELP
     fi
     local cmd
     cmd=(curl -sLv $curl_opt $(printf "%q" "$body") -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" "$(\
-        [ -n "$curlopt_cmd" ] && printf '%s '  ${curlopt_cmd[@]})" \"$_path$query\")
+        [ -n "$curlopt_cmd" ] && printf '%s ' ${curlopt_cmd[@]})"\"$_path$query\")
     if [ "$dry_run" = "yes" ] ; then
         echo "${cmd[@]}"
         return 0
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 66a72b3..ec31f5a 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -186,6 +186,16 @@ describe "Resty"
             assert grep "$erroroutput" "Content-Type:\ application/json"
             assert grep "$erroroutput" "Accept:\ application/json"
         end
+        it "are setted at resty with host match and defaults and config are merged"
+            XDG_CONFIG_HOME=./test/test-data
+            resty localhost:4004 -u "user:secret with space" 2> /dev/null
+            assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"
+            assert equal "${_RESTY_OPT_HOST_GET[*]}" "-H 'Accept: text/plain'"
+            assert equal "$_RESTY_OPT_HOST_POST" "--json"
+            assert equal "$_RESTY_OPTS" "-u user:secret\\ with\\ space"
+            query="$(GET "/echo?a=b" --dry-run)"
+            assert equal "$query" "curl -sLv '' -X GET -b \"/resty/c/localhost:4004\" -c \"/resty/c/localhost:4004\" -H 'Accept: text/plain' -u user:secret\\ with\\ space \"http://localhost:4004/echo?a=b\""
+        end
         it "are unsetted at resty when no host match"
             resty localhost:4005 2> /dev/null
             assert equal "$_RESTY_OPT_DEFAULT_GET" "-Q"

From db34a4c2d2258fa3c2756ec26506b91cd7352767 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 11:51:24 +0100
Subject: [PATCH 161/173] document the default options

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b80e7d4..bb99ea2 100644
--- a/README.md
+++ b/README.md
@@ -294,7 +294,10 @@ is reset.
 
 *Resty* supports a *per-host/per-method configuration* file to help you with
 frequently used curl options. Each host (including the port) can have its
-own configuration file in the `~/.resty_ directory`. The file format is
+own configuration file in the `~/.resty` directory. 
+A special host `resty` is used to define *default* options for all the hosts.
+
+The file format is
 
       GET [arg] [arg] ...
       PUT [arg] [arg] ...
@@ -305,6 +308,9 @@ own configuration file in the `~/.resty_ directory`. The file format is
 Where the `arg`s are curl command line arguments. Each line can specify
 arguments for that HTTP verb only, and all lines are optional.
 
+These config files are loaded each time you run the `resty` command.
+
+#### Example
 So, suppose you find yourself using the same curl options over and over. You
 can save them in a file and resty will pass them to curl for you. Say this
 is a frequent pattern for you:
@@ -318,7 +324,7 @@ is a frequent pattern for you:
       ...
 
 It's annoying to add the `-H` and `-u` options to curl all the time. So
-create a file `~/.resty/localhost:8080_`, like this:
+create a file `~/.resty/localhost:8080`, like this:
 
 _~/.resty/localhost:8080_
 

From 4187af80c877848fd3f89e31154d11a3490ba16b Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 13:54:29 +0100
Subject: [PATCH 162/173] refactor simplify the big pipes at eval cmd and react
 to non 0 curl output

---
 resty | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resty b/resty
index 804c84e..83491a6 100644
--- a/resty
+++ b/resty
@@ -230,15 +230,15 @@ HELP
     fi
 
     # Launch command and retrieved streams
-    local res out err ret
-    res=$( ( ( (eval "${cmd[@]}" | sed 's/^/OUT /' && echo) 3>&2 2>&1 1>&3) \
-                          |sed 's/^/ERR /' && echo) 2>&1)
-    out=$(sed '/^OUT /s/^....//p; d' <<< "$res" )
-    err=$(sed '/^ERR /s/^....//p; d' <<< "$res" )
+    local res out err ret _status outf errf
+    outf=$(mktemp) errf=$(mktemp)
+    eval "${cmd[@]}" > "$outf" 2> "$errf"
+    _status=$?; out="$(cat "$outf")"; err="$(cat "$errf")"
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
 
-    if [ -n "$err" ] && [ -n "$verbose" ]; then echo "$err" 1>&2 ; fi
+    if [ "$_status" -ne "0" ]; then echo "$err" ; return $_status ; fi
 
+    if [ -n "$err" ] && [ -n "$verbose" ]; then echo "$err" 1>&2 ; fi
 
     local display
     if [ -z "$raw" ] && grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err"

From d9b50d67d7f45807fb5dc978766b8f5096492bcc Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 14:06:12 +0100
Subject: [PATCH 163/173] add a test about the curl failure reporting

---
 resty               |  2 +-
 test/resty_shpec.sh | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/resty b/resty
index 83491a6..2b6fb68 100644
--- a/resty
+++ b/resty
@@ -236,7 +236,7 @@ HELP
     _status=$?; out="$(cat "$outf")"; err="$(cat "$errf")"
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
 
-    if [ "$_status" -ne "0" ]; then echo "$err" ; return $_status ; fi
+    if [ "$_status" -ne "0" ]; then echo "$err" >&2 ; return $_status ; fi
 
     if [ -n "$err" ] && [ -n "$verbose" ]; then echo "$err" 1>&2 ; fi
 
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index ec31f5a..5660ce3 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -112,6 +112,21 @@ describe "Resty"
         end
     end
 
+    describe "Curl Failures"
+        it "are reported to the user"
+            stub_command curl "echo '* Connected to mysite.com (64.136.20.67) port 443 (#0)
+* Server aborted the SSL handshake
+* Closing connection 0' >&2; return 2"
+            output=$(GET /simple.html -Z 2>&1)
+            assert unequal $? 0
+            assert equal "$output" "* Connected to mysite.com (64.136.20.67) port 443 (#0)
+* Server aborted the SSL handshake
+* Closing connection 0"
+            unstub_command curl
+
+        end
+    end
+
     describe "Options"
          it "GET with headers"
             output=$(GET /echo -v 2> /tmp/resty-getheader-error)

From 45f21c202317debbd365e7a498a92ca5fdb99294 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 15:07:31 +0100
Subject: [PATCH 164/173] implement a RESTY_NO_PRESERVE_PATH option to solve
 #28

---
 README.md |  3 ++-
 resty     | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index bb99ea2..d35e15d 100644
--- a/README.md
+++ b/README.md
@@ -161,9 +161,10 @@ The HTTP verbs (`OPTIONS`, `HEAD`, `GET`, `POST`, `PUT`, `PATCH`, and `DELETE`)
 first argument is always an optional URI path. This path must always start with a
 `/` character. If the path parameter is not provided on the command line, resty
 will just use the last path it was provided with. This "last path" is stored in an
-environment variable (`$_resty_path`), so each terminal basically has its
+environment variable (`$_RESTY_PATH`), so each terminal basically has its
 own "last path".
 
+This feature can be disabled with the following flag `RESTY_NO_PRESERVE_PATH=true`.
 
 ### URL Encoding Of Path Parameter
 
diff --git a/resty b/resty
index 2b6fb68..454cf51 100644
--- a/resty
+++ b/resty
@@ -119,8 +119,8 @@ HELP
         fi
     done
 
+    local _path __path
 
-    # TODO: local to reset
     local host="$_RESTY_DATA_DIR/host"
     local cookies="$_RESTY_DATA_DIR/c"
 
@@ -133,7 +133,7 @@ HELP
     fi
 
     if [[ "$1" =~ ^/ ]] ; then  # retrieve path
-        local _path; _path="$1"
+        _path="$1"
         shift
     fi
     local body
@@ -179,7 +179,7 @@ HELP
     if [[ "HEAD OPTIONS" =~ $method ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
-    if [ "$method" = "-v" ] ; then # ??
+    if [ "$method" = "-v" ] ; then # ?? # FIXME kill or convert
         echo "$_RESTY_HOST $_RESTY_OPTS"
         return
     fi
@@ -187,16 +187,17 @@ HELP
         echo "$_RESTY_HOST"
         return
     fi
-    if [ -n "$_path" ] ; then # update current path
-	    _RESTY_PATH=$_path
-    fi
 
+    if [[ ! "$RESTY_NO_PRESERVE_PATH" =~ ^true\|yes$ ]]; then
+        __path="${_path:-${_RESTY_PATH}}"
+        _RESTY_PATH="${__path}"
+    else
+        __path=$_path
+    fi
 
     local domain; domain=$(echo -n "$_RESTY_HOST" \
 		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
-    [ -z "$_path" ] && local _path;
-    _path="${_RESTY_HOST//\*/$_RESTY_PATH}"
-
+    _path="${_RESTY_HOST//\*/$__path}"
 
     if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
         if [ ! -t 0 ] ; then # retrieve what stdin hold

From 1e23622e36158461498be746b0aed1c4eee13d6c Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 16:49:08 +0100
Subject: [PATCH 165/173] clean up the temporary file capturing the output

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 454cf51..c6e4e53 100644
--- a/resty
+++ b/resty
@@ -234,7 +234,7 @@ HELP
     local res out err ret _status outf errf
     outf=$(mktemp) errf=$(mktemp)
     eval "${cmd[@]}" > "$outf" 2> "$errf"
-    _status=$?; out="$(cat "$outf")"; err="$(cat "$errf")"
+    _status=$?; out="$(cat "$outf")"; err="$(cat "$errf")"; rm -f "$outf" "$errf"
     ret=$(sed '/^.*HTTP\/1\.[01] [0-9][0-9][0-9]/s/.*\([0-9]\)[0-9][0-9].*/\1/p; d' <<< "$err" | tail -n1)
 
     if [ "$_status" -ne "0" ]; then echo "$err" >&2 ; return $_status ; fi

From e0cc7f1c9983b2ae2582fa22bfefe23bde732f5a Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 16:59:38 +0100
Subject: [PATCH 166/173] add test for the preserve path arguments feature and
 its disabling

---
 test/resty_shpec.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index 5660ce3..c8e2b7a 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -181,6 +181,27 @@ describe "Resty"
             assert no_grep "$erroroutput" "Accept:\ application/json"
         end
     end
+
+    describe "Preserve Path Argument"
+        it "works by default"
+            GET /echo > /dev/null
+            assert equal "$_RESTY_PATH" "/echo"
+            output=$(GET)
+            assert equal "$output" "get"
+        end
+
+        it "can be disabled"
+            RESTY_NO_PRESERVE_PATH="yes"
+            _RESTY_PATH="" # reset RESTY_PATH
+            GET /echo > /dev/null
+            assert equal "$_RESTY_PATH" ""
+            output=$(GET 2>&1)
+            assert equal "$output" '{"statusCode":403,"error":"Forbidden"}'
+            RESTY_NO_PRESERVE_PATH="no"
+        end
+    end
+
+
     describe "Host defined Options"
         it "are setted at resty when host match"
             XDG_CONFIG_HOME=./test/test-data

From 280ca0f22f1af2ce9b2530412e3a6c6a05feaf51 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 19:27:31 +0100
Subject: [PATCH 167/173] filter out elinks in out process

---
 resty | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resty b/resty
index c6e4e53..5ac0fac 100644
--- a/resty
+++ b/resty
@@ -248,9 +248,7 @@ HELP
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
-
-    # §todo: also filter elinks and co
-    if  [[ ! "lynx" =~ $display ]] ; then # perlicize to make it more readable
+    if  [[ ! "$display" =~ ^lynx\|elinks$ ]] ; then # perlicize to make it more readable
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                     -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
     fi

From f932da56dceef8da574a03e43e4f490195a4fa0d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 20:35:38 +0100
Subject: [PATCH 168/173] uninline the perl script for better readability

---
 resty                               | 17 +++++++++++++++--
 test/test-data/simple-html-lynx.txt |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 5ac0fac..0709f9e 100644
--- a/resty
+++ b/resty
@@ -248,9 +248,22 @@ HELP
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
-    if  [[ ! "$display" =~ ^lynx\|elinks$ ]] ; then # perlicize to make it more readable
+    if  [[ ! "$display" =~ ^lynx\|elinks$ ]] ; then
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
-                    -e '@a=<>; $s=0; foreach (reverse(@a)) { if ($_ =~ /^References$/) { $s++; } unless ($s>0) { s/^\s+[0-9]+\. //; s/^file:\/\/localhost/$host/; } push(@ret,$_); } print(join("",reverse(@ret)))')
+                    -e "$(cat <<'PERL'
+            @a=<>;
+            $s=0;
+            foreach (reverse(@a)) {
+                if ($_ =~ /^References$/) { $s++; }
+                unless ($s>0) {
+                    s/^\s+[0-9]+\. //;
+                    s/^file:\/\/localhost/$host/;
+                }
+                push(@ret,$_);
+            }
+            print(join("",reverse(@ret)))
+PERL
+            )")
     fi
 
     if [ "$ret" != "2" ]; then
diff --git a/test/test-data/simple-html-lynx.txt b/test/test-data/simple-html-lynx.txt
index 2b29ac2..ef6e240 100644
--- a/test/test-data/simple-html-lynx.txt
+++ b/test/test-data/simple-html-lynx.txt
@@ -27,4 +27,4 @@ Hello There.
 
 References
 
-http://github.com/micha/resty
\ No newline at end of file
+1.http://github.com/micha/resty
\ No newline at end of file

From daa5a51493e9719e41c3d292ee5ac113952c86eb Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 22:49:37 +0100
Subject: [PATCH 169/173] fix lynx prety printing condition that was broken

---
 resty                               | 4 ++--
 test/test-data/simple-html-lynx.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 0709f9e..65ad208 100644
--- a/resty
+++ b/resty
@@ -248,9 +248,9 @@ HELP
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
-    if  [[ ! "$display" =~ ^lynx\|elinks$ ]] ; then
+    if  [[ "$display" =~ ^lynx\|elinks$ ]] ; then
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
-                    -e "$(cat <<'PERL'
+                                -e "$(cat <<'PERL'
             @a=<>;
             $s=0;
             foreach (reverse(@a)) {
diff --git a/test/test-data/simple-html-lynx.txt b/test/test-data/simple-html-lynx.txt
index ef6e240..2b29ac2 100644
--- a/test/test-data/simple-html-lynx.txt
+++ b/test/test-data/simple-html-lynx.txt
@@ -27,4 +27,4 @@ Hello There.
 
 References
 
-1.http://github.com/micha/resty
\ No newline at end of file
+http://github.com/micha/resty
\ No newline at end of file

From 4c32055f56ff0efe5e886652005913e78abaa9b7 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 22:50:53 +0100
Subject: [PATCH 170/173] kill dead code

---
 resty | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/resty b/resty
index 65ad208..68481eb 100644
--- a/resty
+++ b/resty
@@ -179,15 +179,6 @@ HELP
     if [[ "HEAD OPTIONS" =~ $method ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
-    if [ "$method" = "-v" ] ; then # ?? # FIXME kill or convert
-        echo "$_RESTY_HOST $_RESTY_OPTS"
-        return
-    fi
-    if [ -z "$method" ] ; then # return since no method
-        echo "$_RESTY_HOST"
-        return
-    fi
-
     if [[ ! "$RESTY_NO_PRESERVE_PATH" =~ ^true\|yes$ ]]; then
         __path="${_path:-${_RESTY_PATH}}"
         _RESTY_PATH="${__path}"

From dca41bdba727d288c2eaf51e9c564a93031a5646 Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 23:14:54 +0100
Subject: [PATCH 171/173] diverses code refactor and cleaning

---
 resty | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resty b/resty
index 68481eb..193df97 100644
--- a/resty
+++ b/resty
@@ -128,16 +128,16 @@ HELP
     local editor="$_RESTY_EDITOR"
     if [[ "POST PUT TRACE PATCH DELETE" =~ $method ]]; then local hasbody; hasbody="yes" ;fi
 
-    if [ -d "$cookies" ] ; then   # retrieve cookie
+    if [ -d "$cookies" ] ; then # retrieve cookie
 	    (mkdir -p "$cookies"; echo "http://localhost*" > "$host")
     fi
 
-    if [[ "$1" =~ ^/ ]] ; then  # retrieve path
+    if [[ "$1" =~ ^/ ]] ; then # retrieve path
         _path="$1"
         shift
     fi
     local body
-    if [[ ! "$1" =~ ^- ]] ; then  # retrieve data
+    if [[ ! "$1" =~ ^- ]] ; then # retrieve data
          body="$1"
         [[ $# -gt 0 ]] && shift
     fi
@@ -176,7 +176,6 @@ HELP
 	    _path=$(echo "$_path"|sed 's/%/%25/g;s/\[/%5B/g;s/\]/%5D/g;s/|/%7C/g;s/\$/%24/g;s/&/%26/g;s/+/%2B/g;s/,/%2C/g;s/:/%3A/g;s/;/%3B/g;s/=/%3D/g;s/?/%3F/g;s/@/%40/g;s/ /%20/g;s/#/%23/g;s/{/%7B/g;s/}/%7D/g;s/\\/%5C/g;s/\^/%5E/g;s/~/%7E/g;s/`/%60/g')
     fi
 
-    if [[ "HEAD OPTIONS" =~ $method ]] ; then raw="yes" ; fi
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
     if [[ ! "$RESTY_NO_PRESERVE_PATH" =~ ^true\|yes$ ]]; then
@@ -186,12 +185,11 @@ HELP
         __path=$_path
     fi
 
-    local domain; domain=$(echo -n "$_RESTY_HOST" \
-		    | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
+    local domain; domain=$(echo -n "$_RESTY_HOST" | perl -ane '/^https?:\/\/([^\/\*]+)/; print $1')
     _path="${_RESTY_HOST//\*/$__path}"
 
-    if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat the empty? body
-        if [ ! -t 0 ] ; then # retrieve what stdin hold
+    if [ "$hasbody" = "yes" ] && [ -z "$body" ]; then # treat when no body provided as arg
+        if [ ! -t 0 ] ; then # retrieve what stdin hold if stdin open
            body="@-"
         else
            body=""
@@ -206,13 +204,14 @@ HELP
         rm -f "$tmpf"
     fi
 
-    if [ -n "$body" ] && [ "$body" != "@-" ] ; then [[ $# -gt 0 ]] && shift;fi
-    if [ "$1" = "-Z" ] ; then  raw="yes" ; [[ $# -gt 0 ]] && shift ;fi
     if [ -n "$body" ] ; then curl_opt="--data-binary" ;fi
+    if [ "$method" = "OPTIONS" ] ; then raw="yes" ; fi
     if [ "$method" = "HEAD" ] ; then
         curl_opt="-I"
         raw="yes"
     fi
+
+    # Forge command and display it if dry-run
     local cmd
     cmd=(curl -sLv $curl_opt $(printf "%q" "$body") -X $method  -b \"$cookies/$domain\" -c \"$cookies/$domain\" "$(\
         [ -n "$curlopt_cmd" ] && printf '%s ' ${curlopt_cmd[@]})"\"$_path$query\")
@@ -232,6 +231,7 @@ HELP
 
     if [ -n "$err" ] && [ -n "$verbose" ]; then echo "$err" 1>&2 ; fi
 
+    # post process for display
     local display
     if [ -z "$raw" ] && grep -i '^< \s*Content-Type:  *text/html' >/dev/null <<< "$err"
     then display=$h2t

From a64bcca67887280d109ed904798a9432abc8341d Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 23:31:48 +0100
Subject: [PATCH 172/173] tweak with the lynx/elinks guard

---
 resty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resty b/resty
index 193df97..4265ff4 100644
--- a/resty
+++ b/resty
@@ -239,7 +239,7 @@ HELP
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
-    if  [[ "$display" =~ ^lynx\|elinks$ ]] ; then
+    if [[ "$display" =~ ^lynx\|^elinks ]] ; then
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                                 -e "$(cat <<'PERL'
             @a=<>;

From 4d97c15f348996faeb34f4f078cd941c229f61aa Mon Sep 17 00:00:00 2001
From: AdrieanKhisbe <adriean.khisbe@live.fr>
Date: Tue, 7 Nov 2017 23:43:38 +0100
Subject: [PATCH 173/173] regexp guard tweaks for bash compatibility

---
 resty               | 4 ++--
 test/resty_shpec.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resty b/resty
index 4265ff4..74dba48 100644
--- a/resty
+++ b/resty
@@ -178,7 +178,7 @@ HELP
 
     if [ -z "$_RESTY_HOST" ] ;then _RESTY_HOST=$(cat "$host" 2>/dev/null);fi
 
-    if [[ ! "$RESTY_NO_PRESERVE_PATH" =~ ^true\|yes$ ]]; then
+    if [ "$RESTY_NO_PRESERVE_PATH" != "true" ]&&[ "$RESTY_NO_PRESERVE_PATH" != "yes" ]; then
         __path="${_path:-${_RESTY_PATH}}"
         _RESTY_PATH="${__path}"
     else
@@ -239,7 +239,7 @@ HELP
     fi
     if [ -n "$out" ]; then out=$(echo "$out" | eval "$display") ; fi
 
-    if [[ "$display" =~ ^lynx\|^elinks ]] ; then
+    if [[ "$display" =~ ^lynx ]] || [[ "$display" =~ ^elinks ]] ; then
         out=$(echo "$out" |perl -e "\$host='$(echo "$_RESTY_HOST" |sed 's/^\(https*:\/\/[^\/*]*\).*$/\1/')';" \
                                 -e "$(cat <<'PERL'
             @a=<>;
diff --git a/test/resty_shpec.sh b/test/resty_shpec.sh
index c8e2b7a..d75400d 100644
--- a/test/resty_shpec.sh
+++ b/test/resty_shpec.sh
@@ -196,7 +196,7 @@ describe "Resty"
             GET /echo > /dev/null
             assert equal "$_RESTY_PATH" ""
             output=$(GET 2>&1)
-            assert equal "$output" '{"statusCode":403,"error":"Forbidden"}'
+            assert grep "$output" '{"statusCode":403'
             RESTY_NO_PRESERVE_PATH="no"
         end
     end