Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification

CMakeLists.txt

@@ -33,7 +33,6 @@ set(BIN_ARANGOB       arangob)
 set(BIN_ARANGOD       arangod)
 set(BIN_ARANGODUMP    arangodump)
 set(BIN_ARANGOIMP     arangoimp)
-set(BIN_ARANGOIRB     arangoirb)
 set(BIN_ARANGORESTORE arangorestore)
 set(BIN_ARANGOSH      arangosh)
 
@@ -146,16 +145,6 @@ endif ()
 
 set(ARANGODB_VERSION "1.x.y-rc1" CACHE path "ArangoDB version")
 
-################################################################################
-### @brief MRUBY
-################################################################################
-
-option(USE_MRUBY "Do you want to use MRUBY" OFF)
-
-if (USE_MRUBY)
-  add_definitions("-DTRI_ENABLE_MRUBY=1")
-endif ()
-
 ################################################################################
 ### @brief VISTA LOCKS
 ################################################################################
@@ -166,15 +155,6 @@ if (USE_VISTA_LOCKS)
   add_definitions("-DTRI_WINDOWS_VISTA_LOCKS=1")
 endif ()
 
-################################################################################
-### @brief etcd
-################################################################################
-
-if (DARWIN)
-  install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/etcd-arango
-          DESTINATION ${TRI_BINDIR_INSTALL})
-endif ()
-
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                       DIRECTORIES
 ## -----------------------------------------------------------------------------
@@ -389,6 +369,16 @@ else()
 
 endif ()
 
+
+################################################################################
+### @brief etcd
+################################################################################
+
+if (DARWIN)
+  install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/etcd-arango
+          DESTINATION ${TRI_BINDIR_INSTALL})
+endif ()
+
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                   COMMON INCLUDES
 ## -----------------------------------------------------------------------------
@@ -745,14 +735,6 @@ add_subdirectory(arangosh)
 
 add_subdirectory(arangod)
 
-################################################################################
-### @brief arangoirb
-################################################################################
-
-if (USE_MRUBY)
-  add_subdirectory(arangoirb)
-endif ()
-
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                    DOCUMENTATIONS
 ## -----------------------------------------------------------------------------

Documentation/Books/Users/Foxx/Install/README.mdpp

@@ -128,7 +128,7 @@ But in most cases you will install you own application that is probably not publ
 
 The Application identifier supports several input formats:
 * `appname:version` Install an App from the ArangoDB store [Read More](Store.md)
-* `git:user/repository:tag` Install an App from github [Read More](github.md)
+* `git:user/repository:tag` Install an App from github [Read More](Github.md)
-* `http(s)://example.com/app.zip` Install an App from an URL [Read More](remote.md)
+* `http(s)://example.com/app.zip` Install an App from an URL [Read More](Remote.md)
 * `/usr/tmp/app.zip` Install an App from local file system [Read More](Local.md)
 * `EMPTY` Generate a new Application [Read More](Generate.md)

GNUmakefile

@@ -97,8 +97,7 @@ pack-dmg:
 	rm -rf Build && mkdir Build
 
 	./configure \
-		--prefix=/opt/arangodb \
+		--prefix=/opt/arangodb
-		--enable-mruby
 
 	${MAKE} pack-dmg-cmake
 
@@ -112,7 +111,6 @@ pack-dmg-cmake:
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		-D "LIBEV_VERSION=${LIBEV_VERSION}" \
 		-D "READLINE_VERSION=${READLINE_VERSION}" \
-		-D "USE_MRUBY=ON" \
 		-D "V8_VERSION=${V8_VERSION}" \
 		-D "ZLIB_VERSION=${ZLIB_VERSION}" \
 		..
@@ -120,7 +118,6 @@ pack-dmg-cmake:
 	${MAKE} .libev-build-64
 	${MAKE} .zlib-build-64
 	${MAKE} .v8-build-64
-	${MAKE} .mruby-build-64
 
 	${MAKE} ${BUILT_SOURCES}
 
@@ -145,8 +142,7 @@ pack-macosx:
 	rm -rf Build && mkdir Build
 
 	./configure \
-		--prefix=/opt/arangodb \
+		--prefix=/opt/arangodb
-		--enable-mruby
 
 	${MAKE} pack-macosx-cmake
 
@@ -160,7 +156,6 @@ pack-macosx-cmake:
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		-D "LIBEV_VERSION=${LIBEV_VERSION}" \
 		-D "READLINE_VERSION=${READLINE_VERSION}" \
-		-D "USE_MRUBY=ON" \
 		-D "V8_VERSION=${V8_VERSION}" \
 		-D "ZLIB_VERSION=${ZLIB_VERSION}" \
 		..
@@ -168,7 +163,6 @@ pack-macosx-cmake:
 	${MAKE} .libev-build-64
 	${MAKE} .zlib-build-64
 	${MAKE} .v8-build-64
-	${MAKE} .mruby-build-64
 
 	${MAKE} ${BUILT_SOURCES}
 
@@ -190,8 +184,7 @@ pack-arm:
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--localstatedir=/var \
+		--localstatedir=/var
-		--disable-mruby
 
 	touch .libev-build-32
 	touch .v8-build-32
@@ -212,7 +205,6 @@ pack-arm-cmake:
 		-D "ETCDIR=${sysconfdir}" \
 		-D "LIBEV_VERSION=${LIBEV_VERSION}" \
 		-D "READLINE_VERSION=${READLINE_VERSION}" \
-		-D "USE_MRUBY=OFF" \
 		-D "V8_VERSION=${V8_VERSION}" \
 		-D "VARDIR=${localstatedir}" \
 		-D "ZLIB_VERSION=${ZLIB_VERSION}" \
@@ -270,7 +262,6 @@ winXX-cmake: checkcmake
 		-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
 		-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
 		-D "LIBEV_VERSION=4.11" \
-		-D "USE_MRUBY=OFF" \
 		-D "V8_VERSION=3.31.74.1" \
 		-D "ZLIB_VERSION=1.2.7" \
 		$(MOREOPTS) \
@@ -301,8 +292,7 @@ pack-tar-config:
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--localstatedir=/var \
+		--localstatedir=/var
-		--disable-mruby
 
 pack-tar:
 	rm -rf /tmp/pack-arangodb

arangod/CMakeLists.txt

@@ -106,6 +106,7 @@ add_executable(
     RestHandler/RestEdgeHandler.cpp
     RestHandler/RestImportHandler.cpp
     RestHandler/RestPleaseUpgradeHandler.cpp
+    RestHandler/RestQueryHandler.cpp
     RestHandler/RestReplicationHandler.cpp
     RestHandler/RestUploadHandler.cpp
     RestHandler/RestVocbaseBaseHandler.cpp

js/server/modules/org/arangodb/testing.js

@@ -179,7 +179,7 @@ function printUsage () {
 }
 
 function filterTestcaseByOptions (testname, options, whichFilter) {
-  if (options.hasOwnProperty('test')) {
+  if (options.hasOwnProperty('test') && (typeof(options.test) !== 'undefined')) {
     whichFilter.filter = "testcase";
     return testname === options.test;
   }

lib/V8/v8-environment.cpp

@@ -26,12 +26,12 @@
 /// https://github.com/joyent/node/blob/master/src/node.cc
 ////////////////////////////////////////////////////////////////////////////////
 
+#include "Basics/Common.h"
+#include "v8-utils.h"
+
 #ifdef _WIN32
 #include "Basics/win-utils.h"
 #else
-
-#include "v8-utils.h"
-
 #ifdef __APPLE__
 #include <crt_externs.h>
 #define environ (*_NSGetEnviron())