rbatch 2.1.1 → 2.1.2

data/spec/rbatch/log_spec.rb

@@ -0,0 +1,350 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'rbatch/journal'
+require 'rbatch/variables'
+require 'rbatch/log'
+require 'tmpdir'
+
+describe RBatch::Log do
+  before :each do
+    @home = File.join(Dir.tmpdir, "rbatch_test_" + rand.to_s)
+    @log_dir = File.join(@home,"log")
+    ENV["RB_HOME"]=@home
+
+    Dir.mkdir(@home)
+    Dir::mkdir(@log_dir)
+    @def_vars = RBatch::Variables.new()
+    RBatch::Log.def_vars = @def_vars
+    RBatch::Journal.def_vars = @def_vars
+    @journal = RBatch::Journal.new(0)
+    RBatch::Log.journal = @journal
+  end
+
+  after :each do
+    if Dir.exists? @log_dir
+      Dir::foreach(@log_dir) do |f|
+        File::delete(File.join(@log_dir , f)) if ! (/\.+$/ =~ f)
+      end
+    end
+    Dir::rmdir(@log_dir)
+    Dir::rmdir(@home)
+    @def_vars = nil
+    @journal = nil
+  end
+
+  it "is run" do
+    RBatch::Log.new do | log |
+      log.info("test_log")
+    end
+
+    Dir::foreach(@log_dir) do |f|
+      if ! (/\.+$/ =~ f)
+        File::open(File.join(@log_dir , f)) {|f|
+          expect(f.read).to match /test_log/
+        }
+      end
+    end
+  end
+
+  it "is rescue exception" do
+    expect { 
+      RBatch::Log.new do | log |
+        raise Exception.new
+      end
+    }.to raise_error SystemExit
+  end
+
+  it "raise error when log dir does not exist" do
+    Dir::rmdir(@log_dir)
+    expect{
+      RBatch::Log.new {|log|}
+    }.to raise_error(RBatch::LogException)
+    Dir::mkdir(@log_dir)
+  end
+
+  it "run when log block is nested" do
+    RBatch::Log.new({:name => "name1"}) do | log |
+      log.info("name1")
+      RBatch::Log.new({:name => "name2"})do | log |
+        log.info("name2")
+      end
+    end
+
+    File::open(File.join(@log_dir,"name1")) {|f| expect(f.read).to match /name1/ }
+    File::open(File.join(@log_dir,"name2")) {|f| expect(f.read).to match /name2/ }
+  end
+
+  describe "option by argument" do
+    it "change log name" do
+      opt = {:name => "name1.log" }
+      RBatch::Log.new(opt) { | log | log.info("hoge") }
+      File::open(File.join(@log_dir , "name1.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+    end
+
+    it "change log name 2" do
+      opt = {:name => "<prog><date>name.log" }
+      RBatch::Log.new(opt) { | log | log.info("hoge") }
+
+      File::open(File.join(@log_dir ,  "rspec" + Time.now.strftime("%Y%m%d") + "name.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+    end
+
+   it "change log name 3" do
+      opt = {:name => "<prog>-<date>-name.log" }
+      RBatch::Log.new(opt) { | log | log.info("hoge") }
+
+      File::open(File.join(@log_dir ,  "rspec-" + Time.now.strftime("%Y%m%d") + "-name.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+    end
+
+    it "change log dir" do
+      @tmp = File.join(ENV["RB_HOME"],"log3")
+      Dir.mkdir(@tmp)
+      opt = {:name => "c.log", :dir=> @tmp }
+      RBatch::Log.new(opt) { | log | log.info("hoge") }
+
+      File::open(File.join(@tmp , "c.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+      FileUtils.rm(File.join(@tmp , "c.log"))
+      Dir.rmdir(@tmp)
+    end
+
+    it "is append mode" do
+      opt = {:append => true, :name =>  "a.log" }
+      RBatch::Log.new(opt) { | log | log.info("line1") }
+
+      opt = {:append => true, :name =>  "a.log" }
+      RBatch::Log.new(opt) { | log | log.info("line2") }
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to match /line1/
+        expect(str).to match /line2/
+      }
+    end
+
+    it "is overwrite mode" do
+      opt = {:append => false, :name =>  "a.log" }
+      RBatch::Log.new(opt) { | log | log.info("line1") }
+
+      opt = {:append => false, :name =>  "a.log" }
+      RBatch::Log.new(opt) { | log | log.info("line2") }
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to_not match /line1/
+        expect(str).to match /line2/
+      }
+    end
+
+    it "is debug level" do
+      opt = { :level => "debug",:name =>  "a.log" }
+      RBatch::Log.new(opt) do | log |
+        log.debug("test_debug")
+        log.info("test_info")
+        log.warn("test_warn")
+        log.error("test_error")
+        log.fatal("test_fatal")
+      end
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to match /test_debug/
+        expect(str).to match /test_info/
+        expect(str).to match /test_warn/
+        expect(str).to match /test_error/
+        expect(str).to match /test_fatal/
+      }
+    end
+
+    it "is info level" do
+      opt = { :level => "info",:name =>  "a.log" }
+      RBatch::Log.new(opt) do | log |
+        log.debug("test_debug")
+        log.info("test_info")
+        log.warn("test_warn")
+        log.error("test_error")
+        log.fatal("test_fatal")
+      end
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to_not match /test_debug/
+        expect(str).to match /test_info/
+        expect(str).to match /test_warn/
+        expect(str).to match /test_error/
+        expect(str).to match /test_fatal/
+      }
+    end
+
+    it "is warn level" do
+      opt = { :level => "warn",:name =>  "a.log" }
+      RBatch::Log.new(opt) do | log |
+        log.debug("test_debug")
+        log.info("test_info")
+        log.warn("test_warn")
+        log.error("test_error")
+        log.fatal("test_fatal")
+      end
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to_not match /test_debug/
+        expect(str).to_not match /test_info/
+        expect(str).to match /test_warn/
+        expect(str).to match /test_error/
+        expect(str).to match /test_fatal/
+      }
+    end
+
+    it "is error level" do
+      opt = { :level => "error",:name =>  "a.log" }
+      RBatch::Log.new(opt) do | log |
+        log.debug("test_debug")
+        log.info("test_info")
+        log.warn("test_warn")
+        log.error("test_error")
+        log.fatal("test_fatal")
+      end
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to_not match /test_debug/
+        expect(str).to_not match /test_info/
+        expect(str).to_not match /test_warn/
+        expect(str).to match /test_error/
+        expect(str).to match /test_fatal/
+      }
+    end
+
+    it "is fatal level" do
+      opt = { :level => "fatal",:name =>  "a.log" }
+      RBatch::Log.new(opt) do | log |
+        log.debug("test_debug")
+        log.info("test_info")
+        log.warn("test_warn")
+        log.error("test_error")
+        log.fatal("test_fatal")
+      end
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to_not match /test_debug/
+        expect(str).to_not match /test_info/
+        expect(str).to_not match /test_warn/
+        expect(str).to_not match /test_error/
+        expect(str).to match /test_fatal/
+      }
+    end
+
+    it "is default level" do
+      opt = {:name =>  "a.log" }
+      RBatch::Log.new(opt) do | log |
+        log.debug("test_debug")
+        log.info("test_info")
+        log.warn("test_warn")
+        log.error("test_error")
+        log.fatal("test_fatal")
+      end
+
+      File::open(File.join(@log_dir , "a.log")) {|f|
+        str = f.read
+        expect(str).to_not match /test_debug/
+        expect(str).to match /test_info/
+        expect(str).to match /test_warn/
+        expect(str).to match /test_error/
+        expect(str).to match /test_fatal/
+      }
+    end
+
+    it "delete old log which name include <date>" do
+      loglist = [*0..20].map do |day|
+        File.join(@log_dir , (Date.today - day).strftime("%Y%m%d") + "_test_delete.log")
+      end
+      FileUtils.touch(loglist)
+
+      opt = { :name =>  "<date>_test_delete.log",:delete_old_log => true}
+      RBatch::Log.new(opt) { | log | }
+
+      loglist[1..6].each do |filename|
+        expect(File.exists?(filename)).to be true
+      end
+      loglist[7..20].each do |filename|
+        expect(File.exists?(filename)).to be false
+      end
+    end
+
+    it "delete old log which name include <date> even if <date> position is changed" do
+      loglist = [*0..20].map do |day|
+        File.join(@log_dir , "235959-" + (Date.today - day).strftime("%Y%m%d") + "_test_delete.log")
+      end
+      FileUtils.touch(loglist)
+
+      opt = { :name =>  "<time>-<date>_test_delete.log",:delete_old_log => true}
+      RBatch::Log.new(opt) { | log | }
+
+      loglist[1..6].each do |filename|
+        expect(File.exists?(filename)).to be true
+      end
+      loglist[7..20].each do |filename|
+        expect(File.exists?(filename)).to be false
+      end
+    end
+
+    it "does not delete old log which name does not include <date>" do
+      opt = { :name =>  "test_delete.log",:delete_old_log => true}
+      RBatch::Log.new(opt) { | log | }
+
+      expect(File.exists?(File.join(@log_dir,"test_delete.log"))).to be true
+    end
+
+
+  end
+
+  describe "option by run_conf" do
+    it "change log name" do
+      @def_vars.merge!({:log_name => "name1.log"})
+      RBatch::Log.def_vars = @def_vars
+      RBatch::Log.new { | log | log.info("hoge") }
+
+      File::open(File.join(@log_dir , "name1.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+    end
+
+    it "change log dir" do
+      @tmp = File.join(ENV["RB_HOME"],"log2")
+      Dir.mkdir(@tmp)
+      @def_vars.merge!({:log_dir => @tmp})
+      RBatch::Log.def_vars = @def_vars
+
+      opt = {:name => "c.log" }
+      RBatch::Log.new(opt) { | log | log.info("hoge") }
+
+      File::open(File.join(@tmp , "c.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+      FileUtils.rm(File.join(@tmp , "c.log"))
+      Dir.rmdir(@tmp)
+    end
+  end
+  describe "option both run_conf and opt" do
+    it "change log name" do
+      @def_vars.merge!({:log_name => "name1.log"})
+      RBatch::Log.def_vars = @def_vars
+
+      opt = {:name => "name2.log"}
+      RBatch::Log.new(opt) { | log | log.info("hoge") }
+
+      File::open(File.join(@log_dir , "name2.log")) {|f|
+        expect(f.read).to match /hoge/
+      }
+    end
+  end
+end

data/spec/{run_conf_spec.rb → rbatch/run_conf_spec.rb}

@@ -1,9 +1,15 @@
-require File.expand_path(File.join( File.dirname(__FILE__), 'spec_helper'))
+require 'simplecov'
+SimpleCov.start
 
 require 'rbatch/run_conf'
+require 'tmpdir'
 
 describe RBatch::RunConf do
   before :all 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
@@ -11,7 +17,7 @@ describe RBatch::RunConf do
   before :each do
     FileUtils.rm @config if File.exists? @config
     open( @config  , "w" ){|f| f.write("")}
-    @rc = RBatch::RunConf.new(@config,@home)
+    @rc = RBatch::RunConf.new(@config)
   end
 
   after :each do
@@ -22,12 +28,14 @@ describe RBatch::RunConf do
 
   it "is default when run_conf is empty" do
     expect(@rc[:log_level]).to eq "info"
+    expect(@rc[:conf_dir]).to eq "<home>/conf"
   end
 
   it "is default when run_conf does not exist" do
     FileUtils.rm @config
-    tmp = RBatch::RunConf.new(@config,@home)
+    tmp = RBatch::RunConf.new(@config)
     expect(tmp[:log_level]).to eq "info"
+    expect(tmp[:conf_dir]).to eq "<home>/conf"
   end
 
   it "raise when key does not exist" do
@@ -36,13 +44,13 @@ describe RBatch::RunConf do
 
   it "read run conf" do
     open( @config  , "w" ){|f| f.write("log_level: hoge")}
-    tmp = RBatch::RunConf.new(@config,@home)
+    tmp = RBatch::RunConf.new(@config)
     expect(tmp[:log_level]).to eq "hoge"
   end
 
   it "raise when run_conf has unreserved key" do
     open( @config  , "w" ){|f| f.write("unreserved: hoge")}
-    expect{tmp = RBatch::RunConf.new(@config,@home)}.to raise_error(RBatch::RunConf::Exception)
+    expect{tmp = RBatch::RunConf.new(@config)}.to raise_error(RBatch::RunConf::Exception)
   end
 
   describe "[]= method" do

data/spec/rbatch/variables_spec.rb

@@ -0,0 +1,68 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'tmpdir'
+require 'rbatch/variables'
+
+describe RBatch::Variables do
+
+  before :all do
+    @home = File.join(Dir.tmpdir, "rbatch_test_" + Time.now.strftime("%Y%m%d%H%M%S"))
+  end
+
+  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"
+    expect(@vars[:program_base]).to eq "rspec"
+    expect(@vars[:home_dir]).to eq @home
+    expect(@vars[:log_dir]).to eq File.join(@home,"log")
+    expect(@vars[:conf_dir]).to eq File.join(@home,"conf")
+    expect(@vars[:lib_dir]).to eq File.join(@home,"lib")
+    expect(@vars[:run_conf_path]).to eq File.join(@home,".rbatchrc")
+    expect(@vars[:config_path]).to eq File.join(@home,"conf","rspec.yaml")
+    expect(@vars[:common_config_path]).to eq File.join(@home,"conf","common.yaml")
+    expect(@vars.run_conf[:log_dir]).to eq "<home>/log"
+    expect(@vars.run_conf[:conf_dir]).to eq "<home>/conf"
+    expect(@vars.run_conf[:lib_dir]).to eq "<home>/lib"
+    expect(@vars.run_conf[:log_name]).to eq "<date>_<time>_<prog>.log"
+    expect(@vars[:log_name]).to_not eq "<date>_<time>_<prog>.log"
+  end 
+
+  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 
+
+  describe "merge!" do
+    it "success" do
+      @vars = RBatch::Variables.new()
+      @vars.merge!({:log_name => "hoge"})
+      expect(@vars[:log_name]).to eq "hoge"
+    end
+  end
+
+  describe "run conf" do
+    it "return runconf value via method missing" do
+      @vars = RBatch::Variables.new()
+      expect(@vars[:log_level]).to eq "info"
+    end
+
+    it "raise when key does not exist in run_conf" do
+      @vars = RBatch::Variables.new()
+      expect{@vars[:hoge]}.to raise_error RBatch::VariablesException
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'tmpdir'
-@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"
+require 'simplecov'
+
+SimpleCov.start
+

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - fetaro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-10 00:00:00 Z
+date: 2014-01-15 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".
@@ -39,11 +39,19 @@ files:
 - doc/RBatch/CommonConfig/Exception.html
 - doc/RBatch/Config.html
 - doc/RBatch/Config/Exception.html
+- doc/RBatch/Controller.html
 - doc/RBatch/DoubleRunCheckException.html
 - doc/RBatch/DoubleRunChecker.html
+- doc/RBatch/Journal.html
 - doc/RBatch/Log.html
+- doc/RBatch/LogException.html
+- doc/RBatch/RBatch.html
+- doc/RBatch/RBatch/RBatch.html
+- doc/RBatch/RBatch/RBatch/ConfigException.html
+- doc/RBatch/RBatch/VariablesException.html
 - doc/RBatch/RunConf.html
 - doc/RBatch/RunConf/Exception.html
+- doc/RBatch/Variables.html
 - doc/created.rid
 - doc/images/brick.png
 - doc/images/brick_link.png
@@ -73,20 +81,24 @@ files:
 - doc/lib/rbatch/cmd_rb.html
 - doc/lib/rbatch/common_config_rb.html
 - doc/lib/rbatch/config_rb.html
+- doc/lib/rbatch/controller_rb.html
 - doc/lib/rbatch/double_run_checker_rb.html
+- doc/lib/rbatch/journal_rb.html
 - doc/lib/rbatch/log_rb.html
 - doc/lib/rbatch/run_conf_rb.html
+- doc/lib/rbatch/variables_rb.html
 - doc/lib/rbatch/version_rb.html
 - doc/lib/rbatch_rb.html
 - doc/rdoc.css
 - lib/rbatch.rb
 - lib/rbatch/cmd.rb
-- lib/rbatch/common_config.rb
 - lib/rbatch/config.rb
 - lib/rbatch/controller.rb
 - lib/rbatch/double_run_checker.rb
+- lib/rbatch/journal.rb
 - lib/rbatch/log.rb
 - lib/rbatch/run_conf.rb
+- lib/rbatch/variables.rb
 - lib/rbatch/version.rb
 - rbatch.gemspec
 - sample/.rbatchrc
@@ -118,13 +130,15 @@ files:
 - sample/data/amAuthentication.error.2012-07-10
 - sample/lib/openidm_common_func.rb
 - sample/log/empty
-- spec/cmd_spec.rb
-- spec/common_config_spec.rb
-- spec/config_spec.rb
-- spec/double_run_checker_spec.rb
-- spec/log_spec.rb
-- spec/rbatch_spec.rb
-- spec/run_conf_spec.rb
+- spec/01_rbach_spec.rb
+- spec/rbatch/cmd_spec.rb
+- spec/rbatch/config_spec.rb
+- spec/rbatch/controller_spec.rb
+- spec/rbatch/double_run_checker_spec.rb
+- spec/rbatch/journal_spec.rb
+- spec/rbatch/log_spec.rb
+- spec/rbatch/run_conf_spec.rb
+- spec/rbatch/variables_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/fetaro/rbatch
 licenses: 
@@ -154,11 +168,13 @@ signing_key:
 specification_version: 3
 summary: Ruby-based simple batch framework
 test_files: 
-- spec/cmd_spec.rb
-- spec/common_config_spec.rb
-- spec/config_spec.rb
-- spec/double_run_checker_spec.rb
-- spec/log_spec.rb
-- spec/rbatch_spec.rb
-- spec/run_conf_spec.rb
+- spec/01_rbach_spec.rb
+- spec/rbatch/cmd_spec.rb
+- spec/rbatch/config_spec.rb
+- spec/rbatch/controller_spec.rb
+- spec/rbatch/double_run_checker_spec.rb
+- spec/rbatch/journal_spec.rb
+- spec/rbatch/log_spec.rb
+- spec/rbatch/run_conf_spec.rb
+- spec/rbatch/variables_spec.rb
 - spec/spec_helper.rb

data/spec/common_config_spec.rb

@@ -1,85 +0,0 @@
-require File.expand_path(File.join( File.dirname(__FILE__), 'spec_helper'))
-
-require 'rbatch'
-
-describe RBatch::Config do
-  before :all do
-    @config_dir=File.join(ENV["RB_HOME"],"conf")
-    @config_file = File.join(@config_dir , "common.yaml")
-    Dir::mkdir @config_dir if ! Dir.exists? @config_dir
-  end
-
-  before :each do
-  end
-
-  after :each do
-    FileUtils.rm @config_file if File.exists? @config_file
-  end
-
-  after :all do
-  end
-
-  it "read config" do
-    open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.init
-    expect(RBatch.common_config["key"]).to eq "value"
-  end
-
-  it "read config. Key is Symbol" do
-    open( @config_file  , "w" ){|f| f.write(":key: value")}
-    RBatch.init
-    expect(RBatch.common_config[:key]).to eq "value"
-  end
-
-  it "raise error when config does not exist" do
-    RBatch.init
-    expect {
-      RBatch.common_config["hoge"]
-    }.to raise_error(RBatch::Config::Exception)
-    expect {
-      RBatch.common_config.to_h
-    }.to raise_error(RBatch::Config::Exception)
-    expect {
-      RBatch.common_config.to_s
-    }.to raise_error(RBatch::Config::Exception)
-  end
-
-  it "read config twice" do
-    open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.init
-    expect(RBatch.common_config["key"]).to eq "value"
-    expect(RBatch.common_config["key"]).to eq "value"
-  end
-
-  it "raise error when read value which key does not exist" do
-    open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.init
-    expect {
-      RBatch.common_config["not_exist"]
-    }.to raise_error(RBatch::Config::Exception)
-  end
-
-  it "raise error when read value which key mistake String for Symbol" do
-    open( @config_file  , "w" ){|f| f.write(":key: value")}
-    RBatch.init
-    expect {
-      RBatch.common_config["key"]
-    }.to raise_error(RBatch::Config::Exception)
-  end
-
-  it "raise error when read value which key mistake Symbol for String" do
-    open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.init
-    expect {
-      RBatch.common_config[:key]
-    }.to raise_error(RBatch::Config::Exception)
-  end
-
-  it "success when common_conf_name changed" do
-    conf=File.join(RBatch.ctrl.conf_dir,"global.yaml")
-    open( conf  , "w" ){|f| f.write("key4: value4")}
-    open( RBatch.run_conf_path  , "w" ){|f| f.write("common_conf_name: global.yaml")}
-    RBatch.init
-    expect(RBatch.common_config["key4"]).to eq "value4"
-  end
-end