rbatch 2.1.0 → 2.1.1

data/bin/rbatch-init

@@ -174,7 +174,7 @@ EOF
 
 
 require 'fileutils'
-["bin","conf","log"].each do | dir |
+["bin","conf","log","lib"].each do | dir |
   if ! Dir.exists?(dir)
     FileUtils.mkdir(dir)
     puts "create ./" + dir

data/lib/rbatch.rb

@@ -2,108 +2,48 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 require 'yaml'
 
 module RBatch
-  @@program_name = nil
-  @@program_base = nil
-  @@program_path = nil
-  @@home_dir = nil
-  @@run_conf_path = nil
-  @@run_conf_fpath = nil
-  @@run_conf = nil
-  @@config = nil
-  @@common_config = nil
-  @@journal_verbose = 3
-  @@journal_verbose_map = { :error => 1, :warn => 2, :info => 3, :debug => 4}
-  @@journals = []
-  @@logs = []
+  @@ctrl = nil
   module_function
-  def program_name  ; @@program_name ; end
-  def program_base  ; @@program_base ; end
-  def program_path  ; @@program_path ; end
-  def home_dir      ; @@home_dir ; end
-  def run_conf_path ; @@run_conf_path ; end
-  def run_conf      ; @@run_conf ; end
-  def conf_dir      ; @@run_conf[:conf_dir].gsub("<home>",@@home_dir) ; end
-  def log_dir       ; @@run_conf[:log_dir].gsub("<home>",@@home_dir) ; end
-  def lib_dir       ; @@run_conf[:lib_dir].gsub("<home>",@@home_dir) ; end
-  def config        ; @@config ; end
-  def common_config ; @@common_config ; end
-  def journals      ; @@journals ; end
-  def add_log(log)
-    @@logs << log
-  end
-  def journal(level,str)
-    if @@journal_verbose_map[level] <= @@journal_verbose
-      str = "[RBatch] " + str
-      puts str
-      @@journals << str
-      @@logs.each do |log|
-        if RBatch.run_conf[:mix_rbatch_msg_to_log]
-          log.journal(str)
-        end
-      end
-    end
-  end
   def init
-    @@journal_verbose = ENV["RB_VERBOSE"].to_i if ENV["RB_VERBOSE"]
-    RBatch.journal :info,"=== START RBatch === (PID=#{$$.to_s})"
-    @@program_name = $PROGRAM_NAME
-    @@program_base = File.basename($PROGRAM_NAME)
-    @@program_path = File.expand_path(@@program_name)
-    if  ENV["RB_HOME"]
-      @@home_dir = File.expand_path(ENV["RB_HOME"])
-      RBatch.journal :debug,"RB_HOME : \"#{@@home_dir}\" (defined by $RB_HOME)"
-    else
-      @@home_dir =  File.expand_path(File.join(File.dirname(@@program_name) , ".."))
-      RBatch.journal :debug,"RB_HOME : \"#{@@home_dir}\" (default)"
-    end
-    @@run_conf_path = File.join(@@home_dir,".rbatchrc")
-    RBatch.journal :info,"Load Run-Conf: \"#{@@run_conf_path}\""
-    @@run_conf = RunConf.new(@@run_conf_path,@@home_dir)
-    RBatch.journal :debug,"RBatch option : #{@@run_conf.inspect}"
-    @@common_config = RBatch::CommonConfig.new
-    RBatch.journal :info,"Load Config  : \"#{@@common_config.path}\"" if @@common_config.exist?
-    @@config = RBatch::Config.new
-    RBatch.journal :info,"Load Config  : \"#{@@config.path}\"" if @@config.exist?
+    @@ctrl = RBatch::Controller.new
   end
-  def reload_config
-    begin
-      @@config = RBatch::Config.new
-      RBatch.journal :info, "Load Config  : \"#{@@config.path}\""
-    rescue Errno::ENOENT => e
-    end
+  def ctrl
+    @@ctrl
   end
-  def reload_common_config
-    begin
-      @@common_config = RBatch::CommonConfig.new
-      RBatch.journal :info,"Load Config  : \"#{@@common_config.path}\""
-    rescue Errno::ENOENT => e
-    end
+  def run_conf
+    @@ctrl.run_conf
   end
