rbatch 2.1.4 → 2.1.5

data/bin/rbatch-init

@@ -15,55 +15,56 @@ contents[".rbatchrc"] = <<EOF
 #   Default is "<home>/conf"
 #   <home> is replaced to ${RB_HOME}
 #
-#conf_dir: <home>/config/
-#conf_dir: /etc/rbatch/
+#conf_dir : <home>/config/
+#conf_dir : /etc/rbatch/
 
-# Common config file name
+# Common Config file name
 #
 #   Default is "common.yaml"
 #
-#common_conf_name: share.yaml
+#common_conf_name : share.yaml
 
 # Library Directory
 #
 #   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
 #
 #   Default is true
 #   If true, require "(library directory)/*.rb" before script run.
 #
-#auto_lib_load: true
-#auto_lib_load: false
+#auto_lib_load : true
+#auto_lib_load : false
 
-# Forbit Script Double Run
+# Forbit Script Running Doubly
 #
 #   Default is false.
-#   If true, two same name scripts cannot run at the same time. 
+#   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
 
-# -------------------
-# Cmd setting
-# -------------------
-
-# Raise Exception
+# Journal Message Level
 #
-#   Default is false.
-#   If true, when command exit status is not 0, raise exception.
+#   Default is 1
+#   If 2, put more journal messages to STDOUT.
+#   If 0, put nothing.
+#   Example of journal essages are follows.
+#       [RBatch] Load Config  : "../conf/hoge.yaml"
 #
-#cmd_raise : true
-#cmd_raise : false
+#rbatch_journal_level : 2
+#rbatch_journal_level : 0
 
-# Command Timeout
+# Mix Journal Message to Logs
 #
-#   Default is 0 [sec].
+#   Default is true.
+#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
 #
-#cmd_timeout: 5
+#mix_rbatch_journal_to_logs : true
+#mix_rbatch_journal_to_logs : false
 
 # -------------------
 # Log setting
@@ -74,8 +75,8 @@ contents[".rbatchrc"] = <<EOF
 #   Default is "<home>/log"
 #   <home> is replaced to ${RB_HOME}
 #
-#log_dir: <home>/rb_log
-#log_dir: /var/log/rbatch/
+#log_dir : <home>/rb_log
+#log_dir : /var/log/rbatch/
 
 # Log File Name
 #
@@ -101,12 +102,9 @@ contents[".rbatchrc"] = <<EOF
 #   Effective values are "debug","info","wran","error",and "fatal".
 #
 #log_level : "debug"
-#log_level : "info"
 #log_level : "warn"
-#log_level : "error"
-#log_level : "fatal"
 
-# Print log string both file and STDOUT
+# Print log string both log file and STDOUT
 #
 #   Default is false.
 #
@@ -120,16 +118,16 @@ contents[".rbatchrc"] = <<EOF
 #   A log file to delete is a log file which was made by the
 #   RBatch::Log instance, and log filename format include "<date>".
 #
-#log_delete_old_log: true
-#log_delete_old_log: false
+#log_delete_old_log : true
+#log_delete_old_log : false
 
-# The day of leaving log files
+# Expire Date of Log Files
 #
 #   Default is 7.
 #
-#log_delete_old_log_date: 14
+#log_delete_old_log_date : 14
 
-# Send mail or not
+# Send Mail
 #
 #   Default is false.
 #   When log.error(msg) or log.fatal(msg) called , send e-mail
@@ -137,47 +135,62 @@ contents[".rbatchrc"] = <<EOF
 #
 #log_send_mail : true
 
-# Mail parameters
+# Mail Parameters
 #
 #log_mail_to   : "xxx@sample.com"
 #log_mail_from : "xxx@sample.com"
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
 
-# RBatch Journal Message Level
+# -------------------
+# Cmd setting
+# -------------------
+
+# Raise Exception
 #
-#   Default is 1
-#   If 2, put more journal messages to STDOUT.
-#   If 0, put nothing.
-#   Example of journal essages are follows.
-#       [RBatch] Load Config  : "../conf/hoge.yaml"
+#   Default is false.
+#   If true, when command exit status is not 0, raise exception.
 #
