tefil 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f742434ea5277ddf6d1c079d8d5fcf9f1525cb0c
+  data.tar.gz: 50abba718b395336d1f00d6e3f75149374356f21
+SHA512:
+  metadata.gz: 95669e49a633c958998c4117958e210306ba09831d9c2599f59259f1e436e68b41d6feeb35294842e5c52a46724bc650e7691456005cfbc7d74e64343b22e397
+  data.tar.gz: e4bf80f0b585940963a01cc13c65ae31c30f5b1b92354c6cd734b0f3cb288586753cb16bc5870af877693dfe226b3fc74871fdeda83695565630e202b6e6aae1

data/CHANGES

@@ -1,6 +1,17 @@
-= vasputils changelog
+= tefil changelog
 
-== Master
+== Master (for 0.1.1)
+
+== Version 0.1.0 [2015-07-07] released
+* Add bin/packpercent .
+* Add usage banner.
+* Rename bin/formcolumn to columnform
+* Add bin/indentstat .
+* Add bin/indentconv .
+* Module Tefil converted to class Tefil
+* Delete require "tempfile" for Ruby 2.1
+* Rewrite test to use capture_stdout
+* Remove Tefil::TextFilterBase.filter (class method)
 
 == Version 0.0.3 [2013-05-10] released
 * Rename TextFilter to Tefil

data/Gemfile

@@ -6,9 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.8.3"
+  gem "rdoc", "~> 4.0.1"
+  gem "bundler", "~> 1.9.2"
+  gem "jeweler", "~> 2.0.1"
+  gem "capture_stdout", "~> 0.0.1"
   gem "simplecov", ">= 0"
   gem "builtinextension", ">= 0.1.0"
   #gem "psych", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/bin/{formcolumn → columnform}

@@ -3,8 +3,6 @@
 #
 # USAGE: formcolumn [options] files ...
 
-INPUT_SEPARATOR = /\s+/
-
 
 require "pp"
 require "optparse"
@@ -14,18 +12,14 @@ require "tefil"
 # option analysis
 OPTIONS = {:separator => ' '}
 op = OptionParser.new
+op.banner = [
+    "Usage: #{File.basename("#{__FILE__}")} [options] [files]",
+].join("\n")
 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 Tefil
-  def self.process_stream(in_io, out_io)
-    rows = in_io.readlines.map { |line| line.strip.split(INPUT_SEPARATOR) }
-    Tefil::ColumnFormer.form(rows, out_io, OPTIONS[:separator], OPTIONS[:left])
-  end
-end
-
 OPTIONS[:overwrite] ||= false
 
-Tefil.run(ARGV, OPTIONS[:overwrite])
+Tefil::ColumnFormer.new(OPTIONS).filter(ARGV)

data/bin/indentconv

@@ -0,0 +1,41 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "pp"
+require "optparse"
+require "rubygems"
+require "tefil"
+
+# option analysis
+OPTIONS = {}
+op = OptionParser.new
+op.banner = [
+    "Usage: #{File.basename("#{__FILE__}")} old_width new_width [options] [files]",
+    "Example: #{File.basename("#{__FILE__}")} 4 2 [options] [files]",
+].join("\n")
+op.on("-o"     , "--overwrite"     , "Overwrite."){    OPTIONS[:overwrite] = true}
+#op.on("-m", "--minimum", "Show only minimum indent (not zero)."){ OPTIONS[:minimum] = true}
+#op.on("-l"     , "--left-alline"   , "Left alline."){ OPTIONS[:left] = true}
+op.parse!(ARGV)
+
+#数値として識別できない文字列(to_i で 0 になる)はタブにする。
+num = ARGV.shift.to_i
+if num == 0
+  old_char  = "\t"
+  old_width = 1
+else
+  old_char  = ' '
+  old_width = num
+end
+
+num = ARGV.shift.to_i
+if num == 0
+  new_char  = "\t"
+  new_width = 1
+else
+  new_char  = ' '
+  new_width = num
+end
+
+f = Tefil::IndentConverter.new(old_char, old_width, new_char, new_width, OPTIONS)
+f.filter(ARGV)

