mailcvt 0.1.0 → 0.1.1

data/bin/lock-runmailcvt

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+log=hourly-runmailcvt.log 
+lock="runmailcvt.lock"
+if mkdir $lock &> /dev/null; then
+    ./runmailcvt $1 $2 >> $log 2>&1
+    rmdir $lock
+else
+    echo "lock failed. abort at $(date +'%Y/%m/%d %T')." >> $log
+fi

data/bin/mailcvt

@@ -26,7 +26,7 @@ command :write do |c|
   c.default_value 'default'
   c.flag :f
   c.action do |global_options,options,args|
-    err = "write command need 3 arguments: [input dir] [output dir] [output file number]"
+    err = "write usage: mailcvt write [input dir] [output dir] [output file number]"
     raise err if args.length != 3
     
     raise "Cannot find #{args[0]}" unless Dir.exists?(args[0])
@@ -44,7 +44,7 @@ desc 'Describe read here'
 arg_name 'Describe arguments to read here'
 command :read do |c|
   c.action do |global_options,options,args|
-    err = "read command need 2 arguments: [input dir] [output dir]"
+    err = "read usage: mailcvt read [input dir] [output dir]"
     raise err if args.length != 2
     
     raise "Cannot find #{args[0]}" unless Dir.exists?(args[0])
@@ -80,7 +80,9 @@ end
 on_error do |exception|
   # Error logic here
   # return false to skip default error handling
-  true
+  $stderr.puts "abort mailcvt. #{exception.message}"
+  $stderr.puts exception.backtrace.join("\n")
+  false 
 end
 
 exit run(ARGV)

data/bin/runmailcvt

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+echo "*******************************************************************************"
+
+function now {
+    echo $(date +'%Y/%m/%d %T')
+}
+
+set -e 
+timestamp=$(date +"%Y%m%d%H")
+
+echo "[$(now)] runmailcvt started."
+wdir=$(pwd)
+isize=$(du -h $1)
+echo "[$(now)] working dir = $wdir, input = $isize, output = $2"
+
+if [ ! -d $2 ]; then
+    echo "[$(now)] create directory $2"
+    mkdir $2
+fi
+fngrep="$(cd $2 && pwd)/mout$timestamp.grep"
+if [ -f $fngrep ]; then
+    echo "abort runmailcvt at $(now). $fngrep exists!!! "
+    exit
+fi
+
+allmail="$(cd $1 && pwd)/*"
+echo "[$(now)] start grep output to $fngrep."
+grep -E -A9 "^Date: |^Message-ID: |^Subject: |^From: |^To: |^Cc: |^Content-Disposition: attachment;" $allmail > $fngrep 
+echo "[$(now)] grep finished."
+
+bundle exec bin/mailcvt read $1 $2
+
+
+echo "[$(now)] runmailcvt finished."
+echo "-------------------------------------------------------------------------------"

data/lib/big_mail_generator.rb

@@ -21,10 +21,15 @@ class BigMailGenerator
     end
 
     def cpall
-        inputfiles = Dir.glob(File.join(@input, '*'))
+        if File.directory?(@input)
+            inputfiles = Dir.glob(File.join(@input, '*'))
+        else
+            inputfiles = [@input]
+        end
 
         count = 0
         copycounts = @number / inputfiles.length
+        @digit = copycounts.to_s.length + 1
         inputfiles.each do |ifile|
             size = File.size(ifile)
             puts "copy #{ifile}(#{size / 1024}KB) #{copycounts} times"
@@ -47,7 +52,8 @@ class BigMailGenerator
 
     def cpfile(ifile, i)
         fn = File.basename(ifile)
-        ofile = File.join(@output, "#{fn}_#{i + 1}")
+        pos = fn.rindex('.')
+        ofile = File.join(@output, "#{fn[0..(pos-1)]}#{(i+1).to_s.rjust(@digit, '0')}#{fn[pos..-1]}")
         FileUtils.cp(ifile, ofile)
     end
 end