-#rbatch_journal_level = 2
-#rbatch_journal_level = 0
+#cmd_raise : true
+#cmd_raise : false
 
-# Mix RBatch Journal to Logs
+# Command Timeout
 #
-#   Default is true.
-#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
+#   Default is 0 [sec] (=no timeout).
 #
-#mix_rbatch_journal_to_logs : true
-#mix_rbatch_journal_to_logs : false
+#cmd_timeout : 5
+
 EOF
 
 contents["bin/hello_world.rb"] = <<EOF
 require 'rbatch'
 
+# Config
+p RBatch.config["key1"]
+p RBatch.config["key2"]
+
+# cmd
+result = RBatch.cmd("ls")
+p result.stdout
+p result.stderr
+p result.status
+p result
+
+# Log
 RBatch::Log.new{|log|
   log.info("hello world")
-  log.info("config value: " + RBatch::config["key1"])
-  result = RBatch.cmd("ls")
-  log.info(result)
+  log.error("this is error")
+  raise "Exception here"
 }
 
 EOF
 
 contents["conf/hello_world.yaml"] = <<EOF
 key1 : value1
+key2 :
+  - a
+  - b
+  - c
 EOF
 
 

data/lib/rbatch/journal.rb

@@ -4,14 +4,10 @@ module RBatch
     def Journal.def_vars=(a) ; @@def_vars=a ; end 
     attr :journals,:journal_verbose,:user_logs
     def initialize(verbose=nil)
-      if verbose.nil?
-        if ENV["RB_VERBOSE"]
-          @journal_verbose = ENV["RB_VERBOSE"].to_i
-        else
-          @journal_verbose = 1
-        end
-      else
+      if ! verbose.nil?
         @journal_verbose = verbose
+      else
+        @journal_verbose = @@def_vars[:rbatch_journal_level]
       end
       @journals = []
       @user_logs = []

data/lib/rbatch/log.rb

@@ -55,6 +55,9 @@ module RBatch
         @vars.merge!(tmp)
       end
       @path = File.join(@vars[:log_dir],@vars[:log_name])
+      unless Dir.exist? @vars[:log_dir]
+        raise LogException,"Log directory \"#{@vars[:log_dir]}\" does not exist"
+      end
       # create Logger instance
       begin
         if @vars[:log_append] && File.exist?(@path)
@@ -120,7 +123,7 @@ module RBatch
     end
 
     def journal(a)
-      @log.info(a)
+      @log.info("[RBatch] " + a)
     end
 
     def close

data/lib/rbatch/run_conf.rb

@@ -49,7 +49,7 @@ module RBatch
           if @@def_opt.has_key?(key.to_sym)
             @opt[key.to_sym]=@yaml[key]
           else
-            raise RBatch::RunConf::Exception, "\"#{key}\" is not available option"
+            raise RBatch::RunConfException, "\"#{key}\" is not available option"
           end
         end
       end
@@ -64,7 +64,7 @@ module RBatch
         if @opt.has_key?(key)
           @opt[key] = opt[key]
         else
-          raise RBatch::RunConf::Exception, "\"#{key}\" is not available option"
+          raise RBatch::RunConfException, "\"#{key}\" is not available option"
         end
       end
     end
@@ -75,7 +75,7 @@ module RBatch
         if tmp.has_key?(key)
           tmp[key] = opt[key]
         else
-          raise RBatch::RunConf::Exception, "\"#{key}\" is not available option"
+          raise RBatch::RunConfException, "\"#{key}\" is not available option"
         end
       end
       return tmp
@@ -83,19 +83,19 @@ module RBatch
 
     def[](key)
       if @opt[key].nil?
-        raise RBatch::RunConf::Exception, "Value of key=\"#{key}\" is nil"
+        raise RBatch::RunConfException, "Value of key=\"#{key}\" is nil"
       end
       @opt[key]
     end
 
     def[]=(key,value)
       if ! @opt.has_key?(key)
-        raise RBatch::RunConf::Exception, "Key=\"#{key}\" does not exist"
+        raise RBatch::RunConfException, "Key=\"#{key}\" does not exist"
       end
       @opt[key]=value
     end
   end
 
