Add test for failing ruby scripts, now it does not segfaults anymore, and shows the output of the backtrace.

Author: viferga

source/loaders/rb_loader/source/rb_loader_impl.c

@@ -58,6 +58,13 @@ typedef struct loader_impl_rb_function_type
 
 } * loader_impl_rb_function;
 
+typedef struct loader_impl_rb_module_eval_protect_type
+{
+	int argc;
+	VALUE * argv;
+	VALUE module;
+} * loader_impl_rb_module_eval_protect;
+
 int function_rb_interface_create(function func, function_impl impl)
 {
 	signature s = function_signature(func);
@@ -515,17 +522,31 @@ VALUE rb_loader_impl_load_data(loader_impl impl, const loader_naming_path path)
 	return Qnil;
 }
 
+VALUE rb_loader_impl_module_eval_protect(VALUE args)
+{
+	/* TODO: Do this properly */
+	loader_impl_rb_module_eval_protect protect = (loader_impl_rb_module_eval_protect)args;
+
+	return rb_mod_module_eval(protect->argc, protect->argv, protect->module);
+}
+
 VALUE rb_loader_impl_module_eval(VALUE module, VALUE module_data)
 {
 	const int argc = 1;
 	VALUE result;
-	VALUE args[argc];
+	VALUE argv[argc];
+	struct loader_impl_rb_module_eval_protect_type protect;
+	int state;
+
+	argv[0] = module_data;
 
-	args[0] = module_data;
+	protect.argc = argc;
+	protect.argv = argv;
+	protect.module = module;
 
-	result = rb_mod_module_eval(1, args, module);
+	result = rb_protect(rb_loader_impl_module_eval_protect, (VALUE)&protect, &state);
 
-	if (result == Qnil)
+	if (state || result == Qnil)
 	{
 		VALUE exception;
 
@@ -544,11 +565,13 @@ VALUE rb_loader_impl_module_eval(VALUE module, VALUE module_data)
 			backtrace = rb_funcall(exception, rb_intern("backtrace"), 0);
 
 			rb_io_puts(1, &backtrace, rb_stderr);
-
-			rb_raise(rb_eLoadError, "Invalid module evaluation");
-
-			return Qnil;
 		}
+		else
+		{
+			log_write("metacall", LOG_LEVEL_ERROR, "Ruby module backtrace not available");
+		}
+
+		return Qnil;
 	}
 
 	return result;
@@ -604,12 +627,6 @@ loader_impl_rb_module rb_loader_impl_load_from_file_module(loader_impl impl, con
 					return rb_module;
 				}
 			}
-			else
-			{
-				VALUE exception = rb_errinfo();
-
-				log_write("metacall", LOG_LEVEL_DEBUG, "Ruby loader error (%s)", RSTRING_PTR(exception));
-			}
 		}
 	}
 
@@ -654,11 +671,23 @@ loader_handle rb_loader_impl_load_from_file(loader_impl impl, const loader_namin
 		if (rb_module == NULL)
 		{
 			log_write("metacall", LOG_LEVEL_ERROR, "Invalid ruby module loading %s", paths[iterator]);
-
-			continue;
 		}
+		else
+		{
+			vector_push_back(handle->modules, &rb_module);
+		}
+	}
+
+	// Do not load the handle in case there isn't modules
+	if (vector_size(handle->modules) == 0)
+	{
+		log_write("metacall", LOG_LEVEL_ERROR, "No module could be loaded");
+
+		vector_destroy(handle->modules);
+
+		free(handle);
 
-		vector_push_back(handle->modules, &rb_module);
+		return NULL;
 	}
 
 	return (loader_handle)handle;
@@ -717,12 +746,6 @@ loader_impl_rb_module rb_loader_impl_load_from_memory_module(loader_impl impl, c
 					return rb_module;
 				}
 			}
-			else
-			{
-				VALUE exception = rb_errinfo();
-
-				log_write("metacall", LOG_LEVEL_DEBUG, "Ruby loader error (%s)", RSTRING_PTR(exception));
-			}
 		}
 	}
 

source/scripts/ruby/CMakeLists.txt

@@ -18,3 +18,4 @@ add_subdirectory(second)
 add_subdirectory(blog)
 add_subdirectory(cache)
 add_subdirectory(ducktype)
+add_subdirectory(invalid)

source/scripts/ruby/invalid/CMakeLists.txt

@@ -0,0 +1,5 @@
+#
+# Configure ruby project
+#
+
+rb_project(invalid 0.1.0)

source/scripts/ruby/invalid/source/invalid.rb

@@ -0,0 +1,26 @@
+#! /usr/bin/env ruby
+
+require 'nokogiri'
+require 'open-uri'
+
+def nokogiri_example()
+	# Fetch and parse HTML document
+	doc = Nokogiri::HTML(open('https://nokogiri.org/tutorials/installing_nokogiri.html'))
+	
+	puts "### Search for nodes by css"
+	doc.css('nav ul.menu li a', 'article h2').each do |link|
+	  puts link.content
+	end
+	
+	puts "### Search for nodes by xpath"
+	doc.xpath('//nav//ul//li/a', '//article//h2').each do |link|
+	  puts link.content
+	end
+	
+	puts "### Or mix and match."
+	doc.search('nav ul.menu li a', '//article//h2').each do |link|
+	  puts link.content
+	end
+
+	return 3
+end

