Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Split-up modules and refactor arguments converting #168

Merged
merged 9 commits into from
Jun 14, 2018
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ doc/apidoc

# benchmarks results
bench.*.result.txt

# temporary directory for make apidoc-lint
doc/apidoc-lint-tmp
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ install:
- cd ../graphql
- sudo luarocks install luacheck
- sudo pip install virtualenv
- sudo luarocks install ldoc

script:
- make apidoc-lint
- make test
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ default:
.PHONY: lint
lint:
luacheck graphql/*.lua \
graphql/convert_schema/*.lua \
graphql/server/*.lua \
test/bench/*.lua \
test/space/*.lua \
test/testdata/*.lua \
Expand Down Expand Up @@ -45,6 +47,12 @@ pure-bench:
clean:
rm -rf test/var

.PHONY: apidoc-lint
apidoc-lint:
! ldoc -d doc/apidoc-lint-tmp graphql --all -f markdown 2>&1 >/dev/null | \
grep -v ': no module() call found; no initial doc comment$$\|: contains no items$$'
rm -rf doc/apidoc-lint-tmp

.PHONY: apidoc
apidoc:
ldoc -d doc/apidoc graphql --all -f markdown
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,4 +394,8 @@ make test
Consider LICENSE file for details. In brief:

* graphql/core: MIT (c) 2015 Bjorn Swenson
* graphql/server/graphiql: Facebook dev tools & examples license (allows use,
copy and distribute) (c) 2015, Facebook, Inc (more: [1])
* all other content: BSD 2-clause (c) 2018 Tarantool AUTHORS

[1]: https://github.com/graphql/graphiql/issues/10
2 changes: 1 addition & 1 deletion demo/demo.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package.path =
package.path

local log = require('log')
local test_utils = require('test.utils')
local test_utils = require('test.test_utils')

-- e. g. nullable_1_1_conn
local testdata_name = arg[1] or 'common'
Expand Down
Loading