-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add unit tests and separate library commands from cli tool
- Loading branch information
Showing
10 changed files
with
286 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| .modules/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| language: bash | ||
| sudo: false | ||
| cache: apt | ||
| addons: | ||
| apt: | ||
| packages: | ||
| - libc6-dev-i386 | ||
| - libc6-i386 | ||
| - linux-libc-dev | ||
| - gcc-multilib | ||
|
|
||
| env: | ||
| matrix: | ||
| - BUILD_TYPE=src64 BUILD_VER=18.6 | ||
| - BUILD_TYPE=src64 BUILD_VER=3.1.11 | ||
| - BUILD_TYPE=src BUILD_VER=18.6 | ||
| - BUILD_TYPE=src BUILD_VER=3.1.11 | ||
|
|
||
| before_script: | ||
| - wget http://software-lab.de/picoLisp-${BUILD_VER}.tgz -O /tmp/picolisp.tgz | ||
| - cd /tmp; tar -xf /tmp/picolisp.tgz | ||
| - cd /tmp/picoLisp/${BUILD_TYPE} && make | ||
|
|
||
| script: | ||
| - export PATH=$PATH:/tmp/picoLisp | ||
| - cd ${TRAVIS_BUILD_DIR} && make check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # picolisp-json Makefile | ||
|
|
||
| PIL_MODULE_DIR ?= .modules | ||
| REPO_PREFIX ?= https://github.com/aw | ||
|
|
||
| # Unit testing | ||
| TEST_REPO = $(REPO_PREFIX)/picolisp-unit.git | ||
| TEST_DIR = $(PIL_MODULE_DIR)/picolisp-unit/HEAD | ||
| TEST_REF = v2.1.0 | ||
|
|
||
| .PHONY: all | ||
|
|
||
| all: check | ||
|
|
||
| $(TEST_DIR): | ||
| mkdir -p $(TEST_DIR) && \ | ||
| git clone $(TEST_REPO) $(TEST_DIR) && \ | ||
| cd $(TEST_DIR) && \ | ||
| git checkout $(TEST_REF) | ||
|
|
||
| check: $(TEST_DIR) run-tests | ||
|
|
||
| run-tests: | ||
| PIL_NAMESPACES=false ./test.l |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| # picolisp-awscurl - https://github.com/aw/picolisp-awscurl | ||
| # | ||
| # Copyright (c) 2018 Alexander Williams, Unscramble <license@unscramble.jp> | ||
| # License MIT | ||
|
|
||
| (setq | ||
| *Aws_method "GET" | ||
| *Aws_region "us-east-1" | ||
| *Aws_service "ec2" | ||
| *Aws_host "ec2.amazonaws.com" | ||
| *Aws_endpoint "/" | ||
| *Aws_profile (if (sys "AWS_PROFILE") @ "default") | ||
| *Aws_access_key (sys "AWS_ACCESS_KEY_ID") | ||
| *Aws_secret_key (sys "AWS_SECRET_ACCESS_KEY") | ||
| *Aws_session_token (if (sys "AWS_SESSION_TOKEN") @ (sys "AWS_SECURITY_TOKEN")) # AWS_SECURITY_TOKEN is deprecated | ||
| *Aws_request_date (dat$ (date T)) | ||
| *Aws_request_time (pack (mapcar '((S) (pad 2 S)) (time (time T)))) ) | ||
|
|
||
| ### main | ||
| [de awscurl-make-curl (Cmd) | ||
| (prin (in Cmd (till NIL T) ] | ||
|
|
||
| [de awscurl-make-request (Auth Headers) | ||
| (make | ||
| (link 'curl "--silent" "--request" *Aws_method (pack "https://" *Aws_host *Aws_endpoint (when *Aws_query (pack "?" @))) "--header" Auth) | ||
| (mapc '((S) (link "--header" (pack (car S) ": " (cdr S)))) Headers) | ||
| (when *Aws_data (link "--data" (cdr *Aws_data))) | ||
| (when *Aws_verbose (link "--verbose") ] | ||
|
|
||
| [de awscurl-make-auth-header (Headers Signature) | ||
| (pack "Authorization: AWS4-HMAC-SHA256 Credential=" *Aws_access_key "/" *Aws_request_date "/" *Aws_region "/" *Aws_service "/aws4_request, SignedHeaders=" (glue ";" (mapcar car Headers)) ", Signature=" Signature) ] | ||
|
|
||
| [de awscurl-make-hmac (Key Payload) | ||
| (awscurl-parse-openssl Payload "-mac" "HMAC" "-macopt" Key) ] | ||
|
|
||
| [de awscurl-make-signature (Str2sign) | ||
| (let (A (awscurl-make-hmac (pack "key:AWS4" *Aws_secret_key) *Aws_request_date) | ||
| B (awscurl-make-hmac (pack "hexkey:" A) *Aws_region) | ||
| C (awscurl-make-hmac (pack "hexkey:" B) *Aws_service) | ||
| D (awscurl-make-hmac (pack "hexkey:" C) "aws4_request") ) | ||
|
|
||
| (awscurl-make-hmac (pack "hexkey:" D) Str2sign) ] | ||
|
|
||
| [de awscurl-make-canonical-hash (Canonical) | ||
| (pack | ||
| "AWS4-HMAC-SHA256" "^J" | ||
| *Aws_request_date "T" *Aws_request_time "Z" "^J" | ||
| *Aws_request_date "/" *Aws_region "/" *Aws_service "/aws4_request" "^J" | ||
| (awscurl-parse-openssl Canonical) ] | ||
|
|
||
| [de awscurl-make-canonical (Hash Headers) | ||
| (pack | ||
| *Aws_method "^J" | ||
| *Aws_endpoint "^J" | ||
| *Aws_query "^J" | ||
| (mapcar '((S) (pack (car S) ":" (cdr S) "^J")) Headers) "^J" | ||
| (glue ";" (mapcar car Headers)) "^J" | ||
| Hash ] | ||
|
|
||
| [de awscurl-sort-headers (Sha256) | ||
| (by car sort | ||
| (make | ||
| (link | ||
| (cons "host" *Aws_host) | ||
| (cons "x-amz-content-sha256" Sha256) | ||
| (cons "x-amz-date" (pack *Aws_request_date "T" *Aws_request_time "Z")) ) | ||
| (when *Aws_data (link (cons "content-length" (if (= "file" (car *Aws_data)) (car (info (cdr *Aws_data))) (length (cdr *Aws_data)))))) | ||
| (when *Aws_session_token (link (cons "x-amz-security-token" @))) | ||
| (mapc link *Aws_headers) ] | ||
|
|
||
| [de awscurl-file-openssl (Filename) | ||
| (pack (clip (cadr (split (in (make (link 'openssl "dgst" "-sha256" Filename)) (line)) "=") ] | ||
|
|
||
| [de awscurl-parse-openssl (Payload . @) | ||
| (pack (clip (cadr (split (tc-call-msg (make (link 'openssl "dgst" "-sha256") (when (rest) (chain @))) Payload) "=") ] | ||
|
|
||
| [de awscurl-get-credentials () | ||
| (let Credentials (pack (sys "HOME") "/.aws/credentials") # ~/.aws/credentials | ||
| (when (info Credentials) | ||
| (in Credentials (while (and (from (pack "[" *Aws_profile "]")) (till "[")) | ||
| (let Keys (clip (split @ "^J" "=")) # remove newlines and split into key=value pairs | ||
| (for (L Keys L) | ||
| (case (pack (clip (pop 'L))) | ||
| # use the values in the config if they weren't set from environment variables | ||
| ["aws_access_key_id" (prog1 (clip (pop 'L)) (unless *Aws_access_key (setq *Aws_access_key (pack @) ] | ||
| ["aws_secret_access_key" (prog1 (clip (pop 'L)) (unless *Aws_secret_key (setq *Aws_secret_key (pack @) ] | ||
| ["aws_session_token" (prog1 (clip (pop 'L)) (unless *Aws_session_token (setq *Aws_session_token (pack @) ] | ||
| (T (pop 'L) ] | ||
|
|
||
| [de awscurl-start () | ||
| (awscurl-get-credentials) | ||
| (let (Sha256 (if (= "file" (car *Aws_data)) (awscurl-file-openssl (cdr *Aws_data)) (awscurl-parse-openssl (cdr *Aws_data))) | ||
| Headers (awscurl-sort-headers Sha256) | ||
| Canonical (awscurl-make-canonical Sha256 Headers) | ||
| Str2sign (awscurl-make-canonical-hash Canonical) | ||
| Signature (awscurl-make-signature Str2sign) | ||
| Auth (awscurl-make-auth-header Headers Signature) ) | ||
|
|
||
| (awscurl-make-curl (awscurl-make-request Auth Headers)) ] | ||
|
|
||
| [de awscurl-data (Value) | ||
| (let Data (chop Value) | ||
| (setq *Aws_data | ||
| (if (and (= "@" (car Data)) (info (pack (cdr Data)))) | ||
| (cons "file" (pack (cdr Data))) | ||
| (cons "data" Value) ] | ||
|
|
||
| [de awscurl-headers (Key Value) | ||
| (push '*Aws_headers (cons (lowc Key) (pack (clip (chop Value) ] | ||
|
|
||
| ### helpers | ||
| [de tc-call-msg (Cmd Msg) | ||
| (pipe (out Cmd (prin Msg)) (line) ] |
Oops, something went wrong.