tefil 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c164b9477530341120ac20b00bec36b2164f8bae
-  data.tar.gz: 1912f75664d0844891a98f3c9416ca7d8573da57
+  metadata.gz: f3ef66ea997858ff83884169a599185c467dd4c7
+  data.tar.gz: 66190e623c8c877207106ca7c786b4af25502e93
 SHA512:
-  metadata.gz: 6f2d33e6eaa57c68fa7c782de2e90f67638a141ce6a1b1c321870532bb463d877b91b6903560238981cd4ade6039415fc5b639f37974ec47867675f60fecf2b7
-  data.tar.gz: 0571c3d03879801e2fb40f887fc1c3558b3e39fecad875204968681830f3258ffd53b515998b240bc11a7adb8471714dcec821d00b74078940bbf2b0b1447760
+  metadata.gz: e145abcfdf2cbe51c02f2a2f3ba94f86ce89cdda1ccbac22d909842fe3d5fb6675237442f408a85169cec5de457495f98225821abd38fb91de3a1a09fa5b44de
+  data.tar.gz: 3786672cd4ebaef84982f497941a24cde3705fed3f77755b1d3b5765cc5646ddecf1c7ca0473ff41a20eb7d8f6f304430758aa711480e7ec801cc2bc77ded4ce

data/CHANGES

@@ -1,6 +1,11 @@
 = tefil changelog
 
-== Master (for 0.1.2)
+== Master (for 0.1.3)
+
+== Version 0.1.2 [2016-04-27] released
+* Add bin/calc
+* Add 'bin/linesub --regexp' option
+* Adjust to Ruby2.3
 
 == Version 0.1.1 [2016-03-11] released
 * Add bin/eachsentence

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/calc

@@ -0,0 +1,27 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+#
+# USAGE: calc [options] str0 str1 files ...
+
+require "pp"
+require "optparse"
+#require "rubygems"
+#require "tempfile"
+require "tefil"
+
+## option analysis
+options = {}
+op = OptionParser.new
+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.on("-p"    , "--preserve"    , "Preserve equation with '='."){ options[:preserve] = true}
+op.on("-r"    , "--ruby"    , "Use Ruby 'eval' in spite of 'bc -l', powerful but security weakness."){ options[:ruby] = true} #Math::PI や実数乗ができる。
+op.parse!(ARGV)
+
+options[:overwrite] ||= false
+
+tf = Tefil::Calculator.new(options)
+tf.filter(ARGV)

data/bin/linesub

@@ -14,10 +14,11 @@ require "tefil.rb"
 options = {}
 op = OptionParser.new
 op.banner = [
-  "Usage: #{File.basename("#{__FILE__}")} old_str new_str [options] [files]",
+  "Usage: #{File.basename("#{__FILE__}")} [options] old_str new_str [files]",
 ].join("\n")
-op.on("-o"    , "--overwrite"    , "Overwrite."){    options[:overwrite] = true}
-op.on("-g"    , "--global"    , "Globally substitute."){    options[:global] = true}
+op.on("-o"    , "--overwrite"    , "Overwrite"){    options[:overwrite] = true}
+op.on("-g"    , "--global"    , "Globally substitute"){    options[:global] = true}
+op.on("-r"    , "--reg-exp"    , "Regular expression for old_str"){ options[:regexp] = true}
 op.parse!(ARGV)
 
 old_str = ARGV.shift

data/lib/tefil/calculator.rb

