keystone 0.0.29 → 0.0.30

data/Rakefile

@@ -3,7 +3,7 @@
 
 $:.unshift "lib"
 
-require 'lib/keystone'
+#require 'lib/keystone'
 
 # task :build do
 #   sh 'rm -f kanamei-keystone-#{Keystone::VERSION}.gem'
@@ -11,16 +11,20 @@ require 'lib/keystone'
 #   sh "gem install kanamei-keystone-#{Keystone::VERSION}.gem"
 # end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "keystone"
-    gemspec.summary = "oreore library"
-    gemspec.email = "paco.jp@gmail.com"
-    gemspec.homepage = "http://github.com/kanamei/keystone"
-    gemspec.description = "oreore library"
-    gemspec.authors = ["paco"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+desc "create gem file"
+task :build do
+  begin
+    require 'jeweler'
+    Jeweler::Tasks.new do |gemspec|
+      gemspec.name = "keystone"
+      gemspec.summary = "oreore library"
+      gemspec.email = "paco.jp@gmail.com"
+      gemspec.homepage = "http://github.com/kanamei/keystone"
+      gemspec.description = "oreore library"
+      gemspec.authors = ["paco"]
+    end
+  rescue LoadError
+    puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  end  
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.29
+0.0.30

data/example/batch_sample.rb

@@ -1,24 +1,36 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'keystone'
 require "optparse"
 
-include Keystone::Batch::Base
 
-# 実行時に--helpでオプション一覧
+class SampleBatch
+  include Keystone::Batch::Base
+  logger_name :l
 
-has_option = {}
-opts = option_parser
-opts.on("-v value") do |v|
-  has_option[:v] = v
-end
-opts.on("-w who") do |v|
-  has_option[:w] = v
+  # 実行時に--helpでオプション一覧
+  def main
+    has_option = {}
+    opts = option_parser
+    opts.on("-v value") do |v|
+      has_option[:v] = v
+    end
+    opts.on("-w who") do |v|
+      has_option[:w] = v
+    end
+
+    execute() do
+      begin
+        sleep 10
+        l.info "batch process01"
+        l.info "who=#{has_option[:w]}"
+        sleep 4
+      rescue => e
+        l.error e
+      end
+    end
+  end
 end
 
-execute() do
-  sleep 10
-  info "batch process01"
-  info "who=#{has_option[:w]}"
-  sleep 4
-  raise 'error occur'
-end
+batch = SapmleBatch.new
+batch.main

data/example/os.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'keystone'
 

data/example/sendmail.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'keystone'
 require 'pit'

data/example/string_util.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'keystone'
 

data/lib/keystone.rb

@@ -1,5 +1,10 @@
+# -*- coding: utf-8 -*-
 
-$KCODE = 'u'
+#$KCODE = 'u'
+
+
+# version check
+raise 'this version only for 1.9.2' unless RUBY_VERSION == '1.9.2'
 
 require 'keystone/core_ext'
 require 'keystone/base'
@@ -11,7 +16,7 @@ autoload :Moji          , 'vendor/moji'
 
 module Keystone
 
-  VERSION = '0.0.27'
+  VERSION = '0.0.30'
 
   autoload :StringUtil , 'keystone/string_util'
   autoload :Batch      , 'keystone/batch'

data/lib/keystone/base.rb

@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
 module Keystone
-  
   #
   # ログレベルに関してのローカルルール（ログ確認に関して）
   # debug    対応不要
@@ -11,64 +11,86 @@ module Keystone
   # critical 1つで即時対応
   #
   module Base
-    def log(log_type,message, is_base_info = true)
-      
-      # ......nangiyana
-      message.gsub!(/\r\n/,"\n")
-      message.gsub!(/\r/,"\n")
+    def self.included(base)
+      def __logger
+        Keystone::Base::Logger.instance
+      end
+
+      base.class_eval do
+        def self.logger_name(name)
+          if self.respond_to?(name)
+            raise "name #{name} can not set!!"
+          end
+          define_method(name, instance_method(:__logger))
+        end
+      end
+    end
+    
+    class Logger
+      def self.instance
+        @@looger_instance ||= Keystone::Base::Logger.new
+        return @@looger_instance
+      end
       
-      messages = message.split("\n")
-      if messages.size > 1
-        messages.each_with_index do |st,i|
-          if i == 0
-            puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{st}"
+      def _log(log_type,message, is_base_info = true)
+
+        # ......nangiyana
+        message.gsub!(/\r\n/,"\n")
+        message.gsub!(/\r/,"\n")
+
+        messages = message.split("\n")
+        if messages.size > 1
+          messages.each_with_index do |st,i|
+            if i == 0
+              puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{st}"
+            else
+              puts "[#{log_type.to_s}] #{st}"
+            end
+          end
+        else
+          if is_base_info
+            puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{message}"
           else
-            puts "[#{log_type.to_s}] #{st}"
+            puts "[#{log_type.to_s}] #{message}"
           end
         end
-      else
-        if is_base_info
-          puts "[#{Time.now.strftime("%Y/%m/%d %H:%M:%S")}][#{$$}][#{log_type.to_s}] #{message}"
+      end
+
+      def error(message)
+        if message.is_a? Exception
+          _log(:ERROR,"#{message.message}")
+          message.backtrace.each_with_index {|line, i|
+            _log(:ERROR,"#{line})",false)
+          }
         else
-          puts "[#{log_type.to_s}] #{message}"
+          _log(:ERROR,message.to_s)
         end
       end
-    end
 
-    def error(message)
-      if message.is_a? Exception
-        log(:ERROR,"#{message.message}")
-        message.backtrace.each_with_index {|line, i|
-          log(:ERROR,"#{line})",false)
-        }
-      else
-        log(:ERROR,message.to_s)
+      def info(message)
+        _log(:INFO,message)
       end
-    end
 
-    def info(message)
-      log(:INFO,message)
-    end
+      def warn(message)
+        _log(:WARN,message)
+      end
 
-    def warn(message)
-      log(:WARN,message)
-    end
+      def notice(message)
+        _log(:NOTICE,message)
+      end
 
-    def notice(message)
-      log(:NOTICE,message)
-    end
-    
-    def alert(message)
-      log(:ALERT,message)
-    end    
+      def alert(message)
+        _log(:ALERT,message)
+      end    
 
-    def critical(message)
-      log(:CRIT,message)
-    end    
+      def critical(message)
+        _log(:CRIT,message)
+      end    
 
-    def debug(message)
-      if $DEBUG
-        log(:DEBUG,message)
+      def debug(message)
+        if $DEBUG
+          _log(:DEBUG,message)
+        end
       end
     end
   end

data/lib/keystone/batch.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Batch
     autoload :Base , 'keystone/batch/base'

data/lib/keystone/batch/base.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'digest/md5'
 require "optparse"
 
@@ -77,7 +78,7 @@ module Keystone::Batch
       
       if Module.constants.include?("ARGV_ORIGINAL")
         
-        debug "ARGV_ORIGINAL found!!"
+        Keystone::Base::Logger.instance.debug "ARGV_ORIGINAL found!!"
         
         ARGV << "-h" if ARGV_ORIGINAL.include?("-h")
         ARGV << "--help" if ARGV_ORIGINAL.include?("--help")
@@ -85,13 +86,13 @@ module Keystone::Batch
         pg_path = File.expand_path(script_name)
         opts.banner = "Usage: script/runner #{script_name} [options]"
         
-        debug "pg_path=#{pg_path}"
+        Keystone::Base::Logger.instance.debug "pg_path=#{pg_path}"
         opts.on("-e", "--environment=name", 
           String,"specifies the environment for the runner to operate under (test/development/production).",
           "default: development")
       else
-        debug "caller=#{caller}"
-        pg_path = if File.expand_path(caller[0]) =~ /(.*):\d*\z/
+        Keystone::Base::Logger.instance.debug "caller=#{caller}"
+        pg_path = if File.expand_path(caller[0]) =~ /(.*):\d*:in `.*?'\z/
           $1
         else
           raise "must not happen!! can not get caller value"
@@ -133,7 +134,7 @@ module Keystone::Batch
       
       opts.parse!(ARGV)
       
-      info "start script(#{pg_path})"
+      Keystone::Base::Logger.instance.info "start script(#{pg_path})"
       script_started_at = Time.now
       double_process_check_worked = false
       begin
@@ -143,17 +144,17 @@ module Keystone::Batch
           pg_name = File.basename(pg_path)
           hash = Digest::MD5.hexdigest(pg_path)
           pid_file = "/tmp/.#{pg_name}.#{hash}.pid" unless pid_file
-          debug pid_file
+          Keystone::Base::Logger.instance.debug pid_file
           if File.exists?(pid_file)
             pid = File.open(pid_file).read.chomp
             pid_list = `ps ax | awk '{print $1}'`
             if (pid != nil && pid != "" ) && pid_list =~ /#{pid}/
-              warn "pid:#{pid} still running"
+              Keystone::Base::Logger.instance.warn "pid:#{pid} still running"
               double_process_check_worked = true
               return nil
             else
               if auto_recover
-                warn "lock file still exists[pid=#{pid}],but process does not found.auto_recover enabled.so process continues"
+                Keystone::Base::Logger.instance.warn "lock file still exists[pid=#{pid}],but process does not found.auto_recover enabled.so process continues"
               else
                 double_process_check_worked = true
                 raise "lock file still exists[pid=#{pid}],but process does not found.auto_recover disabled.so process can not continue"
@@ -166,13 +167,13 @@ module Keystone::Batch
         end
         return (yield process)
       rescue => e
-        error e
+        Keystone::Base::Logger.instance.error e
         send_error_mail(e,options)
       ensure
         unless double_process_check_worked
           File.delete(pid_file) if double_process_check
         end
-        info "finish script (%1.3fsec)" % (Time.now - script_started_at)
+        Keystone::Base::Logger.instance.info "finish script (%1.3fsec)" % (Time.now - script_started_at)
       end
     end
     
@@ -187,7 +188,7 @@ module Keystone::Batch
     def send_error_mail(exception,options)
       if options[:error_mail_to]
         host = Keystone::Os.get()
-        title = %|error occur at "#{host.hostname}" [#{exception.message}]|
+        title = %|[error][#{host.hostname}][#{exception.message}]|
         
         mail_to = options[:error_mail_to]
         mail_to = [mail_to] if mail_to.is_a?(String)
@@ -195,12 +196,14 @@ module Keystone::Batch
         smtp_addr = options[:error_mail_smtp_addr]
         smtp_port = options[:error_mail_smtp_port]
         
-        debug "mail_to=#{mail_to}"
-        debug "mail_from=#{mail_from}"
-        debug "smtp_addr=#{smtp_addr}"
-        debug "smtp_port=#{smtp_port}"
+        Keystone::Base::Logger.instance.debug "mail_to=#{mail_to}"
+        Keystone::Base::Logger.instance.debug "mail_from=#{mail_from}"
+        Keystone::Base::Logger.instance.debug "smtp_addr=#{smtp_addr}"
+        Keystone::Base::Logger.instance.debug "smtp_port=#{smtp_port}"
         
         body  = <<-BODY
+==== pg ====
+#{File.expand_path($0)}
 ==== error message ====
 #{exception.message}
 ====== backtrace ======
@@ -208,9 +211,9 @@ module Keystone::Batch
 ===== environment =====
 #{host.dump}
 BODY
-        Keystone::Mail::Send.send(mail_from,mail_to,title,body,{:smtp_addr=>smtp_addr,:smtp_port=>smtp_port})
+        Keystone::Mail::Send.sendmail(mail_from,mail_to,title,body,smtp_addr,smtp_port)
       else
-        warn "ERROR_MAIL_TO not defined.if you want error mail automatically,set this value."
+        Keystone::Base::Logger.instance.info "ERROR_MAIL_TO not defined.if you want error mail automatically,set this value(check execute() method option)."
       end
     end
   end

data/lib/keystone/core_ext.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module CoreExt
     require 'keystone/core_ext/blank'

data/lib/keystone/core_ext/array.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Array
   #
   # TODO 

data/lib/keystone/core_ext/blank.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Object
   # copy from activesupport
   def blank?

data/lib/keystone/core_ext/dir.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Dir
 
 

data/lib/keystone/core_ext/ipaddr.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'ipaddr'
 
 class IPAddr

data/lib/keystone/core_ext/object.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Object
   # http://www.yohasebe.com/pages/trans-seeing-metaclasses-clearly/
   def metaclass
@@ -23,11 +24,11 @@ class Object
   
   # 1.8.7  エミュレート
   # TODO version 指定
-  def tap
-    yield(self)
-    self
-  end
-  
+  # def tap
+  #   yield(self)
+  #   self
+  # end
+  # 
   def tapp
     self.tap{|obj| p obj}
   end

data/lib/keystone/core_ext/tempfile.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'tempfile'
 
 class Tempfile

data/lib/keystone/core_ext/uri.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class Uri
   #
   def self.escape_raw(st)

data/lib/keystone/mail.rb

@@ -1,8 +1,12 @@
+# -*- coding: utf-8 -*-
+
+# 基本的に使わないでーーーー 1.9 対応適当にしただけだから
+
 module Keystone::Mail
-  autoload :Message,          'keystone/mail/message'
-  autoload :MessageIso2022jp, 'keystone/mail/message_iso2022jp'
-  autoload :MessageSjis,      'keystone/mail/message_sjis'
-  autoload :Receive,          'keystone/mail/receive'
-  autoload :MessageFactory,   'keystone/mail/message_factory'
+  # autoload :Message,          'keystone/mail/message'
+  # autoload :MessageIso2022jp, 'keystone/mail/message_iso2022jp'
+  # autoload :MessageSjis,      'keystone/mail/message_sjis'
+  # autoload :Receive,          'keystone/mail/receive'
+  # autoload :MessageFactory,   'keystone/mail/message_factory'
   autoload :Send,             'keystone/mail/send'
 end

data/lib/keystone/mail/send.rb

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 require 'net/smtp'
+require "nkf"
 
 if __FILE__ ==$0
   $: << '../..'
@@ -8,76 +10,26 @@ end
 module Keystone
   module Mail
     class Send
-      attr_accessor :message, :smtp_addr, :smtp_port, :retry_cnt
+      def self.sendmail(from, to, subject, body, host = "localhost", port = 25)
+        body = <<EOT
+From: #{from}
+To: #{to.to_a.join(",\n ")}
+Subject: #{NKF.nkf("-WMm0j", subject)}
+Date: #{Time::now.strftime("%a, %d %b %Y %X %z")}
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-2022-JP
+Content-Transfer-Encoding: 7bit
 
-      #
-      # 普通なことをしたいならTMailを使いましょう
-      #    class Send
-      def initialize(message=nil,opt={})
-        @smtp_addr, @smtp_port, @retry_cnt = "127.0.0.1", 25, 0
-        @message = message
-        @message = Keystone::Mail::MessageFactory.create(opt) if @message == nil
-        debug "@message=#{@message}"
-        set_option(opt)
-      end
+#{body}
+EOT
 
-      #
-      # from could be String or Array
-      # opt 
-      #   :smtp_addr 
-      #   :smtp_port 
-      #   :retry
-      #   :mail_from_text 
-      #   :encoding
-      #
-      def self.send(from, to, subject, body, opt={})
-        queue = self.new(nil,opt)
-        queue.message.mail_to = to
-        queue.message.mail_from = from
-        queue.message.subject = subject
-        queue.message.body = body
-        queue.send
-      end
-      
-      def send
-        src = @message.to_src
-        debug src
-        try_cnt = 0
-        begin
-          m = Net::SMTPSession.new(@smtp_addr, @smtp_port)
-          m.start()
-          m.sendmail(src ,@message.mail_from ,@message.mail_to)
-          m.finish
-        rescue => e
-          debug "try_cnt:#{try_cnt}"
-          try_cnt += 1
-          sleep 1
-          retry if @retry_cnt >= try_cnt
-          raise e
+        body = NKF.nkf("-Wj", body).force_encoding("ASCII-8BIT")
+
+        Net::SMTP.start(host, port) do |smtp|
+          smtp.send_mail body, from, to
         end
       end
-      
-      def set_option(opt)
-        @smtp_addr = opt[:smtp_addr] if opt.key?(:smtp_addr)
-        @smtp_port = opt[:smtp_port] if opt.key?(:smtp_port)
-        @retry_cnt = Integer(opt[:retry_cnt]) if opt.key?(:retry_cnt)
-      end
     end
   end
 end
 
-if __FILE__ ==$0
-  require 'rubygems'
-  require 'pit'
-
-  config = Pit.get("keystone_test")
-  
-  Keystone::Mail::Send.send(
-    config["mailfrom01"],
-    config["mailto01"],
-    "件名かんさいーーーーでんきほーーーあんｋｙ−−−かいいい−−かいいい−−かいいいいいいいい終わり",
-    "body日本語",
-    {:mail_from_text=>"メール送信者名ーーーーーーーーーーーーーーーーーーーーーーーーーーーーーー終わり",:retry_cnt=>3,:encoding=>:sjis}
-  )
-end
-

data/lib/keystone/{mail → mail__old}/address.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'net/smtp'
 
 if __FILE__ ==$0
@@ -42,18 +43,18 @@ module Keystone
           #"=?UTF-8?B?44Gq44GM44O844O844O844O844O844O844O844O844O8?==?UTF-8?B?44O844O844O844O844O844O844O844O844O844O844O8?==?UTF-8?B?44O844O844O844O844O844O844O844O844O844O844O8?==?UTF-8?B?44O844O844O844O844O844O844O844O844O844O844O8?==?UTF-8?B?44O844O844O844O844O844O844O844O844O844O844O8?==?UTF-8?B?44O844O844O844O844O844GE44GC44Gm5YWI?=
 
           name,address = ""
-          KmClassBase::debug "line=#{line}"
+          Keystone::Base::Logger.instance.debug "line=#{line}"
 
           if /"(.*)"\s*<(.*)>/ =~ line
             # umaku dekinkatta
             name = $1.strip
             address = $2.strip
-            KmClassBase::debug "name=|#{name}|"
+            Keystone::Base::Logger.instance.debug "name=|#{name}|"
           elsif /(.*)\s*<(.*)>/ =~ line
             name = $1.strip
             address = $2.strip
-            KmClassBase::debug "name=|#{name}|"
-            KmClassBase::debug "address=|#{address}|"
+            Keystone::Base::Logger.instance.debug "name=|#{name}|"
+            Keystone::Base::Logger.instance.debug "address=|#{address}|"
           else
             address = line.strip
           end
@@ -61,17 +62,17 @@ module Keystone
       #    if /^=\?ISO-2022-JP.*/i =~ name || 
       #    if /^=\?UTF-8/i =~ name
           if /^(?:(=\?ISO-2022-JP\?B\?)|(=\?UTF-8\?B\?))/i =~ name
-            KmClassBase::debug "hit!!"
+            Keystone::Base::Logger.instance.debug "hit!!"
             begin
-              KmClassBase::debug "hit #{$1}"
+              Keystone::Base::Logger.instance.debug "hit #{$1}"
               name = KmMailAddress::convert(name)
             rescue => e
-              KmClassBase::warn e.to_s
+              Keystone::Base::Logger.instance.warn e.to_s
             end
           end
 
-          KmClassBase::debug "name_end=|#{name}|"
-          KmClassBase::debug "address_end=|#{address}|"
+          Keystone::Base::Logger.instance.debug "name_end=|#{name}|"
+          Keystone::Base::Logger.instance.debug "address_end=|#{address}|"
           return address,name
         end  
 

data/lib/keystone/{mail → mail__old}/content_type.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'net/smtp'
 
 if __FILE__ ==$0

data/lib/keystone/{mail → mail__old}/message.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'kconv'
 
 module Keystone
@@ -20,7 +21,9 @@ module Keystone
         header += create_mailto_header
         header += create_subject_header
         header += "\n"
-        header += encode_body
+        e_body = encode_body
+        header = header.encode(encode_body.encoding)
+        header += e_body
         return header
       end
       

data/lib/keystone/{mail → mail__old}/message_factory.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Mail
     class MessageFactory

data/lib/keystone/{mail → mail__old}/message_iso2022jp.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'kconv'
 
 module Keystone

data/lib/keystone/{mail → mail__old}/message_sjis.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'kconv'
 
 module Keystone

data/lib/keystone/{mail → mail__old}/receive.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'net/smtp'
 require 'kconv'
 require 'tempfile'
@@ -72,18 +73,18 @@ module Keystone
             if line == "--#{@content_type.boundary}"
               set_parse_finish_messages
               @messages.push(KmMessage.new(@depth + 1))
-              debug "new multipart start"
+              Keystone::Base::Logger.instance.debug "new multipart start"
               return true
             end
             if line == "--#{@content_type.boundary}--"
               set_parse_finish_messages
               @is_finish_parsing = true
-              debug "multipart end"
+              Keystone::Base::Logger.instance.debug "multipart end"
               if @file_handle != nil
                 begin
                   @file_stream.close
                 rescue => e
-                  error e
+                  Keystone::Base::Logger.instance.error e
                 end
               end
               return true
@@ -101,17 +102,17 @@ module Keystone
   
       def set_special_attrs
         # do not create file for top node KmMessage
-        debug "depth=#{@depth}"
+        Keystone::Base::Logger.instance.debug "depth=#{@depth}"
         if @depth != 1
           if @content_type.content_type != :multipart_mixed && @content_type.content_type != :multipart_related && @content_type.content_type != :multipart_alternative
             if $is_save_file
-            debug "!!!!!!!! create file handle [content_type=#{@content_type.content_type}]"
+            Keystone::Base::Logger.instance.debug "!!!!!!!! create file handle [content_type=#{@content_type.content_type}]"
               $save_folder ||= "/tmp"
               tmp_file = Tempfile.new("KmReceiveMail",$save_folder)
               @file_path = tmp_file.path
               @file_handle =tmp_file
               @file_stream =tmp_file.open        
-              debug "@file_path=#{@file_path}"
+              Keystone::Base::Logger.instance.debug "@file_path=#{@file_path}"
             end
           end
         end
@@ -126,13 +127,13 @@ module Keystone
         header["from"] = KmMailAddress::get_addresses(header["from"])[0] if header["from"] != nil
     
         if @header["content-type"] != nil
-          debug "reshape_header set content-type"
+          Keystone::Base::Logger.instance.debug "reshape_header set content-type"
           @content_type = KmContentType.new(@header["content-type"])
-          debug "@content_type=#{@content_type.inspect}"
-          debug "get file"
+          Keystone::Base::Logger.instance.debug "@content_type=#{@content_type.inspect}"
+          Keystone::Base::Logger.instance.debug "get file"
         else
-          warn "content-type not fond"
-          warn @header.inspect
+          Keystone::Base::Logger.instance.warn "content-type not fond"
+          Keystone::Base::Logger.instance.warn @header.inspect
         end
         if @header["content-transfer-encoding"] != nil
           if /base64/i =~ @header["content-transfer-encoding"]
@@ -146,7 +147,7 @@ module Keystone
           elsif /quoted\-printable/i =~ @header["content-transfer-encoding"]
             @content_transfer_encoding = :quoted_printable
           else
-            error "transfer encoding not supported [#{@header["content-transfer-encoding"]}]"
+            Keystone::Base::Logger.instance.error "transfer encoding not supported [#{@header["content-transfer-encoding"]}]"
           end
         end
       end
@@ -156,7 +157,7 @@ module Keystone
       end
   
       def set_header(key,val)
-        debug "key[#{key}],val[#{val}]"
+        Keystone::Base::Logger.instance.debug "key[#{key}],val[#{val}]"
 
         key = key.downcase
         @header[key] ||= ""
@@ -172,7 +173,7 @@ module Keystone
   
       def parse_and_set_header(line)
         if /^\s/ =~ line
-          debug "multi header:#{@last_header}"
+          Keystone::Base::Logger.instance.debug "multi header:#{@last_header}"
           set_header(@last_header,line.strip)
         else
       
@@ -182,7 +183,7 @@ module Keystone
             @last_header = $1
             set_header($1,$2)
           else
-            error "error parse header!! [#{line}]"
+            Keystone::Base::Logger.instance.error "error parse header!! [#{line}]"
           end
         end
       end
@@ -202,11 +203,11 @@ module Keystone
           @body += cline
           @file_stream.write(cline) if @file_handle != nil
         elsif @content_transfer_encoding == :base64
-          debug "content_type=#{@content_type.content_type.to_s}"
-          debug "boundary=#{@content_type.boundary}"
-          debug "size=#{@file_handle.size}"
-          debug "file_path=#{@file_path}"
-          debug "!!!!!!!!!writing[#{line}]"
+          Keystone::Base::Logger.instance.debug "content_type=#{@content_type.content_type.to_s}"
+          Keystone::Base::Logger.instance.debug "boundary=#{@content_type.boundary}"
+          Keystone::Base::Logger.instance.debug "size=#{@file_handle.size}"
+          Keystone::Base::Logger.instance.debug "file_path=#{@file_path}"
+          Keystone::Base::Logger.instance.debug "!!!!!!!!!writing[#{line}]"
           @file_stream.write(Base64::decode64(line)) if @file_handle != nil
         end   
         return true
@@ -300,16 +301,16 @@ module Keystone
   
       def dump
         dump_inner(@message)
-        info "=========== body =============="
-        info(@message.body)
+        Keystone::Base::Logger.instance.info "=========== body =============="
+        Keystone::Base::Logger.instance.info(@message.body)
       end
   
       def dump_inner(message)
-        info(("-" * message.depth) + "content-type=" + message.content_type.content_type.to_s)
-        info(("-" * message.depth) + "boundary=" + message.content_type.boundary.to_s) if message.content_type.boundary != nil
-        info(("-" * message.depth) + "file_path=" + message.file_path) if message.file_path != nil
-        info(("-" * message.depth) + "content_transfer_encoding=" + message.content_transfer_encoding.to_s) if message.content_transfer_encoding != nil
-        info(("-" * message.depth) + "header=" + message.header.inspect)
+        Keystone::Base::Logger.instance.info(("-" * message.depth) + "content-type=" + message.content_type.content_type.to_s)
+        Keystone::Base::Logger.instance.info(("-" * message.depth) + "boundary=" + message.content_type.boundary.to_s) if message.content_type.boundary != nil
+        Keystone::Base::Logger.instance.info(("-" * message.depth) + "file_path=" + message.file_path) if message.file_path != nil
+        Keystone::Base::Logger.instance.info(("-" * message.depth) + "content_transfer_encoding=" + message.content_transfer_encoding.to_s) if message.content_transfer_encoding != nil
+        Keystone::Base::Logger.instance.info(("-" * message.depth) + "header=" + message.header.inspect)
         message.messages.each{|m|
           dump_inner(m)
         }

data/lib/keystone/mail__old/send.rb

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+require 'net/smtp'
+
+if __FILE__ ==$0
+  $: << '../..'
+  require 'keystone'
+end
+
+module Keystone
+  module Mail
+    class Send
+      attr_accessor :message, :smtp_addr, :smtp_port, :retry_cnt
+
+      #
+      # 普通なことをしたいならTMailを使いましょう
+      #    class Send
+      def initialize(message=nil,opt={})
+        @smtp_addr, @smtp_port, @retry_cnt = "127.0.0.1", 25, 0
+        @message = message
+        @message = Keystone::Mail::MessageFactory.create(opt) if @message == nil
+        Keystone::Base::Logger.instance.debug "@message=#{@message}"
+        set_option(opt)
+      end
+
+      #
+      # from could be String or Array
+      # opt 
+      #   :smtp_addr 
+      #   :smtp_port 
+      #   :retry
+      #   :mail_from_text 
+      #   :encoding
+      #
+      def self.send(from, to, subject, body, opt={})
+        queue = self.new(nil,opt)
+        queue.message.mail_to = to
+        queue.message.mail_from = from
+        queue.message.subject = subject
+        queue.message.body = body
+        queue.send
+      end
+      
+      def send
+        src = @message.to_src
+        Keystone::Base::Logger.instance.debug src.encoding
+        Keystone::Base::Logger.instance.debug src
+        try_cnt = 0
+        begin
+          m = Net::SMTPSession.new(@smtp_addr, @smtp_port)
+          m.start()
+          mail_to = []
+          @message.mail_to.each{|m_to|mail_to << m_to.encode("US-ASCII")}
+          mail_from = @message.mail_from.encode("US-ASCII")
+          
+          m.sendmail(src ,mail_from ,mail_to)
+          m.finish
+        rescue => e
+          Keystone::Base::Logger.instance.debug "try_cnt:#{try_cnt}"
+          try_cnt += 1
+          sleep 1
+          retry if @retry_cnt >= try_cnt
+          raise e
+        end
+      end
+      
+      def set_option(opt)
+        @smtp_addr = opt[:smtp_addr] if opt.key?(:smtp_addr)
+        @smtp_port = opt[:smtp_port] if opt.key?(:smtp_port)
+        @retry_cnt = Integer(opt[:retry_cnt]) if opt.key?(:retry_cnt)
+      end
+    end
+  end
+end
+
+if __FILE__ ==$0
+  require 'rubygems'
+  require 'pit'
+
+  config = Pit.get("keystone_test")
+  
+  Keystone::Mail::Send.send(
+    config["mailfrom01"],
+    config["mailto01"],
+    "件名かんさいーーーーでんきほーーーあんｋｙ−−−かいいい−−かいいい−−かいいいいいいいい終わり",
+    "body日本語",
+    {:mail_from_text=>"メール送信者名ーーーーーーーーーーーーーーーーーーーーーーーーーーーーーー終わり",:retry_cnt=>3,:encoding=>:sjis}
+  )
+end
+

data/lib/keystone/os.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'keystone/os/abstract_os'
 
 module Keystone::Os

data/lib/keystone/os/abstract_os.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Os
     class AbstractOs
@@ -21,12 +22,15 @@ module Keystone
 
       def dump
         self_methods = self.methods - Class.methods
-        self_methods.delete("version=")
-        self_methods.delete("dump")
-        self_methods.delete("bin_or_usrbin")
+        self_methods.delete(:version=)
+        self_methods.delete(:dump)
+        self_methods.delete(:bin_or_usrbin)
+        
+        Keystone::Base::Logger.instance.debug self_methods
+        
         st = ""
         self_methods.each do |method|
-          p method
+          #p method
           st << "== #{method} ==\n  #{self.__send__(method).to_s.split("\n").join("\n  ")}\n"
         end
         return st

data/lib/keystone/os/centos.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Os
     class Centos < Linux

data/lib/keystone/os/darwin.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Os
     class Darwin < Unix

data/lib/keystone/os/linux.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone::Os
   class Linux < Unix
     def self.get

data/lib/keystone/os/osx.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Os
     class Osx < Darwin

data/lib/keystone/os/unix.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   module Os
     class Unix < AbstractOs
@@ -16,9 +17,9 @@ module Keystone
 
       def bin_or_usrbin(cmd,option="")
         cmd_option = "#{cmd} #{option}"
-        begin;return `/bin/#{cmd_option}` if File.exists?("/bin/#{cmd}");rescue;end
-        begin;return `/usr/bin/#{cmd_option}` if File.exists?("/usr/bin/#{cmd}");rescue;end
-        begin;return `/sbin/#{cmd_option}` if File.exists?("/sbin/#{cmd}");rescue;end
+        begin;return `/bin/#{cmd_option}`.chomp if File.exists?("/bin/#{cmd}");rescue;end
+        begin;return `/usr/bin/#{cmd_option}`.chomp if File.exists?("/usr/bin/#{cmd}");rescue;end
+        begin;return `/sbin/#{cmd_option}`.chomp if File.exists?("/sbin/#{cmd}");rescue;end
         begin;return `/usr/sbin/#{cmd_option}`.chomp;rescue;end
       end
 

data/lib/keystone/string_util.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Keystone
   class StringUtil
     def self.int_to_splitted_path(i_value,value_length,base_folder,suffix="")

data/test_local/batch.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+$LOAD_PATH << "../lib/"
+
+require 'keystone'
+require "optparse"
+require 'pit'
+
+
+ENV["EDITOR"] = "vi" unless ENV.key?("EDITOR")
+
+class Batch
+  include Keystone::Batch::Base
+  logger_name :l
+
+  # 実行時に--helpでオプション一覧
+  def main
+    has_option = {}
+    opts = option_parser
+    opts.on("-v value") do |v|
+      has_option[:v] = v
+    end
+    opts.on("-w who") do |v|
+      has_option[:w] = v
+    end
+    
+    config = Pit.get("keystone_test", :require => {
+            "smtp_addr" => "smtp_server_address",
+            "mailto" => "mailto",
+            "mailfrom" => "mailfrom"
+    })    
+
+    execute(:error_mail_to=>config["mailto"]) do
+      # begin
+        l.info "batch process01"
+        l.info "who=#{has_option[:w]}"
+        l.warn "this is warning"
+        raise "error occured manually エラーが発生しましたがなにか？？？？"
+      # rescue => e
+      #   l.error e
+      # end
+    end
+  end
+end
+
+b = Batch.new
+b.main

data/util/bin/command_broadcast.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # TODO 
 # みしあげでおま

data/util/bin/disk_size_check.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+# -*- coding: utf-8 -*-
 
 require 'rubygems'
 require 'keystone'

data/util/bin/ve2tar.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+# -*- coding: utf-8 -*-
 
 require 'rubygems'
 require 'keystone'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: keystone
 version: !ruby/object:Gem::Version 
-  hash: 37
   prerelease: false
   segments: 
   - 0
   - 0
-  - 29
-  version: 0.0.29
+  - 30
+  version: 0.0.30
 platform: ruby
 authors: 
 - paco
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +09:00
+date: 2010-11-04 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -172,14 +171,15 @@ files:
 - lib/keystone/core_ext/tempfile.rb
 - lib/keystone/core_ext/uri.rb
 - lib/keystone/mail.rb
-- lib/keystone/mail/address.rb
-- lib/keystone/mail/content_type.rb
-- lib/keystone/mail/message.rb
-- lib/keystone/mail/message_factory.rb
-- lib/keystone/mail/message_iso2022jp.rb
-- lib/keystone/mail/message_sjis.rb
-- lib/keystone/mail/receive.rb
 - lib/keystone/mail/send.rb
+- lib/keystone/mail__old/address.rb
+- lib/keystone/mail__old/content_type.rb
+- lib/keystone/mail__old/message.rb
+- lib/keystone/mail__old/message_factory.rb
+- lib/keystone/mail__old/message_iso2022jp.rb
+- lib/keystone/mail__old/message_sjis.rb
+- lib/keystone/mail__old/receive.rb
+- lib/keystone/mail__old/send.rb
 - lib/keystone/os.rb
 - lib/keystone/os/abstract_os.rb
 - lib/keystone/os/centos.rb
@@ -190,6 +190,7 @@ files:
 - lib/keystone/string_util.rb
 - test/test_core_ext.rb
 - test/test_string_util.rb
+- test_local/batch.rb
 - util/README
 - util/bin/command_broadcast.rb
 - util/bin/disk_size_check.rb
@@ -211,7 +212,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -220,7 +220,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"