data/bin/indentstat

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "pp"
+require "optparse"
+require "rubygems"
+require "tefil"
+
+
+# option analysis
+options = {}
+op = OptionParser.new
+#op.banner = [
+#    "Usage: #{File.basename("#{__FILE__}")} [options] [files]",
+#].join("\n")
+op.on("-o"     , "--overwrite"     , "Overwrite."){    options[:overwrite] = true}
+op.on("-m", "--minimum", "Show minimum width (not zero). If no indent, show '0'."){ options[:minimum] = true}
+op.parse!(ARGV)
+
+
+options[:overwrite] ||= false
+
+is = Tefil::IndentStatistics.new options
+is.filter(ARGV)

data/bin/linesub

@@ -6,31 +6,24 @@
 require "pp"
 require "optparse"
 require "rubygems"
+require "tempfile"
 #gem "tefil"
 require "tefil.rb"
 
 ## option analysis
-OPTIONS = {}
+options = {}
 op = OptionParser.new
-op.on("-o"    , "--overwrite"    , "Overwrite."){    OPTIONS[:overwrite] = true}
-op.on("-g"    , "--global"    , "Globally substitute."){    OPTIONS[:global] = true}
+op.banner = [
+    "Usage: #{File.basename("#{__FILE__}")} old_str new_str [options] [files]",
+].join("\n")
+op.on("-o"    , "--overwrite"    , "Overwrite."){    options[:overwrite] = true}
+op.on("-g"    , "--global"    , "Globally substitute."){    options[:global] = true}
 op.parse!(ARGV)
 
-OLD_PATTERN = ARGV.shift
-NEW_STR = ARGV.shift
+old_str = ARGV.shift
+new_str = ARGV.shift
 
-module Tefil
-  def self.process_stream(in_io, out_io)
-    in_io.each do |line|
-      if OPTIONS[:global]
-        out_io.puts line.gsub(OLD_PATTERN, NEW_STR)
-      else
-        out_io.puts line.sub(OLD_PATTERN, NEW_STR)
-      end
-    end
-  end
-end
+options[:overwrite] ||= false
 
-OPTIONS[:overwrite] ||= false
-
-Tefil.run(ARGV, OPTIONS[:overwrite])
+tf = Tefil::LineSubstituter.new(old_str, new_str, options)
+tf.filter(ARGV)

data/bin/percentpack

@@ -0,0 +1,26 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+#
+# USAGE: linesub [options] str0 str1 files ...
+
+require "pp"
+require "optparse"
+require "rubygems"
+#gem "tefil"
+require "tefil.rb"
+
+## option analysis
+options = {}
+op = OptionParser.new
+op.banner = [
+  "Usage: #{File.basename("#{__FILE__}")} [options] [files]",
+  "  E.g., echo '%E3%82%B5%E3%83%B3%E3%83%97%E3%83%AB' | packpercent" #サンプル
+].join("\n")
+op.on("-o"    , "--overwrite"    , "Overwrite."){    options[:overwrite] = true}
+op.parse!(ARGV)
+
+options[:overwrite] ||= false
+options[:overwrite]
+
+tf = Tefil::PercentPacker.new(options)
+tf.filter(ARGV)

data/bin/zshescape

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+#
+# USAGE: lineescapezsh [options] files ...
+
+require "pp"
+require "optparse"
+require "rubygems"
+#gem "tefil"
+require "tefil.rb"
+
+## option analysis
+options = {}
+op = OptionParser.new
+op.banner = [
+    "Usage: #{File.basename("#{__FILE__}")} [options] [files]",
+].join("\n")
+op.on("-o"    , "--overwrite"    , "Overwrite."){    options[:overwrite] = true}
+op.parse!(ARGV)
+
+options[:overwrite] ||= false
+
+tf = Tefil::ZshEscaper.new(options)
+tf.filter(ARGV)

