kor 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd2fdf2bb00f0d166762cc23c182273f237606f1
-  data.tar.gz: 6700bcd1a6abdeb9f6314fb995325bfc50eac6a9
+  metadata.gz: f945e02d461ae630c93756a59d37a1adbc2c3783
+  data.tar.gz: 6eb078d973ea6ea8e185461501518639951949f5
 SHA512:
-  metadata.gz: 6a6e55a09cede35a09fece484ad381715f7d64ddd758437e4308e4393b05c9da1866cb08c9af900e243dffc04da0598fd2f99c317d41b04935457397d8df1b20
-  data.tar.gz: a49f5751f123785943068bfdea8a8cc0668a311d3a1f3ee8d523e190dad2a7acf14c6a712d4b791a7d020574c0a4da7544bb58ea3ac0cb6ffe73f0274f01bf17
+  metadata.gz: bccf7c8361ee7937e60d8740b98b906e2ae10444298fb386a231f12a3280614ba99b166923ce92c21bdcfc5bc6d1c9d81420a1c75cd2fc30048a3f152fa7cd1c
+  data.tar.gz: fffda929139840318ea989547d663675124bd5022c42cb14cea70be5a8f42f5c76a599702167f1b2e7c51b717b28f8faccc978213c05e98bbebb5f915d66c425

data/README.md

@@ -42,9 +42,9 @@ Input from stdin and output to stdout.
 
 ```
 $ kor
-kor [input-plugin] [input-option] [output-plugin] [output-option]
+kor [option] [input-plugin] [input-option] [output-plugin] [output-option]
 example:
-  $ kor csv markdown
+  $ kor --sync csv markdown --strip
 ```
 
 ### input-plugin

data/lib/kor.rb

@@ -1,2 +1,7 @@
-require "kor/cli"
-require "kor/version"
+module Kor
+  class NotKeyError < StandardError
+  end
+
+  require "kor/cli"
+  require "kor/version"
+end

data/lib/kor/cli.rb

@@ -1,52 +1,55 @@
 require 'optparse'
-require 'thread'
 require "kor/input/base"
 require "kor/output/base"
 
 module Kor
   class Cli
+    USAGE = <<-USAGE
+kor [option] [input-plugin] [input-option] [output-plugin] [output-option]
+example:
+  $ kor --sync csv markdown --strip
+USAGE
+
     def initialize(argv = ARGV, input_io = $stdin, output_io = $stdout)
       @argv = argv
       @input_io = input_io
       @output_io = output_io
+    end
 
-      @input_plugin = argv.shift
-      @input_args = []
-      while argv.first && argv.first[0] == "-"
-        @input_args << argv.shift
+    def run
+      cli_args = shift
+      cli_opt = OptionParser.new
+      cli_opt.on("--sync", "I/O sync mode") do |arg|
+        @input_io.sync = true
+        @output_io.sync = true
       end
+      cli_opt.parse(cli_args)
 
-      @output_plugin = argv.shift
-      @output_args = []
-      while argv.first && argv.first[0] == "-"
-        @output_args << argv.shift
+      input_plugin = @argv.shift
+      input_args = shift
+      unless input_plugin
+        @output_io.puts Cli::USAGE
+        exit 0
       end
-    end
+      require_plugin "kor/input/#{input_plugin}"
+      in_class = Kor::Input.const_get(input_plugin.capitalize)
+      in_obj = in_class.new(@input_io)
+      in_opt = OptionParser.new
+      in_obj.parse(in_opt)
+      in_opt.parse(input_args)
 
-    def run
-      unless @input_plugin && @output_plugin
-        @output_io.puts <<-USAGE
-kor [input-plugin] [input-option] [output-plugin] [output-option]
-example:
-  $ kor csv markdown
-USAGE
+      output_plugin = @argv.shift
+      output_args = shift
+      unless output_plugin
+        @output_io.puts Cli::USAGE
         exit 0
       end
-
-      require "kor/input/#{@input_plugin}"
-      require "kor/output/#{@output_plugin}"
-
-      in_class = Kor::Input.const_get(@input_plugin.capitalize)
-      out_class = Kor::Output.const_get(@output_plugin.capitalize)
-      in_obj = in_class.new(@input_io)
+      require_plugin "kor/output/#{output_plugin}"
+      out_class = Kor::Output.const_get(output_plugin.capitalize)
       out_obj = out_class.new(@output_io)
-
-      in_opt = OptionParser.new
       out_opt = OptionParser.new
-      in_obj.parse(in_opt)
       out_obj.parse(out_opt)
-      in_opt.parse(@input_args)
-      out_opt.parse(@output_args)
+      out_opt.parse(output_args)
 
       out_obj.head(in_obj.head)
       while body = in_obj.gets
@@ -54,5 +57,22 @@ USAGE
       end
       out_obj.finish
     end
+
+    private
+
+    def shift
+      args = []
+      while @argv.first && @argv.first[0] == "-"
+        args << @argv.shift
+      end
+      args
+    end
+
+    def require_plugin(name)
+      require name
+    rescue LoadError
+      warn "LoadError: `#{name}' plugin not found"
+      exit 1
+    end
   end
 end

data/lib/kor/input/markdown.rb

@@ -1,19 +1,39 @@
 module Kor
   module Input
     class Markdown < Base
+      def parse(opt)
+        opt.on("--key=KEY", "filter key set (e.g. foo,bar,baz)") do |arg|
+          @filter_key = arg
+        end
+      end
+
       def head
         line = io.gets.strip
         first_index = line[0] == '|' ? 1 : 0
-        h = line.split('|')[first_index..-1].map(&:strip)
+        keys = line.split('|')[first_index..-1].map(&:strip)
         # skip separate line
         io.gets
-        h
+        if @filter_key
+          @filter_key = @filter_key.split(",").map do |key|
+            if index = keys.index(key)
+              index
+            else
+              raise NotKeyError, "`#{key}' is a not key of this table"
+            end
+          end
+          keys = @filter_key.map{ |index| keys[index] }
+        end
+        keys
       end
 
       def gets
         if line = io.gets
           first_index = line[0] == '|' ? 1 : 0
-          line.strip.split('|')[first_index..-1].map(&:strip)
+          body = line.strip.split('|')[first_index..-1].map(&:strip)
+          if @filter_key
+            return @filter_key.map{ |index| body[index] }
+          end
+          body
         else
           nil
         end

data/lib/kor/input/markdown_test.rb

@@ -13,7 +13,7 @@ MARKDOWN
 foo | bar | baz |
 --- | --- | ---
 | 1  |  2  |  3
-a  |  b  |  c |  
+a  |  b  |  c |
 MARKDOWN
     exit m.run
   end
@@ -34,6 +34,38 @@ MARKDOWN
     end
   end
 
+  def test_with_key(t)
+    @io.rewind
+    md = Kor::Input::Markdown.new(@io)
+    opt = OptionParser.new
+    md.parse(opt)
+
+    opt.parse ["--key=bar,nothing"]
+    _, err = go { md.head }
+    unless Kor::NotKeyError === err
+      t.error("expect raise an error Kor::NotKeyError got #{err.class}:#{err}")
+    end
+
+    @io.rewind
+    opt.parse ["--key=bar,foo"]
+    actual = md.head
+    expect = %w(bar foo)
+    if actual != expect
+      t.error("expect #{expect} got #{actual}")
+    end
+
+    expects = [
+      %w(2 1),
+      %w(b a),
+      nil, nil, nil, nil, nil
+    ].each do |expect|
+      actual = md.gets
+      if actual != expect
+        t.error("expect #{expect} got #{actual}")
+      end
+    end
+  end
+
   def test_gets(t)
     @io.rewind
     md = Kor::Input::Markdown.new(@io)
@@ -73,4 +105,10 @@ MARKDOWN
       end
     end
   end
+
+  def go
+    [yield, nil]
+  rescue Exception => err
+    [nil, err]
+  end
 end

data/lib/kor/output/markdown.rb

