tefil 0.0.2 → 0.0.3

data/CHANGES

@@ -1,6 +1,13 @@
 = vasputils changelog
 
-== Master (for 0.0.2)
+== Master
+
+== Version 0.0.3 [2013-05-10] released
+* Rename TextFilter to Tefil
+* Add Tefil::ColumnFormer
+* Add -l(left alline) option to formcolumn command.
+
+== Version 0.0.2 [2013-04-18] released
 * Adjust to builtinextension-0.1.0.
 
 == Version 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/formcolumn

@@ -14,35 +14,18 @@ require "tefil"
 # option analysis
 OPTIONS = {:separator => ' '}
 op = OptionParser.new
-op.on("-o"    , "--overwrite"    , "Overwrite."){    OPTIONS[:overwrite] = true}
-op.on("-s char"    , "--separator=char"    , "Indicate separator."){|val| OPTIONS[:separator] = val}
+op.on("-o"     , "--overwrite"     , "Overwrite."){    OPTIONS[:overwrite] = true}
+op.on("-s char", "--separator=char", "Indicate separator."){|val| OPTIONS[:separator] = val}
+op.on("-l"     , "--left-alline"   , "Left alline."){ OPTIONS[:left] = true}
 op.parse!(ARGV)
 
-module TextFilter
+module Tefil
   def self.process_stream(in_io, out_io)
     rows = in_io.readlines.map { |line| line.strip.split(INPUT_SEPARATOR) }
-
-    #Obtain max length for each column.
-    max_lengths = []
-    rows.each do |row|
-      row.each_with_index do |item, index|
-        max_lengths[index] ||= 0
-        size = item.size
-        max_lengths[index] = size if max_lengths[index] < size
-      end
-    end
-
-    #Output
-    rows.each do |row|
-      new_items = []
-      row.each_with_index do |item, index|
-        new_items[index] = sprintf("%#{max_lengths[index]}s", item )
-      end
-      out_io.puts new_items.join(OPTIONS[:separator])
-    end
+    Tefil::ColumnFormer.form(rows, out_io, OPTIONS[:separator], OPTIONS[:left])
   end
 end
 
 OPTIONS[:overwrite] ||= false
 
-TextFilter.run(ARGV, OPTIONS[:overwrite])
+Tefil.run(ARGV, OPTIONS[:overwrite])

data/bin/lineedit

@@ -17,7 +17,7 @@ op.on("-r"    , "--randomize" , "Randomize."){    OPTIONS[:random] = true}
 op.on("-o"    , "--overwrite"    , "Overwrite."){    OPTIONS[:overwrite] = true}
 op.parse!(ARGV)
 
-module TextFilter
+module Tefil
   def self.process_stream(in_io, out_io)
     in_io.each do |line|
       if OPTIONS[:sort]
@@ -34,5 +34,5 @@ OPTIONS[:overwrite] ||= false
 
 
 #pp OPTIONS[:overwrite]
-#TextFilter.run(ARGV, OPTIONS[:overwrite])
-TextFilter.run(ARGV, OPTIONS[:overwrite])
+#Tefil.run(ARGV, OPTIONS[:overwrite])
+Tefil.run(ARGV, OPTIONS[:overwrite])

data/bin/lineescapezsh

@@ -17,7 +17,7 @@ op = OptionParser.new
 op.on("-o"    , "--overwrite"    , "Overwrite."){    OPTIONS[:overwrite] = true}
 op.parse!(ARGV)
 
-module TextFilter
+module Tefil
   def self.process_stream(in_io, out_io)
     in_io.each do |line|
       out_io.puts line.escape_zsh
@@ -27,4 +27,4 @@ end
 
 OPTIONS[:overwrite] ||= false
 
-TextFilter.run(ARGV, OPTIONS[:overwrite])
+Tefil.run(ARGV, OPTIONS[:overwrite])

data/bin/linesub

@@ -19,7 +19,7 @@ op.parse!(ARGV)
 OLD_PATTERN = ARGV.shift
 NEW_STR = ARGV.shift
 
-module TextFilter
+module Tefil
   def self.process_stream(in_io, out_io)
     in_io.each do |line|
       if OPTIONS[:global]