+  def run_conf_path ; @@ctrl.run_conf_path ; end
+
+  # Config Reader
+  #
+  # Read config file and return hash opject. If the key does not exist in config file, raise RBatch::Config::Exception.
+  # 
+  # Default config file path is "${RB_HOME}/conf/(program base name).yaml"
+  # ==== Sample
+  # config : ${RB_HOME}/conf/sample2.yaml
+  #  key: value
+  #  array:
+  #   - item1
+  #   - item2
+  #   - item3
+  # script : ${RB_HOME}/bin/sample2.rb
+  #  require 'rbatch'
+  #  p RBatch::Config.new
+  #  # or  p RBatch::config
+  #  => {"key" => "value", "array" => ["item1", "item2", "item3"]}
+  def config ; @@ctrl.config ; end
+  def common_config ; @@ctrl.common_config ; end
+  def journal(a,b) ; @@ctrl.journal(a,b) ; end
 end
 
 # main
+require 'rbatch/controller'
 require 'rbatch/run_conf'
 require 'rbatch/double_run_checker'
 require 'rbatch/log'
 require 'rbatch/config'
-require 'rbatch/common_config'
 require 'rbatch/cmd'
 
 RBatch::init
 
-if ( RBatch.run_conf[:forbid_double_run] )
-  RBatch::DoubleRunChecker.check(File.basename(RBatch.program_name)) #raise error if check is NG
-  RBatch::DoubleRunChecker.make_lock_file(File.basename(RBatch.program_name))
-end
-
-
-
-if RBatch.run_conf[:auto_lib_load] && Dir.exist?(RBatch.lib_dir)
-  Dir::foreach(RBatch.lib_dir) do |file|
-    if /.*rb/ =~ file
-      require File.join(RBatch.lib_dir,File.basename(file,".rb"))
-      RBatch.journal :info, "Load Library : \"#{File.join(RBatch.lib_dir,file)}\" "
-    end
-  end
-end
-RBatch.journal :info,"Start Script : \"#{RBatch.program_path}\""

data/lib/rbatch/common_config.rb

@@ -1,71 +0,0 @@
-require 'yaml'
-require 'pathname'
-
-module RBatch
-
-  module_function
-  # Common-config Reader
-  #
-  # Read common config file and return hash opject. If the key does not exist in config file, raise RBatch::CommonConfig::Exception.
-  #
-  # Default common config file path is "${RB_HOME}/conf/common.yaml"
-  # ==== Sample
-  # config : ${RB_HOME}/conf/common.yaml
-  #  key: value
-  #  array:
-  #   - item1
-  #   - item2
-  #   - item3
-  # script : ${RB_HOME}/bin/sample.rb
-  #  require 'rbatch'
-  #  p RBatch::common_config
-  #  => {"key" => "value", "array" => ["item1", "item2", "item3"]}
-  class CommonConfig
-    @path
-    @hash
-    def initialize
-      file = RBatch.run_conf[:common_conf_name]
-      @path = File.join(RBatch.conf_dir,file)
-      begin
-        @hash = YAML::load_file(@path)
-      rescue Errno::ENOENT => e
-        @hash = nil
-      end
-    end
-    def[](key)
-      if @hash.nil?
-        raise RBatch::CommonConfig::Exception, "Common Config file \"#{@path}\" does not exist"
-      end
-      if @hash[key].nil?
-        if key.class == Symbol
-          raise RBatch::CommonConfig::Exception, "Value of key(:#{key} (Symbol)) is nil. By any chance, dou you mistake key class Symbol for String?"
-        elsif key.class == String
-          raise RBatch::CommonConfig::Exception, "Value of key(\"#{key}\" (String)) is nil"
-        else
-          raise RBatch::CommonConfig::Exception, "Value of key(#{key}) is nil"
-        end
-      else
-        @hash[key]
-      end
-    end
-    def path ; @path ; end
-    def exist? ; ! @hash.nil? ; end
-    def to_h
-      if @hash.nil?
-        raise RBatch::CommonConfig::Exception, "Common Config file \"#{@path}\" does not exist"
-      else
-        @hash
-      end
-    end
-    def to_s
-      if @hash.nil?
-        raise RBatch::CommonConfig::Exception, "Common Config file \"#{@path}\" does not exist"
-      else
-        @hash.to_s
-      end
-    end
-  end
-
-  class RBatch::CommonConfig::Exception < Exception; end
-end
-

data/lib/rbatch/config.rb

@@ -3,30 +3,11 @@ require 'pathname'
 
 module RBatch
 
