groonga-command-parser 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6586a6d72a155715ad67c47652183969cf9a5255
-  data.tar.gz: a3879393e9c3d9f09718c8f253b2cdc86be05119
+  metadata.gz: a842fe9087d59d4d37a94dba22f419576d192b09
+  data.tar.gz: 60a05fe87c274df64c6abd2e9d14c33162999d9d
 SHA512:
-  metadata.gz: 7354d617dd59ffba8f795c914b73a439eee43a03916a6eea2bd7843aa02fcdaaa53c0a57dc756f308a49e77f1a90e1bd29c171c463bf2ca8972447738d1509ba
-  data.tar.gz: 9abeebb9d08f1af5866533f0599e7e09bde3ca2be723716863822d7a2a36a80db6f0f2832ecb183210456fb4f1e650a4350e07e5797732f7ab1b313fbec00913
+  metadata.gz: a4bee897857636e1286a8e49bd6b1a1ba49d6e1351cff6280dbb75a447855482efeea89de190ce899fdaa169020fcdd59dd6691a93ce67c0d89794d7a729d1c9
+  data.tar.gz: 79ef8b01fd136994a4782e3137c65b7a59159318e2c640dd3e6ebdf98a5ef1bb29bba036561514e665701c5558dee15144e370e46bb4fa9b739aafa875b3e7fb

data/bin/groonga-command-convert-format

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "groonga/command/parser/command/groonga-command-convert-format"
+
+command = Groonga::Command::Parser::Command::GroongaCommandConvertFormat.new
+exit(command.run(ARGV))

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 1.0.3: 2014-12-12
+
+### Improvements
+
+  * Added "groonga-command-convert-format" command that converts
+    command format.
+
 ## 1.0.2: 2014-10-02
 
 ### Improvements

data/groonga-command-parser.gemspec

@@ -44,9 +44,9 @@ Gem::Specification.new do |spec|
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("doc/text/*")
   spec.test_files += Dir.glob("test/**/*")
-  # Dir.chdir("bin") do
-  #   spec.executables = Dir.glob("*")
-  # end
+  Dir.chdir("bin") do
+    spec.executables = Dir.glob("*")
+  end
 
   spec.homepage = "https://github.com/groonga/groonga-command-parser"
   spec.licenses = ["LGPLv2.1+"]

data/lib/groonga/command/parser.rb

@@ -369,7 +369,7 @@ module Groonga
         end
         name, output_type = name.split(/\./, 2)
         arguments["output_type"] = output_type if output_type
-        command_class = Command.find(name)
+        command_class = ::Groonga::Command.find(name)
         command = command_class.new(name, arguments)
         command.original_format = :uri
         command.path_prefix = prefix
@@ -400,7 +400,7 @@ module Groonga
             ordered_arguments << argument
           end
         end
-        command_class = Command.find(name)
+        command_class = ::Groonga::Command.find(name)
         command = command_class.new(name, pair_arguments, ordered_arguments)
         command.original_format = :command
         command

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

@@ -0,0 +1,98 @@
+# Copyright (C) 2014  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "optparse"
+
+require "groonga/command/parser"
+
+module Groonga
+  module Command
+    class Parser
+      module Command
+        class GroongaCommandConvertFormat
+          def initialize
+            @format = :command
+            @uri_prefix = "http://localhost:10041"
+          end
+
+          def run(argv=ARGV)
+            begin
+              parse_options!(argv)
+            rescue OptionParser::ParseError
+              puts($!.message)
+              return false
+            end
+
+            input_paths = argv
+            if input_paths.empty?
+              convert($stdin)
+            else
+              input_paths.each do |input_path|
+                File.open(input_path) do |input|
+                  convert(input)
+                end
+              end
+            end
+
+            true
+          end
+
+          private
+          def parse_options!(argv)
+            option_parser = OptionParser.new
+            option_parser.banner += " INPUT_PATH1 INPUT_PATH2 ..."
+            option_parser.version = VERSION
+
+            formats = [:uri, :command]
+            option_parser.on("--format=FORMAT", formats,
+                             "Convert to FORMAT",
+                             "Available formats #{formats.join(', ')}",
+                             "[#{@format}]") do |format|
+              @format = format
+            end
+
+            option_parser.on("--uri-prefix=PREFIX",
+                             "Add PREFIX to URI",
+                             "[#{@uri_prefix}]") do |prefix|
+              @uri_prefix = prefix
+            end
+
+            option_parser.parse!(argv)
+          end
+
+          def convert(input)
+            parser = Parser.new
+            parser.on_command do |command|
+              puts(convert_format(command))
+            end
+            input.each_line do |line|
+              parser << line
+            end
+          end
+
+          def convert_format(command)
+            case @format
+            when :uri
+              "#{@uri_prefix}#{command.to_uri_format}"
+            else
+              command.to_command_format
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2014  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
@@ -19,7 +19,7 @@
 module Groonga
   module Command
     class Parser
-      VERSION = "1.0.2"
+      VERSION = "1.0.3"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-command-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command
@@ -139,7 +139,8 @@ dependencies:
 description: ''
 email:
 - kou@clear-code.com
-executables: []
+executables:
+- groonga-command-convert-format
 extensions: []
 extra_rdoc_files: []
 files:
@@ -147,10 +148,12 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/groonga-command-convert-format
 - doc/text/lgpl-2.1.txt
 - doc/text/news.md
 - groonga-command-parser.gemspec
 - lib/groonga/command/parser.rb
+- lib/groonga/command/parser/command/groonga-command-convert-format.rb
 - lib/groonga/command/parser/error.rb
 - lib/groonga/command/parser/version.rb
 - test/groonga-command-parser-test-utils.rb
@@ -182,7 +185,7 @@ 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/groonga-command-parser-test-utils.rb
-- test/run-test.rb
 - test/test-parser.rb
+- test/run-test.rb
+- test/groonga-command-parser-test-utils.rb
 has_rdoc: