chore: add ci tests

Author: fffonion

.travis.yml

@@ -0,0 +1,75 @@
+sudo: required
+dist: trusty
+
+os: linux
+
+language: c
+
+compiler: gcc
+
+addons:
+  apt:
+    packages:
+    - cpanminus
+    - axel
+    - luarocks
+
+cache:
+  directories:
+  - download-cache
+
+env:
+  global:
+    - JOBS=2
+    - NGX_BUILD_JOBS=$JOBS
+    - LUAJIT_PREFIX=/opt/luajit21
+    - LUAJIT_LIB=$LUAJIT_PREFIX/lib
+    - LUAJIT_INC=$LUAJIT_PREFIX/include/luajit-2.1
+    - LUA_INCLUDE_DIR=$LUAJIT_INC
+    - LUA_CMODULE_DIR=/lib
+    - LD_LIBRARY_PATH=$LUAJIT_LIB:$LD_LIBRARY_PATH
+    - TEST_NGINX_SLEEP=0.005
+    - TEST_NGINX_RANDOMIZE=1
+    - LUACHECK_VER=0.21.1
+  matrix:
+    - NGINX_VERSION=1.15.8 STREAM_LUA_MODULE_VERSION=v0.0.7 LUA_NGINX_MODULE_VERSION=v0.10.15 LUA_RESTY_CORE_VERSION=v0.1.17
+
+services:
+  - memcache
+
+before_install:
+  - sudo luarocks install luacheck $LUACHECK_VER
+  # - luacheck -q .
+  # - '! grep -n -P ''(?<=.{80}).+'' --color `find . -name ''*.lua''` || (echo "ERROR: Found Lua source lines exceeding 80 columns." > /dev/stderr; exit 1)'
+  # - '! grep -n -P ''\t+'' --color `find . -name ''*.lua''` || (echo "ERROR: Cannot use tabs." > /dev/stderr; exit 1)'
+  - sudo cpanm --notest Test::Nginx IPC::Run > build.log 2>&1 || (cat build.log && exit 1)
+
+install:
+  - if [ ! -d download-cache ]; then mkdir download-cache; fi
+  - git clone https://github.com/openresty/openresty.git ../openresty
+  - git clone https://github.com/openresty/openresty-devel-utils.git
+  - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
+  - git clone -b $LUA_NGINX_MODULE_VERSION https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module
+  - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
+  - git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
+  - git clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
+  - git clone -b $LUA_RESTY_CORE_VERSION https://github.com/openresty/lua-resty-core.git ../lua-resty-core
+  - git clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
+  - git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2
+  - git clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module
+  - git clone https://github.com/openresty/test-nginx.git
+  - git clone -b $STREAM_LUA_MODULE_VERSION https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module
+
+script:
+  - cd luajit2/
+  - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT -msse4.2' > build.log 2>&1 || (cat build.log && exit 1)
+  - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1)
+  - cd ..
+  - export LD_LIBRARY_PATH=$PWD/mockeagain:$LD_LIBRARY_PATH
+  - export TEST_NGINX_RESOLVER=8.8.4.4
+  - export NGX_BUILD_CC=$CC
+  - export PATH=$PWD/work/nginx/sbin:$PWD/openresty-devel-utils:$PATH
+  - ngx-build $NGINX_VERSION --with-ipv6 --with-http_realip_module  --add-module=../ndk-nginx-module --add-module=../echo-nginx-module --add-module=../set-misc-nginx-module --add-module=../headers-more-nginx-module --add-module=../lua-nginx-module --with-debug --with-stream --with-ipv6 --add-module=../stream-lua-nginx-module > build.log 2>&1 || (cat build.log && exit 1)
+  - nginx -V
+  - ldd `which nginx`|grep -E 'luajit|ssl|pcre'
+  - prove -Itest-nginx/lib -j$JOBS -r t

README.md

@@ -3,6 +3,8 @@ Name
 
 lua-resty-shdict-server - A HTTP and Redis protocol compatible interface for debugging ngx.shared API
 