-  class RunConf::Exception < Exception ; end
+  class RunConfException < Exception ; end
 
 end

data/lib/rbatch/variables.rb

@@ -15,12 +15,6 @@ module RBatch
       }
       @vars[:program_noext] = Pathname(@vars[:program_base]).sub_ext("").to_s
 
-      if ENV["RB_VERBOSE"]
-        @vars[:journal_verbose] = ENV["RB_VERBOSE"].to_i
-      else
-        @vars[:journal_verbose] = 1
-      end
-
       case RUBY_PLATFORM
       when /mswin|mingw/
         @vars[:host_name] =  ENV["COMPUTERNAME"] ? ENV["COMPUTERNAME"] : "unknownhost"

data/lib/rbatch/version.rb

@@ -1,3 +1,3 @@
 module RBatch
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/rbatch.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = RBatch::VERSION
   gem.authors       = ["fetaro"]
   gem.email         = ["fetaro@gmail.com"]
-  gem.description   = "RBatch has many fanctions to help with your making a batch script such as \"data backup script\" or \"proccess starting script\"."
-  gem.summary       = "Ruby-based simple batch framework"
+  gem.description   = "Simple Framework of Batch Script"
+  gem.summary       = "Simple Framework of Batch Script"
   gem.homepage      = "https://github.com/fetaro/rbatch"
 
   gem.files         = `git ls-files`.split($/)

data/sample/.rbatchrc

@@ -12,55 +12,56 @@
 #   Default is "<home>/conf"
 #   <home> is replaced to ${RB_HOME}
 #
-#conf_dir: <home>/config/
-#conf_dir: /etc/rbatch/
+#conf_dir : <home>/config/
+#conf_dir : /etc/rbatch/
 
-# Common config file name
+# Common Config file name
 #
 #   Default is "common.yaml"
 #
-#common_conf_name: share.yaml
+#common_conf_name : share.yaml
 
 # Library Directory
 #
 #   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
 #
 #   Default is true
 #   If true, require "(library directory)/*.rb" before script run.
 #
-#auto_lib_load: true
-#auto_lib_load: false
+#auto_lib_load : true
+#auto_lib_load : false
 
-# Forbit Script Double Run
+# Forbit Script Running Doubly
 #
 #   Default is false.
-#   If true, two same name scripts cannot run at the same time. 
+#   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
 
-# -------------------
-# Cmd setting
-# -------------------
-
-# Raise Exception
+# Journal Message Level
 #
-#   Default is false.
-#   If true, when command exit status is not 0, raise exception.
+#   Default is 1
+#   If 2, put more journal messages to STDOUT.
+#   If 0, put nothing.
+#   Example of journal essages are follows.
+#       [RBatch] Load Config  : "../conf/hoge.yaml"
 #
-#cmd_raise : true
-#cmd_raise : false
+#rbatch_journal_level : 2
+#rbatch_journal_level : 0
 
-# Command Timeout
+# Mix Journal Message to Logs
 #
-#   Default is 0 [sec].
+#   Default is true.
+#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
 #
-#cmd_timeout: 5
+#mix_rbatch_journal_to_logs : true
+#mix_rbatch_journal_to_logs : false
 
 # -------------------
 # Log setting
@@ -71,8 +72,8 @@
 #   Default is "<home>/log"
 #   <home> is replaced to ${RB_HOME}
 #
-#log_dir: <home>/rb_log
-#log_dir: /var/log/rbatch/
+#log_dir : <home>/rb_log
+#log_dir : /var/log/rbatch/
 
 # Log File Name
 #
@@ -98,12 +99,9 @@
 #   Effective values are "debug","info","wran","error",and "fatal".
 #
 #log_level : "debug"
-#log_level : "info"
 #log_level : "warn"
-#log_level : "error"
-#log_level : "fatal"
 
-# Print log string both file and STDOUT
+# Print log string both log file and STDOUT
 #
 #   Default is false.
 #
@@ -120,13 +118,13 @@
 #log_delete_old_log: true
 #log_delete_old_log: false
 
