rbatch 2.5.1 → 2.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 73a0f559fa403ce5fbe0ca86faae38b811cce54b
+  data.tar.gz: e153a887fc20abe1d51415699ea72d498c017806
+SHA512:
+  metadata.gz: 5e98f13494c10a7ea409772803471134654e4f47ecb9b9c0f8b6555320d08a7a52a6d115584071c08cabe74bebc119645844ea68a8d787743a3759c2fba10b3f
+  data.tar.gz: 1f4e4b5f29f8d955694eef779010955119ff30154c26fc666977606bda5639d336df207e3f2c429a5e92b726048697b893e909e46810e690df3ee3348435a652

data/.gitignore

@@ -2,3 +2,4 @@ pkg/
 sample/log/*.log
 coverage/
 .yardoc/
+**/*flymake*

data/CHANGELOG

@@ -9,6 +9,12 @@ If you want to know about bug fix, please see commit logs of https://github.com/
 version 2
 ===================
 
+2.6.0 (2015/09/06)
+----
+* [change] ${RB_HOME}/lib is added to $LOAD_PATH by default.
+* [change] Before auto-library-loading only load lib/*.rb, now it can load recursively.
+* [change] auto-library-loading ignore files whose name begin with the "." .
+
 2.5.0 (2015/06/14)
 ----
 * [add] support erb format config.

data/lib/rbatch/controller.rb

@@ -22,6 +22,7 @@ module RBatch
       @journal.put 1, "RB_HOME : \"#{@vars[:home_dir]}\""
       @journal.put 1, "Load Run-Conf: \"#{@vars[:run_conf_path]}\""
       @journal.put 2, "RBatch Variables : #{@vars.inspect}"
+      # Load common_config
       if File.exist?(@vars[:common_config_path])
         @common_config = RBatch::Config.new(@vars[:common_config_path],false)
       elsif File.exist?(@vars[:common_config_erb_path])
@@ -32,6 +33,7 @@ module RBatch
         @common_config = RBatch::Config.new(@vars[:common_config_path],false)
       end
       @journal.put 1, "Load Config  : \"#{@common_config.path}\"" if @common_config.exist?
+      # Load config
       if File.exist?(@vars[:config_path])
         @config = RBatch::Config.new(@vars[:config_path],false)
       elsif File.exist?(@vars[:config_erb_path])
@@ -42,18 +44,18 @@ module RBatch
         @config = RBatch::Config.new(@vars[:config_path],false)
       end
       @journal.put 1, "Load Config  : \"#{@config.path}\"" if @config.exist?
-
       # double_run_check
       if ( @vars[:forbid_double_run])
         RBatch::DoubleRunChecker.check(@vars[:program_base]) #raise error if check is NG
         RBatch::DoubleRunChecker.make_lock_file(@vars[:program_base])
       end
       # load_lib
+      $LOAD_PATH.push(@vars[:lib_dir])
       if @vars[:auto_lib_load] && Dir.exist?(@vars[:lib_dir])
-        Dir::foreach(@vars[:lib_dir]) do |file|
-          if /.*rb/ =~ file
-            require File.join(@vars[:lib_dir],File.basename(file,".rb"))
-            @journal.put 1, "Load Library : \"#{File.join(@vars[:lib_dir],file)}\" "
+        Dir.glob(File.join(@vars[:lib_dir],"**","*")) do |path|
+          if File::basename(path) =~ /^[^\.].*\.rb$/
+            require File.expand_path(path)
+            @journal.put 1, "Load Library : \"#{File.expand_path(path)}\" "
           end
         end
       end

data/lib/rbatch/version.rb

@@ -1,3 +1,3 @@
 module RBatch
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/spec/01_rbach_spec.rb

@@ -6,11 +6,13 @@ describe "RBatch" do
     @home = File.join(Dir.tmpdir, @rand)
     @log_dir = File.join(@home,"log")
     @conf_dir = File.join(@home,"conf")
+    @lib_dir = File.join(@home,"lib")
     ENV["RB_HOME"]=@home
 
     Dir.mkdir(@home)
     Dir.mkdir(@log_dir)
     Dir.mkdir(@conf_dir)
+    Dir.mkdir(@lib_dir)
     open( File.join(@home,".rbatchrc") , "a" ){|f|
       f.write("log_name : hoge.log \nforbid_double_run : true")
     }
@@ -23,6 +25,23 @@ describe "RBatch" do
       f.write("key2 : value2")
     }
 
+    open( File.join(@lib_dir,"hoge.rb") , "a" ){|f|
+      f.write("require 'hoge'\nrequire 'tmp/bar'\nrequire 'tmp/tmp/huga'\n")
+    }
+
+    # this library shold not be loaded
+    open( File.join(@lib_dir,".hoge.rb.swp") , "a" ){|f|}
+
+    Dir.mkdir(File.join(@lib_dir,"tmp"))
+    open( File.join(@lib_dir,"tmp","bar.rb") , "a" ){|f|
+      f.write("require 'hoge'\nrequire 'tmp/bar'\nrequire 'tmp/tmp/huga'\n")
+    }
+
+    Dir.mkdir(File.join(@lib_dir,"tmp","tmp"))
+    open( File.join(@lib_dir,"tmp","tmp","huga.rb") , "a" ){|f|
+      f.write("require 'hoge'\nrequire 'tmp/bar'\nrequire 'tmp/tmp/huga'\n")
+    }
+
     # stop STODOUT output
     #$stdout = File.open(File.join(@home,"out.txt"),"w")
     #$stderr = File.open(File.join(@home,"err.txt"),"w")
@@ -74,10 +93,13 @@ describe "RBatch" do
     expect(RBatch.ctrl.journal.journals[2]).to match /batchrc/
     expect(RBatch.ctrl.journal.journals[3]).to match /common.yaml/
     expect(RBatch.ctrl.journal.journals[4]).to match /rspec.yaml/
-    expect(RBatch.ctrl.journal.journals[5]).to match /Start Script/
-    expect(RBatch.ctrl.journal.journals[6]).to match /Logging Start/
-    expect(RBatch.ctrl.journal.journals[7]).to match /var1/
-    expect(RBatch.ctrl.journal.journals[8]).to match /var0/
+    expect(RBatch.ctrl.journal.journals[5]).to match /Load Library.*.rb/
+    expect(RBatch.ctrl.journal.journals[6]).to match /Load Library.*.rb/
+    expect(RBatch.ctrl.journal.journals[7]).to match /Load Library.*.rb/
+    expect(RBatch.ctrl.journal.journals[8]).to match /Start Script/
+    expect(RBatch.ctrl.journal.journals[9]).to match /Logging Start/
+    expect(RBatch.ctrl.journal.journals[10]).to match /var1/
+    expect(RBatch.ctrl.journal.journals[11]).to match /var0/
 
     # check log
     f = open(File.join(@home,"log","hoge.log")).read
@@ -88,12 +110,15 @@ describe "RBatch" do
     expect(lines[2]).to match /batchrc/
     expect(lines[3]).to match /common.yaml/
     expect(lines[4]).to match /rspec.yaml/
-    expect(lines[5]).to match /Start Script/
-    expect(lines[6]).to match /Logging Start/
-    expect(lines[7]).to match /test_string/
-    expect(lines[8]).to match /var1/
-    expect(lines[9]).to match /var0/
-    expect(lines[10]).to match /FATAL/
+    expect(lines[5]).to match /Load Library.*.rb/
+    expect(lines[6]).to match /Load Library.*.rb/
+    expect(lines[7]).to match /Load Library.*.rb/
+    expect(lines[8]).to match /Start Script/
+    expect(lines[9]).to match /Logging Start/
+    expect(lines[10]).to match /test_string/
+    expect(lines[11]).to match /var1/
+    expect(lines[12]).to match /var0/
+    expect(lines[13]).to match /FATAL/
 
   end
 end

metadata

@@ -1,28 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbatch
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.5.1
+version: !ruby/object:Gem::Version
+  version: 2.6.0
 platform: ruby
-authors: 
+authors:
 - fetaro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-06-17 00:00:00 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies: []
-
 description: Batch Script Framework
-email: 
+email:
 - fetaro@gmail.com
-executables: 
+executables:
 - rbatch-init
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG
@@ -69,33 +64,30 @@ files:
 - spec/rbatch/variables_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/fetaro/rbatch
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.9.0
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.1
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Batch Script Framework
-test_files: 
+test_files:
 - spec/01_rbach_spec.rb
 - spec/rbatch/cmd_spec.rb
 - spec/rbatch/config_spec.rb
@@ -106,4 +98,3 @@ test_files:
 - spec/rbatch/run_conf_spec.rb
 - spec/rbatch/variables_spec.rb
 - spec/spec_helper.rb
-has_rdoc: