grn2drn 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4940edafe622781d134c34040b00f8334c10dd49
-  data.tar.gz: ee1a8d7a39e90e1f7eea163233c6290aded4ac90
+  metadata.gz: 6c38fc6b9e7019672486a1116916fb1564dfb8b1
+  data.tar.gz: d8ba21de8b5bac4ccf19e25c6f610d3de3509481
 SHA512:
-  metadata.gz: b90c36e609d65ae8555f7176fb38a6236f649ffdb5232e788abf3b5bca542dff3f1ec337e545e7fb89a46ba5ec54256c5074bfae615437c08b7f40c92989c5b4
-  data.tar.gz: 57500ec0df6177e1399641d305deb8903138092c2e17f4d54950b6d71628bd1273e83d1758e27d26af7d618ce2de0a0c940f2eff4b7680948b8cab4ed5c5d005
+  metadata.gz: 7bacff4c438d035c04b346e22900e36d94f52e761125d14d1839c3bda590d1ccb4dce6307d492203f792f04ea96fae9224c4c6b320324f8dfd61ebccff71f547
+  data.tar.gz: 156ed4acd12d07cbc810f4887835e752296fd160410eccd9a5fcc93510c0dffb45512e7671b371465ec4553124a11e0b1988f4d195fa899f1089b366da4471bf

data/bin/grn2drn

@@ -22,7 +22,10 @@ require "optparse"
 require "grn2drn/command-converter"
 
 options = OpenStruct.new
+options.output_path = "-"
 option_parser = OptionParser.new do |parser|
+  parser.banner += " INPUT"
+
   parser.separator("")
   parser.separator("Converts Groonga commands to Droonga messages")
 
@@ -50,11 +53,18 @@ option_parser = OptionParser.new do |parser|
             "Responses from Droonga engine will be sent to TO.") do |to|
     options.reply_to = to
   end
+
+  parser.on("--output=PATH",
+            "Output Droonga messages to PATH.",
+            "\"-\" means the standard output.",
+            "(#{options.output_path})") do |path|
+    options.output_path = path
+  end
 end
-args = option_parser.parse!(ARGV)
+option_parser.parse!(ARGV)
 
 if options.dataset.nil?
-  puts("--dataset option is missed.")
+  $stderr.puts("--dataset option is missed.")
   exit(false)
 end
 
@@ -66,9 +76,6 @@ convert_options = {
 }
 converter = Grn2Drn::CommandConverter.new(convert_options)
 
-source_file = args[0]
-result_file = args[1]
-
 def open_input(source_file)
   if source_file.nil?
     yield($stdin)
@@ -79,20 +86,18 @@ def open_input(source_file)
   end
 end
 
-def open_output(result_file)
-  if result_file.nil?
+def open_output(path)
+  if path == "-"
     yield($stdout)
   else
-    File.open("w", result_file) do |output|
+    File.open(path, "w") do |output|
       yield(output)
     end
   end
 end
 
-open_input(source_file) do |input|
-  open_output(result_file) do |output|
-    converter.convert(input) do |command|
-      output.puts(JSON.generate(command))
-    end
+open_output(options.output_path) do |output|
+  converter.convert(ARGF) do |command|
+    output.puts(JSON.generate(command))
   end
 end

data/bin/grn2drn-schema

@@ -16,15 +16,49 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+require "ostruct"
+require "optparse"
 require "json"
 
 require "grn2drn/schema-converter"
 
+def open_output(path)
+  if path == "-"
+    yield($stdout)
+  else
+    File.open(path, "w") do |output|
+      yield(output)
+    end
+  end
+end
+
+options = OpenStruct.new
+options.output_path = "-"
+option_parser = OptionParser.new do |parser|
+  parser.banner += " INPUT"
+
+  parser.separator("")
+  parser.separator("Converts Groonga schema to Droonga schema")
+
+  parser.separator("")
+  parser.separator("Optional parameters:")
+  parser.on("--output=PATH",
+            "Output Droonga messages to PATH.",
+            "\"-\" means the standard output.",
+            "(#{options.output_path})") do |path|
+    options.output_path = path
+  end
+end
+option_parser.parse!(ARGV)
+
 converter = Grn2Drn::SchemaConverter.new
 begin
   schema = converter.convert(ARGF)
 rescue Grn2Drn::Error
-  puts($!.message)
+  $stderr.puts($!.message)
   exit(false)
 end
-puts(JSON.pretty_generate(schema))
+
+open_output(options.output_path) do |output|
+  output.puts(JSON.pretty_generate(schema))
+end

data/lib/grn2drn/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grn2Drn
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grn2drn
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -112,8 +112,8 @@ description: ''
 email:
 - droonga@groonga.org
 executables:
-- grn2drn
 - grn2drn-schema
+- grn2drn
 extensions: []
 extra_rdoc_files: []
 files:
@@ -121,12 +121,12 @@ files:
 - Rakefile
 - Gemfile
 - grn2drn.gemspec
-- lib/grn2drn/command-converter.rb
-- lib/grn2drn/version.rb
 - lib/grn2drn/error.rb
+- lib/grn2drn/version.rb
 - lib/grn2drn/schema-converter.rb
-- bin/grn2drn
+- lib/grn2drn/command-converter.rb
 - bin/grn2drn-schema
+- bin/grn2drn
 homepage: https://github.com/droonga/grn2drn
 licenses:
 - GPLv3 or later
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.13
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Grn2drn is a command to convert a *.grn dump file to a JSONs file for Droonga.