Add failing reproduction test case

* httpie/internal/daemons.py
* httpie/utils.py

.github/workflows/release-choco.yml

@@ -13,7 +13,7 @@ jobs:
     name: Release the Chocolatey
     runs-on: windows-2019
     env:
-        package-dir: ./httpie/docs/packaging/windows-chocolatey
+        package-dir: docs\packaging\windows-chocolatey
 
     steps:
       - uses: actions/checkout@v3
@@ -30,9 +30,21 @@ jobs:
         run: choco info httpie -s .
         working-directory: ${{ env.package-dir }}
 
-      - name: Check the Installation
+      - name: Local installation
         run: |
           choco install httpie -y -dv -s "'.;https://community.chocolatey.org/api/v2/'"
+        working-directory: ${{ env.package-dir }}
+
+      - name: Test the locally installed binaries
+        run: |
+          # Source: https://stackoverflow.com/a/46760714/15330941
+
+          # Make `refreshenv` available right away, by defining the $env:ChocolateyInstall
+          # variable and importing the Chocolatey profile module.
+          $env:ChocolateyInstall = Convert-Path "$((Get-Command choco).Path)\..\.."
+          Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
+          refreshenv
+
           http --version
           https --version
           httpie --version
@@ -46,3 +58,4 @@ jobs:
         run: |
           choco apikey --key $CHOCO_API_KEY --source https://push.chocolatey.org/
           choco push httpie*.nupkg --source https://push.chocolatey.org/
+        working-directory: ${{ env.package-dir }}

.github/workflows/release-linux-standalone.yml

@@ -7,6 +7,9 @@ on:
         description: "The branch, tag or SHA to release from"
         required: true
         default: "master"
+      tag_name:
+        description: "Which release to upload the artifacts to (e.g., 3.0)"
+        required: true
 
   release:
     types: [released, prereleased]