@@ -6,17 +6,32 @@ module Kor
         opt.on("--strip", "strip space") do |arg|
           @space = ""
         end
+        opt.on("--key=KEY", "select output keys (like foo,bar,baz)") do |arg|
+          @select_key = arg
+        end
       end
 
       def head(keys)
+        if @select_key
+          select_keys = @select_key.split(",")
+          @select_key = select_keys.map do |key|
+            keys.index(key) or raise NotKeyError, "`#{key}' is not a key of this table"
+          end
+          keys = select_keys
+        end
         s = @space || " "
         io.puts "|#{s}#{keys.join("#{s}|#{s}")}#{s}|"
         io.puts "|#{s}#{(["---"] * keys.length).join("#{s}|#{s}")}#{s}|"
       end
 
       def puts(values)
-        s = @space || " "
-        io.puts "|#{s}#{values.join("#{s}|#{s}")}#{s}|"
+        if @select_key
+          s = @space || " "
+          io.puts "|#{s}#{@select_key.map{ |index| values[index] }.join("#{s}|#{s}")}#{s}|"
+        else
+          s = @space || " "
+          io.puts "|#{s}#{values.join("#{s}|#{s}")}#{s}|"
+        end
       end
     end
   end

data/lib/kor/output/markdown_test.rb

@@ -4,19 +4,67 @@ require 'kor/output/markdown'
 module KorOutputMarkdownTest
   def test_head(t)
     io = StringIO.new
-    csv = Kor::Output::Markdown.new(io)
-    csv.head(%w(foo bar baz))
+    md = Kor::Output::Markdown.new(io)
+    md.head(%w(foo bar baz))
     if io.string != "| foo | bar | baz |\n| --- | --- | --- |\n"
       t.error("expect output '| foo | bar | baz |\\n| --- | --- | --- |\\n' got #{io.string.inspect}")
     end
   end
 
+  def test_head_with_key(t)
+    io = StringIO.new
+    md = Kor::Output::Markdown.new(io)
+    opt = OptionParser.new
+    md.parse(opt)
+    opt.parse ["--key=foo,nothing"]
+    _, err = go { md.head(["foo", "bar", "baz"]) }
+    unless Kor::NotKeyError === err
+      t.error("expect raise Kor::Output::Markdown::NotKeyError got #{err.class}:#{err}")
+    end
+
+    opt.parse ["--key=bar,foo"]
+    _, err = go { md.head(["foo", "bar", "baz"]) }
+    t.error("expect not raise got #{err.class}:#{err}") if err
+    if io.string != "| bar | foo |\n| --- | --- |\n"
+      t.error("expect bar,foo header got #{head}")
+    end
+  end
+
   def test_puts(t)
     io = StringIO.new
-    csv = Kor::Output::Markdown.new(io)
-    csv.puts(%w(aaa bbb ccc))
+    md = Kor::Output::Markdown.new(io)
+    md.puts(%w(aaa bbb ccc))
     if io.string != "| aaa | bbb | ccc |\n"
       t.error("expect output '| aaa | bbb | ccc |\\n' got #{io.string.inspect}")
     end
   end
+
+  def test_puts_with_key(t)
+    io = StringIO.new
+    md = Kor::Output::Markdown.new(io)
+    opt = OptionParser.new
+    md.parse(opt)
+    opt.parse ["--key=bar,foo"]
+    md.head %w(foo bar baz)
+    md.puts %w(aaa bbb ccc)
+    md.puts %w(100 200 300)
+    io.rewind
+    io.gets
+    io.gets
+    actual = io.gets
+    if actual != "| bbb | aaa |\n"
+      t.error("expect output '| bbb | aaa |\\n' got #{actual}")
+    end
+
+    actual = io.gets
+    if actual != "| 200 | 100 |\n"
+      t.error("expect output '| 200 | 100 |\\n' got #{actual}")
+    end
+  end
+
+  def go
+    [yield, nil]
+  rescue Exception => err
+    [nil, err]
+  end
 end

data/lib/kor/version.rb

@@ -1,3 +1,3 @@
 module Kor
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler