Merge pull request #123 from moteus/curl_mime

Add. Curl mime API

Author: moteus

.travis.yml

@@ -9,23 +9,17 @@ env:
 
 matrix:
   include:
-    - compiler: ": Lua51-osx"
-      env: LUA="lua 5.1"
+    - env: LUA="lua 5.1"
       os: osx
-    - compiler: ": Lua51"
-      env: LUA="lua 5.1"
+    - env: LUA="lua 5.1"
       os: linux
-    - compiler: ": Lua52"
-      env: LUA="lua 5.2"
+    - env: LUA="lua 5.2"
       os: linux
-    - compiler: ": Lua53"
-      env: LUA="lua 5.3"
+    - env: LUA="lua 5.3"
       os: linux
-    - compiler: ": LuaJIT20"
-      env: LUA="luajit 2.0"
+    - env: LUA="luajit 2.0"
       os: linux
-    - compiler: ": LuaJIT21"
-      env: LUA="luajit 2.1"
+    - env: LUA="luajit 2.1"
       os: linux
 
 cache:
@@ -36,25 +30,35 @@ cache:
 branches:
   only:
     - master
+    - curl_mime
 
 before_install:
-  - export CC=gcc
-  - gcc --version
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$PATH:~/Library/Python/2.7/bin/; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LCURL_LD_FLAGS="-bundle -undefined dynamic_lookup -all_load --coverage"; fi
-  - pip install --user cpp-coveralls
-  - pip install --user hererocks
+  - pip2 install --user cpp-coveralls
+  - pip2 install --user hererocks
   - hererocks here -r^ --$LUA
   - source here/bin/activate
+  - luarocks show lluv > /dev/null 2>&1 || bash .travis/setup_uv.sh
 
 install:
   - luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="$LCURL_CC_FLAGS" LIBFLAG="$LCURL_LD_FLAGS"
 
 before_script:
   - luarocks show luacov-coveralls > /dev/null 2>&1 || luarocks install luacov-coveralls
-  - luarocks show lunitx > /dev/null 2>&1           || luarocks install lunitx
-  - luarocks show luafilesystem > /dev/null 2>&1    || luarocks install luafilesystem
-  - luarocks show dkjson > /dev/null 2>&1           || luarocks install dkjson --deps-mode=none
+  - luarocks show lunitx           > /dev/null 2>&1 || luarocks install lunitx
+  - luarocks show luafilesystem    > /dev/null 2>&1 || luarocks install luafilesystem
+  - luarocks show dkjson           > /dev/null 2>&1 || luarocks install dkjson --deps-mode=none
+  - luarocks show pegasus          > /dev/null 2>&1 || luarocks install pegasus http.parser 
+    --server=http://luarocks.org/manifests/moteus
+  - luarocks show pegasus-router   > /dev/null 2>&1 || luarocks install pegasus-router 
+    --server=http://luarocks.org/dev
+  - luarocks show lluv             > /dev/null 2>&1 || luarocks install lluv UV_DIR=$TRAVIS_BUILD_DIR/libuv
+    --server=http://luarocks.org/dev
+  - luarocks show lluv-pegasus     > /dev/null 2>&1 || luarocks install lluv-pegasus 
+    --server=http://luarocks.org/dev --deps-mode=none
+  - lua test/server.lua &
+  - curl -s http://127.0.0.1:7090/get
 
 script:
   - cd test
@@ -63,14 +67,12 @@ script:
   - lua test_pause02.c.lua
   - lua test_multi_callback.lua
   - lua test_multi_nested_callback.lua
-  # - lunit.sh test_easy.lua
-  # - lunit.sh test_safe.lua
-  # - lunit.sh test_form.lua
-  # - lunit.sh test_curl.lua
 
-after_success:
+before_cache:
   - coveralls -b .. -r .. --dump c.report.json
   - luacov-coveralls -j c.report.json -v
+  - luarocks remove lua-curl
+  - rm -f /home/travis/.cache/pip/log/debug.log
 
 notifications:
   email:

.travis/platform.sh