data/lib/grep_mail.rb

@@ -4,7 +4,6 @@ require 'log_helper'
 
 class GrepMail
     def initialize(file, lines)
-        puts "DEBUG> GrepMail.init> \n\t\tfile = #{file}\n"
         @pcontent= file.length + 1
         grouplines(lines)
     end
@@ -61,7 +60,6 @@ class GrepMail
     end
 
     def tolog
-        puts "DEBUG> GrepMail.tolog > @groups = #{@groups}"
         lh = LogHelper.new(@groups)
         lh.tolog
     end

data/lib/mail_parser.rb

@@ -1,60 +1,49 @@
 #!/usr/bin/env ruby
 
-require 'line_converter'
+#require 'line_converter'
+#require 'open3'
 require 'grep_mail'
-require 'open3'
+require 'output_helper'
 
 class MailParser
     def initialize(input, output)
-        @input = input
-        @output = output
+        @fh = OutputHelper.new(input, output)
     end
 
     def parse
-        start = Time.now
-        parseall_grep
-        #parseall
-        diff = Time.now - start
-        if diff / 60 < 1
-            puts "Elapsed time: #{diff.round(3)} seconds." 
-        else
-            puts "Elapsed time: #{(diff / 60).round(1)} minutes." 
-        end
-        system("du -h #{@output}")
-    end
-
-    def parseall_grep
-        cmd = 'grep -E -A30 "^Date: |^Message-ID: |^Subject: |^From: |^To: |^Cc: |^Content-Disposition: attachment;" ' + File.join(@input, '*')
+        grep = @fh.getmout('.grep')
+        raise "can't find #{grep}." unless File.exist?(grep)
+        mcvt = @fh.getmout('.mcvt')
+        raise "#{mcvt} exits." if File.exist?(mcvt)
+        del = @fh.getmout('.del')
+        raise "#{del} exits." if File.exist?(del)
 
-        Open3.popen3(cmd) do |i, o, e, t|
-            puts "Get keywords from mails by grep[#{t.pid}]."
-            puts "#{cmd}"
+        lines = []
+        curfile = nil
+        @fh.output(mcvt, del) do |omcvt, odel|
+            File.foreach(grep) do |line|
+                curfile = getfile(line) unless curfile
+                if line != "--\n" and !line.start_with?(curfile)
+                    convert curfile, lines, omcvt, odel
 
-            lines = []
-            curfile = nil
-            File.open(File.join(@output, "test_log.log"), 'w') do |out|
-                o.each do |line|
-                    puts "DEBUG> MailParser> line = #{line}"
-                    curfile = getfile(line) unless curfile
-                    if line != "--\n" and !line.start_with?(curfile)
-                        gm = GrepMail.new(curfile, lines)
-                        out.puts gm.tolog
-                        curfile = getfile(line)
-                        lines = []
-                    end
-                    lines << line
-                end
-
-                if lines.length > 0
-                    gm = GrepMail.new(curfile, lines)
-                    out.puts gm.tolog
+                    curfile = getfile(line)
+                    lines = []
                 end
+                lines << line
             end
 
-            puts "from grep[#{t.pid}]> #{t.value}."
+            convert curfile, lines, omcvt, odel
         end
     end
 
+    def convert(curfile, lines, omcvt, odel)
+        return if lines.length == 0
+
+        gm = GrepMail.new(curfile, lines)
+        omcvt.puts gm.tolog
+        odel.puts curfile
+    end
+
     def getfile(line)
 
         pos = line.index(':')
@@ -62,20 +51,67 @@ class MailParser
         line[0..(pos-1)]
     end
 
-    def parseall
-        File.open(File.join(@output, "test_log.log"), 'w') do |out|
-            Dir.glob(File.join(@input, '*')) do |file|
-                parsefile file, out
-            end
-        end
-    end
 