-  module_function
-  # Config Reader
-  #
-  # Read config file and return hash opject. If the key does not exist in config file, raise RBatch::Config::Exception.
-  # 
-  # Default config file path is "${RB_HOME}/conf/(program base name).yaml"
-  # ==== Sample
-  # config : ${RB_HOME}/conf/sample2.yaml
-  #  key: value
-  #  array:
-  #   - item1
-  #   - item2
-  #   - item3
-  # script : ${RB_HOME}/bin/sample2.rb
-  #  require 'rbatch'
-  #  p RBatch::Config.new
-  #  # or  p RBatch::config
-  #  => {"key" => "value", "array" => ["item1", "item2", "item3"]}
   class Config
     @path
     @hash
-    def initialize
-      file = Pathname(File.basename(RBatch.program_name)).sub_ext(".yaml").to_s
-      @path = File.join(RBatch.conf_dir,file)
+    def initialize(path)
+      @path = path
       begin
         @hash = YAML::load_file(@path)
       rescue Errno::ENOENT => e

data/lib/rbatch/controller.rb

@@ -0,0 +1,75 @@
+module RBatch
+  class Controller
+    @@journal_verbose_map = { :error => 1, :warn => 2, :info => 3, :debug => 4}
+    attr :program_name,:program_path
+    attr :home_dir,:log_dir,:conf_dir,:lib_dir
+    attr :run_conf_path, :run_conf
+    attr :config, :config_path
+    attr :common_config, :common_config_path
+    attr :journals,:logs
+    def initialize
+      @journals = []
+      @logs = []
+      if ENV["RB_VERBOSE"]
+        @journal_verbose = ENV["RB_VERBOSE"].to_i
+      else
+        @journal_verbose = 3
+      end
+      @program_name = $PROGRAM_NAME
+      @program_base = File.basename($PROGRAM_NAME)
+      @program_path = File.expand_path(@program_name)
+      if  ENV["RB_HOME"]
+        @home_dir = File.expand_path(ENV["RB_HOME"])
+      else
+        @home_dir =  File.expand_path(File.join(File.dirname(@program_name) , ".."))
+      end
+      @run_conf_path = File.join(@home_dir,".rbatchrc")
+      @run_conf = RunConf.new(@run_conf_path,@home_dir)
+      journal :info, "=== START RBatch === (PID=#{$$.to_s})"
+      journal :debug,"RB_HOME : \"#{@home_dir}\""
+      journal :info, "Load Run-Conf: \"#{@run_conf_path}\""
+      journal :debug,"RBatch option : #{@run_conf.inspect}"
+      @lib_dir  = @run_conf[:lib_dir].gsub("<home>",@home_dir)
+      @conf_dir = @run_conf[:conf_dir].gsub("<home>",@home_dir)
+      @log_dir  = @run_conf[:log_dir].gsub("<home>",@home_dir)
+      # common config
+      @common_config_path = File.join(@conf_dir,@run_conf[:common_conf_name])
+      @common_config = RBatch::Config.new(@common_config_path)
+      journal :info, "Load Config  : \"#{@common_config_path}\"" if ! @common_config.nil?
+      # user config
+      @config_path = File.join(@conf_dir,Pathname(File.basename(@program_name)).sub_ext(".yaml").to_s)
+      @config = RBatch::Config.new(@config_path)
+      journal :info, "Load Config  : \"#{@config_path}\"" if ! @config.nil?
+      # double_run_check
+      if ( @run_conf[:forbid_double_run] )
+        RBatch::DoubleRunChecker.check(@program_base) #raise error if check is NG
+        RBatch::DoubleRunChecker.make_lock_file(@program_base)
+      end
+      # load_lib
+      if @run_conf[:auto_lib_load] && Dir.exist?(@lib_dir)
+        Dir::foreach(@lib_dir) do |file|
+          if /.*rb/ =~ file
+            require File.join(@lib_dir,File.basename(file,".rb"))
+            journal :info, "Load Library : \"#{File.join(@lib_dir,file)}\" "
+          end
+        end
+      end
+      journal :info,"Start Script : \"#{@program_path}\""
+    end #end def
+    def journal(level,str)
+      if @@journal_verbose_map[level] <= @journal_verbose
+        str = "[RBatch] " + str
+        puts str
+        @journals << str
+        @logs.each do |log|
+          if RBatch.run_conf[:mix_rbatch_msg_to_log]
+            log.journal(str)
+          end
+        end
+      end
+    end
+    def add_log(log)
+      @logs << log
+    end
+  end
+end

data/lib/rbatch/log.rb

