Initial Commit

Author: rs

.goreleaser.yml

@@ -0,0 +1,22 @@
+project_name: curl-httpie
+builds:
+-
+  env:
+  - CGO_ENABLED=0
+  goos:
+  - darwin
+  binary: http
+git:
+  short_hash: true
+brew:
+  github:
+    owner: rs
+    name: homebrew-tap
+  commit_author:
+    name: Olivier Poitrey
+    email: rs@rhapsodyk.net
+  homepage: https://github.com/rs/curl-httpie
+  description: HTTPie for curl
+
+release:
+  name_template: "{{.ProjectName}}-v{{.Version}}"

.travis.yml

@@ -0,0 +1,19 @@
+language: go
+go:
+- '1.9'
+- '1.10'
+- master
+matrix:
+  allow_failures:
+  - go: master
+script: go test -v -race -cpu=1,2,4 -bench . -benchmem ./...
+deploy:
+- provider: script
+  skip_cleanup: true
+  script: curl -sL http://git.io/goreleaser | bash
+  on:
+    tags: true
+    condition: "$TRAVIS_OS_NAME = linux && $TRAVIS_GO_VERSION = '1.10'"
+env:
+  global:
+    secure: 7Hb/SLMTpff9oj9VYaWhl/P6eDqBav17PCIVAjyNxlRSKpRJlNDsYGz3/i1XHy7BiNMKPstOK+VlB3sR4hrGrNew8EVhROXOXl8OFstA0eptdG0TgwBxsjXiXNFRR3ancgrOlbbsfcUx5qXapQEv/kqqhhh1DrR5i/khDeMIUnZ6/Lwtgw4VTbrQD3I599ORXV7VOxu6qQKL9g0w1rJb9UM+zIDJMMULmlYp31toA520dr4tIlKJANYJLlU5hnFJAvq7ywMTbfA5h6nDtahlTP0iF879gmIoXg9MZkynmPZ4fXhdFxn3Y2xLBCUAU+DoGAXvD3ggffUWVOrnZBKXSPVTBpMHbt9Xd/HPitShOeaQQNlaj29Ky4xzD/p2cDCY4oDL8QLtRF2zP7+GfRaUY0ara3D1Q33fyyoVEeiWskCEZSiENZjrxoyevVvjbLCgT7kDJp+szvfVWJp16oHMtLQ/yXt63ZJ0PAJXUp1UJHSrlmy0r7pfEqfRWN47d45b/ld0ARMLOpMpBVGYQK8SeH2hqQ4EAyU9Erf4llFT0c/T5xgO90s+0uPUswqnIj7BuzgILsAFZQsMW3PU3HQx0mmB7m/qHYWbmkudR3C3kkKMP8IPmhZUETcCPzj4Iy93GNU6De1bv+TrjY4OFBPgKEY52ji01940v5bq90UD7jQ=

README.md