@@ -33,4 +33,4 @@ end
 
 OPTIONS[:overwrite] ||= false
 
-TextFilter.run(ARGV, OPTIONS[:overwrite])
+Tefil.run(ARGV, OPTIONS[:overwrite])

data/lib/tefil/columnformer.rb

@@ -0,0 +1,34 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+#
+#
+#
+module Tefil::ColumnFormer
+  def self.form(matrix, io = $stdout, separator = " ", left = false)
+    #Obtain max length for each column.
+    max_lengths = []
+    matrix.each do |row|
+      row.each_with_index do |item, index|
+        item = item.to_s
+        max_lengths[index] ||= 0
+        size = item.size
+        max_lengths[index] = size if max_lengths[index] < size
+      end
+    end
+
+    #Output
+    matrix.each do |row|
+      new_items = []
+
+      form_left = ""
+      form_left = "-" if left
+
+      row.each_with_index do |item, index|
+        new_items[index] = sprintf("%#{form_left}#{max_lengths[index]}s", item)
+      end
+      io.puts new_items.join(separator).sub(/ +$/, "")
+    end
+  end
+end
+

data/lib/tefil.rb

@@ -26,7 +26,7 @@ require "tempfile"
 # If indicated file(s) not found,
 # this program notify on stderr and does not throw an exception.
 #
-module TextFilter
+module Tefil
 
   class NotRedefinedMethodError < Exception; end
   class TypeError < Exception; end
@@ -73,10 +73,11 @@ module TextFilter
   # An argument 'in_io' indicates an io (file handle) for input.
   # Another argument 'out_io' indicates an io (file handle) for output.
   # This method must be redefined in a subclass or be overridden.
-  # If not redefined, raise an exception TextFilter::NotRedefinedMethodError.
+  # If not redefined, raise an exception Tefil::NotRedefinedMethodError.
   def self.process_stream(in_io, out_io)
     raise NotRedefinedMethodError
   end
 
 end
 
+require "tefil/columnformer"

data/test/test_columnformer.rb

@@ -0,0 +1,33 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "helper"
+#require "test/unit"
+#require "pkg/klass.rb"
+require "stringio"
+
+class TC_ColumnFormer < Test::Unit::TestCase
+  def test_form
+    io = StringIO.new
+    matrix = [
+      ["a", "ab"],
+      ["abc", "a"],
+    ]
+    Tefil::ColumnFormer.form(matrix, io)
+    io.rewind
+    assert_equal("  a ab\nabc  a\n", io.read)
+
+    io = StringIO.new
+    Tefil::ColumnFormer.form(matrix, io, ",")
+    io.rewind
+    assert_equal("  a,ab\nabc, a\n", io.read)
+
+    io = StringIO.new
+    Tefil::ColumnFormer.form(matrix, io, " ", true )
+    io.rewind
+    assert_equal("a   ab\nabc a\n", io.read)
+    io.rewind
+
+  end
+end
+

data/test/test_tefil.rb

@@ -6,7 +6,7 @@ require "stringio"
 require "tempfile"
 require "fileutils"
 
-module TextFilter
+module Tefil
   def self.process_stream(in_file, out_file)
     results = []
     in_file.each do |line|
@@ -40,8 +40,8 @@ class TestTefil < Test::Unit::TestCase
 
   def test_self_run
     # Not found
-    assert_raise(Errno::ENOENT){ TextFilter.run([""]) }
-    assert_raise(Errno::ENOENT){ TextFilter.run([""], true) }
+    assert_raise(Errno::ENOENT){ Tefil.run([""]) }
+    assert_raise(Errno::ENOENT){ Tefil.run([""], true) }
 
     # ファイル指定なしで標準入力
     $stdin = StringIO.new
@@ -50,7 +50,7 @@ class TestTefil < Test::Unit::TestCase
     $stdin.rewind
     # stdout
     $stdout = StringIO.new
-    TextFilter.run([], false)
+    Tefil.run([], false)
     $stdout.rewind
     t = $stdout.readlines
     assert_equal([ "Abc\n", "def\n" ], t)
@@ -61,7 +61,7 @@ class TestTefil < Test::Unit::TestCase
     $stdin.puts "def"
     $stdin.rewind
     $stdout = StringIO.new