data/lib/tefil/columnformer.rb

@@ -1,18 +1,37 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
+INPUT_SEPARATOR = /\s+/
+
+class String
+  #http://www.techscore.com/blog/2012/12/25/
+  def mb_ljust(width, padding=' ')
+    output_width = each_char.map{|c| c.bytesize == 1 ? 1 : 2}.reduce(0, &:+)
+    padding_size = [0, width - output_width].max
+    self + padding * padding_size
+  end
+
+  def mb_rjust(width, padding=' ')
+    output_width = each_char.map{|c| c.bytesize == 1 ? 1 : 2}.reduce(0, &:+)
+    padding_size = [0, width - output_width].max
+    padding * padding_size + self
+  end
+end
+
+
 #
 #
 #
-module Tefil::ColumnFormer
-  def self.form(matrix, io = $stdout, separator = " ", left = false)
+class Tefil::ColumnFormer < Tefil::TextFilterBase
+
+  def 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
+        size = print_size(item)
         max_lengths[index] = size if max_lengths[index] < size
       end
     end
@@ -20,15 +39,28 @@ module Tefil::ColumnFormer
     #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)
+        method = :mb_rjust
+        method = :mb_ljust if left
+        new_items[index] = item.send(method, max_lengths[index])
       end
       io.puts new_items.join(separator).sub(/ +$/, "")
     end
   end
+
+
+  private
+
+  def process_stream(in_io, out_io)
+    rows = in_io.readlines.map do |line|
+      line.strip.split(INPUT_SEPARATOR)
+    end
+    form(rows, out_io, OPTIONS[:separator], OPTIONS[:left])
+  end
+
+  def print_size(string)
+    string.each_char.map{|c| c.bytesize == 1 ? 1 : 2}.reduce(0, &:+)
+  end
+
 end
 

data/lib/tefil/indentconverter.rb