@@ -0,0 +1,29 @@
+# HTTPie for curl
+
+If you like the interface of [HTTPie](https://httpie.org) but miss the features of [curl](https://curl.haxx.se), curl-httpie is what you are searching for. Curl-httpie is a drop-in replacement for `httpie` that use `curl` to perform operations. All `curl` options exposed with most syntax sugar and output formatting provided by `httpie`.
+
+## Install
+
+Using [homebrew](http://brew.sh/):
+
+```
+brew install rs/tap/curl-httpie
+```
+
+## Usage
+
+Hello World:
+
+    $ http httpie.org
+
+Synopsis:
+
+    $ http [curl options] [METHOD] URL [ITEM [ITEM]]
+
+See [HTTPie doc](https://httpie.org/doc) for more examples.
+
+## Differences with httpie
+
+* Like `curl` but unlike `httpie`, headers are written on `stderr` instead of `stdout`.
+* Output is not buffered, all the formatting is done on the fly so you can easily debug streamed data.
+* 

args/curlopts.go

@@ -0,0 +1,6 @@
+package args
+
+var (
+	curlShortValues = "EKCbcdDFPHmoUreXYytzTuAw"
+	curlLongValues  = []string{"abstract-unix-socket", "cacert", "capath", "cert", "cert-type", "ciphers", "config", "connect-timeout", "connect-to", "continue-at", "cookie", "cookie-jar", "crlfile", "data", "data-ascii", "data-binary", "data-raw", "data-urlencode", "delegation", "dns-interface", "dns-ipv4-addr", "dns-ipv6-addr", "dns-servers", "dump-header", "egd-file", "engine", "expect100-timeout", "form", "form-string", "ftp-account", "ftp-alternative-to-user", "ftp-method", "ftp-port", "ftp-ssl-ccc-mode", "header", "hostpubmd5", "interface", "keepalive-time", "key", "key-type", "krb", "libcurl", "limit-rate", "local-port", "login-options", "mail-auth", "mail-from", "mail-rcpt", "max-filesize", "max-redirs", "max-time", "netrc-file", "noproxy", "output", "pass", "pinnedpubkey", "proto", "proto-default", "proto-redir", "proxy-cacert", "proxy-capath", "proxy-cert", "proxy-cert-type", "proxy-ciphers", "proxy-crlfile", "proxy-header", "proxy-key", "proxy-key-type", "proxy-pass", "proxy-service-name", "proxy-tlsauthtype", "proxy-tlspassword", "proxy-tlsuser", "proxy-user", "proxy1.0", "pubkey", "random-file", "range", "referer", "request", "resolve", "retry", "retry-delay", "retry-max-time", "service-name", "socks4", "socks4a", "socks5", "socks5-gssapi-service", "socks5-hostname", "speed-limit", "speed-time", "telnet-option", "tftp-blksize", "time-cond", "tls-max", "tlsauthtype", "tlsuser", "trace", "trace-ascii", "unix-socket", "upload-file", "url", "user", "user-agent", "write-out"}
+)

args/gen.go

@@ -0,0 +1,3 @@
+package args
+
+//go:generate ./gen.sh

args/gen.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl -h|perl -pe 's/^\s*(?:-([^-]),\s+)?--(.*?)\s+<.*?>.*/push @a, $1; push @b, $2/e; undef $_; END {print "package args\n\nvar (\n\tcurlShortValues = \"", @a, "\"\n\tcurlLongValues  = []string{", join(", ", map {"\"$_\""} @b), "}\n)\n"}' > curlopts.go

args/httpie.go

@@ -0,0 +1,84 @@
+package args
+
+import (
+	"encoding/json"
+	"net/url"
+	"strings"
+)
+
+type argType int
+
+const (
+	unknownArg argType = iota
+	headerArg
+	paramArg
+	fieldArg
+	jsonArg
+)
+
+func parseFancyArgs(args []string) (opts []string) {
+	if len(args) == 0 {
+		return
+	}
+	method := strings.ToUpper(args[0])
+	switch method {
+	case "HEAD", "GET", "POST", "PUT", "DELETE":
+		opts = append(opts, "-X", method)
+		args = args[1:]
+	}
+	if len(args) == 0 {
+		return
+	}
+	hostIdx := len(opts)
+	opts = append(opts, args[0]) // host
+	args = args[1:]
+	data := map[string]interface{}{}
+	for _, arg := range args {
+		typ, name, value := parseArg(arg)
+		switch typ {
+		case headerArg:
+			opts = append(opts, "-H", name+":"+value)
+		case paramArg:
+			opts[hostIdx] = appendURLParam(opts[hostIdx], name, value)
+		case fieldArg:
+			data[name] = value
+		case jsonArg:
+			var v interface{}
+			json.Unmarshal([]byte(value), &v)
+			data[name] = v
+		default:
+			opts = append(opts, arg)
+		}
+	}
+	if len(data) > 0 {
+		j, _ := json.Marshal(data)
+		opts = append(opts, "-d", string(j))
+	}
+	return
+}
+
+func parseArg(arg string) (typ argType, name, value string) {
+	for i := 0; i < len(arg); i++ {
+		switch arg[i] {
+		case ':':
+			if i+1 < len(arg) && arg[i+1] == '=' {
+				return jsonArg, arg[:i], arg[i+2:]
+			}
+			return headerArg, arg[:i], arg[i+1:]
+		case '=':
+			if i+1 < len(arg) && arg[i+1] == '=' {
+				return paramArg, arg[:i], arg[i+2:]
+			}
+			return fieldArg, arg[:i], arg[i+1:]
+		}
+	}
+	return
+}
+
+func appendURLParam(u, name, value string) string {
+	sep := "?"
+	if strings.IndexByte(u, '?') != -1 {
+		sep = "&"
+	}
+	return u + sep + url.QueryEscape(name) + "=" + url.QueryEscape(value)
+}

args/parse.go

@@ -0,0 +1,79 @@
+package args
+
+import (
+	"sort"
+	"strings"
+)
+
+type Opts []string
+
+func (opts Opts) index(opt string) int {
+	off := 1
+	if len(opt) > 1 {
+		off = 2
+	}
+	for i, o := range opts {
+		if len(o) >= 2 && o[0] == '-' {
+			if o[off:] == opt {
+				return i
+			}
+		}
+	}
+	return -1
+}
+
+// Has returns true if opt flag is in opts.
+func (opts Opts) Has(opt string) bool {
+	return opts.index(opt) != -1
+}
+
+func (opts Opts) Val(opt string) string {
+	if idx := opts.index(opt); idx != -1 && idx+1 < len(opts) {
+		return opts[idx+1]
+	}
+	return ""
+}
+
+// Parse converts an HTTPie like argv into a list of curl options.
+func Parse(argv []string) (opts Opts) {
+	args := []string{}
+	sort.Strings(curlLongValues)
+	more := true
+	for i := 1; i < len(argv); i++ {
+		arg := argv[i]
+		if !more || len(arg) < 2 || arg[0] != '-' {
+			args = append(args, arg)
+			continue
+		}
+		if arg == "--" {
+			// Enf of opts marker
+			more = false
+			continue
+		}
+		opts = append(opts, arg)
+		if arg[1] == '-' {
+			if longHasValue(arg[2:]) && i+1 < len(argv) {
+				opts = append(opts, argv[i+1])
+				i++
+			}
+			continue
+		}
+		for j := 1; j < len(arg); j++ {
+			if strings.IndexByte(curlShortValues, arg[j]) != -1 {
+				if j == len(arg)-1 && i+1 < len(argv) {
+					opts = append(opts, argv[i+1])
+				}
+				break
+			}
+		}
+	}
+	if len(args) > 0 {
+		opts = append(opts, parseFancyArgs(args)...)
+	}
+	return
+}
+
+func longHasValue(arg string) bool {
+	i := sort.SearchStrings(curlLongValues, arg)
+	return i < len(curlLongValues) && curlLongValues[i] == arg
+}

formatter/cleanup.go

@@ -0,0 +1,93 @@
+package formatter
+
+import (
+	"bytes"
+	"io"
+)
+
+// HeaderCleaner removes > and < from curl --verbose output.
+type HeaderCleaner struct {
+	Out io.Writer
+
+	// Verbose removes the request headers part the output as well as the lines
+	// starting with * if set to false.
+	Verbose bool
+
+	// Post is inserted after the request headers.
+	Post *bytes.Buffer
+
+	inited   bool
+	muted    bool
+	buf      []byte
+	last     byte
+	skip     int
+	skipLine bool
+	body     bool
+}
+
+func (c *HeaderCleaner) Write(p []byte) (n int, err error) {
+	if !c.inited {
+		c.inited = true
+		c.muted = !c.Verbose
+	}
+	cp := c.buf
+	for i := 0; i < len(p); i++ {
+		b := p[i]
+		if c.skipLine && b != '\n' {
+			continue
+		}
+		c.skipLine = false
+		if c.skip > 0 {
+			c.skip--
+			continue
+		}
+		switch b {
+		case '>', '<':
+			if c.last == '\n' {
+				c.skip = 1 // space
+				c.last = b
+				continue
+			}
+		case '\r':
+			if c.last == '>' {
+				c.body = true
+				if c.muted {
+					c.muted = false
+					c.skip = 1
+					c.last = '\n'
+					continue
+				}
+			}
+		default:
+			if c.last == '\n' || c.last == 0 {
+				switch b {
+				case '{', '}':
+					c.skipLine = true
+					c.skip = 1
+					continue
+				case '*':
+					if !c.Verbose {
+						c.skipLine = true
+						c.skip = 1
+						continue
+					}
+					if c.Post != nil && c.body {
+						cp = append(append(cp, c.Post.Bytes()...), '\n')
+						c.Post = nil
+					}
+				}
+			}
+		}
+		if !c.muted {
+			cp = append(cp, b)
+		}
+		c.last = b
+	}
+	if len(cp) > 0 {
+		n, err = c.Out.Write(cp)
+		if err != nil || n != len(cp) {
+			return
+		}
+	}
+	return len(p), nil
+}