-# The day of leaving log files
+# Expire Date of Log Files
 #
 #   Default is 7.
 #
 #log_delete_old_log_date: 14
 
-# Send mail or not
+# Send Mail
 #
 #   Default is false.
 #   When log.error(msg) or log.fatal(msg) called , send e-mail
@@ -134,28 +132,28 @@
 #
 #log_send_mail : true
 
-# Mail parameters
+# Mail Parameters
 #
 #log_mail_to   : "xxx@sample.com"
 #log_mail_from : "xxx@sample.com"
 #log_mail_server_host : "localhost"
 #log_mail_server_port : 25
 
-# RBatch Journal Message Level
+# -------------------
+# Cmd setting
+# -------------------
+
+# Raise Exception
 #
-#   Default is 1
-#   If 2, put more journal messages to STDOUT.
-#   If 0, put nothing.
-#   Example of journal essages are follows.
-#       [RBatch] Load Config  : "../conf/hoge.yaml"
+#   Default is false.
+#   If true, when command exit status is not 0, raise exception.
 #
-#rbatch_journal_level = 2
-#rbatch_journal_level = 0
+#cmd_raise : true
+#cmd_raise : false
 
-# Mix RBatch Journal to Logs
+# Command Timeout
 #
-#   Default is true.
-#   If true, mix RBatch journal messages to log file(s) which is(are) opened at time.
+#   Default is 0 [sec] (=no timeout).
 #
-#mix_rbatch_journal_to_logs : true
-#mix_rbatch_journal_to_logs : false
+#cmd_timeout : 5
+

data/spec/rbatch/journal_spec.rb

@@ -13,17 +13,5 @@ describe RBatch::Journal do
     @j = RBatch::Journal.new(2)
     expect(@j.journal_verbose) == 2
   end
-
-  it "ENV is set" do
-     ENV["RB_VERBOSE"] = "0"
-    @j = RBatch::Journal.new
-    expect(@j.journal_verbose) == 0
-  end
-
-  it "both argument and ENV are set" do
-     ENV["RB_VERBOSE"] = "0"
-    @j = RBatch::Journal.new(2)
-    expect(@j.journal_verbose) == 2
-  end
 end
 

data/spec/rbatch/run_conf_spec.rb

@@ -9,7 +9,6 @@ describe RBatch::RunConf do
     @HOME_DIR = File.join(Dir.tmpdir, "rbatch_test_" + Time.now.strftime("%Y%m%d%H%M%S"))
     Dir.mkdir(@HOME_DIR)
     ENV["RB_HOME"]=@HOME_DIR
-    ENV["RB_VERBOSE"]="0"
     @home = ENV["RB_HOME"]
     @config = File.join(@home,"run_conf_test.yaml")
   end
@@ -39,7 +38,7 @@ describe RBatch::RunConf do
   end
 
   it "raise when key does not exist" do
-    expect{@rc[:not_exist_key]}.to raise_error(RBatch::RunConf::Exception)
+    expect{@rc[:not_exist_key]}.to raise_error(RBatch::RunConfException)
   end
 
   it "read run conf" do
@@ -50,7 +49,7 @@ describe RBatch::RunConf do
 
   it "raise when run_conf has unreserved key" do
     open( @config  , "w" ){|f| f.write("unreserved: hoge")}
-    expect{tmp = RBatch::RunConf.new(@config)}.to raise_error(RBatch::RunConf::Exception)
+    expect{tmp = RBatch::RunConf.new(@config)}.to raise_error(RBatch::RunConfException)
   end
 
   describe "[]= method" do
@@ -61,7 +60,7 @@ describe RBatch::RunConf do
     end
 
     it "raise when set unreserved key" do
-      expect{@rc[:unreservied] = "hoge"}.to raise_error(RBatch::RunConf::Exception)
+      expect{@rc[:unreservied] = "hoge"}.to raise_error(RBatch::RunConfException)
     end
   end
   
@@ -74,7 +73,7 @@ describe RBatch::RunConf do
 
     it "raise when key does not exist" do
       opt={ :unreserved => "error"}
