ilios 0.4.2 → 0.4.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e09127ca5ccb928a707381f139375a696974507f091bdf3ec1a2185675080876
4
- data.tar.gz: b7aef5f16585006b628fcfc1339fa4a2cf8465f14beb7fb690ea97b0b2a81bd2
3
+ metadata.gz: ceba4d7103c0e542adda7973a184cb9d029b46ba623847bbde1c1b11edbb413e
4
+ data.tar.gz: bb78ed04ba7d91d76e312f3427fc9d9785bec6f29c4e361d10f53ad1f60d6ab2
5
5
  SHA512:
6
- metadata.gz: 222d8e3072aeb17174d13282af923eeff30eb2be1fa143adc4cb37a6c266b8c3023c1723aa0fe5eee49acda2a98702ebea1e6628e5d8c9fde1a3a8c5838f4f38
7
- data.tar.gz: 2533002a89d9f0a3311ac31682538985e80133183976ac4f5187cf4e3553e128ac22a0ef57d6cfd92e37e5af8cff53efe864c652536670cfbba83a4e8367d4e2
6
+ metadata.gz: e28cd2f61d785722dab6f55a9ccabbea253814f9204cce2a3d7b167fef41fe1f6a23fe80b4cc8b9b404136052a82eef38aa72e8bae358fe4fd0786538b147f99
7
+ data.tar.gz: 49adffa5274303d4246606b55add435d1dc14cbf63917ac5f2291dfe63f6fac5457847d969317eb0e39cf3cff3d51b6b5480bd9f75ee5bc643afe415c7b38042
data/README.md CHANGED
@@ -20,6 +20,7 @@ This gem's installer will install the DataStax C/C++ Driver to the appropriate l
20
20
  However, if you prefer to install the DataStax C/C++ Driver manually, you can do so by executing:
21
21
 
22
22
  ```sh
23
+ $ bundle config set --local build.ilios --with-libuv-dir=/path/to/libuv-installed-dir
23
24
  $ bundle config set --local build.ilios --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
24
25
  $ bundle add ilios
25
26
  ```
@@ -27,7 +28,7 @@ $ bundle add ilios
27
28
  or
28
29
 
29
30
  ```sh
30
- $ gem install ilios -- --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
31
+ $ gem install ilios -- --with-libuv-dir=/path/to/libuv-installed-dir --with-cassandra-driver-dir=/path/to/cassandra-cpp-driver-installed-dir
31
32
  ```
32
33
 
33
34
  ## Requirements
data/docker-compose.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  version: '3'
2
2
  services:
3
3
  cassandra:
4
- image: cassandra:4
4
+ image: cassandra:5
5
5
  ports:
6
6
  - 9042:9042
7
7
  volumes:
data/ext/ilios/extconf.rb CHANGED
@@ -88,7 +88,7 @@ module CassandraDriverInstaller
88
88
 
89
89
  class CassandraRecipe < MiniPortileCMake
90
90
  def initialize(name, version, **kwargs)
91
- ENV['LIBUV_ROOT_DIR'] = LibuvInstaller.special_install_path
91
+ ENV['LIBUV_ROOT_DIR'] ||= LibuvInstaller.special_install_path
92
92
 
93
93
  super(name, version, **kwargs)
94
94
  end
@@ -99,23 +99,9 @@ module CassandraDriverInstaller
99
99
  end
100
100
 
101
101
  def self.install
102
- return if install_from_package
103
-
104
102
  install_from_source
105
103
  end
106
104
 
107
- def self.install_from_package
108
- # Install Cassandra C/C++ driver via MiniPortile2.
109
- # It doesn't provide pre-built package in some official repository.
110
- return unless NativePackageInstaller.install(homebrew: 'cassandra-cpp-driver')
111
-
112
- path = `brew --prefix cassandra-cpp-driver`.strip
113
- $CPPFLAGS += " -I#{path}/include"
114
- $LDFLAGS += " -L#{path}/lib -Wl,-rpath,#{path}/lib -lcassandra"
115
-
116
- true
117
- end
118
-
119
105
  def self.install_from_source
120
106
  unless File.exist?(CASSANDRA_CPP_DRIVER_INSTALL_PATH)
121
107
  cassandra_recipe = CassandraRecipe.new('cpp-driver', Ilios::CASSANDRA_CPP_DRIVER_VERSION, make_command: "make -j #{num_cpu_cores}")
@@ -158,7 +144,13 @@ else
158
144
  raise
159
145
  end
160
146
 
161
- LibuvInstaller.install
147
+ if (dir = with_config('--with-libuv-dir'))
148
+ $CPPFLAGS += " -I#{dir}/include"
149
+ $LDFLAGS += " -L#{dir}/lib -Wl,-rpath,#{dir}/lib -luv"
150
+ ENV['LIBUV_ROOT_DIR'] = dir
151
+ else
152
+ LibuvInstaller.install
153
+ end
162
154
  CassandraDriverInstaller.install
163
155
  end
164
156
 
data/lib/ilios/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Ilios
4
- VERSION = '0.4.2'
4
+ VERSION = '0.4.3'
5
5
  public_constant :VERSION
6
6
 
7
7
  CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ilios
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Watson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-12-23 00:00:00.000000000 Z
11
+ date: 2024-02-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mini_portile2
@@ -77,7 +77,7 @@ metadata:
77
77
  homepage_uri: https://github.com/Watson1978/ilios
78
78
  source_code_uri: https://github.com/Watson1978/ilios
79
79
  bug_tracker_uri: https://github.com/Watson1978/ilios/issues
80
- documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.2
80
+ documentation_uri: https://www.rubydoc.info/gems/ilios/0.4.3
81
81
  rubygems_mfa_required: 'true'
82
82
  post_install_message:
83
83
  rdoc_options: []
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
95
95
  version: '0'
96
96
  requirements:
97
97
  - cmake
98
- rubygems_version: 3.4.10
98
+ rubygems_version: 3.5.3
99
99
  signing_key:
100
100
  specification_version: 4
101
101
  summary: Cassandra driver written by C language