Merge pull request #90 from tarantool/v2

V2

Author: knazarov

.editorconfig

@@ -0,0 +1,23 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 4
+
+[*.cmake]
+indent_style = space
+indent_size = 4
+
+[*.lua]
+indent_style = space
+indent_size = 4
+
+[*.{h,c,cc}]
+indent_style = tab
+tab_width = 8

.gitignore

@@ -18,3 +18,7 @@ install_manifest.txt
 VERSION
 Testing
 CTestTestfile.cmake
+*.snap
+*.xlog
+VERSION.lua
+.rocks

.luacheckrc

@@ -0,0 +1,36 @@
+redefined = false
+include_files = {"**/*.lua", "*.rockspec", "*.luacheckrc"}
+exclude_files = {"lua_modules", ".luarocks", ".rocks", "luatest/luaunit.lua", "build"}
+new_read_globals = {
+    'box',
+    '_TARANTOOL',
+    'tonumber64',
+    os = {
+        fields = {
+            'environ',
+        }
+    },
+    string = {
+        fields = {
+            'split',
+            'startswith',
+        },
+    },
+    table = {
+        fields = {
+            'maxn',
+            'copy',
+            'new',
+            'clear',
+            'move',
+            'foreach',
+            'sort',
+            'remove',
+            'foreachi',
+            'deepcopy',
+            'getn',
+            'concat',
+            'insert',
+        },
+    },
+}

.travis.yml

@@ -2,146 +2,92 @@ sudo: false
 language: C
 services:
   - docker
+dist: xenial
 
 cache:
-    directories:
-      - $HOME/.cache
+  directories:
+    - $HOME/.cache
 
 git:
-    depth: 100500
+  depth: 100500
 
 env:
-    global:
-      - PRODUCT=tarantool-http
+  global:
+    - PRODUCT=tarantool-http
 
-    matrix:
-      - OS=el DIST=6
-      - OS=el DIST=7
-      - OS=fedora DIST=26
-      - OS=fedora DIST=27
-      - OS=fedora DIST=28
-      - OS=fedora DIST=29
-      - OS=ubuntu DIST=trusty
-      - OS=ubuntu DIST=xenial
-      - OS=ubuntu DIST=bionic
-      - OS=ubuntu DIST=cosmic
-      - OS=debian DIST=jessie
-      - OS=debian DIST=stretch
+_test: &test
+  before_install:
+    - curl http://download.tarantool.org/tarantool/$TARANTOOL_VERSION/gpgkey | sudo apt-key add -
+    - echo "deb http://download.tarantool.org/tarantool/$TARANTOOL_VERSION/ubuntu/ xenial main" |
+      sudo tee /etc/apt/sources.list.d/tarantool.list
+    - sudo apt-get -y update
+    - sudo apt-get install -y tarantool tarantool-dev
+    - tarantoolctl rocks make
+    - tarantoolctl rocks install luatest 0.2.2
+  script: .rocks/bin/luatest
 
-script:
-  - git describe --long
-  - git clone https://github.com/packpack/packpack.git packpack
-  - packpack/packpack
+_deploy: &deploy
+  provider: packagecloud
+  username: tarantool
+  token: ${PACKAGECLOUD_TOKEN}
+  dist: ${OS}/${DIST}
+  package_glob: build/*.{deb,rpm}
+  skip_cleanup: true
+  on:
+    branch: master
+    condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
 
-before_deploy:
-  - ls -l build/
+_packpack: &packpack
+  stage: deploy
+  script:
+    - git describe --long
+    - git clone https://github.com/packpack/packpack.git packpack
+    - packpack/packpack
+    - ls -l build/
+  deploy:
+    # Deploy packages to PackageCloud
+    - <<: *deploy
+      repository: "1_7"
+    - <<: *deploy
+      repository: "1_9"
+    - <<: *deploy
+      repository: "1_10"
+    - <<: *deploy
+      repository: "2x"
+    - <<: *deploy
+      repository: "2_2"
 
-deploy:
-  # Deploy packages to PackageCloud from master branch
-  - provider: packagecloud
-    username: tarantool
-    repository: "1_7"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      branch: master
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "1_9"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      branch: master
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "1_10"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      branch: master
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "2x"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      branch: master
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "2_2"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      branch: master
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  # Deploy packages to PackageCloud from tags
-  # see:
-  #   * https://github.com/tarantool/tarantool/issues/3745
-  #   * https://github.com/travis-ci/travis-ci/issues/7780#issuecomment-302389370
-  - provider: packagecloud
-    username: tarantool
-    repository: "1_7"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "1_9"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "1_10"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "2x"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
-  - provider: packagecloud
-    username: tarantool
-    repository: "2_2"
-    token: ${PACKAGECLOUD_TOKEN}
-    dist: ${OS}/${DIST}
-    package_glob: build/*.{deb,rpm}
-    skip_cleanup: true
-    on:
-      tags: true
-      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
+jobs:
+  include:
+    - <<: *test
+      env: TARANTOOL_VERSION=1.10
+    - <<: *test
+      env: TARANTOOL_VERSION=2x
+
+    - <<: *packpack
+      env: OS=el DIST=6
+    - <<: *packpack
+      env: OS=el DIST=7
+    - <<: *packpack
+      env: OS=fedora DIST=26
+    - <<: *packpack
+      env: OS=fedora DIST=27
+    - <<: *packpack
+      env: OS=fedora DIST=28
+    - <<: *packpack
+      env: OS=fedora DIST=29
+    - <<: *packpack
+      env: OS=ubuntu DIST=trusty
+    - <<: *packpack
+      env: OS=ubuntu DIST=xenial
+    - <<: *packpack
+      env: OS=ubuntu DIST=bionic
+    - <<: *packpack
+      env: OS=ubuntu DIST=cosmic
+    - <<: *packpack
+      env: OS=debian DIST=jessie
+    - <<: *packpack
+      env: OS=debian DIST=stretch
 
 notifications:
   email:

CHANGELOG.md

@@ -5,7 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Added options `log_requests` and `log_errors` to `route()` method for customizing request log output and error log output respectively. 
+### Added
+- Major rewrite since version 1.x
+- Ability to be used with internal http server and an nginx upstream module
+  (without modifying the backend code)
+- Standardized request object (similar to WSGI)
+- A new router with route priorities inspired by Mojolicious
+- Middleware support (for e.g. for centrally handling authorization)
 
 ## [1.0.3] - 2018-06-29
 ### Added

CMakeLists.txt

@@ -21,11 +21,40 @@ enable_testing()
 set (LUA_PATH "LUA_PATH=${PROJECT_SOURCE_DIR}/?.lua\\;${PROJECT_SOURCE_DIR}/?/init.lua\\;\\;")
 set (LUA_SOURCE_DIR "LUA_SOURCE_DIR=${PROJECT_SOURCE_DIR}")
 
-add_test(http ${CMAKE_SOURCE_DIR}/test/http.test.lua)
+add_test(http ${CMAKE_SOURCE_DIR}/.rocks/bin/luatest)
 
 set_tests_properties(http PROPERTIES ENVIRONMENT "${LUA_PATH};${LUA_SOURCE_DIR}")
 
 # Add `make check`
 add_custom_target(check
     WORKING_DIRECTORY ${PROJECT_BUILD_DIR}
     COMMAND ctest -V)
+
+## VERSION ####################################################################
+###############################################################################
+
+execute_process(
+  COMMAND git describe --tags --always
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  OUTPUT_VARIABLE GIT_DESCRIBE
+  ERROR_QUIET
+)
+
+if (NOT GIT_DESCRIBE)
+  set(GIT_DESCRIBE "unknown")
+endif()
+
+configure_file (
+  "${PROJECT_SOURCE_DIR}/http/VERSION.lua.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/VERSION.lua"
+)
+
+
+## Install ####################################################################
+###############################################################################
+
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION.lua
+  DESTINATION ${TARANTOOL_INSTALL_LUADIR}/${PROJECT_NAME}/
+)