rbatch 1.8.0 → 1.8.1

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/
+sample/log/

data/CHANGELOG

@@ -0,0 +1,43 @@
+-----
+initial
+
+1.1.0(2012/11/9)
+-----
+* make common config file
+* change log option
+
+1.2.0(2012/11/13)
+-----
+* change log level option format
+* make log append option
+
+1.3.0(2012/12/30)
+-----
+* add RBatch::Log to instance interface
+* add double run check option
+
+1.4.0(2013/1/5)
+----
+* add log_stdout option
+* add sample code
+* add cmd_raise option
+* add log_delete_old_log option
+
+1.5.0(2013/1/11)
+----
+* change default config dir "../config" -> "../conf"
+
+1.6.0(2013/1/14)
+----
+* add config key check
+
+1.7.0(2013/01/30)
+----
+* change log format
+* delete change log format option
+
+1.8.0(2013/02/10)
+----
+* add log_send_mail option
+* add cmd_timeout option
+

data/HOW_TO_TEST.md

@@ -0,0 +1,9 @@
+
+How to Test
+--------------
+```
+cd (RBatch source code dir)
+ruby -I lib test/cases/test_config.rb
+ruby -I lib test/cases/test_cmd.rb
+ruby -I lib test/cases/test_log.rb
+```

data/README.ja.md

@@ -22,6 +22,7 @@ RBatchについて
 Logging blockを使うことで、自動的にログファイルに出力することができます。
 ログファイルはデフォルトで"../log/YYYYMMDD_HHMMSS_${PROG_NAME}.log"に出力されます。
 例外が発生した場合でも、ログにスタックトレースを出力することができます。
+また、エラーが発生した場合に自動でメールを送信することもできます。
 
 サンプル
 
@@ -281,13 +282,13 @@ $ cat log/YYYYMMDD_HHMMSS_backup.log
 #   デフォルト値は false。
 #   log.error(msg)かlog.fatal(msg) を呼び出したときに,"msg"の内容をメールで送信する。
 #
-#send_mail : true
+#log_send_mail : true
 
 # メール送信のパラメータ
 #
-#mail_to   : "xxx@sample.com"
-#mail_from : "xxx@sample.com"
-#mail_server_host : "localhost"
-#mail_server_port : 25
+#log_mail_to   : "xxx@sample.com"
+#log_mail_from : "xxx@sample.com"
+#log_mail_server_host : "localhost"
+#log_mail_server_port : 25
 
 ```

data/README.md

@@ -21,6 +21,7 @@ This work on only Ruby 1.9.x or more later.
 Use Auto Logging block, RBatch automatically write to logfile.
 Log file default location is "(script file path)/../log/YYYYMMDD_HHMMSS_${PROG_NAME}.log" .
 If exception occuerd, then RBatch write stack trace to logfile.
+When an error occurs, there is also a function to send an error by e-mail automatically. 
 
 sample
 
@@ -276,14 +277,14 @@ Config Sample
 #   Default is false.
 #   When log.error(msg) or log.fatal(msg) called , send e-mail including "msg". 
 #
-#send_mail : true
+#log_send_mail : true
 
 # Send mail parameters
 #
-#mail_to   : "xxx@sample.com"
-#mail_from : "xxx@sample.com"
-#mail_server_host : "localhost"
-#mail_server_port : 25
+#log_mail_to   : "xxx@sample.com"
+#log_mail_from : "xxx@sample.com"
+#log_mail_server_host : "localhost"
+#log_mail_server_port : 25
 
 ```
 

data/Rakefile

@@ -1,38 +1 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
-
-spec = Gem::Specification.new do |s|
-  s.name = 'rbatch'
-  s.version = '1.8.0'
-  s.extra_rdoc_files = ['README.md', 'LICENSE']
-  s.summary = 'simple batch framework'
-  s.description = ''
-  s.author = 'fetaro'
-  s.email = 'fetaro@gmail.com'
-  s.homepage = 'https://github.com/fetaro/rbatch'
-  s.files = %w(LICENSE README.md README.ja.md Rakefile) + Dir.glob("{lib,test,sample,doc}/**/*")
-  s.require_path = "lib"
-
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.package_files.include("lib/**/*")
-  p.need_tar = false
-  p.need_zip = false
-end
-
-Rake::RDocTask.new do |rdoc|
-  files =['README.md', 'LICENSE', 'CHANGELOG', 'lib/**/*.rb']
-  rdoc.rdoc_files.add(files)
-#  rdoc.main = "README.md" # page to start on
-  rdoc.title = "RBatch Docs"
-  rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
-  rdoc.options << '--line-numbers'
-end
-
-
+require "bundler/gem_tasks"

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors: 
 - fetaro
@@ -10,136 +10,98 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-09 00:00:00 Z
+date: 2013-02-11 00:00:00 Z
 dependencies: []
 
 description: ""
-email: fetaro@gmail.com
+email: 
+- fetaro@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- LICENSE
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- CHANGELOG
+- HOW_TO_TEST.md
 - LICENSE
-- README.md
 - README.ja.md
+- README.md
 - Rakefile
-- lib/rbatch/config.rb
-- lib/rbatch/cmd.rb
-- lib/rbatch/log.rb
-- lib/rbatch.rb
-- test/cases/test_config.rb
-- test/cases/test_cmd.rb
-- test/cases/test_log.rb
-- test/mocks/PrintArgs.exe
-- test/mocks/win_cmd.exe
-- sample/data/access_log.2012-07-10
-- sample/data/amAuthentication.error.1
-- sample/data/amAuthentication.access.2012-07-10
-- sample/data/amAgent_localhost_80.log.2012-07-10
-- sample/data/access_log.1
-- sample/data/amAuthentication.error.2012-07-10
-- sample/data/amAgent_localhost_80.log.1
-- sample/data/amAuthentication.access.1
-- sample/log/20130131_apache_log_insert.log
-- sample/log/20130120_openam_log_insert.log
-- sample/log/20130210_test.log
-- sample/log/20130122_apache_log_insert.log
-- sample/log/20130122_openam_log_insert.log
-- sample/log/20130121_webagent_log_insert.log
-- sample/log/20130129_log_backup.log
-- sample/log/20130121_file_batch_copy.log
-- sample/log/20130209_test.log
-- sample/log/20130120_apache_log_insert.log
-- sample/log/empty
-- sample/log/20130122_webagent_log_insert.log
-- sample/log/20130121_openam_log_insert.log
-- sample/log/20130121_apache_log_insert.log
-- sample/conf/openldap_backup.yaml
-- sample/conf/webagent_log_insert.yaml
-- sample/conf/apache_log_insert.yaml
-- sample/conf/log_backup.yaml
-- sample/conf/mysql_data_backup.yaml
-- sample/conf/file_batch_copy.yaml
-- sample/conf/rbatch.yaml
-- sample/conf/openam_log_insert.yaml
-- sample/bin/test2.rb
-- sample/bin/apache_log_insert.rb
-- sample/bin/openldap_backup.rb
-- sample/bin/webagent_log_insert.rb
-- sample/bin/test.rb
-- sample/bin/mysql_data_backup.rb
-- sample/bin/openam_log_insert.rb
-- sample/bin/file_batch_copy.rb
-- sample/bin/log_backup.rb
-- sample/moto/README
-- sample/moto/gradlew
-- sample/moto/gradle.properties
-- sample/moto/auditlog.src.zip
-- sample/moto/src/main/java/jp/ossc/imortAuditlog/LogReader.java
-- sample/moto/src/main/java/jp/ossc/imortAuditlog/ImportAuthLogMain.java
-- sample/moto/src/main/java/jp/ossc/imortAuditlog/DateUtil.java
-- sample/moto/src/main/java/jp/ossc/imortAuditlog/MysqlController.java
-- sample/moto/src/main/logrotate/delete_workflowinstanceslog
-- sample/moto/src/main/logrotate/delete_auditlog
-- sample/moto/src/main/bin/delete_auditlog.sh
-- sample/moto/src/main/bin/delete_workflowinstances.sh
-- sample/moto/src/main/bin/import_auth_log.sh
-- sample/moto/src/main/etc/status.properties
-- sample/moto/src/main/etc/delete_auditlog.param
-- sample/moto/src/main/etc/log4j.xml
-- sample/moto/src/main/etc/sysparam.properties
-- sample/moto/src/main/etc/delete_workflowinstances.param
-- sample/moto/src/main/sql/tables.sql
-- sample/moto/gradlew.bat
-- sample/moto/build.gradle
-- sample/moto/gradle/wrapper/gradle-wrapper.properties
-- sample/moto/gradle/wrapper/gradle-wrapper.jar
-- sample/moto/settings.gradle
+- doc/rdoc/CHANGELOG.html
+- doc/rdoc/LICENSE.html
+- doc/rdoc/RBatch.html
+- doc/rdoc/RBatch/Cmd.html
+- doc/rdoc/RBatch/CmdException.html
+- doc/rdoc/RBatch/CmdResult.html
+- doc/rdoc/RBatch/Config.html
+- doc/rdoc/RBatch/Config/Exception.html
+- doc/rdoc/RBatch/Log.html
+- doc/rdoc/RBatchException.html
+- doc/rdoc/created.rid
+- doc/rdoc/images/brick.png
+- doc/rdoc/images/brick_link.png
+- doc/rdoc/images/bug.png
+- doc/rdoc/images/bullet_black.png
+- doc/rdoc/images/bullet_toggle_minus.png
 - doc/rdoc/images/bullet_toggle_plus.png
-- doc/rdoc/images/page_white_width.png
-- doc/rdoc/images/plugin.png
 - doc/rdoc/images/date.png
+- doc/rdoc/images/find.png
+- doc/rdoc/images/loadingAnimation.gif
 - doc/rdoc/images/macFFBgHack.png
-- doc/rdoc/images/bug.png
-- doc/rdoc/images/bullet_toggle_minus.png
-- doc/rdoc/images/zoom.png
 - doc/rdoc/images/package.png
-- doc/rdoc/images/page_white_text.png
 - doc/rdoc/images/page_green.png
