lmdb 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec26115e9cc3611f3305c308a5a26959e0f2ff6438c191968a562c85808fb6ed
-  data.tar.gz: 866b32d018335fa61dbefdc30234c976573a307ad11ae31c260a902cba6812e8
+  metadata.gz: 5673437b11f0c87befc6f0003aaa1c25f8c20ec3270147396d45c8af38fb0a78
+  data.tar.gz: 407eadc211c71c38cc8d1e4523f2639abb964e187452635af7b603ce5e3eb565
 SHA512:
-  metadata.gz: '0356608ed8065cb4065a752fff8e4aa657fc29c38630e45d278c7edcad4fd211f8129e87eba2e323f2f72a8751b6a43ead97501ece2c8a504cfc9eb0e3b0174c'
-  data.tar.gz: 7f1e02c62e406c108bd7db8875cf528c2ec43cca0beb2ab1ae6380a71b3054b74b66beddd98404e3de93de0928d9221aca9e73c6b309caa5734a0ef78d2d1313
+  metadata.gz: '0596fdb966d1373d03a739901ca441fb3df42b7257566b07a8ee513c1b30ea7b9b8fcfa1ae6f5a1efcbae7a5b91c7983f6d83fc1e6ffa6d63fba6c9572623c39'
+  data.tar.gz: cbfd03a44df15275c6bf66d10501e5d86d6a6bf3bee949588ae7d9b89cd9e03bf57ddb7f3502f56d7128ddf500658d502ea0436bc4868c455a0d139c7525a74c

data/README.md

@@ -1,13 +1,21 @@
 # LMDB
 
-Ruby bindings for the amazing [OpenLDAP's Lightning Memory-Mapped Database (LMDB)](https://www.symas.com/lmdb/).
+These are Ruby bindings [OpenLDAP's excellent Lightning Memory-Mapped
+Database (LMDB)](https://www.symas.com/lmdb/).
 
 ## Installation
 
-Install via rubygems:
+Install via [RubyGems](https://rubygems.org/gems/lmdb/):
 
-```ruby
-gem install lmdb
+```bash
+$ gem install lmdb
+```
+
+If you want to force the bundled LMDB over your system version
+(assuming one is present, along with headers):
+
+```bash
+$ gem install lmdb -- --vendor-lmdb
 ```
 
 ## Links

data/Rakefile

@@ -76,3 +76,51 @@ namespace :release do
     abort "#{tag} exists; update version!" unless `git tag -l #{tag}`.empty?
   end
 end
+
+# all this business is to download actual releases of lmdb instead of using
+# git submodules
+
+require 'open-uri'
+require 'json'
+require 'fileutils'
+require 'rubygems/package'
+require 'zlib'
+
+LMDB_VENDOR_DIR = File.expand_path('vendor/liblmdb', __dir__)
+LMDB_NEEDED     = %w[mdb.c midl.c lmdb.h midl.h].freeze
+
+namespace :lmdb do
+  desc 'Fetch the latest LMDB C source into vendor/liblmdb'
+  task :fetch do
+    tags_url = 'https://api.github.com/repos/LMDB/lmdb/tags?per_page=20'
+    headers  = { 'User-Agent' => 'rb-lmdb-gem-fetch' }
+
+    tags = JSON.parse(URI.open(tags_url, headers).read)
+    # warn tags.inspect
+    # Tags are like "LMDB_0_9_32" — pick the highest numeric one
+    tag  = tags
+      .map { |t| t['name'] }
+      .select { |n| n.match?(/\ALMDB_\d+[_.]\d+[_.]\d+\z/) }
+      .max_by { |n| n.scan(/\d+/).map(&:to_i) }
+
+    abort 'Could not determine latest LMDB tag' unless tag
+    puts "Fetching LMDB #{tag}..."
+
+    tarball_url = "https://github.com/LMDB/lmdb/archive/refs/tags/#{tag}.tar.gz"
+    FileUtils.mkdir_p(LMDB_VENDOR_DIR)
+
+    # Stream the tarball, extract only the liblmdb source files we need
+    URI.open(tarball_url, headers) do |gz|
+      Gem::Package::TarReader.new(Zlib::GzipReader.new(gz)).each do |entry|
+        base = File.basename(entry.full_name)
+        next unless entry.file? && LMDB_NEEDED.include?(base)
+        dest = File.join(LMDB_VENDOR_DIR, base)
+        File.write(dest, entry.read)
+        puts "  -> #{dest}"
+      end
+    end
+
+    File.write(File.join(LMDB_VENDOR_DIR, 'VERSION'), "#{tag}\n")
+    puts "Done. LMDB #{tag} vendored in #{LMDB_VENDOR_DIR}."
+  end
+end

data/ext/lmdb_ext/extconf.rb

@@ -3,18 +3,35 @@ require 'mkmf'
 $CFLAGS << ' -std=c99 -Wall -g '
 $CFLAGS << ' -fdeclspec' if /darwin/.match? RUBY_PLATFORM
 
-# Embed lmdb if we cannot find it
-if enable_config("bundled-lmdb", false) || !(find_header('lmdb.h') && have_library('lmdb', 'mdb_env_create'))
-  lmdbpath = "../../vendor/libraries/liblmdb"
-  $INCFLAGS << " -I$(srcdir)/#{lmdbpath}"
-  $VPATH ||= []
-  $VPATH << "$(srcdir)/#{lmdbpath}"
-  # XXX this is a sketchy, sketchy way to do this
-  $srcs = Dir.glob("#{$srcdir}/{#{lmdbpath}/{mdb,midl}.c,*.c}").map do |n|
-    File.basename(n)
-  end
+dir_config('lmdb')
+
+# --vendor flag: skip system lmdb and always build from vendored source
+vendor_forced = arg_config('--vendor-lmdb', false)
+
+have_system_lmdb = false
+
+unless vendor_forced
+  have_system_lmdb =
+    have_header('lmdb.h') && have_library('lmdb', 'mdb_env_create')
 end
 
+unless have_system_lmdb
+  vendor_dir = File.expand_path('../../vendor/liblmdb', __dir__)
+  abort <<~MSG unless File.exist?(File.join(vendor_dir, 'mdb.c'))
+    Could not find system lmdb and no vendored source found.
+    Run `rake lmdb:fetch` to download the LMDB C source, then retry.
+  MSG
+
+  warn "Building from vendored LMDB source in #{vendor_dir}"
+  $INCFLAGS << " -I#{vendor_dir}"
+  $srcs = Dir[File.join(__dir__, '*.c')] +
+          [File.join(vendor_dir, 'mdb.c'),
+           File.join(vendor_dir, 'midl.c')]
+  $VPATH << vendor_dir
+end
+
+
+
 have_header 'limits.h'
 have_header 'string.h'
 have_header 'stdlib.h'
@@ -23,8 +40,10 @@ have_header 'sys/types.h'
 have_header 'assert.h'
 
 have_header 'ruby.h'
+
 have_func 'rb_funcall_passing_block'
 have_func 'rb_thread_call_without_gvl2'
+have_func 'rb_gc_mark_movable'
 
 create_header