ilios 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e09127ca5ccb928a707381f139375a696974507f091bdf3ec1a2185675080876
-  data.tar.gz: b7aef5f16585006b628fcfc1339fa4a2cf8465f14beb7fb690ea97b0b2a81bd2
+  metadata.gz: e28970c92e0e274f14457318e1ab9ddd17dcdb197cc89084d2d58fe9b51afb14
+  data.tar.gz: 9dab2538fd742cc4f85ae9a864348a97ba6d9655ababbd633c1477781be5274d
 SHA512:
-  metadata.gz: 222d8e3072aeb17174d13282af923eeff30eb2be1fa143adc4cb37a6c266b8c3023c1723aa0fe5eee49acda2a98702ebea1e6628e5d8c9fde1a3a8c5838f4f38
-  data.tar.gz: 2533002a89d9f0a3311ac31682538985e80133183976ac4f5187cf4e3553e128ac22a0ef57d6cfd92e37e5af8cff53efe864c652536670cfbba83a4e8367d4e2
+  metadata.gz: fe695966bf3b1dacf3825ceb73d689b7b38f4488fb11d3bdea777942aa0c7e5b653d2a3be2eff4cc5cc897af489583deb6ae383874a0c814e4270452091dc4b1
+  data.tar.gz: 310d435e083b862b4e890edd4195ff58363494fd7b4c47612d7cc1fbd794f80faab7da6e2fdb333b26df49326641ab87803805f39e7ff14cab0c915d8d539015

data/README.md

@@ -20,6 +20,7 @@ This gem's installer will install the DataStax C/C++ Driver to the appropriate l
 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-libuv-dir=/path/to/libuv-installed-dir
 $ bundle config set --local build.ilios --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
 $ bundle add ilios
 ```
@@ -27,7 +28,7 @@ $ bundle add ilios
 or
 
 ```sh
-$ gem install ilios -- --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
+$ gem install ilios -- --with-libuv-dir=/path/to/libuv-installed-dir --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
 ```
 
 ## Requirements

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   cassandra:
-    image: cassandra:4
+    image: cassandra:5
     ports:
     - 9042:9042
     volumes:

data/ext/ilios/extconf.rb

@@ -9,18 +9,22 @@ require 'native-package-installer'
 have_func('malloc_usable_size')
 have_func('malloc_size')
 
+MAX_CORES = 8
+
 def num_cpu_cores
   cores =
     begin
       if RUBY_PLATFORM.include?('darwin')
-        Integer(`sysctl -n hw.ncpu`, 10) - 1
+        Integer(`sysctl -n hw.ncpu`, 10)
       else
-        Integer(`nproc`, 10) - 1
+        Integer(`nproc`, 10)
       end
     rescue StandardError
       2
     end
-  cores.positive? ? cores : 1
+
+  return 1 if cores <= 0
+  cores >= 7 ? MAX_CORES : cores
 end
 
 module LibuvInstaller
@@ -88,7 +92,7 @@ module CassandraDriverInstaller
 
   class CassandraRecipe < MiniPortileCMake
     def initialize(name, version, **kwargs)
-      ENV['LIBUV_ROOT_DIR'] = LibuvInstaller.special_install_path
+      ENV['LIBUV_ROOT_DIR'] ||= LibuvInstaller.special_install_path
 
       super(name, version, **kwargs)
     end
@@ -99,23 +103,9 @@ module CassandraDriverInstaller
   end
 
   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}")
@@ -158,7 +148,13 @@ else
     raise
   end
 
-  LibuvInstaller.install
+  if (dir = with_config('--with-libuv-dir'))
+    $CPPFLAGS += " -I#{dir}/include"
+    $LDFLAGS += " -L#{dir}/lib -Wl,-rpath,#{dir}/lib -luv"
+    ENV['LIBUV_ROOT_DIR'] = dir
+  else
+    LibuvInstaller.install
+  end
   CassandraDriverInstaller.install
 end
 

data/lib/ilios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '0.4.2'
+  VERSION = '0.4.4'
   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.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -77,7 +77,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.4.2
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.4
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cmake
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Cassandra driver written by C language