@@ -45,24 +48,30 @@ jobs:
           name: httpie.rpm
           path: extras/packaging/linux/artifacts/dist/*.rpm
 
+      - name: Determine the release upload upload_url
+        id: release_id
+        run: |
+          pip install httpie
+          export API_URL="api.github.com/repos/httpie/httpie/releases/tags/${{ github.event.inputs.tag_name }}"
+          export UPLOAD_URL=`https --ignore-stdin GET $API_URL | jq -r ".upload_url"`
+          echo "::set-output name=UPLOAD_URL::$UPLOAD_URL"
+
       - name: Publish Debian Package
-        if: github.event_name == 'release'
         uses: actions/upload-release-asset@v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: extras/packaging/linux/artifacts/dist/httpie-${{ github.event.release.tag_name }}.deb
-          asset_name: httpie-${{ github.event.release.tag_name }}.deb
+          upload_url: ${{ steps.release_id.outputs.UPLOAD_URL }}
+          asset_path: extras/packaging/linux/artifacts/dist/httpie_${{ github.event.inputs.tag_name }}_amd64.deb
+          asset_name: httpie-${{ github.event.inputs.tag_name }}.deb
           asset_content_type: binary/octet-stream
 
       - name: Publish Single Executable
-        if: github.event_name == 'release'
         uses: actions/upload-release-asset@v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ github.event.release.upload_url }}
+          upload_url: ${{ steps.release_id.outputs.UPLOAD_URL }}
           asset_path: extras/packaging/linux/artifacts/dist/http
           asset_name: http
           asset_content_type: binary/octet-stream

CONTRIBUTING.md

@@ -59,8 +59,10 @@ $ git checkout -b my_topical_branch
 
 #### Setup
 
-The [Makefile](https://github.com/httpie/httpie/blob/master/Makefile) contains a bunch of tasks to get you started. Just run
-the following command, which:
+The [Makefile](https://github.com/httpie/httpie/blob/master/Makefile) contains a bunch of tasks to get you started.
+You can run `$ make` to see all the available tasks.
+
+To get started, run the command below, which:
 
 - Creates an isolated Python virtual environment inside `./venv`
   (via the standard library [venv](https://docs.python.org/3/library/venv.html) tool);
@@ -70,7 +72,7 @@ the following command, which:
 - and runs tests (It is the same as running `make install test`).
 
 ```bash
-$ make
+$ make all
 ```
 
 #### Python virtual environment

Makefile

@@ -22,6 +22,26 @@ VENV_PYTHON=$(VENV_BIN)/python
 export PATH := $(VENV_BIN):$(PATH)
 
 
+
+default: list-tasks
+
+
+###############################################################################
+# Default task to get a list of tasks when `make' is run without args.
+# <https://stackoverflow.com/questions/4219255>
+###############################################################################
+
+list-tasks:
+	@echo Available tasks:
+	@echo ----------------
+	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
+	@echo
+
+
+###############################################################################
+# Installation
+###############################################################################
+
 all: uninstall-httpie install test
 
 
@@ -33,7 +53,7 @@ install-reqs:
 	$(VENV_PIP) install --upgrade pip wheel build
 
 	@echo $(H1)Installing dev requirements$(H1END)
-	$(VENV_PIP) install --upgrade --editable '.[dev]'
+	$(VENV_PIP) install --upgrade '.[dev]' '.[test]'
 
 	@echo $(H1)Installing HTTPie$(H1END)
 	$(VENV_PIP) install --upgrade --editable .

docs/README.md

@@ -215,6 +215,21 @@ $ pacman -Syu httpie
 $ pacman -Syu
 ```
 
+#### Single binary executables
+
+Get the standalone HTTPie Linux executables when you don't want to go through the full installation process
+
+```bash
+# Install httpie
+$ https --download packages.httpie.io/binaries/linux/http-latest -o http
+$ chmod +x ./http
+```
+
+```bash
+# Upgrade httpie
+$ https --download packages.httpie.io/binaries/linux/http-latest -o http
+```
+
 ### FreeBSD
 
 #### FreshPorts
@@ -2410,7 +2425,7 @@ You can check whether a new update is available for your system by running `http
 
 In the past `pip` was used to install/uninstall plugins, but on some environments (e.g., brew installed
 packages) it wasn’t working properly. The new interface is a very simple overlay on top of `pip` to allow
-plugin installations on every installation method.
+plugin installations on every installation method.
 
 By default, the plugins (and their missing dependencies) will be stored under the configuration directory,
 but this can be modified through `plugins_dir` variable on the config.

docs/installation/methods.yml

@@ -17,11 +17,12 @@ docs-structure:
   Windows:
     - chocolatey
   Linux:
-    - snap-linux
-    - brew-linux
     - apt
     - dnf
     - yum
+    - single-binary
+    - snap-linux
+    - brew-linux
     - pacman
   FreeBSD:
     - pkg
@@ -181,3 +182,16 @@ tools:
         - yum install httpie
       upgrade:
         - yum upgrade httpie
+
+  single-binary:
+    title: Single binary executables
+    name: Single binary executables
+    note: Get the standalone HTTPie Linux executables when you don't want to go through the full installation process.
+    links:
+    commands:
+      install:
+        - https --download packages.httpie.io/binaries/linux/http-latest -o http
+        - ln -ls ./http ./https
+        - chmod +x ./http ./https
+      upgrade:
+        - https --download packages.httpie.io/binaries/linux/http-latest -o http

docs/packaging/brew/README.md

@@ -22,7 +22,7 @@ If it is needed to be done manually, the following command can be used:
 $ brew bump-formula-pr httpie --version={TARGET_VERSION}
 ```
 
-which will bump the formala, and create a PR against the package index.
+which will bump the formula, and create a PR against the package index.
 
 ## Hacking
 

docs/packaging/windows-chocolatey/httpie.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
 	<metadata>
 		<id>httpie</id>
-		<version>3.1.0</version>
+		<version>3.2.1</version>
 		<summary>Modern, user-friendly command-line HTTP client for the API era</summary>
 		<description>
 HTTPie *aitch-tee-tee-pie* is a user-friendly command-line HTTP client for the API era.
@@ -33,7 +33,7 @@ Main features:
 		<licenseUrl>https://raw.githubusercontent.com/httpie/httpie/master/LICENSE</licenseUrl>
 		<iconUrl>https://pie-assets.s3.eu-central-1.amazonaws.com/LogoIcons/GB.png</iconUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<releaseNotes>See the [changelog](https://github.com/httpie/httpie/releases/tag/3.1.0).</releaseNotes>
+		<releaseNotes>See the [changelog](https://github.com/httpie/httpie/releases/tag/3.2.0).</releaseNotes>
 		<tags>httpie http https rest api client curl python ssl cli foss oss url</tags>
 		<projectUrl>https://httpie.io</projectUrl>
 		<packageSourceUrl>https://github.com/httpie/httpie/tree/master/docs/packaging/windows-chocolatey</packageSourceUrl>

extras/httpie-completion.fish

@@ -1,52 +1,24 @@
 function __fish_httpie_styles
-    echo "
-abap
-algol
-algol_nu
-arduino
-auto
-autumn
-borland
-bw
-colorful
-default
-emacs
-friendly
-fruity
-gruvbox-dark
-gruvbox-light
-igor
-inkpot
-lovelace
-manni
-material
-monokai
-murphy
-native
-paraiso-dark
-paraiso-light
-pastie
-perldoc
-rainbow_dash
-rrt
-sas
-solarized
-solarized-dark
-solarized-light
-stata
-stata-dark
-stata-light
-tango
-trac
-vim
-vs
-xcode
-zenburn"
+    printf '%s\n' abap algol algol_nu arduino auto autumn borland bw colorful default emacs friendly fruity gruvbox-dark gruvbox-light igor inkpot lovelace manni material monokai murphy native paraiso-dark paraiso-light pastie perldoc pie pie-dark pie-light rainbow_dash rrt sas solarized solarized-dark solarized-light stata stata-dark stata-light tango trac vim vs xcode zenburn
+end
+
+function __fish_httpie_mime_types
+    test -r /usr/share/mime/types && cat /usr/share/mime/types
+end
+
+function __fish_httpie_print_args
+    set -l arg (commandline -t)
+    string match -qe H "$arg" || echo -e $arg"H\trequest headers"
+    string match -qe B "$arg" || echo -e $arg"B\trequest body"
+    string match -qe h "$arg" || echo -e $arg"h\tresponse headers"
+    string match -qe b "$arg" || echo -e $arg"b\tresponse body"
+    string match -qe m "$arg" || echo -e $arg"m\tresponse metadata"
 end
 
 function __fish_httpie_auth_types
     echo -e "basic\tBasic HTTP auth"
     echo -e "digest\tDigest HTTP auth"
+    echo -e "bearer\tBearer HTTP Auth"
 end
 
 function __fish_http_verify_options
@@ -54,6 +26,7 @@ function __fish_http_verify_options
     echo -e "no\tDisable cert verification"
 end
 
+
 # Predefined Content Types
 
 complete -c http -s j -l json         -d 'Data items are serialized as a JSON object'
@@ -70,26 +43,28 @@ complete -c http -s x -l compress -d 'Content compressed with Deflate algorithm'
 
 # Output Processing
 
-complete -c http      -l pretty         -xa "all colors format none" -d 'Controls output processing'
-complete -c http -s s -l style          -xa "(__fish_httpie_styles)" -d 'Output coloring style'
-complete -c http      -l unsorted                                    -d 'Disables all sorting while formatting output'
-complete -c http      -l sorted                                      -d 'Re-enables all sorting options while formatting output'
-complete -c http      -l format-options -x                           -d 'Controls output formatting'
+complete -c http      -l pretty           -xa "all colors format none"     -d 'Controls output processing'
+complete -c http -s s -l style            -xa "(__fish_httpie_styles)"     -d 'Output coloring style'
+complete -c http      -l unsorted                                          -d 'Disables all sorting while formatting output'
+complete -c http      -l sorted                                            -d 'Re-enables all sorting options while formatting output'
+complete -c http      -l response-charset -x                               -d 'Override the response encoding'
+complete -c http      -l response-mime    -xa "(__fish_httpie_mime_types)" -d 'Override the response mime type for coloring and formatting'
+complete -c http      -l format-options   -x                               -d 'Controls output formatting'
 
 
 # Output Options
 
-complete -c http -s p -l print         -x -d 'String specifying what the output should contain'
-complete -c http -s h -l headers          -d 'Print only the response headers'
-complete -c http -s b -l body             -d 'Print only the response body'
-complete -c http -s v -l verbose          -d 'Print the whole request as well as the response'
-complete -c http      -l all              -d 'Show any intermediary requests/responses'
-complete -c http -s P -l history-print -x -d 'The same as --print but applies only to intermediary requests/responses'
-complete -c http -s S -l stream           -d 'Always stream the response body by line'
-complete -c http -s o -l output        -F -d 'Save output to FILE'
-complete -c http -s d -l download         -d 'Download a file'
-complete -c http -s c -l continue         -d 'Resume an interrupted download'
-complete -c http -s q -l quiet            -d 'Do not print to stdout or stderr'
+complete -c http -s p -l print         -xa "(__fish_httpie_print_args)" -d 'String specifying what the output should contain'
+complete -c http -s h -l headers                                        -d 'Print only the response headers'
+complete -c http -s m -l meta                                           -d 'Print only the response metadata'
+complete -c http -s b -l body                                           -d 'Print only the response body'
+complete -c http -s v -l verbose                                        -d 'Print the whole request as well as the response'
+complete -c http      -l all                                            -d 'Show any intermediary requests/responses'
+complete -c http -s S -l stream                                         -d 'Always stream the response body by line'
+complete -c http -s o -l output        -F                               -d 'Save output to FILE'
+complete -c http -s d -l download                                       -d 'Download a file'
+complete -c http -s c -l continue                                       -d 'Resume an interrupted download'
+complete -c http -s q -l quiet                                          -d 'Do not print to stdout or stderr'
 
 
 # Sessions
@@ -115,22 +90,24 @@ complete -c http      -l max-headers   -x -d 'Maximum number of response headers
 complete -c http      -l timeout       -x -d 'Connection timeout in seconds'
 complete -c http      -l check-status     -d 'Error with non-200 HTTP status code'
 complete -c http      -l path-as-is       -d 'Bypass dot segment URL squashing'
-complete -c http      -l chunked          -d ''
+complete -c http      -l chunked          -d 'Enable streaming via chunked transfer encoding'
 
 
 # SSL
 
-complete -c http -l verify   -xa "(__fish_http_verify_options)" -d 'Enable/disable cert verification'
-complete -c http -l ssl      -x                                 -d 'Desired protocol version to use'
-complete -c http -l ciphers  -x                                 -d 'String in the OpenSSL cipher list format'
-complete -c http -l cert     -F                                 -d 'Client side SSL certificate'
-complete -c http -l cert-key -F                                 -d 'Private key to use with SSL'
+complete -c http -l verify        -xa "(__fish_http_verify_options)" -d 'Enable/disable cert verification'
+complete -c http -l ssl           -x                                 -d 'Desired protocol version to use'
+complete -c http -l ciphers       -x                                 -d 'String in the OpenSSL cipher list format'
+complete -c http -l cert          -F                                 -d 'Client side SSL certificate'
+complete -c http -l cert-key      -F                                 -d 'Private key to use with SSL'
+complete -c http -l cert-key-pass -x                                 -d 'Passphrase for the given private key'
 
 
 # Troubleshooting
 
 complete -c http -s I -l ignore-stdin      -d 'Do not attempt to read stdin'
 complete -c http      -l help              -d 'Show help'
+complete -c http      -l manual            -d 'Show the full manual'
 complete -c http      -l version           -d 'Show version'
 complete -c http      -l traceback         -d 'Prints exception traceback should one occur'
 complete -c http      -l default-scheme -x -d 'The default scheme to use'

extras/packaging/linux/build.py

@@ -6,6 +6,9 @@ from typing import Iterator, Tuple
 BUILD_DIR = Path(__file__).parent
 HTTPIE_DIR = BUILD_DIR.parent.parent.parent
 
+EXTRAS_DIR = HTTPIE_DIR / 'extras'
+MAN_PAGES_DIR = EXTRAS_DIR /  'man'
+
 SCRIPT_DIR = BUILD_DIR / Path('scripts')
 HOOKS_DIR = SCRIPT_DIR / 'hooks'
 
@@ -50,6 +53,11 @@ def build_packages(http_binary: Path, httpie_binary: Path) -> None:
         (http_binary, '/usr/bin/https'),
         (httpie_binary, '/usr/bin/httpie'),
     ]
+    files.extend(
+        (man_page, f'/usr/share/man/man1/{man_page.name}')
+        for man_page in MAN_PAGES_DIR.glob('*.1')
+    )
+
     # A list of additional dependencies
     deps = [
         'python3 >= 3.7',

httpie/cli/constants.py

@@ -132,10 +132,3 @@ class RequestType(enum.Enum):
     FORM = enum.auto()
     MULTIPART = enum.auto()
     JSON = enum.auto()
-
-
-EMPTY_STRING = ''
-OPEN_BRACKET = '['
-CLOSE_BRACKET = ']'
-BACKSLASH = '\\'
-HIGHLIGHTER = '^'

httpie/cli/nested_json.py

@@ -9,8 +9,14 @@ from typing import (
     Type,
     Union,
 )
-from httpie.cli.dicts import NestedJSONArray
-from httpie.cli.constants import EMPTY_STRING, OPEN_BRACKET, CLOSE_BRACKET, BACKSLASH, HIGHLIGHTER
+from .dicts import NestedJSONArray
+
+
+EMPTY_STRING = ''
+HIGHLIGHTER = '^'
+OPEN_BRACKET = '['
+CLOSE_BRACKET = ']'
+BACKSLASH = '\\'
 
 
 class HTTPieSyntaxError(ValueError):
@@ -31,7 +37,7 @@ class HTTPieSyntaxError(ValueError):
         if self.token is not None:
             lines.append(self.source)
             lines.append(
-                ' ' * (self.token.start)
+                ' ' * self.token.start
                 + HIGHLIGHTER * (self.token.end - self.token.start)
             )
         return '\n'.join(lines)
@@ -51,9 +57,15 @@ class TokenKind(Enum):
             return 'a ' + self.name.lower()
 
 
-OPERATORS = {OPEN_BRACKET: TokenKind.LEFT_BRACKET, CLOSE_BRACKET: TokenKind.RIGHT_BRACKET}
+OPERATORS = {
+    OPEN_BRACKET: TokenKind.LEFT_BRACKET,
+    CLOSE_BRACKET: TokenKind.RIGHT_BRACKET,
+}
 SPECIAL_CHARS = OPERATORS.keys() | {BACKSLASH}
-LITERAL_TOKENS = [TokenKind.TEXT, TokenKind.NUMBER]
+LITERAL_TOKENS = [
+    TokenKind.TEXT,
+    TokenKind.NUMBER,
+]
 
 
 class Token(NamedTuple):

httpie/client.py

@@ -13,7 +13,8 @@ import urllib3
 from . import __version__
 from .adapters import HTTPieHTTPAdapter
 from .context import Environment
-from .cli.constants import EMPTY_STRING, HTTP_OPTIONS
+from .cli.constants import HTTP_OPTIONS
+from .cli.nested_json import EMPTY_STRING
 from .cli.dicts import HTTPHeadersDict, NestedJSONArray
 from .encoding import UTF8
 from .models import RequestsMessage

httpie/internal/daemons.py

@@ -1,6 +1,6 @@
 """
 This module provides an interface to spawn a detached task to be
-runned with httpie.internal.daemon_runner on a separate process. It is
+run with httpie.internal.daemon_runner on a separate process. It is
 based on DVC's daemon system.
 https://github.com/iterative/dvc/blob/main/dvc/daemon.py
 """

httpie/utils.py

@@ -277,7 +277,7 @@ def open_with_lockfile(file: Path, *args, **kwargs) -> Generator[IO[Any], None,
     target_file = Path(tempfile.gettempdir()) / file_id
 
     # Have an atomic-like touch here, so we'll tighten the possibility of
-    # a race occuring between multiple processes accessing the same file.
+    # a race occurring between multiple processes accessing the same file.
     try:
         target_file.touch(exist_ok=False)
     except FileExistsError as exc:

tests/test_regressions.py

@@ -1,9 +1,12 @@
 """Miscellaneous regression tests"""
 import pytest
 
+from httpie.cli.argtypes import KeyValueArgType
+from httpie.cli.constants import SEPARATOR_HEADER, SEPARATOR_QUERY_PARAM, SEPARATOR_DATA_STRING
+from httpie.cli.requestitems import RequestItems
 from httpie.compat import is_windows
-from .utils.matching import assert_output_matches, Expect
 from .utils import HTTP_OK, MockEnvironment, http
+from .utils.matching import assert_output_matches, Expect
 
 
 def test_Host_header_overwrite(httpbin):
@@ -47,3 +50,21 @@ def test_verbose_redirected_stdout_separator(httpbin):
         Expect.RESPONSE_HEADERS,
         Expect.BODY,
     ])
+
+
+@pytest.mark.parametrize(['separator', 'target'], [
+    (SEPARATOR_HEADER, 'headers'),
+    (SEPARATOR_QUERY_PARAM, 'params'),
+    (SEPARATOR_DATA_STRING, 'data'),
+])
+def test_initial_backslash_number(separator, target):
+    """
+    <https://github.com/httpie/httpie/issues/1408>
+    """
+    back_digit = r'\0'
+    raw_arg = back_digit + separator + back_digit
+    expected_parsed_data = {back_digit: back_digit}
+    parsed_arg = KeyValueArgType(separator)(raw_arg)
+    items = RequestItems.from_args([parsed_arg])
+    parsed_data = getattr(items, target)
+    assert parsed_data == expected_parsed_data