precursor 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3304cac9ee21759234bd745095460b9dc71573f4cb6a0f54ba8ca7862c0b0a
-  data.tar.gz: b1995f5395d1b767e08d61db569c40995b277f69f4b516646fed026a000acdb6
+  metadata.gz: 86985495bc3e48757e33837b70e20bd1a431f5e19ce750dd8a38cc6512ed0ffd
+  data.tar.gz: fecd720458ce41d39b8f000754500b0ebb9fc586a4cd7bf869657cc3b22391ec
 SHA512:
-  metadata.gz: 4b3bb038529d96de309c2cf16e7acf1918310944612bd002dfa272e612c2a584c42fdea929cfe1a06f19999dc7b01b4f805c607891cbfb2621eebdd11a3724b6
-  data.tar.gz: d73549d136b50202dd4b222a4e0145851ba78927f3677e9ff55259057a8599018e1494cee40941c7ceafdff745d79f41447aad01f7d7b13c2d1867bad7fc0a6d
+  metadata.gz: c582c2744224ddfb04b89eddfe0193bbb4b17ff789db6b3a1c56905806f3f769d1bbb3efe9f3f1e9211d1a0693cc262ca915991ea6ec3f5911ffa6df74ae5b41
+  data.tar.gz: 01e5f3bade8c2b1c16d7e630b299984a1abd5a752bf60a7ab0b2f2b0726e7fdb14709a5eeb23a5027587b663995fa1891afc4e3654aba3cea0b6dec8158a39c3

data/lib/argv_vault.rb

@@ -10,8 +10,8 @@ require_relative 'vault'
 module Precursor
   # Vault that parses command line arguments
   class ArgvVault < Vault
-    def initialize(argv)
-      super()
+    def initialize(argv, priority:)
+      super(priority: priority)
 
       @vault_data = {}
       @parser = OptionParser.new do |parser|

data/lib/config_root.rb

@@ -4,7 +4,7 @@ module Precursor
   # Root class to access config vaults
   class ConfigRoot
     def initialize(vaults, key_options)
-      @vaults = vaults
+      @vaults = vaults.sort_by(&:priority).reverse
       @key_options = key_options
     end
 
@@ -17,6 +17,10 @@ module Precursor
       value.is_a?(String) ? resolve_variables(value) : value
     end
 
+    def add_vault(vault)
+      @vaults = @vaults.push(vault).sort_by(&:priority).reverse
+    end
+
     private
 
     VAR_PATTERN = /\$\{(?<var_name>[a-zA-Z]+[\w.]+)\}/

data/lib/env_vault.rb

@@ -8,8 +8,8 @@ module Precursor
     # Initializes new instance of [EnvVault]
     # @param separator [String] separator for hierarchical config entries
     # @param allow_list [Array<String>] list of allowed env vars to prevent leaking of sensitive or unrelated vars
-    def initialize(separator: '__', allow_list: [])
-      super()
+    def initialize(priority:, separator: '__', allow_list: [])
+      super(priority: priority)
       @separator = separator
 
       allow_set = Set.new(allow_list)

data/lib/hash_vault.rb

@@ -5,8 +5,8 @@ require_relative 'vault'
 module Precursor
   # Vault that reads config data from passed hash
   class HashVault < Vault
-    def initialize(hash)
-      super()
+    def initialize(hash, priority:)
+      super(priority: priority)
       @store = hash
     end
 

data/lib/override_vault.rb

@@ -5,8 +5,8 @@ require_relative 'vault'
 module Precursor
   # Vault that stores data in hash and allows to override config on the fly
   class OverrideVault < Vault
-    def initialize
-      super()
+    def initialize(priority:)
+      super(priority: priority)
       @vault_data = {}
     end
 

data/lib/vault.rb

@@ -3,6 +3,15 @@
 module Precursor
   # Base class for config vaults
   class Vault
+    # Priority of the vault. Vaults with higher priority are checked first when looking for config value
+    attr_reader :priority
+
+    # Initializes new instance of [Precursor::Vault]
+    # @param priority [Integer] the vault priority
+    def initialize(priority:)
+      @priority = priority
+    end
+
     # Returns true if the vault has a value for the given key, otherwise false
     # @return [Boolean] true if the vault has a value for the given key, otherwise false
     def key?(key)

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Precursor
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/yaml_vault.rb

@@ -7,8 +7,8 @@ require_relative 'vault'
 module Precursor
   # Vault that reads config data from a string with Yaml
   class YamlVault < Vault
-    def initialize(src)
-      super()
+    def initialize(src, priority:)
+      super(priority: priority)
       @yaml = flat_hash(YAML.safe_load(src))
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: precursor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrey Maraev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optparse
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: code-scanning-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement