enveloperb 0.1.5 → 0.1.6.1.gad82e0b

data/{Cargo.toml → ext/enveloperb/Cargo.toml}

@@ -6,12 +6,12 @@ edition = "2021"
 [dependencies]
 enveloper = { git = "https://github.com/cipherstash/enveloper", branch = "main" }
 lazy_static = "^0.2.2"
-rutie = { version = "0.8.4", features = ["no-link"] }
+rb-sys = "0.8.0"
+rutie = { git = "https://github.com/mpalmer/rutie", branch = "rb_sys" }
 tokio = { version = "^1.17.0", features = [ "rt-multi-thread" ] }
 aws-config = "0.10.1"
 aws-sdk-kms = "0.10.1"
 aws-types = { version = "0.10.1", features = [ "hardcoded-credentials" ] }
 
 [lib]
-name = "enveloperb"
 crate-type = ["cdylib"]

data/ext/enveloperb/extconf.rb

@@ -0,0 +1,4 @@
+require "mkmf"
+require "rb_sys/mkmf"
+
+create_rust_makefile("enveloperb/enveloperb")

data/{src → ext/enveloperb/src}/lib.rs

@@ -173,8 +173,8 @@ methods!(
 
 #[allow(non_snake_case)]
 #[no_mangle]
-pub extern "C" fn Init_libenveloperb() {
-    Module::new("Enveloperb").define(|envmod| {
+pub extern "C" fn Init_enveloperb() {
+    Module::from_existing("Enveloperb").define(|envmod| {
         envmod.define_nested_class("Simple", None).define(|klass| {
             klass.singleton_class().def_private("_new", enveloperb_simple_new);
             klass.def_private("_encrypt", enveloperb_simple_encrypt);

data/lib/enveloperb.rb

@@ -1,12 +1,14 @@
-require "fiddle"
+module Enveloperb
+end
 
 begin
-  Fiddle::Function.new(Fiddle.dlopen("#{__dir__}/#{RbConfig::CONFIG["ruby_version"]}/libenveloperb.#{RbConfig::CONFIG["SOEXT"]}")["Init_libenveloperb"], [], Fiddle::TYPE_VOIDP).call
-rescue Fiddle::DLError
+  RUBY_VERSION =~ /(\d+\.\d+)/
+  require_relative "./#{$1}/enveloperb"
+rescue LoadError
   begin
-    Fiddle::Function.new(Fiddle.dlopen("#{__dir__}/libenveloperb.#{RbConfig::CONFIG["SOEXT"]}")["Init_libenveloperb"], [], Fiddle::TYPE_VOIDP).call
-  rescue Fiddle::DLError
-    raise LoadError, "Failed to initialize libenveloperb.#{RbConfig::CONFIG["SOEXT"]}; either it hasn't been built, or was built incorrectly for your system"
+    require_relative "./enveloperb.#{RbConfig::CONFIG["DLEXT"]}"
+  rescue LoadError
+    raise LoadError, "Failed to load enveloperb.#{RbConfig::CONFIG["DLEXT"]}; either it hasn't been built, or was built incorrectly for your system"
   end
 end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enveloperb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6.1.gad82e0b
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fiddle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-    - - ">="
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
-    - - ">="
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rb_sys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -161,21 +183,23 @@ email:
 - matt@cipherstash.com
 executables: []
 extensions:
-- ext/Rakefile
+- ext/enveloperb/extconf.rb
 extra_rdoc_files: []
 files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
-- Cargo.toml
 - LICENCE
 - README.md
 - enveloperb.gemspec
-- ext/Rakefile
+- ext/enveloperb/.gitignore
+- ext/enveloperb/Cargo.lock
+- ext/enveloperb/Cargo.toml
+- ext/enveloperb/extconf.rb
+- ext/enveloperb/src/lib.rs
 - lib/enveloperb.rb
 - lib/enveloperb/awskms.rb
 - lib/enveloperb/encrypted_record.rb
 - lib/enveloperb/simple.rb
-- src/lib.rs
 homepage: https://github.com/cipherstash/enveloperb
 licenses: []
 metadata: {}
@@ -190,9 +214,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 

data/ext/Rakefile

@@ -1,12 +0,0 @@
-task :build do
-  extra_flags = if RbConfig::CONFIG["SOEXT"] == "dylib"
-                  ["--", "-C", "link-args=-flat_namespace -undefined suppress"]
-                else
-                  []
-                end
-
-  sh *(["cargo", "rustc", "--release"] + extra_flags)
-  mv "../target/release/libenveloperb.#{RbConfig::CONFIG["SOEXT"]}", "../lib" rescue nil
-end
-
-task default: :build