rroonga 14.1.2 → 15.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e743a4f12cf79bf5b69af96c6cb7aec72900dcf48316494b9acc41281eb182
-  data.tar.gz: 18af75fdf1d051bd57a36642c526fc3bbce572695c09de55912a7998a6030b00
+  metadata.gz: a8c53dad486923a4125523854fc1a538064bd66f7eca124a49d41cd8678e36f4
+  data.tar.gz: 29f8b4c3ca44a611e5ef943dd021dca22aaf5a749caaa6919092b07cbc521a44
 SHA512:
-  metadata.gz: 91261fdf0a7a10bb90554cd3efb7758df845789c68a972a0dd7336fcc5f427f0f5470e5780d723541477e603c4b22fcaf5fb039bb50363f8f0b2682b9b977c3c
-  data.tar.gz: 7ad28c09541ad3b0b676445e6c31c8fcfe1cc417ecbd0e6dd068400aa887e0951b1a865242cc27b667639150cae1afb8f99d0865c6304ad0af21fd5b64c02db9
+  metadata.gz: f9953a1cff0d6dd71d32268a37e1f4cf3a00c68b5be4e750b0f52206100252eca38c81f2a4a5c13b2f697f3269247b02be62c899c13fd30424d575302b29cf51
+  data.tar.gz: 469bcf0c193330227165df69424cedc00639ef13a31a5c8d0be427ebf242fb374c0bf0fd98bc8c3a41dab197dd445da0ea43259a7523fab9c51767e96dc2e1d4

data/Gemfile

@@ -1,4 +1,4 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
 # Copyright (C) 2011-2013  Kouhei Sutou <kou@clear-code.com>
 #
@@ -17,4 +17,13 @@
 
 source "https://rubygems.org/"
 
+plugin "rubygems-requirements-system"
+
 gemspec
+
+gem "bundler"
+gem "kramdown"
+gem "packnga", ">= 1.0.0"
+gem "rake"
+gem "test-unit", ">= 3.0.0"
+gem "yard"

data/README.md

@@ -43,7 +43,21 @@ contributed patches.)
 
 ## Install
 
-    % sudo gem install rroonga
+If you're using Bundler, add `plugin "rubygems-requirements-system"`
+and `gem "rroonga"` to your `Gemfile`:
+
+```ruby
+plugin "rubygems-requirements-system"
+
+gem "rroonga"
+```
+
+If you're not using Bundler, install `rubygems-requirements-system`
+and `rroonga`:
+
+```bash
+sudo gem install rubygems-requirements-system rroonga
+```
 
 ## Documents
 

data/doc/text/news.md

@@ -1,5 +1,14 @@
 # NEWS
 
