tanker-core 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d3bb4f3507a91646d35abf258091dd70ac67448918e1ae740c57d7853cf6a7
-  data.tar.gz: 5957f005ee52f329551a20c038b0672911b5930e772eb6ae1289c22e1409889e
+  metadata.gz: a679a4adda85f80bb146bf73a365982a492c65ddf4c4930fc688c38796e624b8
+  data.tar.gz: 62a6fc4e808225298bbf8a30b494780a6e81f47e5c66904014f56f1754cc957a
 SHA512:
-  metadata.gz: 42566745f1f997e845b04d59e76999abb18f938ebf16ba637e4ecf77bbd51cfb60e93875dec55e3f66c06c84234159d57a3907580d01e5292656a06675d21387
-  data.tar.gz: 94abebfe0253967a31637c02436578068482540805f29f28693c86ef5f0b305d59516ddc2346ffa07cf6de1887ff312c033ef8caff2230847a6d2cfb69bc7d43
+  metadata.gz: 952d8771ff38bc23dd80aeb45fd87d41481484c3900f9676d2ea4266e04dd06246c811c13fb72a481082a895ca526e16a0fb96475333f2ed11302287b04ca62b
+  data.tar.gz: 41c19bea75dec5c26e2c17b6bc4435c85917df1edff5756663847a10f3f1fcc692d0f9b197e17219358723afc342523ab1b2ed8540c44c1ff252e81ee4a359bb

data/lib/tanker/admin/c_admin.rb

@@ -2,14 +2,14 @@
 
 require 'ffi'
 require 'tanker/c_tanker/c_future'
+require 'tanker/c_tanker/c_lib'
 
 module Tanker
   class Admin
     module CAdmin
       extend FFI::Library
 
-      ffi_lib "#{__dir__}/../../../vendor/libctanker/linux64/tanker/lib/libtanker_admin-c.so"
-
+      ffi_lib Tanker::CTanker.get_path('tanker_admin-c')
       typedef :pointer, :admin_pointer
 
       # Note: We use those CFutures with the tanker_future_* functions exposed by CTanker,

data/lib/tanker/c_tanker.rb

@@ -4,6 +4,7 @@ require 'ffi'
 require_relative 'core/options'
 require_relative 'sharing_options'
 require_relative 'encryption_options'
+require_relative 'c_tanker/c_lib'
 require_relative 'c_tanker/c_future'
 require_relative 'c_tanker/c_verification'
 require_relative 'c_tanker/c_verification_method'
@@ -22,8 +23,7 @@ end
 module Tanker
   module CTanker
     extend FFI::Library
-
-    ffi_lib "#{__dir__}/../../vendor/libctanker/linux64/tanker/lib/libctanker.so"
+    ffi_lib get_path('ctanker')
 
     typedef :pointer, :session_pointer
     typedef :pointer, :enc_sess_pointer

data/lib/tanker/c_tanker/c_future.rb

@@ -2,13 +2,14 @@
 
 require 'ffi'
 require 'tanker/error'
+require 'tanker/c_tanker/c_lib'
 require_relative 'c_tanker_error'
 
 module Tanker
   module CTanker
     extend FFI::Library
 
-    ffi_lib "#{__dir__}/../../../vendor/libctanker/linux64/tanker/lib/libctanker.so"
+    ffi_lib get_path('ctanker')
 
     class CFuture < FFI::AutoPointer
       def initialize(ptr, proc = nil, &block)

data/lib/tanker/c_tanker/c_lib.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Tanker::CTanker
+  def self.get_path(name)
+    if /darwin/ =~ RUBY_PLATFORM
+      ext = '.dylib'
+      subdir = 'mac64'
+    else
+      ext = '.so'
+      subdir = 'linux64'
+    end
+
+    File.expand_path "../../../vendor/libctanker/#{subdir}/tanker/lib/lib#{name}#{ext}", __dir__
+  end
+end

data/lib/tanker/core/init.rb

@@ -8,8 +8,11 @@ module Tanker
     def initialize(options)
       @revoke_event_handlers = Set.new
       @ctanker = CTanker.tanker_create(options).get
+      @freed = false
       ctanker_addr = @ctanker.address
       ObjectSpace.define_finalizer(@ctanker) do |_|
+        next if @freed
+
         CTanker.tanker_destroy(FFI::Pointer.new(:void, ctanker_addr)).get
       end
 
@@ -19,6 +22,18 @@ module Tanker
       CTanker.tanker_event_connect(@ctanker, CTanker::CTankerEvent::DEVICE_REVOKED, @device_revoked_handler, nil).get
     end
 
+    def free
+      @freed = true
+      CTanker.tanker_destroy(@ctanker).get
+      @ctanker = nil
+
+      public_methods(false).each do |method|
+        send(:define_singleton_method, method) do |*_|
+          raise "using Tanker::Core##{method} after free"
+        end
+      end
+    end
+
     def self.set_log_handler(&block) # rubocop:disable Naming/AccessorMethodName
       @log_handler = lambda do |clog|
         block.call LogRecord.new clog[:category], clog[:level], clog[:file], clog[:line], clog[:message]

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '2.4.2'
+    VERSION = '2.5.0'
 
     def self.native_version
       CTanker.tanker_version_string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Tanker team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -142,6 +142,7 @@ files:
 - lib/tanker/c_tanker/c_device_info.rb
 - lib/tanker/c_tanker/c_event.rb
 - lib/tanker/c_tanker/c_future.rb
+- lib/tanker/c_tanker/c_lib.rb
 - lib/tanker/c_tanker/c_log_record.rb
 - lib/tanker/c_tanker/c_string.rb
 - lib/tanker/c_tanker/c_tanker_error.rb
@@ -165,6 +166,7 @@ files:
 - lib/tanker/error.rb
 - lib/tanker/sharing_options.rb
 - vendor/libctanker/linux64/tanker/lib/libctanker.so
+- vendor/libctanker/mac64/tanker/lib/libctanker.dylib
 homepage: https://tanker.io
 licenses:
 - Apache-2.0
@@ -186,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for Tanker