Merge pull request #56 from moteus/master

Fix export internal functions to global environment.
Close #56

Author: moteus

.travis.yml

@@ -1,8 +1,10 @@
 language: c
 
+sudo: false
+
 env:
   global:
-    - LUAROCKS=2.2.0
+    - LUAROCKS=2.2.2
   matrix:
     - LUA=lua5.1
     - LUA=lua5.2
@@ -14,16 +16,15 @@ branches:
     - master
 
 before_install:
-  - sudo apt-get update
-  - bash .travis/setup_lua.sh
-  - sudo pip install cpp-coveralls
-  - sudo luarocks install luafilesystem --from=https://rocks.moonscript.org/dev
-  - sudo luarocks install luacov-coveralls
-  - sudo luarocks install lunitx
-  - sudo luarocks install dkjson --deps-mode=none
+  - source .travis/setenv_lua.sh
+  - pip install --user cpp-coveralls
+  - luarocks install luafilesystem --from=https://rocks.moonscript.org/dev
+  - luarocks install luacov-coveralls
+  - luarocks install lunitx
+  - luarocks install dkjson --deps-mode=none
 
 install:
-  - sudo luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
+  - luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
 
 script: 
   - cd test

.travis/platform.sh

@@ -1,4 +1,4 @@
-if [ -z "$PLATFORM" ]; then
+if [ -z "${PLATFORM:-}" ]; then
   PLATFORM=$TRAVIS_OS_NAME;
 fi
 

.travis/setenv_lua.sh

@@ -0,0 +1,3 @@
+export PATH=${PATH}:$HOME/.lua:$HOME/.local/bin:${TRAVIS_BUILD_DIR}/install/luarocks/bin
+bash .travis/setup_lua.sh
+eval `$HOME/.lua/luarocks path`

.travis/setup_lua.sh

@@ -6,10 +6,18 @@
 # luajit2.0 - master v2.0
 # luajit2.1 - master v2.1
 
+set -eufo pipefail
+
 LUAJIT_BASE="LuaJIT-2.0.3"
 
 source .travis/platform.sh
 
+LUA_HOME_DIR=$TRAVIS_BUILD_DIR/install/lua
+
+LR_HOME_DIR=$TRAVIS_BUILD_DIR/install/luarocks
+
+mkdir $HOME/.lua
+
 LUAJIT="no"
 
 if [ "$PLATFORM" == "macosx" ]; then
@@ -26,6 +34,8 @@ elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then
   LUAJIT="yes";
 fi
 
+mkdir -p "$LUA_HOME_DIR"
+
 if [ "$LUAJIT" == "yes" ]; then
 
   if [ "$LUA" == "luajit" ]; then
@@ -40,62 +50,73 @@ if [ "$LUAJIT" == "yes" ]; then
     git checkout v2.1;
   fi
 
-  make && sudo make install
+  make && make install PREFIX="$LUA_HOME_DIR"
 
   if [ "$LUA" == "luajit2.1" ]; then
-    sudo ln -s /usr/local/bin/luajit-2.1.0-alpha /usr/local/bin/luajit
-    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
+    ln -s $LUA_HOME_DIR/bin/luajit-2.1.0-alpha $HOME/.lua/luajit
+    ln -s $LUA_HOME_DIR/bin/luajit-2.1.0-alpha $HOME/.lua/lua;
   else
-    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
+    ln -s $LUA_HOME_DIR/bin/luajit $HOME/.lua/luajit
+    ln -s $LUA_HOME_DIR/bin/luajit $HOME/.lua/lua;
   fi;
 
 else
+
   if [ "$LUA" == "lua5.1" ]; then
     curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
     cd lua-5.1.5;
   elif [ "$LUA" == "lua5.2" ]; then
-    curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
-    cd lua-5.2.3;
+    curl http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
+    cd lua-5.2.4;
   elif [ "$LUA" == "lua5.3" ]; then
     curl http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz
     cd lua-5.3.0;
   fi
-  sudo make $PLATFORM install;
+
+  make $PLATFORM
+  make INSTALL_TOP="$LUA_HOME_DIR" install;
+
+  ln -s $LUA_HOME_DIR/bin/lua $HOME/.lua/lua
+  ln -s $LUA_HOME_DIR/bin/luac $HOME/.lua/luac;
+
 fi
 
-cd $TRAVIS_BUILD_DIR;
+cd $TRAVIS_BUILD_DIR
+
+lua -v
 
 LUAROCKS_BASE=luarocks-$LUAROCKS
 
-# curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
+curl --location http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
 
-git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_BASE
 cd $LUAROCKS_BASE
 
-git checkout v$LUAROCKS
-
 if [ "$LUA" == "luajit" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
+  ./configure --lua-suffix=jit --with-lua-include="$LUA_HOME_DIR/include/luajit-2.0" --prefix="$LR_HOME_DIR";
 elif [ "$LUA" == "luajit2.0" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
+  ./configure --lua-suffix=jit --with-lua-include="$LUA_HOME_DIR/include/luajit-2.0" --prefix="$LR_HOME_DIR";
 elif [ "$LUA" == "luajit2.1" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.1;
+  ./configure --lua-suffix=jit --with-lua-include="$LUA_HOME_DIR/include/luajit-2.1" --prefix="$LR_HOME_DIR";
 else
-  ./configure;
+  ./configure --with-lua="$LUA_HOME_DIR" --prefix="$LR_HOME_DIR"
 fi
 
-make build && sudo make install
+make build && make install
+
+ln -s $LR_HOME_DIR/bin/luarocks $HOME/.lua/luarocks
 
 cd $TRAVIS_BUILD_DIR
 
+luarocks --version
+
 rm -rf $LUAROCKS_BASE
 
 if [ "$LUAJIT" == "yes" ]; then
   rm -rf $LUAJIT_BASE;
 elif [ "$LUA" == "lua5.1" ]; then
   rm -rf lua-5.1.5;
 elif [ "$LUA" == "lua5.2" ]; then
-  rm -rf lua-5.2.3;
+  rm -rf lua-5.2.4;
 elif [ "$LUA" == "lua5.3" ]; then
   rm -rf lua-5.3.0;
 fi

src/lua/cURL/impl/cURL.lua

@@ -586,7 +586,7 @@ function Multi:info_read(...)
   end
 end
 
-function wrap_callback(...)
+local function wrap_callback(...)
   local n = select("#", ...)
   local fn, ctx, has_ctx
   if n >= 2 then
@@ -603,7 +603,7 @@ function wrap_callback(...)
   return function(...) return fn(...) end
 end
 
-function wrap_socketfunction(self, cb)
+local function wrap_socketfunction(self, cb)
   return function(h, ...)
     local e = self._easy[h]
     if e then return cb(e, ...) end