data_collector 0.61.0 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef5644ca619ea4368ca7e6620fd5b692995b3f81206837e91a7f8b576799014e
-  data.tar.gz: 1c064d51a23891829cc376822de08368e1129cc5891a13a47e3c66e893a75e11
+  metadata.gz: '0923a758b6a621afd2d2fb4aa85f580cb757ee3ca1150e7175827a9bf617e07b'
+  data.tar.gz: 1a83fecc0244088447747f4c196ffcfddc6cb70e5ab8f40232a0401ac9912fc3
 SHA512:
-  metadata.gz: 524275f37414a0a67566ae4d942ffee36de24980c99138c87947f71c995adf57924a2d5e34de5e7e0b3b313e043132c7dbe76eb364ecd0bc014e3e5eca120466
-  data.tar.gz: 5f54cc53b400f1778edf35b3e9ba5b9a981b17a688467ba05fd7f2e18449002c10ea55bc40d6c152d12481f7957ec17baf9ebf278a1bcab0b990000d1ab3873f
+  metadata.gz: d6d75c0bd763bbf2c107ebe7e5bc2c5c813454c6ad496eb234d38c79fae01525969e5d8b6abd601cf3103f8363f3f7965957cb54103eb10aaa80b65f80aa3073
+  data.tar.gz: '029d8bbf6819f90b955f373d8ee8e795fca2b130fc1900b487ef692a1b56cf7f7a8d02b222637bf83361354f1e795713c731eba90fb446f2906a758986c99af1'

data/lib/data_collector/config_file.rb

@@ -10,7 +10,7 @@ module DataCollector
     @mtime = nil
 
     def self.version
-      '0.0.3'
+      '0.0.4'
     end
 
     def self.name
@@ -59,7 +59,8 @@ module DataCollector
 
       ftime = File.exist?("#{@config_file_path}/#{@config_file_name}") ? File.mtime("#{@config_file_path}/#{@config_file_name}") : nil
       if @config.nil? || @config.empty? || @mtime != ftime
-        config = YAML::load_file("#{@config_file_path}/#{@config_file_name}", aliases: true, permitted_classes: [Time, Symbol])
+        # config = YAML::load_file("#{@config_file_path}/#{@config_file_name}", aliases: true, permitted_classes: [Time, Symbol])
+        config = interpret_yaml_with_expressions("#{@config_file_path}/#{@config_file_name}", ENV)
         @config = process(config)
       end
     end
@@ -92,5 +93,36 @@ module DataCollector
     private_class_method :init
     private_class_method :discover_config_file_path
     private_class_method :process
+
+    private
+    def self.interpret_yaml_with_expressions(yaml_file, variables = {})
+      # Read the YAML file content
+      content = File.read(yaml_file)
+
+      # Process any :key: "${expression}" patterns
+      processed_content = content.gsub(/:key:\s*"?\$\{([^}]+)\}"?/) do |match|
+        expression = $1.strip
+
+        # Evaluate the expression using the provided variables
+        if variables.key?(expression)
+          # Replace with the variable value
+          match.gsub("${#{expression}}", variables[expression].to_s)
+        elsif expression.include?('.')
+          # Handle dot notation for nested variables
+          parts = expression.split('.')
+          value = variables
+          parts.each do |part|
+            value = value[part.to_sym] if value.is_a?(Hash) && value.key?(part.to_sym)
+          end
+          value.to_s
+        else
+          # Keep the original if we can't evaluate
+          match
+        end
+      end
+
+      # Parse the processed YAML content
+      YAML.load(processed_content, aliases: true, permitted_classes: [Time, Symbol])
+    end
   end
 end

data/lib/data_collector/core.rb

@@ -138,7 +138,9 @@ module DataCollector
     module_function :error
 
     def logger(*destinations)
-      @logger ||= begin
+      @logger if @logger && (@log_destination.eql?(destinations.flatten) || destinations.empty? || destinations.nil?)
+      @log_destination = destinations.flatten
+      @logger =  begin
                     destinations = STDOUT if destinations.nil? || destinations.empty?
                     Logger.new(ProxyLogger.new(destinations))
                   rescue StandardError => e

data/lib/data_collector/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DataCollector
-  VERSION = "0.61.0"
+  VERSION = "0.62.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: data_collector
 version: !ruby/object:Gem::Version
-  version: 0.61.0
+  version: 0.62.0
 platform: ruby
 authors:
 - Mehmet Celik
 bindir: exe
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -407,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: ETL helper library
 test_files: []