grn2drn 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c38fc6b9e7019672486a1116916fb1564dfb8b1
-  data.tar.gz: d8ba21de8b5bac4ccf19e25c6f610d3de3509481
+  metadata.gz: 6b881ef409eb9ed83ad1af4b266945828a251a49
+  data.tar.gz: 86b5c9cda0770503aa48faa9fc26ab7a5d6eff8e
 SHA512:
-  metadata.gz: 7bacff4c438d035c04b346e22900e36d94f52e761125d14d1839c3bda590d1ccb4dce6307d492203f792f04ea96fae9224c4c6b320324f8dfd61ebccff71f547
-  data.tar.gz: 156ed4acd12d07cbc810f4887835e752296fd160410eccd9a5fcc93510c0dffb45512e7671b371465ec4553124a11e0b1988f4d195fa899f1089b366da4471bf
+  metadata.gz: dabdcf4ed5dfbd0531fac2456c0439138e6f5dc227b98c3bc979332f5afa04204e5aa3beab94e38aa6149a6d0e0cc4f1575beeebe33585f2cb810d1658fed05e
+  data.tar.gz: 843449bcafa9ea97f5e3bed00c06d783125238593858db7a77cecb0d322920bfcbd18ccba71190ebd7548066eeac7267ddb0b99496904018fea86a6e1d39d9cf

data/bin/grn2drn

@@ -19,25 +19,34 @@
 require "ostruct"
 require "optparse"
 
+require "grn2drn/version"
 require "grn2drn/command-converter"
 
 options = OpenStruct.new
 options.output_path = "-"
+options.dataset = "Default"
+options.encoding = "UTF-8"
 option_parser = OptionParser.new do |parser|
+  parser.version = Grn2Drn::VERSION
+
   parser.banner += " INPUT"
 
   parser.separator("")
   parser.separator("Converts Groonga commands to Droonga messages")
 
   parser.separator("")
-  parser.separator("Required parameters:")
   parser.on("--dataset=DATASET",
-            "Use DATASET as \"dataset\" field value") do |dataset|
+            "Use DATASET as \"dataset\" field value",
+            "(#{options.dataset})") do |dataset|
     options.dataset = dataset
   end
 
-  parser.separator("")
-  parser.separator("Optional parameters:")
+  parser.on("--encoding=ENCODING",
+            "Read input as strings encoded in ENCODING",
+            "(#{options.encoding})") do |encoding|
+    options.encoding = encoding
+  end
+
   parser.on("--id-prefix=PREFIX",
             "Use PREFIX as prefix of IDs") do |prefix|
     options.id_prefix = prefix
@@ -76,16 +85,6 @@ convert_options = {
 }
 converter = Grn2Drn::CommandConverter.new(convert_options)
 
-def open_input(source_file)
-  if source_file.nil?
-    yield($stdin)
-  else
-    File.open(source_file) do |input|
-      yield(input)
-    end
-  end
-end
-
 def open_output(path)
   if path == "-"
     yield($stdout)
@@ -96,6 +95,8 @@ def open_output(path)
   end
 end
 
+ARGF.set_encoding(options.encoding)
+
 open_output(options.output_path) do |output|
   converter.convert(ARGF) do |command|
     output.puts(JSON.generate(command))

data/bin/grn2drn-schema

@@ -20,6 +20,7 @@ require "ostruct"
 require "optparse"
 require "json"
 
+require "grn2drn/version"
 require "grn2drn/schema-converter"
 
 def open_output(path)
@@ -35,6 +36,8 @@ end
 options = OpenStruct.new
 options.output_path = "-"
 option_parser = OptionParser.new do |parser|
+  parser.version = Grn2Drn::VERSION
+
   parser.banner += " INPUT"
 
   parser.separator("")

data/lib/grn2drn/schema-converter.rb

@@ -49,7 +49,7 @@ module Grn2Drn
       end
 
       input.each_line do |line|
-        command_parser << line
+        command_parser << line.force_encoding("UTF-8")
       end
       command_parser.finish
 

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.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grn2drn
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Droonga Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -121,9 +121,9 @@ files:
 - Rakefile
 - Gemfile
 - grn2drn.gemspec
-- lib/grn2drn/error.rb
-- lib/grn2drn/version.rb
 - lib/grn2drn/schema-converter.rb
+- lib/grn2drn/version.rb
+- lib/grn2drn/error.rb
 - lib/grn2drn/command-converter.rb
 - bin/grn2drn-schema
 - bin/grn2drn