Review fixes

Author: SudoBobo

.travis.yml

@@ -13,8 +13,6 @@ git:
     depth: 100500
 
 env:
-    global:
-      - PRODUCT=tarantool-graphql
     matrix:
       - OS=el DIST=6
       - OS=el DIST=7

Makefile

@@ -24,8 +24,8 @@ lint:
 
 .PHONY: test
 test: lint
-	virtualenv -p python2 ./.env-2
-	. ./.env-2/bin/activate && \
+	virtualenv -p python2.7 ./.env-2.7
+	. ./.env-2.7/bin/activate && \
 		pip install -r ./test-run/requirements.txt && \
 		pip install tarantool && \
 		cd test && ./test-run.py

graphql/accessor_general.lua

@@ -3,7 +3,6 @@
 ---
 --- It provides basic logic for such space-like data storages and abstracted
 --- away from details from where tuples are arrived into the application.
-package.cpath = package.cpath .. ";/usr/share/tarantool/pcre2/?.so"
 
 local ffi = require('ffi')
 local json = require('json')

graphql/core/parse.lua

@@ -1,4 +1,3 @@
-package.path = package.path .. ";/usr/share/tarantool/lulpeg/?.lua"
 local lpeg = require 'lulpeg'
 local P, R, S, V = lpeg.P, lpeg.R, lpeg.S, lpeg.V
 local C, Ct, Cmt, Cg, Cc, Cf, Cmt = lpeg.C, lpeg.Ct, lpeg.Cmt, lpeg.Cg, lpeg.Cc, lpeg.Cf, lpeg.Cmt

rpm/prebuild-el-6.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -exu  # Strict shell (w/o -o pipefail)
+
+sudo yum -y install https://centos6.iuscommunity.org/ius-release.rpm
+sudo yum -y install python27
+sudo yum -y install python27-devel

rpm/tarantool-graphql.spec

@@ -24,12 +24,16 @@ 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
+# Dependencies below are not mandatory, they extend tarantool-graphql
+# functionality. Currently we build packages for distros which do not have
+# package manager versions which supports Suggests tag. We left section
+# below commented till all actual distros will have necessary package manager
+# versions.
 #Suggests: tarantool-lrexlib-pcre2
-#Suggests: tarantool-shard
+#Suggests: tarantool-shard >= 2.1.0
 #Suggests: tarantool-http
-#Suggests: tarantool-avro-schema
 
 %description
 Set of adapters for GraphQL query language to the Tarantool data model

tools/ubuntu.trusty.test.sh

@@ -2,59 +2,30 @@
 
 set -euxo pipefail  # Strict shell
 
-#sudo apt-get -qq update
-#curl http://download.tarantool.org/tarantool/1.9/gpgkey |
-#sudo apt-key add -release=`lsb_release -c -s`
-
-# install https download transport for APT
-#sudo apt-get -y install apt-transport-https
-
-#curl -s https://packagecloud.io/install/repositories/tarantool/1_7/script.deb.sh | sudo bash
-#sudo apt-get update > /dev/null
-#sudo apt-get -q -y install tarantool tarantool-dev
-
 sudo apt-get -qq update
-curl http://download.tarantool.org/tarantool/1.9/gpgkey |
-sudo apt-key add -release=`lsb_release -c -s`
+curl http://download.tarantool.org/tarantool/1.9/gpgkey | \
+    sudo apt-key add -
+release=`lsb_release -c -s`
 
 # install https download transport for APT
 sudo apt-get -y install apt-transport-https
 
 # append two lines to a list of source repositories
 sudo rm -f /etc/apt/sources.list.d/*tarantool*.list
-echo "deb http://download.tarantool.org/tarantool/1.9/ubuntu/ trusty main" |
-sudo tee /etc/apt/sources.list.d/tarantool_1_9.list
-echo "deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ trusty main" |
-sudo tee -a /etc/apt/sources.list.d/tarantool_1_9.list
-
-sudo apt-get update > /dev/null
-sudo apt-get -q -y install tarantool tarantool-dev
+echo "deb http://download.tarantool.org/tarantool/1.9/ubuntu/ ${release} main" | \
+    sudo tee /etc/apt/sources.list.d/tarantool_1_9.list
+echo "deb-src http://download.tarantool.org/tarantool/1.9/ubuntu/ ${release} main" | \
+    sudo tee -a /etc/apt/sources.list.d/tarantool_1_9.list
 
-cd ..
-git clone https://github.com/rtsisyk/msgpuck
-cd msgpuck
-cmake .
-sudo make install
-cd ..
-cd graphql
+sudo apt-get update
+sudo apt-get -y install tarantool tarantool-dev libmsgpuck-dev
 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 ..
-# lua (with dev headers) is necessary for luacheck
-# maybe we can use tarantool headers?
-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
+sudo apt-get install luarocks
 sudo luarocks install luacheck
 sudo pip install virtualenv
 make test