@@ -0,0 +1,15 @@
+if [ -z "${PLATFORM:-}" ]; then
+  PLATFORM=$TRAVIS_OS_NAME;
+fi
+
+if [ "$PLATFORM" == "osx" ]; then
+  PLATFORM="macosx";
+fi
+
+if [ -z "$PLATFORM" ]; then
+  if [ "$(uname)" == "Linux" ]; then
+    PLATFORM="linux";
+  else
+    PLATFORM="macosx";
+  fi;
+fi

.travis/setup_uv.sh

@@ -0,0 +1,25 @@
+#! /bin/bash
+
+source .travis/platform.sh
+
+cd $TRAVIS_BUILD_DIR
+
+git clone https://github.com/libuv/libuv.git -b v1.x
+
+cd libuv
+
+git checkout v1.19.0
+
+mkdir -p lib
+mkdir -p build
+git clone https://chromium.googlesource.com/external/gyp build/gyp
+
+if [ "$PLATFORM" == "macosx" ]; then
+  ./gyp_uv.py -f xcode && xcodebuild -ARCHS="x86_64" -project uv.xcodeproj -configuration Release -target All
+  cp ./build/Release/libuv.a ./lib;
+else
+  ./gyp_uv.py -f make && BUILDTYPE=Release CFLAGS=-fPIC make -C out
+  cp ./out/Release/libuv.a ./lib;
+fi
+
+cd $TRAVIS_BUILD_DIR

appveyor.yml

@@ -7,7 +7,7 @@ shallow_clone: true
 
 environment:
   LR_EXTERNAL: c:\external
-  CURL_VER: 7.55.1
+  CURL_VER: 7.59.0
 
   matrix:
   - LUA: "lua 5.1"
@@ -39,6 +39,7 @@ install:
       hererocks c:\hererocks --%LUA% --target %HR_TARGET% -rlatest
     )
   - call c:\hererocks\bin\activate
+  - luarocks show luarocks-fetch-gitrec >nul 2>&1 || luarocks install luarocks-fetch-gitrec
 
 before_build:
   # external deps
@@ -57,6 +58,12 @@ before_test:
   - luarocks show dkjson >nul 2>&1 || luarocks install dkjson
   - luarocks show luafilesystem >nul 2>&1 || luarocks install luafilesystem
   - luarocks show lua-path >nul 2>&1 || luarocks install lua-path
+  - luarocks show pegasus >nul 2>&1 || luarocks install pegasus http.parser 
+    --server=http://luarocks.org/manifests/moteus
+  - luarocks show pegasus-router >nul 2>&1 || luarocks install pegasus-router 
+    --server=http://luarocks.org/dev
+  - ps: $TestServer = Start-Process lua -ArgumentList test/server.lua -RedirectStandardOutput "$env:APPVEYOR_BUILD_FOLDER\server.stdout.txt" -RedirectStandardError "$env:APPVEYOR_BUILD_FOLDER\server.stderr.txt" -PassThru
+  - curl -s http://127.0.0.1:7090/get
 
 test_script:
   - echo "Testing..."
@@ -69,3 +76,12 @@ test_script:
 after_test:
   - cd %APPVEYOR_BUILD_FOLDER%
   - .appveyor\pack_artifact.bat lua-curl bin-rock
+
+on_failure:
+  - ps: Stop-Process -Id $TestServer.Id
+  - ps: $path = "$env:APPVEYOR_BUILD_FOLDER\server.stderr.txt"; if (Test-Path $path -PathType Leaf) { Push-AppveyorArtifact $path; } else { echo "File $path does not exist"; }
+  - ps: $path = "$env:APPVEYOR_BUILD_FOLDER\server.stdout.txt"; if (Test-Path $path -PathType Leaf) { Push-AppveyorArtifact $path; } else { echo "File $path does not exist"; }
+
+on_finish:
+  - curl -s http://127.0.0.1:7090/get
+  - ps: Stop-Process -Id $TestServer.Id

examples/lcurl/smtp-mime.lua

