ilios 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5dee1fc3383cb4e1c7ee917e6b582456b02ef3e1121ca62b65ad5f94e827706
-  data.tar.gz: c6f7a9a6ae097cc74a644ec2d1d4d1b8fadcfc09697db4a537ab6e500ed8e6ef
+  metadata.gz: 7841d4ad68b5090cc50963acc2e6f8b7962d87fce97d662f21d2e162665494de
+  data.tar.gz: 9a185b594c0406c369fa65d62bc05251e6f9dee221497a19cd940235fc38308c
 SHA512:
-  metadata.gz: 372a423c84b1a61457f2be6f7a7f639664d5854a0b274cb77936052e0ea2da29c5af61c36202d9363c9e7c1f4e39258480ecfe81e875f32bc3fad6c70b072b69
-  data.tar.gz: fa5a1d64b04fc51b1a831204af7d82154c72631f0276fee2ebfcf0641af3b82940664793c995365551312c5d8ad56ccc16fc640dbb9577410d8671c7c3d17d09
+  metadata.gz: 846bd0ef0240d01fa0fbfe1cd12b3cbb4e4430b864f745de00efd3ed9f98651444be936ab06dd693259e184219a0bfcecf570d820da0422f7bd332b6346d3fed
+  data.tar.gz: 1d5b1bd0537ab97f3c8cb4d4aa35ced037cd1a8a7c88bee18ce57ad16e8938e6edee741fb0c2eddb4697950ae1916af2da8a3b346ad452dd9c41ef0f83d73f6f

data/README.md

