ffi-hiredis_vip-core 0.1.0.pre3 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b679c377de470cfe396c388d4a4c7946e2331f5a
-  data.tar.gz: 110075769569adc12766136039c5a6c7d68b9ec7
+  metadata.gz: 663a312faeb9876f597a3d3ec243a78a6f8a1a1a
+  data.tar.gz: 03c4726d35b3a48335f2f52c7da6e5da5de43c00
 SHA512:
-  metadata.gz: 3c7125d422a5324f13883ce346579826a0990b9d3a1c51366564d1dd6dbe57b9179fccf45687904f1b2451cff15b84f6c38737b6e5e5b38bdb3dd08677afe16f
-  data.tar.gz: 64b9f29bcd4106a04b91712d7090be284fac147fd4302aae4a05efc74f3caec346f1a9ceb78044e66d1c001e5dc4f412b8392d922225f308ade6c9d2c2b4de3a
+  metadata.gz: 29af71e9d5f9fee7fd73f7df585d17df858390b126eca07b923b76f6e96c89f2e93427c20da8268c6eaa4b973efb6bde5caea4941daa10994089b60d85efee34
+  data.tar.gz: 19adb10cc75ecee01a98df7d5b1874bb47d29a64e15931dc2f9bcc56cc8cad4784d319261c293093d71ef6e2c07925fa6e08240452e2756aada88c62eca02441

data/lib/ffi/hiredis_vip/core.rb

@@ -8,10 +8,61 @@ module FFI
     module Core
       extend ::FFI::Library
       ffi_lib_flags :now, :global
-      # TODO: can we support libhiredis + libhiredis_vip and enable clustering on the latter?
-      # TODO: need to provide ways to set the loading of the lip and check standard lib paths
-      LIB_HOME = ENV["HIREDIS_VIP_HOME"]
-      ffi_lib File.expand_path("#{LIB_HOME}/libhiredis_vip.#{::FFI::Platform::LIBSUFFIX}", File.dirname(__FILE__))
+
+      ##
+      # ffi-rzmq-core for reference
+      #
+      # https://github.com/chuckremes/ffi-rzmq-core/blob/master/lib/ffi-rzmq-core/libzmq.rb
+      #
+      begin
+        # bias the library discovery to a path inside the gem first, then
+        # to the usual system paths
+        inside_gem = File.join(File.dirname(__FILE__), '..', '..', 'ext')
+        local_path = FFI::Platform::IS_WINDOWS ? ENV['PATH'].split(';') : ENV['PATH'].split(':')
+        env_path = [ ENV['HIREDIS_VIP_LIB_PATH'] ].compact
+        rbconfig_path = RbConfig::CONFIG["libdir"]
+        homebrew_path = nil
+
+        # RUBYOPT set by RVM breaks 'brew' so we need to unset it.
+        rubyopt = ENV.delete('RUBYOPT')
+
+        begin
+          stdout, stderr, status = Open3.capture3("brew", "--prefix")
+          homebrew_path  = if status.success?
+                             "#{stdout.chomp}/lib"
+                           else
+                             '/usr/local/homebrew/lib'
+                           end
+        rescue
+          # Homebrew doesn't exist
+        end
+
+        # Restore RUBYOPT after executing 'brew' above.
+        ENV['RUBYOPT'] = rubyopt
+
+        # Search for libhiredis_vip in the following order...
+        HIREDIS_VIP_LIB_PATHS = ([inside_gem] + env_path + local_path + [rbconfig_path] + [
+          '/usr/local/lib', '/opt/local/lib', homebrew_path, '/usr/lib64'
+        ]).compact.map{|path| "#{path}/libhiredis_vip.#{FFI::Platform::LIBSUFFIX}"}
+        ffi_lib(HIREDIS_VIP_LIB_PATHS + %w{libhiredis_vip})
+
+      rescue LoadError
+        if HIREDIS_VIP_LIB_PATHS.any? {|path|
+          File.file? File.join(path, "libhiredis_vip.#{FFI::Platform::LIBSUFFIX}")}
+          warn "Unable to load this gem. The libhiredis_vip library exists, but cannot be loaded."
+          warn "If this is Windows:"
+          warn "-  Check that you have MSVC runtime installed or statically linked"
+          warn "-  Check that your DLL is compiled for #{FFI::Platform::ADDRESS_SIZE} bit"
+        else
+          warn "Unable to load this gem. The libhiredis_vip library (or DLL) could not be found."
+          warn "If this is a Windows platform, make sure libhiredis_vip.dll is on the PATH."
+          warn "If the DLL was built with mingw, make sure the other two dependent DLLs,"
+          warn "libgcc_s_sjlj-1.dll and libstdc++6.dll, are also on the PATH."
+          warn "For non-Windows platforms, make sure libhiredis_vip is located in this search path:"
+          warn HIREDIS_VIP_LIB_PATHS.inspect
+        end
+        raise LoadError, "The libhiredis_vip library (or DLL) could not be loaded"
+      end
 
       RedisClusterFlags = enum :HIRCLUSTER_FLAG_NULL, 0x0,
         :HIRCLUSTER_FLAG_ADD_SLAVE, 0x1000, #/* The flag to decide whether add slave node in redisClusterContext->nodes. This is set in the
@@ -50,7 +101,6 @@ module FFI
       end
 
       attach_function :freeReplyObject, [:pointer], :void, :blocking => true
-
       attach_function :redisReplyElement, [:pointer, :size_t], RedisReply.ptr, :blocking => true
       attach_function :redisConnect, [:string, :int], :pointer, :blocking => true
       attach_function :redisReconnect, [:pointer], RedisOkType, :blocking => true # :pointer => redisContext

data/lib/ffi/hiredis_vip/core/version.rb

@@ -1,7 +1,7 @@
 module FFI
   module HiredisVip
     module Core
-      VERSION = "0.1.0.pre3"
+      VERSION = "0.1.0.pre4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-hiredis_vip-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi