rbatch 2.3.0 → 2.3.1

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
-php:
+ruby:
   - "1.9"
 before_install:
   - gem install rbatch rspec

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rbatch.gemspec
 gemspec
+
+group :test do
+  gem 'rspec'
+  gem 'simplecov'
+end

data/README.ja.md

@@ -426,7 +426,7 @@ Run-Conf(`${RB_HOME}/.rbatchrc`)のサンプルは以下の通り
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
 #
-# 宛先を複数指定した場合は
+# 宛先を複数指定した場合は配列を利用する
 #
 #log_mail_to :
 #  - "AAA@sample.com"
@@ -469,6 +469,7 @@ opt = {
       :stdout    => false,
       :delete_old_log => false,
       :delete_old_log_date => 7,
+      :bufferd => false,
       :send_mail => false,
       :mail_to   => nil,
       :mail_from => "rbatch.localhost",

data/README.md

@@ -422,7 +422,7 @@ Sample of RBatch Run-Conf `${RB_HOME}/.rbatchrc`.
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
 #
-# if you want to send multiple recipients...
+# if you want to send multiple recipients, use array.
 #
 #log_mail_to :
 #  - "AAA@sample.com"
@@ -466,6 +466,7 @@ opt = {
       :stdout    => false,
       :delete_old_log => false,
       :delete_old_log_date => 7,
+      :bufferd => false,
       :send_mail => false,
       :mail_to   => nil,
       :mail_from => "rbatch.localhost",

data/lib/rbatch/log.rb

@@ -228,7 +228,11 @@ module RBatch
                          + "$")
           if r =~ file && Date.strptime($1,"%Y%m%d") <= Date.today - date
             @@journal.put 1, "Delete old log file: " + File.join(@vars[:log_dir] , file)
-            File::delete(File.join(@vars[:log_dir]  , file))
+            begin
+              File::delete(File.join(@vars[:log_dir]  , file))
+            rescue Exception => e
+              @@journal.put 1, "Fail to delete old log file. Skipped."
+            end
           end
         end
       end

data/lib/rbatch/version.rb

@@ -1,3 +1,3 @@
 module RBatch
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/sample/.rbatchrc

@@ -26,7 +26,7 @@
 #   Default is "<home>/lib"
 #   <home> is replaced to ${RB_HOME}
 #
-#lib_dir : /usr/local/lib/rbatch/
+#lib_dir: /usr/local/lib/rbatch/
 
 # Auto Library Load
 #
@@ -41,24 +41,31 @@
 #   Default is false.
 #   If true, two same name scripts cannot run at the same time.
 #
-#forbid_double_run : true
-#forbid_double_run : false
+#forbid_double_run: true
+#forbid_double_run: false
 
-# Journal Message Level
+# RBatch Journal Level
 #
 #   Default is 1
-#   If 2, put more journal messages to STDOUT.
+#   RBatch Journal is message of RBatch and is output to STDOUT. 
+#   If 2, put much more information.
 #   If 0, put nothing.
-#   Example of journal essages are follows.
-#       [RBatch] Load Config  : "../conf/hoge.yaml"
+#
+#   Example of RBatch Journal are follows.
+#     [RBatch] === START RBatch === (PID=5795)
+#     [RBatch] RB_HOME : "/path/to/"
+#     [RBatch] Load Run-Conf: "/path/to/.rbatchrc"
+#     [RBatch] Start Script : "/path/to/bin/hello.rb"
+#     ....
 #
 #rbatch_journal_level : 2
 #rbatch_journal_level : 0
 
-# Mix Journal Message to Logs
+# Mix RBatch Journal to Logs
 #
 #   Default is true.
-#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
+#   If true, RBatch Journal is output not only STDOUT
+#   but also log file(s) which is(are) opened at time.
 #
 #mix_rbatch_journal_to_logs : true
 #mix_rbatch_journal_to_logs : false
@@ -111,24 +118,31 @@
 # Delete old log files
 #
 #   Default is false.
-#   If this is true, delete old log file when RBatch::Log.new is called.
-#   A log file to delete is a log file which was made by the
-#   RBatch::Log instance, and log filename format include "<date>".
+#   If this is true, delete old log files when RBatch::Log.new is called.
+#   If log filename format does not include "<date>", do nothing.
 #
-#log_delete_old_log: true
-#log_delete_old_log: false
+#log_delete_old_log : true
+#log_delete_old_log : false
 
-# Expire Date of Log Files
+# Expire Days of Log Files
 #
 #   Default is 7.
 #
-#log_delete_old_log_date: 14
+#log_delete_old_log_date : 14
+
+# Log buffering
+#
+#   Default is false.
+#   If true, log output is bufferd.
+#
+#log_bufferd : true
+#log_bufferd : false
 
 # Send Mail
 #
 #   Default is false.
-#   When log.error(msg) or log.fatal(msg) called , send e-mail
-#   including "msg".
+#   When log.error is called, log.fatal is called,
+#   or rescue an Exception, send e-mail.
 #
 #log_send_mail : true
 
@@ -138,6 +152,12 @@
 #log_mail_from : "xxx@sample.com"
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
+#
+# if you want to send multiple recipients, use array.
+#
+#log_mail_to :
+#  - "AAA@sample.com"
+#  - "BBB@sample.com"
 
 # -------------------
 # Cmd setting

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors: 
 - fetaro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-28 00:00:00 Z
+date: 2014-12-08 00:00:00 Z
 dependencies: []
 
 description: Batch Script Framework