@@ -90,13 +90,13 @@ module RBatch
       end
 
       # determine log file name
-      @prog_base = Pathname(File.basename(RBatch.program_name)).sub_ext("").to_s
+      @prog_base = Pathname(File.basename(RBatch.ctrl.program_name)).sub_ext("").to_s
       @file_name = @opt[:log_name].clone
       @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>", @opt[:log_hostname])
-      @log_dir = @opt[:log_dir].gsub("<home>",RBatch.home_dir)
+      @log_dir = @opt[:log_dir].gsub("<home>",RBatch.ctrl.home_dir)
       path = File.join(@log_dir,@file_name)
       # create Logger instance
       begin
@@ -106,7 +106,7 @@ module RBatch
           @log = Logger.new(open(path,"w"))
         end
       rescue Errno::ENOENT => e
-        RBatch.journal :error, "Can not open log file  - #{path}"
+        RBatch.ctrl.journal :error, "Can not open log file  - #{path}"
         raise e
       end
       # set logger option
@@ -126,15 +126,15 @@ module RBatch
         @stdout_log.level = @@log_level_map[@opt[:log_level]]
         @stdout_log.formatter = formatter
       end
-      RBatch.journal :info,"Start Logging: \"#{path}\""
+      RBatch.ctrl.journal :info,"Start Logging: \"#{path}\""
       # delete old log
       self.delete_old_log(@opt[:log_delete_old_log_date]) if @opt[:log_delete_old_log]
       # Firstly write journal to log
       if RBatch.run_conf[:mix_rbatch_msg_to_log]
-        RBatch.journals.each do |str|
+        RBatch.ctrl.journals.each do |str|
           self.journal(str)
         end
-        RBatch.add_log(self)
+        RBatch.ctrl.add_log(self)
       end
       # Start logging
       if block_given?
@@ -215,7 +215,7 @@ module RBatch
       body = <<EOT
 From: <#{@opt[:log_mail_from]}>
 To: <#{@opt[:log_mail_to]}>
-Subject: [RBatch] #{RBatch.program_name} has error
+Subject: [RBatch] #{RBatch.ctrl.program_name} has error
 Date: #{Time::now.strftime("%a, %d %b %Y %X %z")}
 Mime-Version: 1.0
 Content-Type: text/plain; charset=ISO-2022-JP

data/lib/rbatch/version.rb

@@ -1,3 +1,3 @@
 module RBatch
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/sample/bin/ftp_get.rb

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,10 @@
+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

data/sample/conf/common.yaml

@@ -0,0 +1,5 @@
+openidm :
+  server : localhost
+  port: 80
+  api_user : hoge
+  api_pass : hoge

data/sample/lib/openidm_common_func.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'rbatch'
+
+require 'net/http'
+require 'net/http/post/multipart'
+
+# Send file-upload request to OpenIDM
+#  @param category : openidf file category
+#  @param filepath : file
+#  @param log : RBatch::Log instance
+#
+# do same
+# curl --header "X-OpenIDM-Username: openidm-admin" --header "X-OpenIDM-Password: openidm-admin" -F file=@"D:\test.pdf" "http://localhost:8080/openidm/filerepo/cat/?_action=upload&save=true"
+def store_file_to_openidm(category,filepath,log)
+  server = RBatch.common_config["openidm"]["server"]
+  port = RBatch.common_config["openidm"]["port"]
+  path = "/openidm/filerepo/#{category}/?_action=upload&save=true"
+  param = "_action=upload&save=true"
+  headers = {
+    "X-OpenIDM-Username" => RBatch.common_config["openidm"]["api_user"],
+    "X-OpenIDM-Password" => RBatch.common_config["openidm"]["api_pass"]
+  }
+  File.open(filepath) do |file|
+    http = Net::HTTP.new(server,port)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    request = Net::HTTP::Post::Multipart.new(
+        path,
+        {"file" => UploadIO.new(file, "image/jpeg", "image.jpg")},
+        headers)
+    
+    log.info("upload file: " + file.path)
+    log.info("post url: http://#{server}:#{port}#{path}" )
+    log.info("header: #{request.to_hash}" )
+   
+    response = http.request(request) #send request
+    
+    log.info("response code: #{response.message} #{response.code}")
+    response.body.split("\n").each {|l| log.info("response body: #{l}")}
+    if response.code == 200 || response.code == 201 || response.code == 202
+      log.info("Success to upload file to OpenIDM");
+    else
+      raise "Faild to upload file to OpenIDM"
+    end
+  end
+end

