Review fixes #3.

Author: SudoBobo

graphql/accessor_general.lua

@@ -10,12 +10,12 @@ local avro_schema = require('avro_schema')
 local utils = require('graphql.utils')
 local clock = require('clock')
 local bit = require('bit')
+package.cpath = package.cpath .. ";/usr/share/tarantool/pcre2/?.so"
 local rex, is_pcre2 = utils.optional_require_rex()
 local avro_helpers = require('graphql.avro_helpers')
 local db_schema_helpers = require('graphql.db_schema_helpers')
 local error_codes = require('graphql.error_codes')
 
-package.cpath = package.cpath .. ";/usr/share/tarantool/pcre2/?.so"
 
 local check = utils.check
 local e = error_codes

rpm/tarantool-graphql.spec

@@ -1,4 +1,4 @@
-Name: tarantool-graphql
+Name: graphql
 # During package building {version} is overwritten by Packpack with
 # VERSION. It is set to major.minor.patch.number_of_commits_above_last_tag.
 # major.minor.patch tag and number of commits above are taken from the
@@ -24,7 +24,7 @@ BuildRequires: tarantool-lrexlib-pcre2
 
 # Dependencies for a user
 Requires: tarantool >= 1.9.0.0
-Requires: tarantool-avro-schema >= 2.0.0
+Requires: tarantool-avro-schema >= 2.0.71
 Requires: tarantool-lulpeg
 #Suggests: tarantool-lrexlib-pcre2
 #Suggests: tarantool-shard

tools/ubuntu.trusty.test.sh

@@ -20,30 +20,31 @@ echo "deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ ${release} mai
 sudo apt-get update
 sudo apt-get -q -y install tarantool tarantool-dev
 
-cd ..
-git clone https://github.com/rtsisyk/msgpuck
-cd msgpuck
-cmake .
-sudo make install
-cd ..
-cd graphql
+#cd ..
+#git clone https://github.com/rtsisyk/msgpuck
+#cd msgpuck
+#cmake .
+#sudo make install
+#cd ..
+#cd graphql
 git submodule update --recursive --init
 tarantoolctl rocks install lulpeg
 tarantoolctl rocks install lrexlib-pcre
 tarantoolctl rocks install http
 tarantoolctl rocks install shard "${SHARD_VERSION}"
 tarantoolctl rocks install avro-schema "${AVRO_SCHEMA}"
-cd ..
+#cd ..
 # lua (with dev headers) is necessary for luacheck
 sudo apt-get install lua5.1
 sudo apt-get install liblua5.1-0-dev
-wget "http://luarocks.github.io/luarocks/releases/luarocks-2.4.4.tar.gz"
-tar xf luarocks-2.4.4.tar.gz
-cd luarocks-2.4.4
-./configure
-make build
-sudo make install
-cd ../graphql
+#wget "http://luarocks.github.io/luarocks/releases/luarocks-2.4.4.tar.gz"
+#tar xf luarocks-2.4.4.tar.gz
+#cd luarocks-2.4.4
+#./configure
+#make build
+#sudo make install
+#cd ../graphql
+sudo apt-get install luarocks
 sudo luarocks install luacheck
 sudo pip install virtualenv
 make test