-- doc/rdoc/images/brick_link.png
-- doc/rdoc/images/loadingAnimation.gif
-- doc/rdoc/images/find.png
-- doc/rdoc/images/wrench_orange.png
-- doc/rdoc/images/bullet_black.png
-- doc/rdoc/images/wrench.png
-- doc/rdoc/images/brick.png
+- doc/rdoc/images/page_white_text.png
+- doc/rdoc/images/page_white_width.png
+- doc/rdoc/images/plugin.png
 - doc/rdoc/images/ruby.png
 - doc/rdoc/images/tag_green.png
-- doc/rdoc/lib/rbatch/config_rb.html
-- doc/rdoc/lib/rbatch/log_rb.html
-- doc/rdoc/lib/rbatch/cmd_rb.html
-- doc/rdoc/lib/rbatch_rb.html
+- doc/rdoc/images/wrench.png
+- doc/rdoc/images/wrench_orange.png
+- doc/rdoc/images/zoom.png
 - doc/rdoc/index.html
-- doc/rdoc/rdoc.css
-- doc/rdoc/created.rid
-- doc/rdoc/RBatch.html
-- doc/rdoc/RBatch/Config.html
-- doc/rdoc/RBatch/Cmd.html
-- doc/rdoc/RBatch/CmdResult.html
-- doc/rdoc/RBatch/Log.html
-- doc/rdoc/RBatch/CmdException.html
-- doc/rdoc/RBatch/Config/Exception.html
-- doc/rdoc/js/jquery.js
 - doc/rdoc/js/darkfish.js
+- doc/rdoc/js/jquery.js
 - doc/rdoc/js/quicksearch.js
 - doc/rdoc/js/thickbox-compressed.js
-- doc/rdoc/LICENSE.html
-- doc/rdoc/CHANGELOG.html
-- doc/rdoc/RBatchException.html
+- doc/rdoc/lib/rbatch/cmd_rb.html
+- doc/rdoc/lib/rbatch/config_rb.html
+- doc/rdoc/lib/rbatch/log_rb.html
+- doc/rdoc/lib/rbatch_rb.html
+- doc/rdoc/rdoc.css
+- lib/rbatch.rb
+- lib/rbatch/cmd.rb
+- lib/rbatch/config.rb
+- lib/rbatch/log.rb
+- sample/bin/apache_log_insert.rb
+- sample/bin/file_batch_copy.rb
+- sample/bin/mysql_data_backup.rb
+- sample/bin/openam_log_insert.rb
+- sample/bin/openldap_backup.rb
+- sample/bin/webagent_log_insert.rb
+- sample/conf/apache_log_insert.yaml
+- sample/conf/file_batch_copy.yaml
+- sample/conf/mysql_data_backup.yaml
+- sample/conf/openam_log_insert.yaml
+- sample/conf/openldap_backup.yaml
+- sample/conf/rbatch.yaml
+- sample/conf/webagent_log_insert.yaml
+- sample/data/access_log.1
+- sample/data/access_log.2012-07-10
+- sample/data/amAgent_localhost_80.log.1
+- sample/data/amAgent_localhost_80.log.2012-07-10
+- sample/data/amAuthentication.access.1
+- sample/data/amAuthentication.access.2012-07-10
+- sample/data/amAuthentication.error.1
+- sample/data/amAuthentication.error.2012-07-10
+- sample/log/empty
+- test/cases/test_cmd.rb
+- test/cases/test_config.rb
+- test/cases/test_log.rb
+- test/mocks/PrintArgs.exe
+- test/mocks/win_cmd.exe
 homepage: https://github.com/fetaro/rbatch
 licenses: []
 
@@ -166,6 +128,10 @@ rubyforge_project:
 rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
-summary: simple batch framework
-test_files: []
-
+summary: Ruby-based simple batch framework
+test_files: 
+- test/cases/test_cmd.rb
+- test/cases/test_config.rb
+- test/cases/test_log.rb
+- test/mocks/PrintArgs.exe
+- test/mocks/win_cmd.exe

data/sample/bin/log_backup.rb

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rbatch'
-require 'fileutils'
-require 'date'
-
-RBatch::Log.new do |log|
-  log.info("Start---------------")
-  target_dir = RBatch::config["target_dir"]
-  RBatch::config["file_list"].each do |file_wildcard|
-    Dir::glob(file_wildcard).each do |file|
-      if ! File.exists?(File.join(target_dir,File.basename(file)))
-        log.info("Copy " + file + " to " + target_dir)
-        FileUtils.cp(file,target_dir)
-      else
-        log.info("Skip " + file + " (already backuped)")
-      end
-    end
-  end
-end
-

data/sample/bin/test.rb

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rbatch'
-
-RBatch::Log.new() do |log|
-sdfa
-end

data/sample/bin/test2.rb

@@ -1,3 +0,0 @@
-require 'rbatch'
-
-sleep 100

data/sample/conf/log_backup.yaml

@@ -1,4 +0,0 @@
-file_list:
-  - /var/log/hoge*
-  - /var/log/messages
-target_dir: /tmp