+![Build status](https://travis-ci.com/fffonion/lua-resty-shdict-server.svg?branch=master)
+
 Table of Contents
 =================
 
@@ -38,7 +40,7 @@ It can also be used as a mocking Redis server (WIP).
 Status
 ========
 
-Experimental.
+Production.
 
 Synopsis
 ========
@@ -399,4 +401,4 @@ See Also
 ========
 * [openresty/lua-nginx-module](https://github.com/openresty/lua-nginx-module)
 
-[Back to TOC](#table-of-contents)
+[Back to TOC](#table-of-contents)

lib/resty/shdict/redis-commands.lua

@@ -74,7 +74,7 @@ if ngx_shared then
                     if numkeys ~= nil then
                         numkeys = tonumber(numkeys)
                         if numkeys == nil then
-                            return "nil", "value is not an integer or out of range"
+                            return nil, "value is not an integer or out of range"
                         elseif numkeys < 0 then
                             return nil, "Number of keys can't be negative"
                         elseif #arg < numkeys then

t/http.t

@@ -1,13 +1,21 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use Test::Nginx::Socket 'no_plan';
+use Test::Nginx::Socket::Lua 'no_plan';
+use Cwd qw(cwd);
+
+
+my $pwd = cwd();
+
+our $HttpConfig = qq{
+    lua_package_path "$pwd/lib/?.lua;$pwd/lib/?/init.lua;;";
+    lua_shared_dict dogs 1m;
+};
 
 run_tests();
 
 __DATA__
 === TEST 1: HTTP with get.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -19,15 +27,14 @@ __DATA__
     }
 --- request
     GET /t?cmd=get%20doge
---- response_body
-"wow"
+--- response_body eval
+"\"wow\""
 --- no_error_log
 [error]
 
 
 === TEST 2: HTTP initialized without shdict, no dict arg.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -39,15 +46,14 @@ __DATA__
     }
 --- request
     GET /t?cmd=get%20doge
---- response_body
-ERR no shdict selected
+--- response_body eval
+"ERR no shdict selected"
 --- no_error_log
 [error]
 
 
 === TEST 3: HTTP initialized without shdict, has dict arg.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -59,15 +65,14 @@ ERR no shdict selected
     }
 --- request
     GET /t?dict=dogs&cmd=get%20doge
---- response_body
-"wow"
+--- response_body eval
+"\"wow\""
 --- no_error_log
 [error]
 
 
 === TEST 4: HTTP initialized without shdict, has wrong dict arg.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -79,15 +84,14 @@ ERR no shdict selected
     }
 --- request
     GET /t?dict=cats&cmd=get%20dog
---- response_body
-ERR shdict 'cats' not defined
+--- response_body eval
+"ERR shdict 'cats' not defined"
 --- no_error_log
 [error]
 
 
 === TEST 5: HTTP initialized with password, no password arg.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -99,15 +103,14 @@ ERR shdict 'cats' not defined
     }
 --- request
     GET /t?dict=dogs&cmd=get%20dog
---- response_body
-ERR authentication required
+--- response_body eval
+"ERR authentication required"
 --- no_error_log
 [error]
 
 
 === TEST 6: HTTP initialized with password, has password arg.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -119,15 +122,14 @@ ERR authentication required
     }
 --- request
     GET /t?dict=dogs&cmd=get%20doge&password=foobar
---- response_body
-"wow"
+--- response_body eval
+"\"wow\""
 --- no_error_log
 [error]
 
 
 === TEST 7: HTTP initialized with password, wrong password arg.
---- http_config
-    lua_shared_dict dogs 1m;
+--- http_config eval: $::HttpConfig
 --- config
     location =/t {
         content_by_lua_block {
@@ -139,8 +141,8 @@ ERR authentication required
     }
 --- request
     GET /t?dict=dogs&cmd=get%20doge&password=foobarbar
---- response_body
-ERR invalid password
+--- response_body eval
+"ERR invalid password"
 --- no_error_log
 [error]
 

t/redis-inline.t

@@ -2,13 +2,22 @@
 
 use Test::Nginx::Socket::Lua::Stream 'no_plan';
 
+use Cwd qw(cwd);
+
+
+my $pwd = cwd();
+
+our $StreamConfig = qq{
+    lua_package_path "$pwd/lib/?.lua;$pwd/lib/?/init.lua;;";
+    lua_shared_dict dogs 1m;
+};
+
 #no_shuffle();
 run_tests();
 
 __DATA__
 === TEST 1: Redis inline protocol simple get.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -30,8 +39,7 @@ quit\r
 
 
 === TEST 2: Redis inline protocol initialized without shdict, no dict arg.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -53,8 +61,7 @@ quit\r
 
 
 === TEST 3: Redis inline protocol initialized without shdict, has dict arg.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -78,8 +85,7 @@ quit\r
 
 
 === TEST 4: Redis inline protocol initialized without shdict, has wrong dict arg.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -101,8 +107,7 @@ quit\r
 
 
 === TEST 5: Redis inline protocol initialized with password, no password arg.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -126,8 +131,7 @@ quit\r
 
 
 === TEST 6: Redis inline protocol initialized with password, has password arg.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -153,8 +157,7 @@ quit\r
 
 
 === TEST 7: Redis inline protocol initialized with password, wrong password arg.
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("doge", "wow")
@@ -180,8 +183,7 @@ quit\r
 
 
 === TEST 8: Redis inline protocol ping 
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         local srv = require("resty.shdict.server")
@@ -202,8 +204,7 @@ quit\r
 
 
 === TEST 9: Redis inline protocol parse line
---- stream_config
-    lua_shared_dict dogs 1m;
+--- stream_config eval: $::StreamConfig
 --- stream_server_config
     content_by_lua_block {
         ngx.shared.dogs:set("d'o'ge", "wow")