htot_conv 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5f671f2c6eb3e7bc5c8ba10c10b7dfba0417a3
-  data.tar.gz: 051cd8132c24bb1e640171f747a25342f8b59d45
+  metadata.gz: 7d6b05b18971056f0854dc2b5674f8022bc3da6c
+  data.tar.gz: 4009d559fa7b8268f3f56c27767bb1e3b15d9b26
 SHA512:
-  metadata.gz: 3b658635745828831f4fdb86a97e14eb3aaddca9a8fe606ad8ea3ce366f743de8e100350dc82e278fa3832d2464585dff1ffddc41c0ebb60984b3db8543ad6e9
-  data.tar.gz: 4521c421e386868aee477c20a6f7a33a78d225304be6e8f894560963f2862d9fde61f8c3cd915555f5c7964b7888b68f9c38dde662c91143e5771d2c2b8b6837
+  metadata.gz: 6d281c8cc12e304d6da77a91c2a1b306aa08e4943f953f955c721bed6cee91fb0a7686600561770cf658307d77cb33486c57f2a33ce5902a148f621f9a4360b1
+  data.tar.gz: a44f3092a705a11583df6c651dedbb4006a6fc6d0a07cb93128e3c34a4ee3696ad8e27dbc73329ed815c184aab7bc830a08abc6e6fb22b0a869957949166ca3d

data/lib/htot_conv/cli.rb

@@ -16,7 +16,7 @@ module HTOTConv
       end
       attr_accessor :options, :from_options, :to_options
 
-      def define_options(opts)
+      def define_options(opts, io_filter=false)
         opts.banner       = %q{Hierarchical-Tree Outline Text Converter}
         opts.define_head    %q{Usage: htot_conv [options] [input] [output]}
         opts.separator      %q{}
@@ -53,11 +53,31 @@ module HTOTConv
 
         opts.separator ""
         opts.separator "I/O Options:"
-        define_sub_options(opts, HTOTConv::Parser, "from") do |key, v|
-          @from_options[key] = v
+        if io_filter
+          define_sub_options_of(opts, HTOTConv::Parser, options[:from_type], "from") do |key, v|
+            @from_options[key] = v
+          end
+          define_sub_options_of(opts, HTOTConv::Generator, options[:to_type], "from") do |key, v|
+            @to_options[key] = v
+          end
+        else
+          define_sub_options(opts, HTOTConv::Parser, "from") do |key, v|
+            @from_options[key] = v
+          end
+          define_sub_options(opts, HTOTConv::Generator, "to") do |key, v|
+            @to_options[key] = v
+          end
         end
-        define_sub_options(opts, HTOTConv::Generator, "to") do |key, v|
-          @to_options[key] = v
+      end
+
+      private
+      def define_sub_options_of(opts, klass, type, prefix) # :yields: key, v
+        type_klass = klass.const_get(Rinne.camelize(type.to_s))
+        type_klass.option_help.each do |key,v|
+          long_option = "--#{prefix}-#{key.to_s.tr('_','-')}"
+          opts.on("#{long_option}=VAL", v[:pat], "For #{type}, #{v[:desc]}") do |v|
+            yield key, v
+          end
         end
       end
 
@@ -102,6 +122,17 @@ module HTOTConv
       OptionParser.new do |opts|
         script_opts.define_options(opts)
 
+        begin
+          opts.parse!(args.dup)
+        rescue OptionParser::ParseError => ex
+          $stderr << ex.message << "\n"
+          exit 1
+        end
+      end
+
+      OptionParser.new do |opts|
+        script_opts.define_options(opts, true)
+
         begin
           opts.parse!(args)
         rescue OptionParser::ParseError => ex

data/lib/htot_conv/generator/xlsx_type3.rb

@@ -23,7 +23,9 @@ module HTOTConv
         ws.add_row([
           @data.key_header[0],
           *(HTOTConv::Util.pad_array([@data.value_header[0]], max_level)),
-          *((@data.value_header.length <= 1)? [] : @data.value_header.last(@data.value_header.length - 1)),
+          *(HTOTConv::Util.pad_array(
+            (@data.value_header.length <= 1)? [] : @data.value_header.last(@data.value_header.length - 1),
+            [max_value_length - 1, 0].max)),
         ], :style => Axlsx::STYLE_THIN_BORDER)
         1.upto(max_level) do |col_idx|
           edges = [:top, :bottom]
@@ -37,8 +39,9 @@ module HTOTConv
           key_value_cell = Array.new(max_level + 1, nil)
           key_value_cell[item.level - 1] = item.key
           key_value_cell[item.level    ] = item.value[0]
-          rest_value_cell = (item.value.length <= 1)? [] :
-            HTOTConv::Util.pad_array(item.value.last(item.value.length - 1), max_value_length - 1)
+          rest_value_cell = HTOTConv::Util.pad_array(
+            (item.value.length <= 1)? [] : item.value.last(item.value.length - 1),
+            [max_value_length - 1, 0].max)
 
           ws.add_row(key_value_cell.concat(rest_value_cell),
                      :style => Axlsx::STYLE_THIN_BORDER)

data/lib/htot_conv/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module HTOTConv
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htot_conv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - "@cat_in_136"
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: axlsx