data/spec/common_config_spec.rb

@@ -1,85 +1,85 @@
-require File.expand_path(File.join( File.dirname(__FILE__), 'spec_helper'))
-
-require 'rbatch'
-
-describe RBatch::CommonConfig 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.reload_common_config
-    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.reload_common_config
-    expect(RBatch.common_config[:key]).to eq "value"
-  end
-
-  it "raise error when config does not exist" do
-    RBatch.reload_common_config
-    expect {
-      RBatch.common_config["hoge"]
-    }.to raise_error(RBatch::CommonConfig::Exception)
-    expect {
-      RBatch.common_config.to_h
-    }.to raise_error(RBatch::CommonConfig::Exception)
-    expect {
-      RBatch.common_config.to_s
-    }.to raise_error(RBatch::CommonConfig::Exception)
-  end
-
-  it "read config twice" do
-    open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.reload_common_config
-    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.reload_common_config
-    expect {
-      RBatch.common_config["not_exist"]
-    }.to raise_error(RBatch::CommonConfig::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.reload_common_config
-    expect {
-      RBatch.common_config["key"]
-    }.to raise_error(RBatch::CommonConfig::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.reload_common_config
-    expect {
-      RBatch.common_config[:key]
-    }.to raise_error(RBatch::CommonConfig::Exception)
-  end
-
-  it "success when common_conf_name changed" do
-    conf=File.join(RBatch.conf_dir,"global.yaml")
-    open( conf  , "w" ){|f| f.write("key4: value4")}
-    RBatch.run_conf[:common_conf_name]="global.yaml"
-    RBatch.reload_common_config
-    expect(RBatch.common_config["key4"]).to eq "value4"
-  end
-end
+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

data/spec/config_spec.rb

@@ -21,18 +21,18 @@ describe RBatch::Config do
 
   it "read config" do
     open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.reload_config
+    RBatch.init
     expect(RBatch.config["key"]).to eq "value"
   end
 
   it "read config. Key is Symbol" do
     open( @config_file  , "w" ){|f| f.write(":key: value")}
-    RBatch.reload_config
+    RBatch.init
     expect(RBatch.config[:key]).to eq "value"
   end
 
   it "raise error when config does not exist" do
-    RBatch.reload_config
+    RBatch.init
     expect {
       RBatch.config["hoge"]
     }.to raise_error(RBatch::Config::Exception)
@@ -46,14 +46,14 @@ describe RBatch::Config do
 
   it "read config twice" do
     open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.reload_config
+    RBatch.init
     expect(RBatch.config["key"]).to eq "value"
     expect(RBatch.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.reload_config
+    RBatch.init
     expect {
       RBatch.config["not_exist"]
     }.to raise_error(RBatch::Config::Exception)
@@ -61,7 +61,7 @@ describe RBatch::Config do
 
   it "raise error when read value which key mistake String for Symbol" do
     open( @config_file  , "w" ){|f| f.write("key: value")}
-    RBatch.reload_config
+    RBatch.init
     expect {
       RBatch.config[:key]
     }.to raise_error(RBatch::Config::Exception)
@@ -69,7 +69,7 @@ describe RBatch::Config do
 
   it "raise error when read value which key mistake Symbol for String" do
     open( @config_file  , "w" ){|f| f.write(":key: value")}
-    RBatch.reload_config
+    RBatch.init
     expect {
       RBatch.config["key"]
     }.to raise_error(RBatch::Config::Exception)

data/spec/rbatch_spec.rb

@@ -15,7 +15,7 @@ describe "RBatch" do
 
   it "RB_HOME should be home_dir" do
     require 'rbatch'
-    expect(RBatch.home_dir).to eq ENV["RB_HOME"]
+    expect(RBatch.ctrl.home_dir).to eq ENV["RB_HOME"]
   end
 
 

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - fetaro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-09 00:00:00 Z
+date: 2014-01-10 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".
@@ -83,6 +83,7 @@ files:
 - 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/log.rb
 - lib/rbatch/run_conf.rb
@@ -91,17 +92,21 @@ 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
 - 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
+- sample/conf/store_to_idm.yaml
 - sample/conf/webagent_log_insert.yaml
 - sample/data/access_log.1
 - sample/data/access_log.2012-07-10
@@ -111,6 +116,7 @@ files:
 - 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
 - spec/cmd_spec.rb
 - spec/common_config_spec.rb