enveloperb 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de566264b463ee63b0024edeccc53cfc521facee9e1c5c73fe92f01757274af
-  data.tar.gz: 4f9698390562b623fadb6553d33e453be7fc93f51f5b688c1de810db09a9d22b
+  metadata.gz: 0cbf9bca661a49920a4253d26b53558a0b24230bfdc1cc899999b6a8e833fdfa
+  data.tar.gz: aad2ec02767d93e9960f155b61f921bd81986c5536eaa0bbe2f50c14c9afb35f
 SHA512:
-  metadata.gz: 366e625212f67799750deb1187a853f1eec0f1e03e4603f5cf37b8feb83f05f3372f52c578555b15de4be0559716f9d09feae5cafbe81d83c3b8a8dd5d781c89
-  data.tar.gz: 9be09187a714dc4744bfaba126a1faa5ff806153c191c459033175f10893b5ce46138423572571f7f74716f14038cd3db002b65b7e505f32bd32db7def628259
+  metadata.gz: 4d693d44a7b3aedffdc7c2f64677f94b819e38304a8ae72723699e023b2769b2718655ff2b632a1e4c2785fdbe145da93b7df542d1cb82e3805c15e91615b35a
+  data.tar.gz: a8f4c7a5c759469ed45c29e0734966f9ac5db36428dac3a6cabd9870eb9afe3597f1aebaa21089962918b37ee7c61a51d0643b29856c753433dedd2a7a9c9c74

data/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 enveloper = { git = "https://github.com/cipherstash/enveloper", branch = "main" }
 lazy_static = "^0.2.2"
-rutie = "0.8.4"
+rutie = { version = "0.8.4", features = ["no-link"] }
 tokio = { version = "^1.17.0", features = [ "rt-multi-thread" ] }
 aws-config = "0.10.1"
 aws-sdk-kms = "0.10.1"

data/README.md

@@ -19,24 +19,22 @@ Except for testing purposes, it is not common to use envelope encryption in situ
 
 # Installation
 
-In order to build the `enveloperb` gem, you must have Rust 1.31.0 or later installed.
-On an ARM-based platform, you must use Rust nightly, for SIMD intrinsics support.
+For the most common platforms, we provide "native" gems (which have the shared object that provides the cryptographic primitives pre-compiled).
+At present, we provide native gems for:
 
-With that available, you should be able to install it like any other gem:
+* Linux `x86_64` and `aarch64`
+* macOS `x86_64` and `arm64`
 
-    gem install enveloperb
+On these platforms, you can just install the `enveloperb` gem via your preferred method, and it should "just work".
+If it doesn't, please [report that as a bug](https://github.com/cipherstash/enveloperb/issues).
 
-There's also the wonders of [the Gemfile](http://bundler.io):
+For other platforms, you will need to install the source gem, which requires that you have Rust 1.31.0 or later installed.
+On ARM-based platforms, you must use Rust nightly, for SIMD intrinsics support.
 
-    gem 'enveloperb'
+## Installing from Git
 
-If you're the sturdy type that likes to run from git:
-
-    bundle install
-    rake install
-
-Or, if you've eschewed the convenience of Rubygems entirely, then you
-presumably know what to do already.
+If you have a burning need to install directly from a checkout of the git repository, you can do so by running `bundle install && rake install`.
+As this is a source-based installation, you will need to have Rust installed, as described above.
 
 
 # Usage

data/enveloperb.gemspec

@@ -21,14 +21,12 @@ Gem::Specification.new do |s|
   s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(\.|G|spec|Rakefile)/ }
 
   s.extensions = ["ext/Rakefile"]
-  s.require_paths = ["lib", "target"]
 
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_runtime_dependency "rutie", "~> 0.0.4"
+  s.add_runtime_dependency 'fiddle', '~> 1.1'
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'gem-compiler'
   s.add_development_dependency 'github-release'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'

data/ext/Rakefile

@@ -1,5 +1,12 @@
 task :build do
-  sh "cargo build --release"
+  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

data/lib/enveloperb.rb

@@ -1,7 +1,13 @@
-require "rutie"
+require "fiddle"
 
-module Enveloperb
-  Rutie.new(:enveloperb).init 'Init_enveloperb', __dir__
+begin
+  Fiddle::Function.new(Fiddle.dlopen("#{__dir__}/#{RbConfig::CONFIG["ruby_version"]}/libenveloperb.#{RbConfig::CONFIG["SOEXT"]}")["Init_libenveloperb"], [], Fiddle::TYPE_VOIDP).call
+rescue Fiddle::DLError
+  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"
+  end
 end
 
 require_relative "./enveloperb/encrypted_record"

data/src/lib.rs

@@ -173,8 +173,8 @@ methods!(
 
 #[allow(non_snake_case)]
 #[no_mangle]
-pub extern "C" fn Init_enveloperb() {
-    Module::from_existing("Enveloperb").define(|envmod| {
+pub extern "C" fn Init_libenveloperb() {
+    Module::new("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);

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: enveloperb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rutie
+  name: fiddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gem-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: github-release
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +183,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- target
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="