+## 15.0.4: 2025-03-29 {#version-15-0-4}
+
+### Improvements
+
+  * Dropped support for
+    [native-package-installer](https://rubygems.org/gems/native-package-installer).
+    We use only
+    [rubygems-requirements-system](https://rubygems.org/gems/rubygems-requirements-system).
+
 ## 14.1.2: 2025-01-09 {#version-14-1-2}
 
 ### Improvements

data/ext/groonga/extconf.rb

@@ -25,7 +25,6 @@ require "shellwords"
 require "tmpdir"
 require "uri"
 
-require "native-package-installer"
 require "pkg-config"
 
 base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
@@ -190,18 +189,7 @@ def install_local_groonga(package_name, major, minor, micro)
   add_rpath_for_local_groonga
 end
 
-need_auto_groonga_install = false
 unless PKGConfig.have_package(package_name, major, minor, micro)
-  if NativePackageInstaller.install(debian: "libgroonga-dev",
-                                    homebrew: "groonga",
-                                    msys2: "groonga")
-    need_auto_groonga_install =
-      !PKGConfig.have_package(package_name, major, minor, micro)
-  else
-    need_auto_groonga_install = true
-  end
-end
-if need_auto_groonga_install
   install_local_groonga(package_name, major, minor, micro)
 end
 

data/ext/groonga/rb-grn-less-operator.c

@@ -46,7 +46,7 @@ VALUE rb_cGrnLessOperator;
 static VALUE
 rb_grn_less_operator_exec (int argc, VALUE *argv, VALUE self)
 {
-    grn_bool less;
+    bool less;
     VALUE rb_x;
     VALUE rb_y;
     VALUE rb_options;

data/ext/groonga/rb-grn-table-key-support.c

@@ -250,7 +250,7 @@ rb_grn_table_key_support_add (int argc, VALUE *argv, VALUE self)
 {
     grn_id id;
     VALUE key, values;
-    int added = GRN_FALSE;
+    int added = false;
 
     rb_scan_args(argc, argv, "11", &key, &values);
     id = rb_grn_table_key_support_add_raw(self, key, &added);
@@ -659,12 +659,12 @@ static VALUE
 rb_grn_table_key_support_get_value (int argc, VALUE *argv, VALUE self)
 {
     VALUE rb_id_or_key, rb_options;
-    grn_bool use_key;
+    bool use_key;
 
     rb_scan_args(argc, argv, "11", &rb_id_or_key, &rb_options);
 
     if (NIL_P(rb_options)) {
-        use_key = GRN_TRUE;
+        use_key = true;
     } else {
         VALUE rb_option_id;
 
@@ -729,12 +729,12 @@ static VALUE
 rb_grn_table_key_support_set_value (int argc, VALUE *argv, VALUE self)
 {
     VALUE rb_id_or_key, rb_value, rb_options;
-    grn_bool use_key;
+    bool use_key;
 
     rb_scan_args(argc, argv, "21", &rb_id_or_key, &rb_value, &rb_options);
 
     if (NIL_P(rb_options)) {
-        use_key = GRN_TRUE;
+        use_key = true;
     } else {
         VALUE rb_option_id;
 
@@ -775,7 +775,7 @@ rb_grn_table_key_support_get_default_tokenizer (VALUE self)
                                  NULL);
     rb_grn_context_check(context, self);
 
-    return GRNOBJECT2RVAL(Qnil, context, tokenizer, GRN_FALSE);
+    return GRNOBJECT2RVAL(Qnil, context, tokenizer, false);
 }
 
 /*
@@ -905,7 +905,7 @@ rb_grn_table_key_support_get_normalizer (VALUE self)
     normalizer = grn_obj_get_info(context, table, GRN_INFO_NORMALIZER, NULL);
     rb_grn_context_check(context, self);
 
-    return GRNOBJECT2RVAL(Qnil, context, normalizer, GRN_FALSE);
+    return GRNOBJECT2RVAL(Qnil, context, normalizer, false);
 }
 
 /*
@@ -1020,7 +1020,7 @@ rb_grn_table_key_support_tokenize (int argc, VALUE *argv, VALUE self)
     grn_obj *table;
     char *string;
     int string_size;
-    grn_bool add_p;
+    bool add_p;
     grn_obj tokens;
 
     rb_scan_args(argc, argv, "11", &rb_string, &rb_options);

data/ext/groonga/rb-grn.h

@@ -91,9 +91,9 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_HAVE_FLOAT32 GRN_VERSION_OR_LATER(10, 0, 2)
 
-#define RB_GRN_MAJOR_VERSION 14
-#define RB_GRN_MINOR_VERSION 1
-#define RB_GRN_MICRO_VERSION 2
+#define RB_GRN_MAJOR_VERSION 15
+#define RB_GRN_MINOR_VERSION 0
+#define RB_GRN_MICRO_VERSION 4
 
 #define RB_GRN_OBJECT(object) ((RbGrnObject *)(object))
 #define RB_GRN_NAMED_OBJECT(object) ((RbGrnNamedObject *)(object))

data/rroonga.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012-2020  Sutou Kouhei <kou@clear-code.com>
+# Copyright (C) 2012-2025  Sutou Kouhei <kou@clear-code.com>
 # Copyright (C) 2017  Masafumi Yokoyama <yokoyama@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
@@ -85,45 +85,38 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("groonga-client", ">= 0.0.3")
   s.add_runtime_dependency("json")
-  s.add_runtime_dependency("native-package-installer")
   s.add_runtime_dependency("pkg-config")
-  s.add_runtime_dependency("rubygems-requirements-system")
-  s.add_development_dependency("test-unit", [">= 3.0.0"])
-  s.add_development_dependency("rake")
-  s.add_development_dependency("bundler")
-  s.add_development_dependency("yard")
-  s.add_development_dependency("packnga", [">= 1.0.0"])
-  s.add_development_dependency("kramdown")
 
   required_groonga_version = RroongaBuild::RequiredGroongaVersion::STRING
   s.metadata["msys2_mingw_dependencies"] = "groonga>=#{required_groonga_version}"
 
   package = "groonga>=#{required_groonga_version}"
+  groonga_base_url = "https://packages.groonga.org"
   [
+    # Try without additional APT repositories
     [
       "debian",
-      "https://apache.jfrog.io/artifactory/arrow/%{distribution}/apache-arrow-apt-source-latest-%{code_name}.deb",
+      "libgroonga-dev",
     ],
     [
       "debian",
-      "https://packages.groonga.org/%{distribution}/groonga-apt-source-latest-%{code_name}.deb",
-    ],
-    [
-      "ubuntu",
-      "ppa:groonga/ppa",
+      "#{groonga_base_url}/%{distribution}/groonga-apt-source-latest-%{code_name}.deb",
     ],
+    # Retry with additional APT repositories
     [
       "debian",
       "libgroonga-dev",
     ],
+    # Try without additional Yum repositories
     [
       "rhel",
-      "https://apache.jfrog.io/artifactory/arrow/almalinux/%{major_version}/apache-arrow-release-latest.rpm",
+      "pkgconfig(groonga)",
     ],
     [
       "rhel",
-      "https://packages.groonga.org/almalinux/%{major_version}/groonga-release-latest.noarch.rpm",
+      "#{groonga_base_url}/almalinux/%{major_version}/groonga-release-latest.noarch.rpm",
     ],
+    # Retry without additional Yum repositories
     [
       "rhel",
       "pkgconfig(groonga)",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 14.1.2
+  version: 15.0.4
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -11,7 +11,7 @@ authors:
 - SHIDARA Yoji
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-client
@@ -41,20 +41,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: native-package-installer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pkg-config
   requirement: !ruby/object:Gem::Requirement
@@ -69,104 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubygems-requirements-system
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: packnga
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |-
   Rroonga is an extension library to use Groonga's DB-API
   layer. Rroonga provides Rubyish readable and writable API
@@ -399,11 +287,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'system: groonga>=12.0.2: debian: https://apache.jfrog.io/artifactory/arrow/%{distribution}/apache-arrow-apt-source-latest-%{code_name}.deb'
+- 'system: groonga>=12.0.2: debian: libgroonga-dev'
 - 'system: groonga>=12.0.2: debian: https://packages.groonga.org/%{distribution}/groonga-apt-source-latest-%{code_name}.deb'
-- 'system: groonga>=12.0.2: ubuntu: ppa:groonga/ppa'
 - 'system: groonga>=12.0.2: debian: libgroonga-dev'
-- 'system: groonga>=12.0.2: rhel: https://apache.jfrog.io/artifactory/arrow/almalinux/%{major_version}/apache-arrow-release-latest.rpm'
+- 'system: groonga>=12.0.2: rhel: pkgconfig(groonga)'
 - 'system: groonga>=12.0.2: rhel: https://packages.groonga.org/almalinux/%{major_version}/groonga-release-latest.noarch.rpm'
 - 'system: groonga>=12.0.2: rhel: pkgconfig(groonga)'
 - 'system: groonga>=12.0.2: homebrew: groonga'