-    TextFilter.run([], true)
+    Tefil.run([], true)
     $stdout.rewind
     t = $stdout.readlines
     assert_equal([ "Abc\n", "def\n" ], t)
@@ -71,7 +71,7 @@ class TestTefil < Test::Unit::TestCase
     # overwrite なし。
     setup
     $stdout = StringIO.new
-    TextFilter.run([TMP00])
+    Tefil.run([TMP00])
     $stdout.rewind
     tmp = $stdout.readlines
     assert_equal(["Abc\n", "def\n"], tmp)
@@ -84,7 +84,7 @@ class TestTefil < Test::Unit::TestCase
     # overwrite あり
     setup
     $stdout = StringIO.new
-    TextFilter.run([TMP00], true)
+    Tefil.run([TMP00], true)
     $stdout.rewind
     tmp = $stdout.readlines
     assert_equal([], tmp)
@@ -98,7 +98,7 @@ class TestTefil < Test::Unit::TestCase
     # overwrite なし。
     setup
     $stdout = StringIO.new
-    TextFilter.run([TMP00, TMP01])
+    Tefil.run([TMP00, TMP01])
     $stdout.rewind
     tmp = $stdout.readlines
     assert_equal(["Abc\n", "def\n", "Abc\n", "def\n", "cAb\n"], tmp)
@@ -111,7 +111,7 @@ class TestTefil < Test::Unit::TestCase
     # overwrite あり。
     setup
     $stdout = StringIO.new
-    TextFilter.run([TMP00, TMP01], true)
+    Tefil.run([TMP00, TMP01], true)
     $stdout.rewind
     stdout = $stdout.readlines
     assert_equal([], stdout)
@@ -126,22 +126,5 @@ class TestTefil < Test::Unit::TestCase
     $stdin  = STDIN
   end
 
-  def test_textfilter_command
-    #result = `echo "ab" | textfilter a A`
-    #assert_equal("Ab\n", result)
-
-    #setup
-    #result = `textfilter a A #{TMP00}`
-    #assert_equal("Abc\ndef\n", result)
-    #str = File.open(TMP00, "r").read
-    #assert_equal("abc\ndef\n", str)
-
-    #setup
-    #result = `textfilter -o a A #{TMP00}`
-    #assert_equal("", result)
-    #str = File.open(TMP00, "r").read
-    #assert_equal("Abc\ndef\n", str)
-  end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tefil
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85293740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *85293740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85293490 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *85293490
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85293240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *85293240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &85292980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85292980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builtinextension
-  requirement: &85292730 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *85292730
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: ! "This gem provides a framework of text filter.\n    Tefil eneable to
   make text filter commands which have overwrite option easily.\n  "
 email: ippei94da@gmail.com
@@ -91,9 +116,10 @@ files:
 - bin/lineescapezsh
 - bin/linesub
 - lib/tefil.rb
-- tefil.gemspec
+- lib/tefil/columnformer.rb
 - test/formcolumn_space
 - test/helper.rb
+- test/test_columnformer.rb
 - test/test_tefil.rb
 homepage: http://github.com/ippei94da/tefil
 licenses:
@@ -110,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -610993165
+      hash: 416452449
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Basic framework of text filter

data/tefil.gemspec

@@ -1,68 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "tefil"
-  s.version = "0.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["ippei94da"]
-  s.date = "2013-04-18"
-  s.description = "This gem provides a framework of text filter.\n    Tefil eneable to make text filter commands which have overwrite option easily.\n  "
-  s.email = "ippei94da@gmail.com"
-  s.executables = ["formcolumn", "lineedit", "lineescapezsh", "linesub"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "CHANGES",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/formcolumn",
-    "bin/lineedit",
-    "bin/lineescapezsh",
-    "bin/linesub",
-    "lib/tefil.rb",
-    "tefil.gemspec",
-    "test/formcolumn_space",
-    "test/helper.rb",
-    "test/test_tefil.rb"
-  ]
-  s.homepage = "http://github.com/ippei94da/tefil"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "Basic framework of text filter"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<builtinextension>, [">= 0.1.0"])
-    else
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<builtinextension>, [">= 0.1.0"])
-    end
-  else
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<builtinextension>, [">= 0.1.0"])
-  end
-end
-