Accept "--encoding" option

bin/grn2drn

@@ -25,6 +25,7 @@ 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
 
@@ -34,15 +35,18 @@ option_parser = OptionParser.new do |parser|
   parser.separator("Converts Groonga commands to Droonga messages")
 
   parser.separator("")
-  parser.separator("Required parameters:")
   parser.on("--dataset=DATASET",
             "Use DATASET as \"dataset\" field value",
             "(#{options.dataset})") do |dataset|
     options.dataset = dataset
   end
 
-  parser.separator("")
-  parser.separator("Optional parameters:")
+  parser.on("-e, --encoding=ENCODING",
+            "Read input dump 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
@@ -78,6 +82,7 @@ convert_options = {
   :date => options.date,
   :reply_to => options.reply_to,
   :dataset => options.dataset,
+  :encoding => options.encoding,
 }
 converter = Grn2Drn::CommandConverter.new(convert_options)
 

lib/grn2drn/command-converter.rb

@@ -53,8 +53,9 @@ def convert(input, &block)
         command.original_source.clear
       end
 
+      encoding = @options[:encoding] || "UTF-8"
       input.each_line do |line|
-        @command_parser << line.force_encoding("UTF-8")
+        @command_parser << line.force_encoding(encoding)
       end
       @command_parser.finish
     end