-      expect{@rc.merge!(opt)}.to raise_error(RBatch::RunConf::Exception)
+      expect{@rc.merge!(opt)}.to raise_error(RBatch::RunConfException)
     end
   end
 
@@ -88,7 +87,7 @@ describe RBatch::RunConf do
 
     it "raise when key does not exist" do
       opt={ :unreserved => "error"}
-      expect{@rc.merge(opt)}.to raise_error(RBatch::RunConf::Exception)
+      expect{@rc.merge(opt)}.to raise_error(RBatch::RunConfException)
     end
   end
 end

data/spec/rbatch/variables_spec.rb

@@ -12,12 +12,10 @@ describe RBatch::Variables do
 
   before :each do
     ENV["RB_HOME"]=@home
-    ENV["RB_VERBOSE"]="0"
   end
 
   it "default" do
     @vars = RBatch::Variables.new()
-    expect(@vars[:journal_verbose]).to eq 0
     #expect(@vars[:host_name]).to eq ""
     #expect(@vars[:program_name]).to eq "rspec"
     #expect(@vars[:program_path]).to eq "rspec"
@@ -38,10 +36,8 @@ describe RBatch::Variables do
 
   it "success when ENV Change" do
     ENV["RB_HOME"]="/var"
-    ENV["RB_VERBOSE"]="3"
 
     @vars = RBatch::Variables.new()
-    expect(@vars[:journal_verbose]).to eq 3
     expect(@vars[:home_dir]).to eq "/var"
     expect(@vars[:log_dir]).to eq File.join("/var","log")
   end 

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors: 
 - fetaro
@@ -13,7 +13,7 @@ cert_chain: []
 date: 2014-01-16 00:00:00 Z
 dependencies: []
 
-description: RBatch has many fanctions to help with your making a batch script such as "data backup script" or "proccess starting script".
+description: Simple Framework of Batch Script
 email: 
 - fetaro@gmail.com
 executables: 
@@ -104,12 +104,10 @@ files:
 - sample/.rbatchrc
 - sample/bin/apache_log_insert.rb
 - sample/bin/file_batch_copy.rb
-- sample/bin/ftp_get.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/store_to_idm.rb
 - sample/bin/webagent_log_insert.rb
 - sample/conf/apache_log_insert.yaml
 - sample/conf/common.yaml
@@ -118,18 +116,8 @@ files:
 - sample/conf/mysql_data_backup.yaml
 - sample/conf/openam_log_insert.yaml
 - sample/conf/openldap_backup.yaml
-- sample/conf/store_to_idm.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/lib/openidm_common_func.rb
-- sample/log/empty
+- sample/lib/.gitkeep
 - spec/01_rbach_spec.rb
 - spec/rbatch/cmd_spec.rb
 - spec/rbatch/config_spec.rb
@@ -166,7 +154,7 @@ rubyforge_project:
 rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
-summary: Ruby-based simple batch framework
+summary: Simple Framework of Batch Script
 test_files: 
 - spec/01_rbach_spec.rb
 - spec/rbatch/cmd_spec.rb

data/sample/bin/ftp_get.rb

@@ -1,20 +0,0 @@
-require "rbatch"
-require "net/ftp"
-
-server=""
-user=""
-password=""
-target_files=["",""]
-
-RBatch::Log.new do | log |
-  ftp = Net::FTP.new(server,user,password)
-  log.info("ftp login: server=#{server},user=#{user},password=#{password}")
-  ftp.login
-  ftp.passive = true
-  ftp.chdir('pub/ruby')
-  files = ftp.list('ruby*')
-  target_files.each do |file|
-    ftp.getbinaryfile(file)
-  end
-  ftp.close
-end

data/sample/bin/store_to_idm.rb

@@ -1,10 +0,0 @@
-require 'rbatch'
-
-RBatch::Log.new do |log|
-  if ARGV.size != 2
-    raise "Argument ERROR: Usage: ruby store_to_openidm.rb (category) (file)"
-  end
-  category=ARGV[0]
-  filepath=ARGV[1]
-  store_file_to_openidm(category,filepath,log)
-end