lxi_rb 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99383b1cdd2261dbfded47620d15cd516d51556e21ccef91511cc0ca147648dd
-  data.tar.gz: 2b8c3cfd54a3742c23a0f131a9a736a27e10ca3842576f7813ba75e1d968e073
+  metadata.gz: 7283b02860c4482c2eb260bb784a6f86d18852bc5df24dfdd2b0e0ec2b878393
+  data.tar.gz: 29ba50fe2386ad91be3f5f7a891a354b0234fa0ec988db2c242e28215c921444
 SHA512:
-  metadata.gz: 0077ab297a5436e9e3444e24bf575351069ad7ca29c9b06b84f32b24c8d1a613358f4a2c9686974133d3fdfe846d58d5003edc94bfbccd2ed577acbc87a36ada
-  data.tar.gz: dfc8b8ac3a3511057699192bd3ebb8123006fca60a134887bc6b0806df3ccb3badbc18d24d155add053be764e31dfaacd919d193bc55a35c440378cdaedd80c4
+  metadata.gz: e89829c886e7df3271eb647d3a70566eb3da5d56786c848a68feebafac5d8993cc46ad017c9d9c372e2dcda7a6f6e71eac2f202cef3aed53b1421668e76eaaf1
+  data.tar.gz: 2962ef69f5523a261794211eba4443cbe8ce503d38f3e9da69e62021380a4543c6cc7aeee09ced35cb8d1d8279205a2a9f065cedccc248640121cd2a8872b7c5

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.3
+ruby 3.2.2

data/CHANGELOG.md

@@ -4,6 +4,13 @@
 All notable changes to this project will be documented in this file.
 
 - - -
+## [v0.10.0](https://github.com/robcarruthers/lxi_rb/compare/v0.9.0..v0.10.0) - 2023-05-24
+#### Refactoring
+- **(libchecker)** Add linux lib names and library paths - ([f19c674](https://github.com/robcarruthers/lxi_rb/commit/f19c67461fc76c8fcfd20ab95b86978af6e109ba)) - [@robcarruthers](https://github.com/robcarruthers)
+- **(netfinder)** Refine NetFinder search. Upgrade to ruby 3.2.2 +yjit - ([b26ef17](https://github.com/robcarruthers/lxi_rb/commit/b26ef179b6ba392bbfab9e1a33c239a933229cd6)) - [@robcarruthers](https://github.com/robcarruthers)
+
+- - -
+
 ## [v0.9.0](https://github.com/robcarruthers/lxi_rb/compare/v0.8.1..v0.9.0) - 2023-05-22
 #### Features
 - **(net_finder)** Add NetFinder class - ([079cef5](https://github.com/robcarruthers/lxi_rb/commit/079cef504cb37bb238b50b8fc06edf9b441ffe95)) - [@robcarruthers](https://github.com/robcarruthers)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lxi_rb (0.8.1)
+    lxi_rb (0.9.0)
       ffi (~> 1.15)
 
 GEM
@@ -51,6 +51,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   awesome_print (~> 1.8)

data/lib/lxi/constants.rb

@@ -4,23 +4,7 @@ module Lxi
   LXI_OK = 0
   LXI_ERROR = -1
 
-  LIBLXI_PATHS = %w[
-    liblxi
-    liblxi.so.1
-    /home/linuxbrew/.linuxbrew/lib/liblxi.so.1
-    /usr/local/lib/liblxi.dylib
-    /usr/local/lib/liblxi.so
-    /usr/lib/liblxi.dylib
-    /usr/lib/liblxi.so
-  ].freeze
+  LIBLXI_PATHS = %w[liblxi liblxi.so.1].freeze
 
-  MDNS_PATHS = %w[
-    mdns
-    avahi-client
-    libavahi-client
-    avahi-client.so.1
-    /home/linuxbrew/.linuxbrew/lib/avahi-client.so.1
-    /usr/local/lib/libavahi-client.so
-    /usr/lib/libavahi-client.so
-  ].freeze
+  MDNS_LIBS = %w[mdns avahi-client].freeze
 end

data/lib/lxi/functions.rb

@@ -5,7 +5,7 @@ module Lxi
   module FFIFunctions
     extend FFI::Library
 
-    ffi_lib %w[liblxi liblxi.so.1 /home/linuxbrew/.linuxbrew/lib/liblxi.so.1]
+    ffi_lib LIBLXI_PATHS
     ffi_lib_flags :now, :global
 
     # Define liblxi structs

data/lib/lxi/net_finder.rb

@@ -9,11 +9,28 @@ module Lxi
       Lxi.init_session
     end
 
-    def search(timeout: 1000, type: :vxi11)
-      if type == :mdns
-        raise Error, 'mDNS library not found' unless check_mdns_lib?
+    def search(type = :vxi11, timeout: 1000)
+      if type == :vxi11
+        search_vxi11(timeout)
+      elsif type == :mdns
+        search_mdns(timeout)
+      else
+        raise Error, 'Invalid search type'
       end
+    end
+
+    private
+
+    def search_vxi11(timeout)
+      net_search(timeout, :vxi11)
+    end
 
+    def search_mdns(timeout)
+      raise Error, 'mDNS library not found' unless mdns_lib_found?
+      net_search(timeout, :mdns)
+    end
+
+    def net_search(timeout, type)
       @devices = []
       info = FFIFunctions::LxiInfo.new
       info[:broadcast] = broadcast_callback
@@ -27,17 +44,15 @@ module Lxi
       @devices
     end
 
-    private
-
-    def check_mdns_lib?
-      Lxi::LibChecker.installed?(Lxi::MDNS_PATHS)
+    def mdns_lib_found?
+      Lxi::LibChecker.installed?(Lxi::MDNS_LIBS)
     end
 
     def broadcast_callback
-      # FFI::Function.new(:void, %i[pointer pointer]) do |service, interface|
-      #   puts("Broadcast: #{service.read_string} on #{interface.read_string}\n\n")
-      #   @devices << { service: service.read_string, interface: interface.read_string }
-      # end
+      FFI::Function.new(:void, %i[pointer pointer]) do |service, interface|
+        # puts("Broadcast: #{service.read_string} on #{interface.read_string}\n\n")
+        # @devices << { service: service.read_string, interface: interface.read_string }
+      end
     end
 
     def device_callback

data/lib/lxi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lxi
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lxi_rb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Rob Carruthers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for the liblxi library.