ffi-module 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5eb3b1aa3f99163ffd15dddc88852709b31677be988ebd0c2d3758866f19d43
-  data.tar.gz: 138e20272596fe28a109d49634f3357e7c544fe3b266ccc158dfcfc44906efff
+  metadata.gz: 7a52ed552e03d97ac432cdb4abda13d253fdecac9e40325473f1f0c9d2a7f3b6
+  data.tar.gz: 2bd69738708f23141cb530fce7d8f125fa1094510951455594b9af6f8ef5cfce
 SHA512:
-  metadata.gz: bd1516bf65a1d8d19bd4a972f03e47ef078441f6c5927eb699a79428bb727b740e62193f810cce6c2ebc4d4e1e39d90abcf38a076da04c8d4e628af4e1a3ae50
-  data.tar.gz: e194ca5bd89f3c75716e50b9f389803c73b0a5136e7eef766c43a1b31f0d193e2e097bd93373454d458fdd5057d20042b955b4e8c88b81053ce5aac8038d6dcc
+  metadata.gz: bfe6e9cbaed35a167175ef42dd15ba6ab42ccf8d9554c5d1d38aea0a72a4c2996966f4afe111cd572ab7a6886214b4c681121bffa5f82612393dc57665da6e27
+  data.tar.gz: 6f2087778c13121cc6c43c9fa2d71343bf9177dbcd0041f33b10122b93877086c311774117b44728202eccd422282819d49d75222d86afd897e6fb6e715a7263

data/lib/ffi/module/config_tool.rb

@@ -33,6 +33,8 @@ module FFI
 				return false unless output = ::IO.popen(command).read
 				
 				arguments = ::Shellwords.split(output)
+				search_paths = search_paths.dup
+				names = names.dup
 				
 				arguments.each do |argument|
 					if match = argument.match(/\A(-[lL])(.*)\z/)
@@ -43,16 +45,22 @@ module FFI
 						when '-l'
 							names << value
 						end
-					else
+					elsif File.directory?(argument)
 						# Assume it's a search path:
-						search_paths << value
+						search_paths << argument
 					end
 				end
 				
+				result = false
+				
 				# Load all specified libraries:
 				names.each do |name|
-					ffi_load(name, search_paths: search_paths, **options)
+					result = ffi_load(name, search_paths: search_paths, **options) || result
 				end
+				
+				return result
+			rescue Errno::ENOENT
+				return nil
 			end
 		end
 	end

data/lib/ffi/module/library.rb

@@ -40,7 +40,8 @@ module FFI
 				@ffi_libraries << DynamicLibrary.open(name, flags)
 				
 				return true
-			rescue LoadError
+			rescue LoadError, RuntimeError
+				# TruffleRuby raises a RuntimeError if the library can't be found.
 				return nil
 			end
 			
@@ -52,7 +53,7 @@ module FFI
 				return @ffi_calling_convention
 			end
 			
-			def ffi_attach_function(name, cname, argument_types, return_type = :void, **options)
+			def ffi_attach_function(name, argument_types, return_type = :void, as: name, **options)
 				argument_types = argument_types.map{|type| self.ffi_find_type(type)}
 				return_type = self.ffi_find_type(return_type)
 				
@@ -65,7 +66,7 @@ module FFI
 				@ffi_libraries.each do |library|
 					function = nil
 					
-					ffi_function_names(cname, argument_types).each do |function_name|
+					ffi_function_names(name, argument_types).each do |function_name|
 						break if function = library.find_function(function_name.to_s)
 					end
 					
@@ -81,29 +82,29 @@ module FFI
 				end
 				
 				if invoker
-					invoker.attach(self, name.to_s)
+					invoker.attach(self, as.to_s)
 					return true
 				else
-					raise FFI::NotFoundError.new(cname, @ffi_libraries)
+					raise FFI::NotFoundError.new(name, @ffi_libraries)
 				end
 			end
 			
-			def ffi_attach_variable(name, cname, type)
+			def ffi_attach_variable(name, type, as: name)
 				address = @ffi_libraries.find do |library|
 					begin
-						library.find_variable(cname)
+						library.find_variable(name)
 					rescue LoadError
 					end
 				end
 				
 				if address.nil? || address.null?