@@ -16,6 +16,20 @@ If bundler is not being used to manage dependencies, install the gem by executin
 $ gem install ilios
 ```
 
+This gem's installer will install the DataStax C/C++ Driver to the appropriate location automatically.
+However, if you prefer to install the DataStax C/C++ Driver manually, you can do so by executing:
+
+```sh
+$ bundle config set --local build.ilios --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
+$ bundle add ilios
+```
+
+or
+
+```sh
+$ gem install ilios -- --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
+```
+
 ## Requirements
 
 - cmake (in order to build the DataStax C/C++ Driver and libuv)

data/docker-compose.yml

@@ -8,10 +8,12 @@ services:
     - cassandra-data:/var/lib/cassandra
   ilios:
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ./dockerfiles
+      dockerfile: ubuntu.dockerfile
     depends_on:
     - cassandra
+    environment:
+      CASSANDRA_HOST: cassandra
     command: bash -c 'sleep infinity'
     volumes:
     - "./:/opt/ilios"

data/ext/ilios/extconf.rb

@@ -4,13 +4,11 @@ require File.expand_path('../../lib/ilios/version', __dir__)
 require 'fileutils'
 require 'mini_portile2'
 require 'mkmf'
+require 'native-package-installer'
 
 have_func('malloc_usable_size')
 have_func('malloc_size')
 
-CASSANDRA_CPP_DRIVER_INSTALL_PATH = File.expand_path('cpp-driver')
-LIBUV_INSTALL_PATH = File.expand_path('libuv')
-
 def num_cpu_cores
   cores =
     begin
@@ -25,40 +23,72 @@ def num_cpu_cores
   cores.positive? ? cores : 1
 end
 
-unless find_executable('cmake')
-  puts '--------------------------------------------------'
-  puts 'Error: cmake is required to build this gem'
-  puts '--------------------------------------------------'
-  raise
-end
+module LibuvInstaller
+  LIBUV_INSTALL_PATH = File.expand_path('libuv')
+  private_constant :LIBUV_INSTALL_PATH
+
+  @@special_install_path = nil
 
-unless File.exist?(LIBUV_INSTALL_PATH)
   class LibuvRecipe < MiniPortileCMake
     def configure_prefix
       "-DCMAKE_INSTALL_PREFIX=#{LIBUV_INSTALL_PATH}"
     end
   end
 
-  libuv_recipe = LibuvRecipe.new('libuv', Ilios::LIBUV_VERSION, make_command: "make -j #{num_cpu_cores}")
-  libuv_recipe.files << {
-    url: "https://github.com/libuv/libuv/archive/v#{Ilios::LIBUV_VERSION}.tar.gz"
-  }
-  libuv_recipe.cook
-  if RUBY_PLATFORM.include?('darwin')
-    unless find_executable('install_name_tool')
-      puts '------------------------------------------------------'
-      puts 'Error: install_name_tool is required to build this gem'
-      puts '------------------------------------------------------'
-      raise
+  def self.install
+    return if install_from_package
+
+    install_from_source
+  end
+
+  def self.install_from_package
+    NativePackageInstaller.install(
+      arch_linux: 'libuv',
+      alt_linux: 'libuv',
+      debian: 'libuv1-dev',
+      freebsd: 'libuv',
+      gentoo_linux: 'libuv',
+      homebrew: 'libuv',
+      macports: 'libuv',
+      redhat: 'libuv-devel'
+    )
+  end
+
+  def self.install_from_source
+    unless File.exist?(LIBUV_INSTALL_PATH)
+      libuv_recipe = LibuvRecipe.new('libuv', Ilios::LIBUV_VERSION, make_command: "make -j #{num_cpu_cores}")
+      libuv_recipe.files << {
+        url: "https://github.com/libuv/libuv/archive/v#{Ilios::LIBUV_VERSION}.tar.gz"
+      }
+      libuv_recipe.cook
+      if RUBY_PLATFORM.include?('darwin')
+        xsystem(
+          "install_name_tool -id #{LIBUV_INSTALL_PATH}/lib/libuv.1.dylib #{LIBUV_INSTALL_PATH}/lib/libuv.1.dylib"
+        )
+      end
     end
-    xsystem("install_name_tool -id #{LIBUV_INSTALL_PATH}/lib/libuv.1.dylib #{LIBUV_INSTALL_PATH}/lib/libuv.1.dylib")
+    @@special_install_path = LIBUV_INSTALL_PATH
+
+    FileUtils.rm_rf('ports')
+    FileUtils.rm_rf('tmp')
+
+    $CPPFLAGS += " -I#{LIBUV_INSTALL_PATH}/include"
+    $LDFLAGS += " -L#{LIBUV_INSTALL_PATH}/lib -Wl,-rpath,#{LIBUV_INSTALL_PATH}/lib -luv"
+  end
+
+  def self.special_install_path
+    @@special_install_path
   end
 end
 
-unless File.exist?(CASSANDRA_CPP_DRIVER_INSTALL_PATH)
+module CassandraDriverInstaller
+  CASSANDRA_CPP_DRIVER_INSTALL_PATH = File.expand_path('cpp-driver')
+  private_constant :CASSANDRA_CPP_DRIVER_INSTALL_PATH
+
   class CassandraRecipe < MiniPortileCMake
     def initialize(name, version, **kwargs)
-      ENV['LIBUV_ROOT_DIR'] = LIBUV_INSTALL_PATH
+      ENV['LIBUV_ROOT_DIR'] = LibuvInstaller.special_install_path
+
       super(name, version, **kwargs)
     end
 
@@ -67,21 +97,68 @@ unless File.exist?(CASSANDRA_CPP_DRIVER_INSTALL_PATH)
     end
   end
 
-  cassandra_recipe = CassandraRecipe.new('cpp-driver', Ilios::CASSANDRA_CPP_DRIVER_VERSION, make_command: "make -j #{num_cpu_cores}")
-  cassandra_recipe.files << {
-    url: "https://github.com/datastax/cpp-driver/archive/#{Ilios::CASSANDRA_CPP_DRIVER_VERSION}.tar.gz"
-  }
-  cassandra_recipe.cook
-  if RUBY_PLATFORM.include?('darwin')
-    xsystem("install_name_tool -id #{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib/libcassandra.2.dylib #{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib/libcassandra.2.dylib")
+  def self.install
+    return if install_from_package
+
+    install_from_source
+  end
+
+  def self.install_from_package
+    # Install Cassandra C/C++ driver via MiniPortile2.
+    # It doesn't provide pre-built package in some official repository.
+    return unless NativePackageInstaller.install(homebrew: 'cassandra-cpp-driver')
+
+    path = `brew --prefix cassandra-cpp-driver`.strip
+    $CPPFLAGS += " -I#{path}/include"
+    $LDFLAGS += " -L#{path}/lib -Wl,-rpath,#{path}/lib -lcassandra"
+
+    true
+  end
+
+  def self.install_from_source
+    unless File.exist?(CASSANDRA_CPP_DRIVER_INSTALL_PATH)
+      cassandra_recipe = CassandraRecipe.new('cpp-driver', Ilios::CASSANDRA_CPP_DRIVER_VERSION, make_command: "make -j #{num_cpu_cores}")
+      cassandra_recipe.files << {
+        url: "https://github.com/datastax/cpp-driver/archive/#{Ilios::CASSANDRA_CPP_DRIVER_VERSION}.tar.gz"
+      }
+      cassandra_recipe.cook
+      if RUBY_PLATFORM.include?('darwin')
+        xsystem(
+          "install_name_tool -id #{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib/libcassandra.2.dylib #{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib/libcassandra.2.dylib"
+        )
+      end
+    end
+    @@installed_path_from_source = CASSANDRA_CPP_DRIVER_INSTALL_PATH
+
+    FileUtils.rm_rf('ports')
+    FileUtils.rm_rf('tmp')
+
+    $CPPFLAGS += " -I#{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/include"
+    $LDFLAGS += " -L#{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib -Wl,-rpath,#{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib -lcassandra"
   end
 end
 
-FileUtils.rm_rf('ports')
-FileUtils.rm_rf('tmp')
+if (dir = with_config('--with-cassandra-driver-dir'))
+  $CPPFLAGS += " -I#{dir}/include"
+  $LDFLAGS += " -L#{dir}/lib -Wl,-rpath,#{dir}/lib -lcassandra"
+else
+
+  unless find_executable('cmake')
+    puts '--------------------------------------------------'
+    puts 'Error: cmake is required to build this gem'
+    puts '--------------------------------------------------'
+    raise
+  end
+
+  if RUBY_PLATFORM.include?('darwin') && !find_executable('install_name_tool')
+    puts('------------------------------------------------------')
+    puts('Error: install_name_tool is required to build this gem')
+    puts('------------------------------------------------------')
+    raise
+  end
 
-$CPPFLAGS += " -I#{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/include -I#{LIBUV_INSTALL_PATH}/include"
-$LDFLAGS += " -L#{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib -Wl,-rpath,#{CASSANDRA_CPP_DRIVER_INSTALL_PATH}/lib -lcassandra"
-$LDFLAGS += " -L#{LIBUV_INSTALL_PATH}/lib -Wl,-rpath,#{LIBUV_INSTALL_PATH}/lib -luv"
+  LibuvInstaller.install
+  CassandraDriverInstaller.install
+end
 
 create_makefile('ilios')

data/ext/ilios/future.c

@@ -34,7 +34,6 @@ static void future_thread_pool_init(future_thread_pool *pool)
     pool->queue = rb_funcall(cQueue, id_new, 0);
     for (int i = 0; i < THREAD_MAX; i++) {
         pool->thread[i] = rb_thread_create(future_result_yielder_thread, (void*)pool);
-        rb_funcall(pool->thread[i], id_abort_on_exception_set, 1, Qtrue);
     }
 }
 

data/ext/ilios/ilios.c

@@ -15,7 +15,6 @@ VALUE cQueue;
 VALUE id_cvar_config;
 VALUE id_shuffle;
 VALUE id_to_time;
-VALUE id_abort_on_exception_set;
 VALUE id_new;
 VALUE id_push;
 VALUE id_pop;
@@ -81,7 +80,6 @@ void Init_ilios(void)
     id_cvar_config = rb_intern("@@config");
     id_shuffle = rb_intern("shuffle");
     id_to_time = rb_intern("to_time");
-    id_abort_on_exception_set = rb_intern("abort_on_exception=");
     id_new = rb_intern("new");
     id_push = rb_intern("push");
     id_pop = rb_intern("pop");

data/ext/ilios/ilios.h

@@ -80,7 +80,6 @@ extern VALUE cQueue;
 extern VALUE id_cvar_config;
 extern VALUE id_shuffle;
 extern VALUE id_to_time;
-extern VALUE id_abort_on_exception_set;
 extern VALUE id_new;
 extern VALUE id_push;
 extern VALUE id_pop;

data/ilios.gemspec

@@ -28,11 +28,12 @@ Gem::Specification.new do |spec|
   spec.files =
     Dir.chdir(__dir__) do
       `git ls-files -z`.split("\x0").reject do |f|
-        (f == __FILE__) || f.match(%r{\A(?:(?:test|example)/|\.(?:git|editorconfig|rubocop.*))})
+        (f == __FILE__) || f.match(%r{\A(?:(?:test|dockerfiles|example)/|\.(?:git|editorconfig|rubocop.*))})
       end
     end
   spec.require_paths = ['lib']
   spec.extensions << 'ext/ilios/extconf.rb'
 
   spec.add_runtime_dependency('mini_portile2', '~> 2.8')
+  spec.add_runtime_dependency('native-package-installer', '~> 1.1')
 end

data/lib/ilios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: native-package-installer
+  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'
 description: Cassandra driver written by C language
 email:
 - watson1978@gmail.com
@@ -33,7 +47,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".yardopts"
-- Dockerfile
 - Gemfile
 - README.md
 - Rakefile
@@ -58,7 +71,7 @@ metadata:
   homepage_uri: https://github.com/Watson1978/ilios
   source_code_uri: https://github.com/Watson1978/ilios
   bug_tracker_uri: https://github.com/Watson1978/ilios/issues
-  documentation_uri: https://www.rubydoc.info/gems/ilios/0.3.0
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.3.2
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/Dockerfile

@@ -1,9 +0,0 @@
-FROM ubuntu:22.04
-
-RUN apt update && \
-    apt install -y tzdata sudo && \
-    apt install -y curl cmake make gcc g++ git bzip2 zlib1g-dev libgdbm-dev libreadline-dev libffi-dev libssl-dev libyaml-dev && \
-    git clone --depth 1 https://github.com/rbenv/ruby-build.git && \
-    cd ruby-build/bin && ./ruby-build 3.0.6 /usr/local
-
-WORKDIR /opt/ilios