-    def parsefile(file, out)
-        cvt = LineConverter.new
-        File.foreach(file) {|line| cvt.convert line}
+#    def parse
+#        start = Time.now
+#        parseall_grep
+#        #parseall
+#        diff = Time.now - start
+#        if diff / 60 < 1
+#            puts "Elapsed time: #{diff.round(3)} seconds." 
+#        else
+#            puts "Elapsed time: #{(diff / 60).round(1)} minutes." 
+#        end
+#        system("du -h #{@output}")
+#    end
 
-        out.puts(cvt.log)
-        out.flush
-        #File.delete file
-    end
+#    def parseall_grep
+#        cmd = 'grep -E -A30 "^Date: |^Message-ID: |^Subject: |^From: |^To: |^Cc: |^Content-Disposition: attachment;" ' + File.join(@input, '*')
+#
+#        Open3.popen3(cmd) do |i, o, e, t|
+#            puts "Get keywords from mails by grep[#{t.pid}]."
+#            puts "#{cmd}"
+#
+#            lines = []
+#            curfile = nil
+#            File.open(File.join(@output, "test_log.log"), 'w') do |out|
+#                o.each do |line|
+#                    puts "DEBUG> MailParser> line = #{line}"
+#                    curfile = getfile(line) unless curfile
+#                    if line != "--\n" and !line.start_with?(curfile)
+#                        gm = GrepMail.new(curfile, lines)
+#                        out.puts gm.tolog
+#                        curfile = getfile(line)
+#                        lines = []
+#                    end
+#                    lines << line
+#                end
+#
+#                if lines.length > 0
+#                    gm = GrepMail.new(curfile, lines)
+#                    out.puts gm.tolog
+#                end
+#            end
+#
+#            puts "from grep[#{t.pid}]> #{t.value}."
+#        end
+#    end
+#
+#
+#    def parseall
+#        File.open(File.join(@output, "test_log.log"), 'w') do |out|
+#            Dir.glob(File.join(@input, '*')) do |file|
+#                parsefile file, out
+#            end
+#        end
+#    end
+#
+#    def parsefile(file, out)
+#        cvt = LineConverter.new
+#        File.foreach(file) {|line| cvt.convert line}
+#
+#        out.puts(cvt.log)
+#        out.flush
+#        #File.delete file
+#    end
 end

data/lib/mailcvt/version.rb

@@ -1,3 +1,3 @@
 module Mailcvt
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/output_helper.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+class OutputHelper
+    attr_reader :output, :input
+
+    def initialize(input, output)
+        @input = input
+        @output = output
+        @timestamp = Time.new.strftime("%Y%m%d%H")
+    end
+
+    def getmout(ext)
+        File.join(@output, "mout#{@timestamp}#{ext}")
+    end
+
+    def output(f1, f2)
+        tmp1 = f1 + '.tmp'
+        tmp2 = f2 + '.tmp'
+        File.open(tmp1, 'w') do |of1|
+            File.open(tmp2, 'w') do |of2|
+                yield of1, of2
+            end
+        end
+        File.rename(tmp1, f1)
+        File.rename(tmp2, f2)
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcvt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,6 +85,8 @@ extra_rdoc_files:
 - mailcvt.rdoc
 files:
 - bin/mailcvt
+- bin/lock-runmailcvt
+- bin/runmailcvt
 - lib/mailcvt/version.rb
 - lib/mailcvt.rb
 - lib/big_mail_generator.rb
@@ -92,6 +94,7 @@ files:
 - lib/line_converter.rb
 - lib/grep_mail.rb
 - lib/log_helper.rb
+- lib/output_helper.rb
 - README.rdoc
 - mailcvt.rdoc
 homepage: http://github.com/ryu-kahou/mailcvt
@@ -114,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 474110297974916369
+      hash: -3200601137855396094
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 474110297974916369
+      hash: -3200601137855396094
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25