source/tests/CMakeLists.txt

@@ -142,3 +142,4 @@ add_subdirectory(metacall_reinitialize_test)
 add_subdirectory(metacall_fork_test)
 add_subdirectory(metacall_return_monad_test)
 add_subdirectory(metacall_callback_test)
+add_subdirectory(metacall_ruby_fail_test)

source/tests/metacall_ruby_fail_test/CMakeLists.txt

@@ -0,0 +1,148 @@
+#
+# Executable name and options
+#
+
+# Target name
+set(target metacall-ruby-fail-test)
+message(STATUS "Test ${target}")
+
+#
+# Compiler warnings
+#
+
+include(Warnings)
+
+#
+# Compiler security
+#
+
+include(SecurityFlags)
+
+#
+# Sources
+#
+
+set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
+set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
+
+set(sources
+	${source_path}/main.cpp
+	${source_path}/metacall_ruby_fail_test.cpp
+)
+
+# Group source files
+set(header_group "Header Files (API)")
+set(source_group "Source Files")
+source_group_by_path(${include_path} "\\\\.h$|\\\\.hpp$"
+	${header_group} ${headers})
+source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
+	${source_group} ${sources})
+
+#
+# Create executable
+#
+
+# Build executable
+add_executable(${target}
+	${sources}
+)
+
+# Create namespaced alias
+add_executable(${META_PROJECT_NAME}::${target} ALIAS ${target})
+
+#
+# Project options
+#
+
+set_target_properties(${target}
+	PROPERTIES
+	${DEFAULT_PROJECT_OPTIONS}
+	FOLDER "${IDE_FOLDER}"
+)
+
+#
+# Include directories
+#
+
+target_include_directories(${target}
+	PRIVATE
+	${DEFAULT_INCLUDE_DIRECTORIES}
+	${PROJECT_BINARY_DIR}/source/include
+)
+
+#
+# Libraries
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LIBRARIES}
+
+	GTest
+
+	${META_PROJECT_NAME}::version
+	${META_PROJECT_NAME}::preprocessor
+	${META_PROJECT_NAME}::environment
+	${META_PROJECT_NAME}::format
+	${META_PROJECT_NAME}::log
+	${META_PROJECT_NAME}::memory
+	${META_PROJECT_NAME}::portability
+	${META_PROJECT_NAME}::adt
+	${META_PROJECT_NAME}::reflect
+	${META_PROJECT_NAME}::dynlink
+	${META_PROJECT_NAME}::detour
+	${META_PROJECT_NAME}::serial
+	${META_PROJECT_NAME}::configuration
+	${META_PROJECT_NAME}::loader
+	${META_PROJECT_NAME}::metacall
+)
+
+#
+# Compile definitions
+#
+
+target_compile_definitions(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_DEFINITIONS}
+)
+
+#
+# Compile options
+#
+
+target_compile_options(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_OPTIONS}
+)
+
+#
+# Linker options
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LINKER_OPTIONS}
+)
+
+#
+# Define test
+#
+
+add_test(NAME ${target}
+	COMMAND $<TARGET_FILE:${target}>
+)
+
+#
+# Define test properties
+#
+
+set_property(TEST ${target}
+	PROPERTY LABELS ${target} MEMCHECK_IGNORE
+)
+
+include(TestEnvironmentVariables)
+
+test_environment_variables(${target}
+	""
+	${TESTS_ENVIRONMENT_VARIABLES}
+)

source/tests/metacall_ruby_fail_test/source/main.cpp

@@ -0,0 +1,28 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2020 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gmock/gmock.h>
+
+int main(int argc, char * argv[])
+{
+	::testing::InitGoogleMock(&argc, argv);
+
+	return RUN_ALL_TESTS();
+}

source/tests/metacall_ruby_fail_test/source/metacall_ruby_fail_test.cpp

@@ -0,0 +1,55 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2020 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gmock/gmock.h>
+
+#include <metacall/metacall.h>
+#include <metacall/metacall_value.h>
+#include <metacall/metacall_loaders.h>
+
+class metacall_test : public testing::Test
+{
+public:
+};
+
+TEST_F(metacall_test, DefaultConstructor)
+{
+	metacall_print_info();
+
+	metacall_log_stdio_type log_stdio = { stdout };
+
+	ASSERT_EQ((int) 0, (int) metacall_log(METACALL_LOG_STDIO, (void *)&log_stdio));
+
+	ASSERT_EQ((int) 0, (int) metacall_initialize());
+
+	/* Ruby */
+	#if defined(OPTION_BUILD_LOADERS_RB)
+	{
+		const char * rb_scripts[] =
+		{
+			"invalid.rb"
+		};
+
+		EXPECT_EQ((int) 1, (int) metacall_load_from_file("rb", rb_scripts, sizeof(rb_scripts) / sizeof(rb_scripts[0]), NULL));
+	}
+	#endif /* OPTION_BUILD_LOADERS_RB */
+
+	EXPECT_EQ((int) 0, (int) metacall_destroy());
+}