rbatch 2.5.0 → 2.5.1

data/README.ja.md

@@ -373,7 +373,7 @@ Run-Conf(`${RB_HOME}/.rbatchrc`)のサンプルは以下の通り
 
 # ログを追記するかどうか
 #
-#   デフォルト値はture。
+#   デフォルト値はtrue。
 #
 #log_append : true
 #log_append : false

data/README.md

@@ -401,7 +401,7 @@ Sample of RBatch Run-Conf `${RB_HOME}/.rbatchrc`.
 
 # Append Log
 #
-#   Default is ture.
+#   Default is true.
 #
 #log_append : true
 #log_append : false

data/bin/rbatch-init

@@ -98,7 +98,7 @@ contents[".rbatchrc"] = <<EOF
 
 # Append Log
 #
-#   Default is ture.
+#   Default is true.
 #
 #log_append : true
 #log_append : false

data/lib/rbatch/config.rb

@@ -8,19 +8,19 @@ module RBatch
     @path
 
     # Actual data
-    @hash
+    @element
 
     # @param [String] path Config file path
     def initialize(path,is_erb = false)
       @path = path
       begin
         if is_erb
-          @hash = ConfigElement.new(YAML::load(ERB.new(IO.read(@path)).result))
+          @element = Config.parse(YAML::load(ERB.new(IO.read(@path)).result))
         else
-          @hash = ConfigElement.new(YAML::load_file(@path))
+          @element = Config.parse(YAML::load_file(@path))
         end
       rescue Errno::ENOENT => e
-        @hash = nil
+        @element = nil
       end
     end
 
@@ -28,10 +28,10 @@ module RBatch
     # @param [Object] key Config key.
     # @raise [RBatch::ConfigException]
     def[](key)
-      if @hash.nil?
+      if @element.nil?
         raise RBatch::ConfigException, "Config file \"#{@path}\" does not exist"
       else
-        @hash[key]
+        @element[key]
       end
     end
 
@@ -41,36 +41,51 @@ module RBatch
 
     # Config file exists or not
     # @return [Boolean]
-    def exist? ; ! @hash.nil? ; end
+    def exist? ; ! @element.nil? ; end
 
     # @return [Hash]
     def to_h
-      if @hash.nil?
+      if @element.nil?
         raise RBatch::ConfigException, "Config file \"#{@path}\" does not exist"
       else
-        @hash
+        @element
       end
     end
 
     # @return [String]
     def to_s
-      if @hash.nil?
+      if @element.nil?
         raise RBatch::ConfigException, "Config file \"#{@path}\" does not exist"
       else
-        @hash.to_s
+        @element.to_s
       end
     end
-  end
 
-  class ConfigElement < Hash
+    # @return ConfigElementArray or ConfigElementHash
+    def Config.parse(yaml)
+      if yaml.class == Hash
+        return ConfigElementHash.new(yaml)
+      elsif yaml.class == Array
+        return ConfigElementArray.new(yaml)
+      else
+        return yaml
+      end
+    end
+  end
+  
+  class ConfigElementArray < Array
+    def initialize(array)
+      array.each_with_index do |item,index|
+        self[index] = Config.parse(item)
+      end
+    end
+  end
+  
+  class ConfigElementHash < Hash
     def initialize(hash)
       if hash
         hash.each_key do |key|
-          if hash[key].class == Hash
-            self[key] = ConfigElement.new(hash[key])
-          else
-            self[key] = hash[key]
-          end
+          self[key] = Config.parse(hash[key])
         end
       end
     end

data/lib/rbatch/version.rb

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

data/sample/.rbatchrc

@@ -95,7 +95,7 @@
 
 # Append Log
 #
-#   Default is ture.
+#   Default is true.
 #
 #log_append : true
 #log_append : false

data/spec/rbatch/config_spec.rb

@@ -77,8 +77,8 @@ describe RBatch::Config do
 
 end
 
-describe RBatch::ConfigElement do
-  it "" do
+describe "RBatch::Config.parse" do
+  it "parses hash" do
     hash = {
       "a" => "av" ,
       "b" => {
@@ -89,11 +89,11 @@ describe RBatch::ConfigElement do
         }
       }
     }
-    ce = RBatch::ConfigElement.new(hash)
+    ce = RBatch::Config.parse(hash)
     expect(ce["a"]).to eq "av"
-    expect(ce["b"].class).to eq RBatch::ConfigElement
+    expect(ce["b"].class).to eq RBatch::ConfigElementHash
     expect(ce["b"]["c"]).to eq "cv"
-    expect(ce["b"]["d"].class).to eq RBatch::ConfigElement
+    expect(ce["b"]["d"].class).to eq RBatch::ConfigElementHash
     expect(ce["b"]["d"]["e"]).to eq "ev"
     expect(ce["b"]["d"]["f"][1]).to eq 2
     expect { ce["noexist"] }.to raise_error(RBatch::ConfigException)
@@ -101,4 +101,23 @@ describe RBatch::ConfigElement do
     expect { ce["b"]["noexist"] }.to raise_error(RBatch::ConfigException)
     expect { ce["b"]["d"]["noexist"] }.to raise_error(RBatch::ConfigException)
   end
+
+  it "parses array" do
+    array = [
+      "a",
+      [ "b", "c" ],
+      { "d" => "dv" , "e" => "ev" },
+      [ "f",["g","h","i"]]
+    ]
+    ce = RBatch::Config.parse(array)
+    expect(ce.class).to eq RBatch::ConfigElementArray
+    expect(ce[0]).to eq "a"
+    expect(ce[1].class).to eq RBatch::ConfigElementArray
+    expect(ce[1][0]).to eq "b"
+    expect(ce[1][1]).to eq "c"
+    expect(ce[2].class).to eq RBatch::ConfigElementHash
+    expect(ce[2]["d"]).to eq "dv"
+    expect { ce[2]["z"] }.to raise_error(RBatch::ConfigException)
+    expect(ce[3][1][1]).to eq "h"
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: rbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors: 
 - fetaro
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-06-13 00:00:00 Z
+date: 2015-06-17 00:00:00 Z
 dependencies: []
 
 description: Batch Script Framework