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

Commit 7569a7d

Browse files
authored
Merge pull request #168 from tarantool/gh-166-refactor-arguments
Split-up modules and refactor arguments converting
2 parents 7ff2aba + a3ba71e commit 7569a7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3408
-2496
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ doc/apidoc
1919

2020
# benchmarks results
2121
bench.*.result.txt
22+
23+
# temporary directory for make apidoc-lint
24+
doc/apidoc-lint-tmp

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ install:
5858
- cd ../graphql
5959
- sudo luarocks install luacheck
6060
- sudo pip install virtualenv
61+
- sudo luarocks install ldoc
6162

6263
script:
64+
- make apidoc-lint
6365
- make test

Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ default:
99
.PHONY: lint
1010
lint:
1111
luacheck graphql/*.lua \
12+
graphql/convert_schema/*.lua \
13+
graphql/server/*.lua \
1214
test/bench/*.lua \
1315
test/space/*.lua \
1416
test/testdata/*.lua \
@@ -45,6 +47,12 @@ pure-bench:
4547
clean:
4648
rm -rf test/var
4749

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

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -394,4 +394,8 @@ make test
394394
Consider LICENSE file for details. In brief:
395395

396396
* graphql/core: MIT (c) 2015 Bjorn Swenson
397+
* graphql/server/graphiql: Facebook dev tools & examples license (allows use,
398+
copy and distribute) (c) 2015, Facebook, Inc (more: [1])
397399
* all other content: BSD 2-clause (c) 2018 Tarantool AUTHORS
400+
401+
[1]: https://github.com/graphql/graphiql/issues/10

demo/demo.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ package.path =
1111
package.path
1212

1313
local log = require('log')
14-
local test_utils = require('test.utils')
14+
local test_utils = require('test.test_utils')
1515

1616
-- e. g. nullable_1_1_conn
1717
local testdata_name = arg[1] or 'common'

0 commit comments

Comments
 (0)