@@ -0,0 +1,48 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require 'pp'
+
+
+
+class Tefil::Calculator < Tefil::TextFilterBase
+  def initialize(options = {})
+    @options = options
+    @preserve = options[:preserve]
+    @ruby = options[:ruby]
+    super(options)
+  end
+
+  def process_stream(in_io, out_io)
+    in_io.each do |line|
+      eq = line.chomp
+
+      eq.gsub!(/\{/, '(' )
+      eq.gsub!(/\}/, ')' )
+      eq.gsub!(/\\times/, '*' )
+
+      if @ruby
+        eq.gsub!(/\^/, '**' )
+        eq.gsub!(/sqrt/, 'Math::sqrt' )
+        eq.gsub!(/log\(/, 'Math::log(' )
+        eq.gsub!(/l\(/, 'Math::log(' )
+        eq.gsub!(/exp\(/, 'Math::exp(' )
+        eq.gsub!(/e\(/, 'Math::exp(' )
+        result = eval(eq)
+      else
+        eq.gsub!(/\(/, '\(' )
+        eq.gsub!(/\)/, '\)' )
+        eq.gsub!(/\*/, '\*' )
+
+        result = `echo  #{eq} | bc -l`.chomp
+        result.sub!(/^\./, '0.')
+        result.sub!(/^-\./, '-0.')
+        result.sub!(/^0$/, '0.0')
+      end
+
+      out_io.print line.chomp + " = " if @preserve
+      out_io.puts result
+    end
+  end
+end
+

data/lib/tefil/eachsentence.rb

@@ -12,11 +12,11 @@ class Tefil::EachSentence < Tefil::TextFilterBase
 
   def process_stream(in_io, out_io)
     results = []
-    words = []
+    #words = []
     in_io.read.strip.split("\n").each do |line|
       new_line = ''
       #line.gsub!("\n", ' ')
-      line.chars do |char|
+      line.chars.each do |char|
         new_line += char
         new_line += "\n" if (END_CHAR.include?(char))
       end

data/lib/tefil/linesubstituter.rb

@@ -1,7 +1,8 @@
 class Tefil::LineSubstituter < Tefil::TextFilterBase
   def initialize(old_str, new_str, options = {})
-    @old_str  = old_str 
-    @new_str  = new_str 
+    @old_str  = old_str
+    @old_str  = /#{old_str}/ if options[:regexp]
+    @new_str  = new_str
     @global = options[:global]
     super(options)
   end

data/lib/tefil/percentpacker.rb

@@ -2,13 +2,12 @@ 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*")
+          new_str += [old_chars[(old_index + 1) .. (old_index + 2)].join].pack("H*")
           old_index += 2
         else
           new_str += old_chars[old_index]

data/lib/tefil.rb

@@ -6,6 +6,7 @@ require 'tempfile'
 module Tefil; end
 require 'tefil/textfilterbase'
 
+require 'tefil/calculator.rb'
 require 'tefil/columnformer'
 require 'tefil/indentconverter'
 require 'tefil/indentstatistics'

data/tefil.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tefil 0.1.1 ruby lib
+# stub: tefil 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tefil"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["ippei94da"]
-  s.date = "2016-03-10"
+  s.date = "2016-04-27"
   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 = ["columnform", "eachsentence", "fswiki2md", "indentconv", "indentstat", "linesub", "md2fswiki", "percentpack", "zshescape"]
+  s.executables = ["calc", "columnform", "eachsentence", "fswiki2md", "indentconv", "indentstat", "linesub", "md2fswiki", "percentpack", "zshescape"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/calc",
     "bin/columnform",
     "bin/eachsentence",
     "bin/fswiki2md",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
     "example/percentpack/sample.txt",
     "example/zshescape/sample.txt",
     "lib/tefil.rb",
+    "lib/tefil/calculator.rb",
     "lib/tefil/columnformer.rb",
     "lib/tefil/eachsentence.rb",
     "lib/tefil/fswikitomd.rb",
@@ -58,8 +60,10 @@ Gem::Specification.new do |s|
     "lib/tefil/textfilterbase.rb",
     "lib/tefil/zshescaper.rb",
     "tefil.gemspec",
+    "test/calc/sample.dat",
     "test/formcolumn_space",
     "test/helper.rb",
+    "test/test_calculator.rb",
     "test/test_columnformer.rb",
     "test/test_eachsentence.rb",
     "test/test_fswikitomd.rb",

data/test/calc/sample.dat

@@ -0,0 +1,10 @@
+1+2
+0.1
+-0.1
+0.0
+2^3
+2^{1+2}
+2 \times 3
+(sqrt(2.0) * 3.231283)^(1.0/3.0) * 10
+log(10)
+l(10)

data/test/test_calculator.rb

@@ -0,0 +1,67 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "helper"
+require "stringio"
+
+class Tefil::Calculator
+  public :process_stream
+end
+
+class TC_Calculator < Test::Unit::TestCase
+  def setup
+    @is00 = Tefil::Calculator.new
+  end
+
+  def test_process_stream
+    setup
+    $stdin = StringIO.new
+    $stdin.puts "1+2"
+    $stdin.puts "0.1"
+    $stdin.puts "-0.1"
+    $stdin.puts "0.0"
+    $stdin.rewind
+    str = capture_stdout{}
+    result = capture_stdout{ @is00.filter([])}
+    correct =
+      "3\n" +
+      "0.1\n" +
+      "-0.1\n" +
+      "0.0\n"
+    assert_equal(correct, result)
+
+    setup
+    $stdin = StringIO.new
+    $stdin.puts "2^3"
+    $stdin.rewind
+    str = capture_stdout{}
+    result = capture_stdout{ @is00.filter([])}
+    correct = "8\n"
+    assert_equal(correct, result)
+
+    setup
+    $stdin = StringIO.new
+    $stdin.puts "2^{1+2}"
+    $stdin.rewind
+    str = capture_stdout{}
+    result = capture_stdout{ @is00.filter([])}
+    correct = "8\n"
+    assert_equal(correct, result)
+
+  end
+
+  #なぜか変換されないが、コマンド経由ならいける。
+  #def test_times
+  #  setup
+  #  $stdin = StringIO.new
+  #  $stdin.puts "2 \times 3"
+  #  $stdin.rewind
+  #  str = capture_stdout{}
+  #  result = capture_stdout{ @is00.filter([])}
+  #  correct = "6\n"
+  #  assert_equal(correct, result)
+  #end
+
+
+end
+

data/test/test_fswikitomd.rb

@@ -40,7 +40,7 @@ class TC_FswikiToMd < Test::Unit::TestCase
       $stdin = StringIO.new
       $stdin.puts i[0]
       $stdin.rewind
-      str = capture_stdout{}
+      #str = capture_stdout{}
       result = capture_stdout{ @f00.filter([])}
       correct = sprintf("#{i[1]}\n")
       assert_equal(correct, result)

data/test/test_indentconverter.rb

@@ -23,7 +23,7 @@ class TC_IndentConverter < Test::Unit::TestCase
     $stdin.puts "    e"
     $stdin.puts "    f"
     $stdin.rewind
-    str = capture_stdout{}
+    #str = capture_stdout{}
     result = capture_stdout{ @ic00.filter([])}
     correct =
       "a\n" +

data/test/test_indentstatistics.rb

@@ -25,7 +25,7 @@ class TC_IndentStatistics < Test::Unit::TestCase
     $stdin.puts "  g"
     $stdin.puts "    h"
     $stdin.rewind
-    str = capture_stdout{}
+    #str = capture_stdout{}
     result = capture_stdout{ @is00.filter([])}
     correct =
       " 0|*\n" +

data/test/test_linesubstituter.rb

@@ -10,8 +10,9 @@ end
 
 class TC_LineSubstituter < Test::Unit::TestCase
   def setup
-    @is00 = Tefil::LineSubstituter.new('abc', 'XYZ')
-    @is01 = Tefil::LineSubstituter.new('abc', 'XYZ', {:global => true})
+    @ls00 = Tefil::LineSubstituter.new('abc', 'XYZ')
+    @ls01 = Tefil::LineSubstituter.new('abc', 'XYZ', {:global => true})
+    @ls02 = Tefil::LineSubstituter.new('^a', 'A', {:regexp => true})
   end
 
   def test_process_stream
@@ -21,7 +22,7 @@ class TC_LineSubstituter < Test::Unit::TestCase
     $stdin.puts "ABCDABCD"
     $stdin.rewind
     str = capture_stdout{}
-    result = capture_stdout{ @is00.filter([])}
+    result = capture_stdout{ @ls00.filter([])}
     correct =
       "XYZdabcd\n" +
       "ABCDABCD\n"
@@ -34,12 +35,24 @@ class TC_LineSubstituter < Test::Unit::TestCase
     $stdin.puts "ABCDABCD"
     $stdin.rewind
     str = capture_stdout{}
-    result = capture_stdout{ @is01.filter([])}
+    result = capture_stdout{ @ls01.filter([])}
     correct =
       "XYZdXYZd\n" +
       "ABCDABCD\n"
     assert_equal(correct, result)
 
+    setup
+    $stdin = StringIO.new
+    $stdin.puts "abcdabcd"
+    $stdin.puts "ABCDABCD"
+    $stdin.rewind
+    str = capture_stdout{}
+    result = capture_stdout{ @ls02.filter([])}
+    correct =
+      "Abcdabcd\n" +
+      "ABCDABCD\n"
+    assert_equal(correct, result)
+
   end
 end
 

data/test/test_mdtofswiki.rb

@@ -43,7 +43,7 @@ class TC_MdToFswiki < Test::Unit::TestCase
       $stdin = StringIO.new
       $stdin.puts i[0]
       $stdin.rewind
-      str = capture_stdout{}
+      #str = capture_stdout{}
       result = capture_stdout{ @f00.filter([])}
       correct = sprintf("#{i[1]}\n")
       assert_equal(correct, result)

data/test/test_percentpacker.rb

@@ -18,7 +18,7 @@ class TC_PercentPacker < Test::Unit::TestCase
     $stdin = StringIO.new
     $stdin.puts '%E3%83%86%E3%82%B9%E3%83%88'
     $stdin.rewind
-    str = capture_stdout{}
+    #str = capture_stdout{}
     result = capture_stdout{ @pp00.filter([])}
     correct = "テスト\n"
     assert_equal(correct, result)

data/test/test_textfilterbase.rb

@@ -10,7 +10,7 @@ require "fileutils"
 
 class SampleFilter < Tefil::TextFilterBase
   def process_stream(in_file, out_file)
-    results = []
+    #results = []
     in_file.each do |line|
       out_file.puts line.sub('a', 'A')
     end

data/test/test_zshescaper.rb

@@ -18,7 +18,7 @@ class TC_ZshEscaper < Test::Unit::TestCase
     $stdin = StringIO.new
     $stdin.puts "abcdABCD * * *"
     $stdin.rewind
-    str = capture_stdout{}
+    #str = capture_stdout{}
     result = capture_stdout{ @is00.filter([])}
     correct = 'abcdABCD\ \*\ \*\ \*' + "\n"
     assert_equal(correct, result)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tefil
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ippei94da
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -112,6 +112,7 @@ description: "This gem provides a framework of text filter.\n    Tefil eneable t
   make text filter commands which have overwrite option easily.\n  "
 email: ippei94da@gmail.com
 executables:
+- calc
 - columnform
 - eachsentence
 - fswiki2md
@@ -133,6 +134,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/calc
 - bin/columnform
 - bin/eachsentence
 - bin/fswiki2md
@@ -153,6 +155,7 @@ files:
 - example/percentpack/sample.txt
 - example/zshescape/sample.txt
 - lib/tefil.rb
+- lib/tefil/calculator.rb
 - lib/tefil/columnformer.rb
 - lib/tefil/eachsentence.rb
 - lib/tefil/fswikitomd.rb
@@ -164,8 +167,10 @@ files:
 - lib/tefil/textfilterbase.rb
 - lib/tefil/zshescaper.rb
 - tefil.gemspec
+- test/calc/sample.dat
 - test/formcolumn_space
 - test/helper.rb
+- test/test_calculator.rb
 - test/test_columnformer.rb
 - test/test_eachsentence.rb
 - test/test_fswikitomd.rb