ilios 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb732bdcf04d5150f8294a8338ee88f0cb25b45fa103262fa609c66d7ab3bcd4
-  data.tar.gz: 6d9806c6187c7bff25edfa9ca7bba20da49a55f08caa65a6306fb3a0b9255b81
+  metadata.gz: ceba4d7103c0e542adda7973a184cb9d029b46ba623847bbde1c1b11edbb413e
+  data.tar.gz: bb78ed04ba7d91d76e312f3427fc9d9785bec6f29c4e361d10f53ad1f60d6ab2
 SHA512:
-  metadata.gz: c55c0599ca523bf7bf9864ac9e7f34d1dbfb65bbaea0beba6fe9bfaff23a5e2cd288659fe531652a795e6cf913a1575e5a4645dcf0e3635352bbf2ca0c82acaa
-  data.tar.gz: 2f9c1ef1d6d5fce24903cde814ffb652f84fe922c792459f10d981a03767376697bde1e20401e3843e1b7efb7e8f51c9f3ff372e4bb21c85338487dd2d73d035
+  metadata.gz: e28cd2f61d785722dab6f55a9ccabbea253814f9204cce2a3d7b167fef41fe1f6a23fe80b4cc8b9b404136052a82eef38aa72e8bae358fe4fd0786538b147f99
+  data.tar.gz: 49adffa5274303d4246606b55add435d1dc14cbf63917ac5f2291dfe63f6fac5457847d969317eb0e39cf3cff3d51b6b5480bd9f75ee5bc643afe415c7b38042

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

@@ -43,8 +43,9 @@ module LibuvInstaller
 
   def self.install_from_package
     NativePackageInstaller.install(
-      arch_linux: 'libuv',
+      alpine_linux: 'libuv-dev',
       alt_linux: 'libuv',
+      arch_linux: 'libuv',
       debian: 'libuv1-dev',
       freebsd: 'libuv',
       gentoo_linux: 'libuv',
@@ -87,7 +88,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
@@ -98,23 +99,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}")
@@ -157,7 +144,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/ilios.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.extensions << 'ext/ilios/extconf.rb'
 
   spec.add_runtime_dependency('mini_portile2', '~> 2.8')
-  spec.add_runtime_dependency('native-package-installer', '~> 1.1')
+  spec.add_runtime_dependency('native-package-installer', '~> 1.1', '>= 1.1.9')
 end

data/lib/ilios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '0.4.1'
+  VERSION = '0.4.3'
   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.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Watson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.9
 description: Cassandra driver written by C language
 email:
 - watson1978@gmail.com
@@ -71,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.1
+  documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.3
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -89,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