rbatch 1.8.2 → 1.9.0

data/CHANGELOG

@@ -41,3 +41,7 @@ initial
 * add log_send_mail option
 * add cmd_timeout option
 
+1.9.0(2013/02/11)
+----
+* add "<host>" keyword to log_name option
+* Environmental variables ($TMPDIR and $HOSTNAME) are checked strictly 

data/README.ja.md

@@ -16,7 +16,7 @@ RBatchについて
 * ファイル名・ディレクトリ構造制約
 * 二重起動チェック
 
-このフレームワークはRuby 1.9.x以降のみで動作します。
+このフレームワークはRuby 1.9.x以降で動作します。また、Rubyプラットフォームは"linux","mswin","mingw","cygwin"で動作します。
 
 ### 自動ログ出力
 Logging blockを使うことで、自動的にログファイルに出力することができます。
@@ -223,6 +223,7 @@ $ cat log/YYYYMMDD_HHMMSS_backup.log
 #   <data> --> YYYYMMDDの日付形式に置換されます
 #   <time> --> hhmmssの時刻形式に置換されます
 #   <prog> --> 拡張子を除いたファイル名に置換されます
+#   <host> --> ホスト名に置換されます
 #
 #log_name : "<date>_<time>_<prog>.log"
 #log_name : "<date>_<prog>.log"

data/README.md

@@ -15,7 +15,7 @@ There are following functions.
 * Directory Structure convention
 * Double Run Check
 
-This work on only Ruby 1.9.x or more later.
+This work on Ruby 1.9.x or later, and on Ruby platform of "linux","mswin","mingw","cygwin".
 
 ### Auto Logging
 Use Auto Logging block, RBatch automatically write to logfile.
@@ -218,9 +218,10 @@ Config Sample
 #
 #   Default is "<date>_<time>_<prog>.log".
 #   Reservation words are follows.
-#   <data> --> replace to YYYYMMDD date string
-#   <time> --> replace to hhmmss time string
-#   <prog> --> Program file base name (except extention)
+#   <data> --> Replace to YYYYMMDD date string
+#   <time> --> Replace to HHMMSS time string
+#   <prog> --> Replace to Program file base name (except extention).
+#   <host> --> Replace to Hostname.
 #
 #log_name : "<date>_<time>_<prog>.log"
 #log_name : "<date>_<prog>.log"

data/lib/rbatch/log.rb

@@ -80,7 +80,7 @@ module RBatch
     # 
     # ==== Params
     # +opt+ = Option hash object. Hash keys is follows.
-    # - +:name+ (String) = log file name. Default is "<date>_<time>_<prog>.log"
+    # - +:name+ (String) = log file name. Default is "<date>_<time>_<prog>.log".Reservation words are "<date>","<time>","<prog>","<host>".
     # - +:dir+ (String) = log direcotry path. Default is "../log"
     # - +:level+ (String) = log level. ["debug"|"info"|"warn"|"error"|"fatal"] . Default is "info".
     # - +:append+ (Boolean) = appned to log or not(=overwrite). Default is ture.
@@ -115,6 +115,7 @@ module RBatch
       @file_name.gsub!("<date>", Time.now.strftime("%Y%m%d"))
       @file_name.gsub!("<time>", Time.now.strftime("%H%M%S"))
       @file_name.gsub!("<prog>", @prog_base)
+      @file_name.gsub!("<host>", RBatch::hostname)
       path = File.join(@opt[:dir],@file_name)
       # create Logger instance
       begin

data/lib/rbatch/version.rb

@@ -1,3 +1,3 @@
 module Rbatch
-  VERSION = "1.8.2"
+  VERSION = "1.9.0"
 end

data/lib/rbatch.rb

@@ -5,12 +5,28 @@ module RBatch
   module_function
   def program_name=(f) ; @@program_name = f ; end
   def program_name ; @@program_name ; end
+  # Hostname
+  def hostname
+    case RUBY_PLATFORM
+    when /mswin|mingw/
+      return ENV["COMPUTERNAME"] ? ENV["COMPUTERNAME"] : "unknownhost"
+    when /cygwin|linux/
+      return ENV["HOSTNAME"] ? ENV["HOSTNAME"] : "unknownhost"
+    else
+      raise "Unknown RUBY_PRATFORM : " + RUBY_PLATFORM
+    end
+  end
+  # tmp dir
   def tmp_dir
     case RUBY_PLATFORM
     when /mswin|mingw/
-      return ENV["TEMP"]
+      if ENV["TEMP"].nil?
+        raise "Cannot use temporary directory, because ENV[\"TEMP\"] is not defined"
+      else
+        return ENV["TEMP"]
+      end
     when /cygwin|linux/
-      return "/tmp/"
+      return ENV["TMPDIR"] ? ENV["TMPDIR"] : "/tmp"
     else
       raise "Unknown RUBY_PRATFORM : " + RUBY_PLATFORM
     end

data/sample/bin/log_backup.rb

@@ -0,0 +1,20 @@
+# -*- 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/conf/log_backup.yaml

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

data/test/cases/test_log.rb

@@ -459,6 +459,15 @@ class LoggerTest < Test::Unit::TestCase
     }
   end
 
+  def test_i_change_name_by_opt_with_host
+    log = RBatch::Log.new({:name => "<prog><date><host>name.log" })
+    log.info("test_change_name_by_opt_with_host")
+    log.close
+    File::open(File.join(@dir ,  "test_log" + Time.now.strftime("%Y%m%d") + RBatch::hostname + "name.log")) {|f|
+      assert_match /test_change_name_by_opt_with_host/, f.read
+    }
+  end
+
   
   def test_i_log_level_default
     log = RBatch::Log.new({ :name =>  "test_level" })

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors: 
 - fetaro
@@ -80,12 +80,14 @@ files:
 - rbatch.gemspec
 - sample/bin/apache_log_insert.rb
 - sample/bin/file_batch_copy.rb
+- sample/bin/log_backup.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/log_backup.yaml
 - sample/conf/mysql_data_backup.yaml
 - sample/conf/openam_log_insert.yaml
 - sample/conf/openldap_backup.yaml