Solve issues with ruby loader.

Author: viferga

source/cli/metacallcli/CMakeLists.txt

@@ -416,6 +416,21 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_PY)
 	)
 endif()
 
+if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_RB)
+	add_test(NAME ${target}-rb-simplest
+		COMMAND $<TARGET_FILE:${target}> simplest.rb
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	)
+	set_tests_properties(${target}-rb-simplest PROPERTIES
+		LABELS ${target}-rb-simplest
+		PASS_REGULAR_EXPRESSION "Hello from Ruby"
+	)
+	test_environment_variables(${target}-rb-simplest
+		""
+		${TESTS_ENVIRONMENT_VARIABLES}
+	)
+endif()
+
 if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_TS AND OPTION_BUILD_SCRIPTS AND OPTION_BUILD_SCRIPTS_TS)
 	add_test(NAME ${target}-ts
 		COMMAND ${CMAKE_COMMAND} -D "EXECUTABLE=$<TARGET_FILE:${target}>" -D "INPUT=${TEST_COMMAND_INPUT}-ts.txt" -P ${TEST_COMMAND_RUNNER}

source/loaders/rb_loader/source/rb_loader_impl.c

@@ -1237,6 +1237,12 @@ loader_handle rb_loader_impl_load_from_file(loader_impl impl, const loader_path
 
 		module_data = rb_loader_impl_load_data(impl, paths[0]);
 
+		if (module_data == Qnil)
+		{
+			log_write("metacall", LOG_LEVEL_ERROR, "Ruby module not found: %s", paths[0]);
+			goto load_error;
+		}
+
 		result = rb_eval_string_protect(StringValuePtr(module_data), &state);
 
 		if (state != 0)
@@ -1246,7 +1252,17 @@ loader_handle rb_loader_impl_load_from_file(loader_impl impl, const loader_path
 			goto load_error;
 		}
 
-		module_name = rb_funcall(result, rb_intern("name"), 0);
+		if (result == Qnil)
+		{
+			loader_path name;
+			size_t size = portability_path_get_name(paths[0], strnlen(paths[0], LOADER_PATH_SIZE), name, LOADER_PATH_SIZE);
+
+			module_name = rb_str_new(name, size);
+		}
+		else
+		{
+			module_name = rb_funcall(result, rb_intern("name"), 0);
+		}
 
 		rb_module = rb_loader_impl_create_module(module_name, result, module_data, result);
 

source/scripts/ruby/CMakeLists.txt

@@ -21,3 +21,4 @@ add_subdirectory(ducktype)
 add_subdirectory(invalid)
 add_subdirectory(klass)
 add_subdirectory(failempty)
+add_subdirectory(simplest)

source/scripts/ruby/simplest/CMakeLists.txt

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

source/scripts/ruby/simplest/source/simplest.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/ruby
+
+print("Hello from Ruby")