ffi-module 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5eb3b1aa3f99163ffd15dddc88852709b31677be988ebd0c2d3758866f19d43
-  data.tar.gz: 138e20272596fe28a109d49634f3357e7c544fe3b266ccc158dfcfc44906efff
+  metadata.gz: '0966d9341e590e8623b6e5f8b46672e1258e64d76c4b5a623fed1153d982ca97'
+  data.tar.gz: 7c0d82c153c368cce300aa8e2e4cf45f1f2135707974d4a3da0c1f0ff6bb7aea
 SHA512:
-  metadata.gz: bd1516bf65a1d8d19bd4a972f03e47ef078441f6c5927eb699a79428bb727b740e62193f810cce6c2ebc4d4e1e39d90abcf38a076da04c8d4e628af4e1a3ae50
-  data.tar.gz: e194ca5bd89f3c75716e50b9f389803c73b0a5136e7eef766c43a1b31f0d193e2e097bd93373454d458fdd5057d20042b955b4e8c88b81053ce5aac8038d6dcc
+  metadata.gz: cfc6f8d0f8d137fed89851a1b94a456b11641dc60289c80fe2122ae8b4dff21ac8144cdd1b92da35a4de9a5e8cd5990ab75c1856f70a0af34257b06f0eff322c
+  data.tar.gz: d4306604e74a7f8211d4acfa6c2eef9e7e53ae45c9807d8a0b1e2313959a82546664708633bf108f1fc98a52eece56bf6a253d67de6e1fb46335f05066a86b4d

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,9 +45,9 @@ 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
 				

data/lib/ffi/module/library.rb

@@ -150,9 +150,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 +163,13 @@ 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
 			
 		private

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.1.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.1.1
 platform: ruby
 authors:
 - Samuel Williams