bricolage 5.9.3 → 5.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34a5e474f1bf0c6dea10cfe5d5b13f3c364e9cc8
-  data.tar.gz: 8388f6793a9f21ba0884974b14066863f2d40058
+  metadata.gz: f6178538ee6f9522da94f6ec5273f58d3f1d24c8
+  data.tar.gz: c9399075400ce46842b58b10a4761692a970c22d
 SHA512:
-  metadata.gz: 7ea970399f9e90a4c7838524a2f5defec648a172f72bc4dea8f61424805e5e3a7a355dae9c58eafc8cd780df3f4c3204344d9b51e21e08388a4a8efc42cca2a7
-  data.tar.gz: 52142307c7ba46c9635a770f3aa2c3955c7f0f96560ba06d8bbb83924aea060faf69ab1f99e6ff5f15936345d2c860801267e073d6cb6fff661d1eb1c4e5200a
+  metadata.gz: 6843c00f3ce9ebd77541208d856a150860103ef40aae4cb8af225cd04a031f35af3798b6fd1352f29dbeac1d75c2c264114732e65338ff2019af964e66e2a5a0
+  data.tar.gz: f3039246c29a45a74db335f50a857adfeaf94e155c81288248c9d5fd937d81e264d130fc567b4cae67895bc73c5b639574b4e7e3d9fc6d7576090b3f68b6f424

data/lib/bricolage/configloader.rb

@@ -10,31 +10,17 @@ require 'date'
 module Bricolage
 
   class ConfigLoader
-    def ConfigLoader.load_eruby_yaml(path)
-      new(nil).load_eruby_yaml(path)
-    end
-
     def initialize(app_home)
       @app_home = app_home
       @base_dir = Pathname('.')
     end
 
-    def load_eruby(path)
-      eruby(read_file(path), path)
-    end
-
-    def load_eruby_yaml(path)
-      parse_yaml(load_eruby(path), path)
-    end
-
     def load_yaml(path)
-      parse_yaml(read_file(path), path)
+      parse_yaml(load_text(path), path)
     end
 
-    def parse_yaml(text, path)
-      YAML.load(text)
-    rescue => err
-      raise ParameterError, "#{path}: config file syntax error: #{err.message}"
+    def load_text(path)
+      eruby(read_file(path), path)
     end
 
     def eruby(text, path)
@@ -45,10 +31,12 @@ module Bricolage
       }
     end
 
-    def eval_file(path)
-      push_base_dir(path) {
-        instance_eval(File.read(path), path.to_s, 1)
-      }
+    private
+
+    def parse_yaml(text, path)
+      YAML.load(text)
+    rescue => err
+      raise ParameterError, "#{path}: config file syntax error: #{err.message}"
     end
 
     def read_file(path)
@@ -57,7 +45,9 @@ module Bricolage
       raise ParameterError, "could not read file: #{err.message}"
     end
 
-    private
+    #
+    # For embedded code
+    #
 
     include EmbeddedCodeAPI
 
@@ -77,6 +67,12 @@ module Bricolage
         @base_dir = saved
       end
     end
+
+    # $base_dir + "vars.yml" -> "$base_dir/vars.yml"
+    # $base_dir + "/abs/path/vars.yml" -> "/abs/path/vars.yml"
+    def read_config_file(path)
+      load_text(relative_path(Pathname(path)))
+    end
   end
 
 end

data/lib/bricolage/context.rb

@@ -97,7 +97,7 @@ module Bricolage
 
     def load_variables(path)
       Variables.define {|vars|
-        parameter_file_loader.load_eruby_yaml(path).each do |name, value|
+        @filesystem.config_file_loader.load_yaml(path).each do |name, value|
           vars[name] = value
         end
       }

data/lib/bricolage/datasource.rb

@@ -35,7 +35,7 @@ module Bricolage
         database_yml = @context.config_pathes(basename).detect {|path| path.exist? }
         raise ParameterError, "database.yml does not exist" unless database_yml
         @config_dir = database_yml.parent
-        DataSourceFactory.new(load_eruby_yaml(database_yml), @context, @logger)
+        DataSourceFactory.new(load_yaml(database_yml), @context, @logger)
       end
 
       def password(name)

data/lib/bricolage/filesystem.rb

@@ -126,6 +126,10 @@ module Bricolage
       [ "config/#{name}", "config/#{@environment}/#{name}" ].map {|rel| root.relative(rel) }
     end
 
+    def config_file_loader
+      ConfigLoader.new(home_path)
+    end
+
     def job_file(id)
       path = typed_name(id, 'job')
       return path if path.exist?

data/lib/bricolage/jobfile.rb

@@ -8,7 +8,7 @@ module Bricolage
       values = if /\.sql\.job\z/ =~ path.to_s
         load_embedded_definition(ctx, path)
       else
-        ctx.parameter_file_loader.load_eruby_yaml(path)
+        ctx.parameter_file_loader.load_yaml(path)
       end
       parse(values, path)
     end
@@ -17,7 +17,7 @@ module Bricolage
       private
 
       def load_embedded_definition(ctx, path)
-        sql = ctx.parameter_file_loader.read_file(path)
+        sql = ctx.parameter_file_loader.load_text(path)
         block = sql.slice(%r{\A/\*.*?^\*/}m) or
             raise ParameterError, "missing embedded job definition block: #{path}"
         yaml = block.sub(%r{\A/\*}, '').sub(%r{^\*/\s*\z}, '')

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.9.3'
+  VERSION = '5.9.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.9.3
+  version: 5.9.4
 platform: ruby
 authors:
 - Minero Aoki