@@ -0,0 +1,85 @@
+local curl = require "lcurl"
+
+local SMTP = {
+  url      = "smtp://mail.example.com";
+}
+
+local FROM      = "<sender@example.org>"
+local TO        = "<addressee@example.net>"
+local CC        = "<info@example.org>"
+local FILE      = "smtp-mime.lua" -- if you send this file do not forget it may have mail password
+local CT_FILE   = "application/lua"
+
+local DUMP_MIME = false
+
+local headers = {
+  "Date: Tue, 22 Aug 2017 14:08:43 +0100",
+  "To: "   .. TO,
+  "From: " .. FROM .. " (Example User)",
+  "Cc: "   .. CC   .. " (Another example User)",
+  "Message-ID: <dcd7cb36-11db-487a-9f3a-e652a9458efd@rfcpedant.example.org>",
+  "Subject: example sending a MIME-formatted message",
+}
+
+local inline_text = ""
+  .. "This is the inline text message of the e-mail.\r\n"
+  .. "\r\n"
+  .. "  It could be a lot of lines that would be displayed in an e-mail\r\n"
+  .. "viewer that is not able to handle HTML.\r\n"
+
+local inline_html = ""
+  .. "<html><body>\r\n"
+  .. "<p>This is the inline <b>HTML</b> message of the e-mail.</p>"
+  .. "<br />\r\n"
+  .. "<p>It could be a lot of HTML data that would be displayed by "
+  .. "e-mail viewers able to handle HTML.</p>"
+  .. "</body></html>\r\n"
+
+local function dump_mime(type, data)
+  if type == curl.INFO_DATA_OUT then io.write(data) end
+end
+
+local easy = curl.easy()
+
+local mime = easy:mime() do
+  local alt = easy:mime()
+  alt
+    :addpart()
+      :data(inline_html, "text/html")
+  alt
+    :addpart()
+      :data(inline_text)
+  mime:addpart()
+    :subparts(alt, "multipart/alternative", {
+      "Content-Disposition: inline"
+    })
+  mime
+    :addpart()
+      :filedata(FILE, CT_FILE)
+end
+
+easy:setopt{
+  url            = SMTP.url,
+  mail_from      = FROM,
+  mail_rcpt      = {TO, CC},
+  httpheader     = headers;
+  mimepost       = mime;
+  ssl_verifyhost = false;
+  ssl_verifypeer = false;
+  username       = SMTP.user;
+  password       = SMTP.password;
+  upload         = true;
+}
+
+if DUMP_MIME then
+  easy:setopt{
+    verbose        = true;
+    debugfunction  = dump_mime;
+  }
+end
+
+easy:perform()
+
+easy:close()
+
+mime:free()

lakefile

@@ -32,6 +32,7 @@ target('test', install, function()
   run_test('test_form.lua')
   run_test('test_pause02.c.lua')
   run_test('test_curl.lua')
+  run_test('test_mime.lua')
   run_test('test_multi_callback.lua')
   run_test('test_multi_nested_callback.lua')
 

msvc/lcurl.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="lcurl"
 	ProjectGUID="{200D5C0C-8123-48F6-9EA0-CF0E6A6943F2}"
 	RootNamespace="lcurl"
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(CPPLIB_DIR)\curl\7.37.1\include;$(LUA_DIR)\include"
+				AdditionalIncludeDirectories="$(CPPLIB_DIR)\curl\7.56.0\include;$(LUA_DIR)\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LCURL_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="lua5.1.lib libcurl.lib ws2_32.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(CPPLIB_DIR)\curl\7.37.1\lib&quot;;&quot;$(LUA_DIR)\lib&quot;"
+				AdditionalLibraryDirectories="&quot;$(CPPLIB_DIR)\curl\7.56.0\lib&quot;;&quot;$(LUA_DIR)\lib&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -189,6 +189,10 @@
 				RelativePath="..\src\lchttppost.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\lcmime.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\lcmulti.c"
 				>
@@ -251,6 +255,10 @@
 				RelativePath="..\src\lcinfoeasy.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\lcmime.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\lcmulti.h"
 				>

rockspecs/lua-curl-scm-0.rockspec

@@ -63,7 +63,7 @@ build = {
       sources = {
         "src/l52util.c",    "src/lceasy.c", "src/lcerror.c",
         "src/lchttppost.c", "src/lcurl.c",  "src/lcutils.c",
-        "src/lcmulti.c",    "src/lcshare.c",
+        "src/lcmulti.c",    "src/lcshare.c","src/lcmime.c",
       },
       incdirs   = { "$(CURL_INCDIR)" },
       libdirs   = { "$(CURL_LIBDIR)" }