@@ -0,0 +1,24 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+class Tefil::IndentConverter < Tefil::TextFilterBase
+  def initialize(old_char, old_width, new_char, new_width, options)
+    @old_width = old_width
+    @new_width = new_width
+    @old_char  = old_char 
+    @new_char  = new_char 
+    super(options)
+  end
+
+  def process_stream(in_io, out_io)
+    in_io.readlines.each do |line|
+      /^(#{@old_char}*)(.*)$/ =~ line
+      indent = $1
+      body = $2
+      new_indent = indent.size * @new_width / @old_width
+      out_io.puts "#{@new_char * new_indent}#{body}"
+    end
+  end
+end
+
+

data/lib/tefil/indentstatistics.rb

@@ -0,0 +1,47 @@
+class Tefil::IndentStatistics < Tefil::TextFilterBase
+
+  HISTGRAM_LIMIT = 50
+
+  def initialize(options = {})
+    options[:smart_filename] = true
+    @minimum = options[:minimum]
+    super(options)
+  end
+
+  def process_stream(in_io, out_io)
+    frequencies = {}
+    in_io.readlines.each do |line|
+      #/^(\s*)/ =~ line #改行文字が含まれる。
+      /^( *)/ =~ line
+      width = $1.size
+      frequencies[width] ||= 0
+      frequencies[width] += 1
+    end
+
+    if @minimum
+      frequencies.delete(0)
+      output = frequencies.keys.min
+      output = 0 if frequencies.empty?
+    else
+      output = ''
+      output = "\n" if ARGV.size >= 2
+      output += self.histgram(frequencies)
+    end
+
+    out_io.puts output
+  end
+
+  def histgram(frequencies)
+    result = ''
+    max = frequencies.values.max
+    frequencies.keys.sort.each do |key|
+      num = frequencies[key]
+      num = num * HISTGRAM_LIMIT / max if max > HISTGRAM_LIMIT
+      result += sprintf("%2d|", key)
+      result += "*" * num
+      result += "\n"
+    end
+    result
+  end
+end
+

data/lib/tefil/linesubstituter.rb

@@ -0,0 +1,17 @@
+class Tefil::LineSubstituter < Tefil::TextFilterBase
+  def initialize(old_str, new_str, options = {})
+    @old_str  = old_str 
+    @new_str  = new_str 
+    @global = options[:global]
+    super(options)
+  end
+
+  def process_stream(in_io, out_io)
+    in_io.each do |line|
+      method = :sub
+      method = :gsub if @global
+      out_io.puts line.send(method, @old_str, @new_str)
+    end
+  end
+end
+

data/lib/tefil/percentpacker.rb

@@ -0,0 +1,23 @@
+class Tefil::PercentPacker < Tefil::TextFilterBase
+  def process_stream(in_io, out_io)
+    in_io.each do |line|
+      old_chars = line.split("")
+
+      new_str = ""
+      new_index = 0
+      old_index = 0
+      while old_index < old_chars.size
+        if old_chars[old_index] == "%"
+          new_str += [old_chars[(old_index +1) .. (old_index + 2)].join].pack("H*")
+          old_index += 2
+        else
+          new_str += old_chars[old_index]
+        end
+        old_index += 1
+        new_index += 1
+      end
+      out_io.print new_str
+    end
+  end
+end
+

data/lib/tefil/textfilterbase.rb

@@ -0,0 +1,109 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+#
+#require "tefil"
+#require "tempfile"
+#require "tmpdir"
+
+# Module that provide a framework for text filters.
+#
+# Provide basic functions for a command like below:
+#   Input:
+#     - Without indicating filenames like "command.rb",
+#       input data is eaten from STDIN.
+#     - With indicating filenames like "command.rb *.txt",
+#       input data is eaten from indicated files in order.
+#       When the file which is in the filenames does not exist,
+#       output report to STDERR.
+#
+#   Output:
+#     - Without indicating "--overwrite" option,
+#       output to STDOUT even from many files.
+#     - With indicating "--overwrite" option,
+#       - With indicating input files,
+#         overwrite each file.
+#       - Without indicating input files,
+#         output to STDOUT in one stream.
+#
+# If indicated file(s) not found,
+# this program notify on stderr and does not throw an exception.
+#
+class Tefil::TextFilterBase
+
+  class NotRedefinedMethodError < Exception; end
+  class TypeError < Exception; end
+
+  def initialize(options = {})
+    @overwrite = options[:overwrite]
+    @smart_filename = options[:smart_filename]
+  end
+
+  # 保持している入力ファイル対して、順に処理を実行する。
+  # filenames.size が 0 ならば STDIN からの入力を待つことになる。
+  #
+  # STDIN からの入力だった場合、出力先は必ず STDOUT になる。
+  # STDIN からの入力ではない、すなわちファイル入力であった場合、
+  #   - overwrite_flag が false ならば STDOUT に出力する。
+  #   - overwrite_flag が true ならば 個々のファイルに上書きする。
+  #
+  # Process of each file is defined in 'process_stream' method.
+  #
+  #def self.filter(filenames, options)
+  #  self.class.new(options).filter(filenames)
+  #end
+
+  #line ごとのファイル名表示はここでは提供せず、したければ process_stream で作る。
+  #grep のように行数を表示するなど、複雑な表示をすることもありうる。
+  def filter(filenames)
+    @num_files = filenames.size
+    input_io = $stdin
+    output_io = $stdout
+    if filenames.size == 0 
+      process_stream( input_io, output_io)
+    else
+      filenames.each do |filename|
+        @filename = filename
+        input_io = File.open(filename, "r")
+        output_io = Tempfile.new("tefil", "/tmp") if @overwrite
+        smart_filename(output_io)
+        begin
+          process_stream(input_io, output_io)
+        rescue ArgumentError, Errno::EISDIR
+          $stderr.puts $!
+          next
+        end
+
+        if @overwrite
+          output_io.open
+          File.open(filename, "w") do |overwrite_io|
+            output_io.each { |line| overwrite_io.puts(line) }
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @smart_filename が真, かつ
+  # @overwrite が 偽, かつ
+  # filter メソッドに渡されたファイル数が複数のときには
+  # 処理中のファイル名を output_io に出力する。
+  def smart_filename(output_io)
+    if @smart_filename && (! @overwrite) && (@num_files >= 2)
+      output_io.puts("#{@filename}:")
+    end
+  end
+
+
+  # Process a file.
+  # 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 Tefil::NotRedefinedMethodError.
+  def process_stream(in_io, out_io)
+    raise NotRedefinedMethodError
+  end
+
+end
+

data/lib/tefil/zshescaper.rb

@@ -0,0 +1,12 @@
+gem     "builtinextension"
+require "string/escapezsh"
+
+class Tefil::ZshEscaper < Tefil::TextFilterBase
+  def process_stream(in_io, out_io)
+    in_io.each do |line|
+      out_io.puts line.escape_zsh
+    end
+  end
+end
+
+

data/lib/tefil.rb

@@ -1,83 +1,12 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "tempfile"
-
-# Module that provide a framework for text filters.
-#
-# Provide basic functions for a command like below:
-#   Input:
-#     - Without indicating filenames like "command.rb",
-#       input data is eaten from STDIN.
-#     - With indicating filenames like "command.rb *.txt",
-#       input data is eaten from indicated files in order.
-#       When the file which is in the filenames does not exist,
-#       output report to STDERR.
-#
-#   Output:
-#     - Without indicating "--overwrite" option,
-#       output to STDOUT even from many files.
-#     - With indicating "--overwrite" option,
-#       - With indicating input files,
-#         overwrite each file.
-#       - Without indicating input files,
-#         output to STDOUT in one stream.
-#
-# If indicated file(s) not found,
-# this program notify on stderr and does not throw an exception.
-#
-module Tefil
-
-  class NotRedefinedMethodError < Exception; end
-  class TypeError < Exception; end
-
-  # 保持している入力ファイル対して、順に処理を実行する。
-  # filenames.size が 0 ならば STDIN からの入力を待つことになる。
-  #
-  # STDIN からの入力だった場合、出力先は必ず STDOUT になる。
-  # STDIN からの入力ではない、すなわちファイル入力であった場合、
-  #   - overwrite_flag が false ならば STDOUT に出力する。
-  #   - overwrite_flag が true ならば 個々のファイルに上書きする。
-  #
-  # Process of each file is defined in 'process_stream' method.
-  #
-  def self.run(filenames, overwrite_flag = false)
-    #p self; exit
-    if filenames.size == 0 
-      self.process_stream( $stdin, $stdout )
-    else
-      #p filenames
-      filenames.each do |filename|
-        if overwrite_flag
-          tempfile = Tempfile.new("tefil", "/tmp")
-          File.open(filename, "r") do |input_file|
-            self.process_stream(input_file, tempfile)
-          end
-          tempfile.close
-          tempfile.open
-          File.open(filename, "w") do |output_file|
-            tempfile.each { |line| output_file.puts(line) }
-          end
-        else
-          File.open(filename, "r") do |input_file|
-            self.process_stream(input_file, $stdout)
-          end
-        end
-      end
-    end
-  end
-
-  private
-
-  # Process a file.
-  # 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 Tefil::NotRedefinedMethodError.
-  def self.process_stream(in_io, out_io)
-    raise NotRedefinedMethodError
-  end
-
-end
+module Tefil; end
+require "tefil/textfilterbase"
 
 require "tefil/columnformer"
+require "tefil/indentconverter"
+require "tefil/indentstatistics"
+require "tefil/linesubstituter"
+require "tefil/percentpacker"
+require "tefil/zshescaper"