-					raise FFI::NotFoundError.new(cname, @ffi_libraries)
+					raise FFI::NotFoundError.new(name, @ffi_libraries)
 				end
 				
 				if type.is_a?(Class) && type < FFI::Struct
 					variable = type.new(address)
 					
-					self.define_singleton_method(name) do
+					self.define_singleton_method(as) do
 						variable
 					end
 				else
@@ -111,11 +112,11 @@ module FFI
 					container_type.layout :value, self.ffi_find_type(type)
 					container = container_type.new(address)
 					
-					self.define_singleton_method(name) do
+					self.define_singleton_method(as) do
 						container[:value]
 					end
 					
-					self.define_singleton_method(:"#{name}=") do |value|
+					self.define_singleton_method(:"#{as}=") do |value|
 						container[:value] = value
 					end
 				end
@@ -150,9 +151,9 @@ module FFI
 			end
 			
 			def ffi_define_type(name, value)
-				case type
+				case value
 				when FFI::Type
-					@ffi_type_map[name] = type
+					@ffi_type_map[name] = value
 				when FFI::DataConverter
 					@ffi_type_map[name] = FFI::Type::Mapped.new(value)
 				else
@@ -163,13 +164,36 @@ module FFI
 			def ffi_define_enumeration(name, *arguments)
 				native_type = arguments.first.kind_of?(FFI::Type) ? arguments.shift : nil
 				
-				ffi_generic_enumeration(name, FFI::Enum, native_type, arguments)
+				ffi_define_generic_enumeration(name, FFI::Enum, native_type, *arguments)
 			end
 			
 			def ffi_define_bitmask(name, *arguments)
 				native_type = arguments.first.kind_of?(FFI::Type) ? arguments.shift : nil
 				
-				ffi_generic_enumeration(name, FFI::Bitmask, native_type, arguments)
+				ffi_define_generic_enumeration(name, FFI::Bitmask, native_type, *arguments)
+			end
+			
+			def ffi_find_type(argument)
+				if argument.kind_of?(Type)
+					return argument
+				end
+				
+				if type = @ffi_type_map[argument]
+					return type
+				end
+				
+				if argument.is_a?(Class) && argument < Struct
+					return Type::POINTER
+				end
+				
+				if argument.is_a?(DataConverter)
+					# Cache the mapped type:
+					return ffi_define_type(argument, Type::Mapped.new(argument))
+				end
+				
+				if argument
+					return FFI.find_type(argument)
+				end
 			end
 			
 		private
@@ -213,29 +237,6 @@ module FFI
 				
 				return result
 			end
-			
-			def ffi_find_type(argument)
-				if argument.kind_of?(Type)
-					return argument
-				end
-				
-				if type = @ffi_type_map[argument]
-					return type
-				end
-				
-				if argument.is_a?(Class) && argument < Struct
-					return Type::POINTER
-				end
-				
-				if argument.is_a?(DataConverter)
-					# Cache the mapped type:
-					return ffi_define_type(argument, Type::Mapped.new(argument))
-				end
-				
-				if argument
-					return FFI.find_type(argument)
-				end
-			end
 		end
 	end
 end

data/lib/ffi/module/loader.rb

@@ -35,22 +35,18 @@ module FFI
 				
 				return nil
 			end
-
+			
 			def ffi_load(name, search_paths: nil, **options)
 				# Try to load the library directly:
-				return true if ffi_load_library(name, **options)
+				return true if ffi_open_library(name, **options)
 				
 				# If that fails, try to load it from the specified search paths:
 				if search_paths&.any?
 					name = FFI.map_library_name(name)
 					
-					if path = ffi_find_library_path(library_name, search_paths)
-						if library = ffi_load_library(path, **options)
-							libraries << library
-						end
+					if path = ffi_find_library_path(name, search_paths)
+						return true if ffi_open_library(path, **options)
 					end
-					
-					return true if ffi_load_library(name, **options)
 				end
 				
 				return nil

data/lib/ffi/module/version.rb

@@ -31,6 +31,6 @@ end
 
 module FFI
 	module Module
-		VERSION = "0.1.0"
+		VERSION = "0.2.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-module
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Samuel Williams