groonga-command-parser 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d15b5c7601c61b757b5f422f0edb1f8fb49f904a
-  data.tar.gz: 6bb40d256f229dbf2e99884facc76d6dc1da11f4
+SHA256:
+  metadata.gz: 5f7e2b01c72582f1718fdf43f61bb224754697b48fb283523fe30ef7273bb6d0
+  data.tar.gz: 0feaf747b1f1e28d4300ffe35044f94887b44571f1958d592b6c9c9f6b4ee739
 SHA512:
-  metadata.gz: 618025a3101618ce4d4dde8074158c765faa4c179de98019a2375f66419e3849a5dcec40c59a9e5d0b3230ac2a875b1b6dda7247f2dd17ca7a4fb2f9f4d1cfcf
-  data.tar.gz: 6a5f6f60e9e002bdf64949af7dbe5fb6c229b864608f695256111d2d0e1da99792e48b2c560b0721e5bdd2943d93bc7b08b9621657c5d764dc19d5d90ac15888
+  metadata.gz: 8d6e9e681c69244925c5366d7a9098a265194ac2c2ec64952ddfbd72ab584209ff14c763d3f3aebd1dc8454409b0abe3a928bba78cb32aa17d1bb883bc35c7b2
+  data.tar.gz: e096edc06404d287db93fb984e531c489290465dbb1b13c5ad719eac9a8f7e4f472fbb4acf059b66b621c875b8678fb486de225489acf8fd689bcbddfc140e38

data/Rakefile

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- mode: ruby -*-
 #
-# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -43,3 +43,13 @@ desc "Run tests"
 task :test do
   ruby("test/run-test.rb")
 end
+
+release_task = Rake.application["release"]
+# We use Trusting Publishing
+release_task.prerequisites.delete("build")
+release_task.prerequisites.delete("release:rubygem_push")
+release_task_comment = release_task.comment
+if release_task_comment
+  release_task.clear_comments
+  release_task.comment = release_task_comment.gsub(/ and build.*$/, "")
+end

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 1.1.5: 2024-12-24
+
+### Improvements
+
+  * Suppressed warnings with Ruby 3.4.
+
+## 1.1.4: 2019-03-26
+
+### Fixes
+
+  * Fixed a bug that can't convert to the Elasticsearch format
+    when a "load" command hasn't option name of "--value"
+
 ## 1.1.3: 2019-03-22
 
 ### Improvements

data/groonga-command-parser.gemspec

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- mode: ruby -*-
 #
-# Copyright (C) 2012-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -56,7 +56,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency("json-stream")
 
   spec.add_development_dependency("test-unit")
-  spec.add_development_dependency("test-unit-notify")
   spec.add_development_dependency("rake")
   spec.add_development_dependency("bundler")
   spec.add_development_dependency("packnga")

data/lib/groonga/command/parser/command/groonga-command-convert-format.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2014-2019  Kouhei Sutou <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -86,6 +86,7 @@ module Groonga
                              "Currently, we can specify 5, 6, 7, and 8" +
                                                       " in this option",
                              "Available only in elasticsearch format",
+                             Integer,
                              "[#{@elasticsearch_version}]") do |version|
               @elasticsearch_version = version
             end
@@ -94,9 +95,24 @@ module Groonga
           end
 
           def convert(input)
-            parser = Parser.new
-            parser.on_command do |command|
-              puts(convert_format(command))
+            parser = Parser.new(need_original_source: false)
+            case @format
+            when :elasticsearch
+              parser.on_load_columns do |command, columns|
+                command[:columns] ||= columns.join(",")
+              end
+              loaded_values = []
+              parser.on_load_value do |command, value|
+                loaded_values << value
+              end
+              parser.on_load_complete do |command|
+                command[:values] = JSON.generate(loaded_values)
+                puts(convert_format(command))
+              end
+            else
+              parser.on_command do |command|
+                puts(convert_format(command))
+              end
             end
             input.each_line do |line|
               parser << line

data/lib/groonga/command/parser/command-line-splitter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2015-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@ module Groonga
           start_quote = nil
           until scanner.eos?
             if start_quote
-              token = ""
+              token = +""
               loop do
                 chunk = scanner.scan_until(/#{Regexp.escape(start_quote)}/)
                 if chunk.nil?

data/lib/groonga/command/parser/error.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2011-2015  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -31,7 +29,7 @@ module Groonga
 
         private
         def compute_location(before, after)
-          location = ""
+          location = +""
           if before[-1] == ?\n
             location << before
             location << after

data/lib/groonga/command/parser/version.rb

@@ -17,7 +17,7 @@
 module Groonga
   module Command
     class Parser
-      VERSION = "1.1.3"
+      VERSION = "1.1.5"
     end
   end
 end

data/lib/groonga/command/parser.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2019  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2011-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -345,7 +345,8 @@ module Groonga
       def reset
         @command = nil
         @loading = false
-        @buffer = "".force_encoding("ASCII-8BIT")
+        @buffer = +""
+        @buffer.force_encoding("ASCII-8BIT")
         @load_values_parser = nil
       end
 
@@ -371,7 +372,8 @@ module Groonga
           if @loading
             @command.original_source << consumed if @need_original_source
             if @buffer.bytesize == consumed.bytesize
-              @buffer = "".force_encoding("ASCII-8BIT")
+              @buffer = +""
+              @buffer.force_encoding("ASCII-8BIT")
             else
               @buffer = @buffer[consumed.bytesize..-1]
             end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012-2016  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2012-2024  Sutou Kouhei <kou@clear-code.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -23,9 +23,6 @@ lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
 require "test-unit"
-require "test/unit/notify"
-
-Test::Unit::Priority.enable
 
 groonga_command_dir = File.join(base_dir, "..", "groonga-command")
 groonga_command_dir = File.expand_path(groonga_command_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2024-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -188,15 +174,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Groonga-command-parser is a Ruby library to parses [groonga](http://groonga.org/)'s
   command syntax. You can write a program to process groonga's command by using groonga-command-parser.
 test_files:
-- test/test-load-value-parser.rb
-- test/run-test.rb
-- test/test-parser.rb
 - test/groonga-command-parser-test-utils.rb
+- test/run-test.rb
 - test/test-command-line-splitter.rb
+- test/test-load-value-parser.rb
+- test/test-parser.rb