ruby now loads from default libs location

fundthmcalculus · fundthmcalculus · commit 68ec16459de7 · 2021-10-29T17:53:36.000-04:00
python now loads from default libs location
diff --git a/devops/build_sdks.py b/devops/build_sdks.py
@@ -69,8 +69,6 @@ def build_python(args) -> None:
     python_dir = abspath(join(dirname(__file__), '..', 'python'))
     update_line(join(python_dir, 'setup.cfg'),
                 {'version = ': f'version = {get_package_versions(args)}'})
-    # Copy in the binaries
-    copy_okapi_libs(join(python_dir, 'okapi', 'libs'))
 
 
 def build_java(args) -> None:
@@ -85,8 +83,6 @@ def build_ruby(args) -> None:
     ruby_dir = abspath(join(dirname(__file__), '..', 'ruby'))
     update_line(join(ruby_dir, 'lib', 'version.rb'),
                 {'  VERSION =': f"  VERSION = '{get_package_versions(args)}'"})
-    # Copy in the binaries
-    copy_okapi_libs(join(ruby_dir, 'libs'))
 
 
 def build_golang(args) -> None:
diff --git a/python/tests/test_keys.py b/python/tests/test_keys.py
@@ -1,10 +1,12 @@
 import base64
 import unittest
+from os.path import dirname, join, abspath
+
 import base58
 
 from okapi.wrapper import DIDKey
 from okapi.proto.okapi.keys.v1 import GenerateKeyRequest, KeyType, GenerateKeyResponse, ResolveRequest
-from okapi.okapi_utils import DidError
+from okapi.okapi_utils import DidError, get_os_arch_binary, set_library_path
 
 
 def base64_padding(base_64: str) -> str:
@@ -18,6 +20,11 @@ def base64_padding(base_64: str) -> str:
 
 
 class KeyTests(unittest.TestCase):
+    def setUp(self) -> None:
+        base_dir = abspath(join(dirname(__file__), '..', '..'))
+        lib_path, _ = get_os_arch_binary(base_dir)
+        set_library_path(dirname(lib_path))
+
     def test_generate_key(self):
         request = GenerateKeyRequest()
         request.key_type = KeyType.KEY_TYPE_ED25519
diff --git a/python/tests/test_ldproofs.py b/python/tests/test_ldproofs.py
@@ -1,13 +1,19 @@
 import datetime
 import unittest
+from os.path import join, dirname, abspath
 
-from okapi.okapi_utils import dictionary_to_struct
+from okapi.okapi_utils import dictionary_to_struct, set_library_path, get_os_arch_binary
 from okapi.proto.okapi.keys.v1 import GenerateKeyRequest, KeyType, JsonWebKey
 from okapi.wrapper import DIDKey, LDProofs
 from okapi.proto.okapi.proofs.v1 import CreateProofRequest, LdSuite
 
 
 class LdProofsTests(unittest.TestCase):
+    def setUp(self) -> None:
+        base_dir = abspath(join(dirname(__file__), '..', '..'))
+        lib_path, _ = get_os_arch_binary(base_dir)
+        set_library_path(dirname(lib_path))
+
     def test_generate_capability_invocation_proof_with_jcs(self):
         capability_dict = {"@context": "https://w3id.org/security/v2",
                            "target": "urn:trinsic:wallets:noop",
diff --git a/python/tests/test_oberon.py b/python/tests/test_oberon.py
@@ -1,11 +1,18 @@
 import unittest
+from os.path import join, dirname, abspath
 
+from okapi.okapi_utils import set_library_path, get_os_arch_binary
 from okapi.proto.okapi.security.v1 import CreateOberonKeyRequest, CreateOberonTokenRequest, CreateOberonProofRequest, \
     VerifyOberonProofRequest, UnBlindOberonTokenRequest, BlindOberonTokenRequest
 from okapi.wrapper import Oberon
 
 
 class OberonTests(unittest.TestCase):
+    def setUp(self) -> None:
+        base_dir = abspath(join(dirname(__file__), '..', '..'))
+        lib_path, _ = get_os_arch_binary(base_dir)
+        set_library_path(dirname(lib_path))
+
     def test_oberon_demo(self):
         key = Oberon.create_key(CreateOberonKeyRequest())
         data = bytes("alice", "utf8")
diff --git a/ruby/lib/okapi.rb b/ruby/lib/okapi.rb
@@ -30,6 +30,14 @@ def self.library_path=(path)
     @@library_path = path
   end
 
+  def self.library_directory
+    return 'windows' if OS.windows?
+    return 'linux' if OS.linux?
+    return 'macos' if OS.mac?
+
+    raise NotImplementedError
+  end
+
   def self.library_name
     return 'okapi.dll' if OS.windows?
     return 'libokapi.so' if OS.linux?
diff --git a/ruby/test/key_test.rb b/ruby/test/key_test.rb
@@ -10,7 +10,7 @@
 
 class KeyTest < Minitest::Test
   def before_setup
-    Okapi.library_path = ('./libs')
+    Okapi.library_path = "#{__dir__}/../../libs/#{Okapi.library_directory}"
     Okapi.load_native_library
   end
 
diff --git a/ruby/test/ldproof_test.rb b/ruby/test/ldproof_test.rb
@@ -11,7 +11,7 @@
 
 class LdProofTest < Minitest::Test
   def before_setup
-    Okapi.library_path = ('./libs')
+    Okapi.library_path = "#{__dir__}/../../libs/#{Okapi.library_directory}"
     Okapi.load_native_library
   end
 
diff --git a/ruby/test/oberon_test.rb b/ruby/test/oberon_test.rb
@@ -10,7 +10,7 @@
 
 class OberonTest < Minitest::Test
   def before_setup
-    Okapi.library_path = ('./libs')
+    Okapi.library_path = "#{__dir__}/../../libs/#{Okapi.library_directory}"
     Okapi.load_native_library
   end
 
