complex_config 0.19.0 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff2b361ee9d3b06983e6ccdcc847a1ca17dd7b41cdf7bc45fc83bc0261b318c
-  data.tar.gz: a658135bbc6e28aaef43ec7ba14ec70e8cde6bcdf1a897ddae0c26abd1a5f0fb
+  metadata.gz: b4a1562a55eb1a93435d27f476d78745853d6cd92f9f2f509bb6f0222625e218
+  data.tar.gz: cd505065b7d309a0d3fb0309d3e77fae65044b711632c8c0abe04fd0a74d14ea
 SHA512:
-  metadata.gz: 750968741f4e6744525b091cd101d8e3344ded32f538e98a99f450c553de9b36e7f18d7275c1efacc4319634b85f78549107c1daa05eb24b560464043b0b02e0
-  data.tar.gz: 2f6a955ac2ee470429390784b2e886655556ac0c06a3a6d440357a295b62d155c4f8ce6622834a2724671cab5e9a4c28c74f46e05631523bb12fa84c0c96d1d0
+  metadata.gz: bc0ec49f9ad9e50e010a1aa3632fd96a6efd436b6c0cd7f7d441248e0361f5f16dfaea68507a6218ceef145912034155362370a94b363832bab247152f205e0d
+  data.tar.gz: 01a5162d15b3e2c02a3454fc190de89b1fc1ddd25c3bc5e83532542c41e7dc2df0bb612bf03a87a9b7327c362079e0e58da75ab63652b0da6af722d3b72049a9

data/.all_images.yml

@@ -0,0 +1,17 @@
+dockerfile: |-
+  RUN apk add --no-cache build-base git
+  RUN gem update --system
+  RUN gem install gem_hadar bundler
+script: &script |-
+  echo -e "\e[1m"
+  ruby -v
+  echo -e "\e[0m"
+  bundle
+  rake test
+
+images:
+  ruby:3.1-alpine: *script
+  ruby:3.0-alpine: *script
+  ruby:2.7-alpine: *script
+  ruby:2.6-alpine: *script
+  ruby:2.5-alpine: *script

data/README.md

@@ -142,86 +142,6 @@ Here is the `ComplexConfig::Plugins::MONEY` plugin for example:
       end
     end
 
-## Changes
-
-* 2019-03-18 Release 0.17.0
-  * Improve error message for missing encryption key
-* 2019-03-14 Release 0.16.0
-  * Enable `- trim_mode` for ERB in yml files
-  * Allow `to_json` calls on settings
-* 2019-03-14 Release 0.15.1
-  * Fix shared feature for empy top level settings
-* 2018-12-07 Release 0.15.0
-  * Allow inplace recrypt for encrypted files
-* 2018-07-06 Release 0.14.0
-  * Better support for rails encryption
-  * Adds `complex_config` executable.
-* 2018-02-23 Release 0.13.3
-  Change evaluation order of key sources
-* 2018-02-23 Release 0.13.2
-  Refactor key sources
-* 2018-02-09 Release 0.13.1
-  Improve error reporting for encrypted files (missing key)
-* 2018-01-26 Release 0.13.0
-  Improve `write_config` interface and more tests
-* 2017-11-17 Release 0.12.2
-  Output string keys on top level configs, Rails don't like it otherwise.
-* 2017-11-17 Release 0.12.1
-  Do not output newlines when writing encrypted configs, Rails don't like it.
-* 2017-11-16 Release 0.12.0
-  * Supports writing of configurations (encrypted or unencrypted)
-* 2017-11-16 Release 0.11.3
-  * Small bugfix
-* 2017-10-30 Release 0.11.2
-  * Small bugfix
-* 2017-10-27 Release 0.11.1
-  * Small bugfix
-* 2017-10-27 Release 0.11.0
-  * Support encrypted config files a la rails
-* 2017-02-02 Release 0.10.0
-  * `cc.foo?`/`complex_config.foo?` returns config or nil (when not existant)
-* 2017-01-23 Release 0.9.2
-  * Improve performance for proxy objects
-* 2016-11-22 Release 0.9.1
-  * Fix travis builds
-* 2016-11-22 Release 0.9.0
-  * Extract ComplexConfig::Provider::Shortcuts into its own module
-* 2016-07-21 Release 0.8.0
-  * `ComplexConfig::Settings` can be replaced with `replace_attributes` which
-    allows for easier testing by calling:
-    `cc.foo.replace_attributes(new: 'settings')`.
-* 2016-07-15 Release 0.7.0
-  * Slim down `ComplexConfig::Settings` interface to avoid clashes with methods
-    mixed into `Object` class or `Enumerable#instance_methods`
-* 2016-07-15 Release 0.6.0
-  * Depend on mize gem for caching.
-* 2016-06-23 Release 0.5.2
-  * Resolve index access via the plugin code path, so foo.bar and foo[:bar]
-    have the same result for a plugin key.
-* 2015-11-19 Release 0.5.0
-  * Support rails reloading behaviour.
-  * Allow configuration via ComplexConfig.configure(&block) method.
-* 2015-11-17 Release 0.4.0
-  * Add root object for configuration, e. g. cc.name instead of cc(name).
-* 2015-11-03 Release 0.3.1
-  * Add missing dependency to tins.
-* 2015-11-03 Release 0.3.0
-  * Add nicer default output for settings.
-* 2015-03-24 Release 0.2.3
-  * Fix typo in load error case of money.
-* 2015-02-25 Release 0.2.2
-  * Fix an issue with path interpolation.
-* 2015-01-28 Release 0.2.1
-  * Turn monetize into a runtime dependency for the plugin.
-* 2015-01-27 Release 0.2.0
-  * Fix for attributes named like Enumerable methods
-  * Make tests run on JRuby
-* 2015-01-01 Release 0.1.1
-  * Some small fixes for handling of arrays
-* 2014-12-15 Release 0.1.0
-  * Freeze configuration by default.
-* 2014-12-12 Release 0.0.0
-
 ## Download
 
 The homepage of this library is located at

data/Rakefile

@@ -13,6 +13,8 @@ GemHadar do
   test_dir    'spec'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '.rvmrc',
     '.AppleDouble', '.DS_Store', '.byebug_history', 'errors.lst', 'tags'
+  package_ignore '.all_images', '.utilsrc', '.rspec', '.tool-versions',
+    '.gitignore'
 
   readme      'README.md'
   title       "#{name.camelize} -- configuration library"
@@ -25,6 +27,7 @@ GemHadar do
   development_dependency 'simplecov'
   development_dependency 'rspec'
   development_dependency 'monetize'
+  development_dependency 'utils'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.19.3

data/complex_config.gemspec

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.19.0 ruby lib
+# stub: complex_config 0.19.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config".freeze
-  s.version = "0.19.0"
+  s.version = "0.19.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2021-01-05"
+  s.date = "2022-05-19"
   s.description = "This library allows you to access configuration files via a simple interface".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["complex_config".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/complex_config.rb".freeze, "lib/complex_config/config.rb".freeze, "lib/complex_config/encryption.rb".freeze, "lib/complex_config/errors.rb".freeze, "lib/complex_config/key_source.rb".freeze, "lib/complex_config/plugins.rb".freeze, "lib/complex_config/plugins/enable.rb".freeze, "lib/complex_config/plugins/money.rb".freeze, "lib/complex_config/plugins/uri.rb".freeze, "lib/complex_config/provider.rb".freeze, "lib/complex_config/provider/shortcuts.rb".freeze, "lib/complex_config/proxy.rb".freeze, "lib/complex_config/railtie.rb".freeze, "lib/complex_config/rude.rb".freeze, "lib/complex_config/settings.rb".freeze, "lib/complex_config/shortcuts.rb".freeze, "lib/complex_config/version.rb".freeze]
-  s.files = [".gitignore".freeze, ".rspec".freeze, ".travis.yml".freeze, ".utilsrc".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/complex_config".freeze, "complex_config.gemspec".freeze, "config/products.yml".freeze, "lib/complex_config.rb".freeze, "lib/complex_config/config.rb".freeze, "lib/complex_config/encryption.rb".freeze, "lib/complex_config/errors.rb".freeze, "lib/complex_config/key_source.rb".freeze, "lib/complex_config/plugins.rb".freeze, "lib/complex_config/plugins/enable.rb".freeze, "lib/complex_config/plugins/money.rb".freeze, "lib/complex_config/plugins/uri.rb".freeze, "lib/complex_config/provider.rb".freeze, "lib/complex_config/provider/shortcuts.rb".freeze, "lib/complex_config/proxy.rb".freeze, "lib/complex_config/railtie.rb".freeze, "lib/complex_config/rude.rb".freeze, "lib/complex_config/settings.rb".freeze, "lib/complex_config/shortcuts.rb".freeze, "lib/complex_config/version.rb".freeze, "spec/complex_config/config_spec.rb".freeze, "spec/complex_config/encryption_spec.rb".freeze, "spec/complex_config/key_source_spec.rb".freeze, "spec/complex_config/plugins_spec.rb".freeze, "spec/complex_config/provider_spec.rb".freeze, "spec/complex_config/settings_spec.rb".freeze, "spec/complex_config/shortcuts_spec.rb".freeze, "spec/config/broken_config.yml".freeze, "spec/config/config.yml".freeze, "spec/config/master.key".freeze, "spec/config/with-key-file.yml.enc".freeze, "spec/config/with-key-file.yml.key".freeze, "spec/config/without-key-file.yml.enc".freeze, "spec/spec_helper.rb".freeze]
+  s.files = [".all_images.yml".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/complex_config".freeze, "complex_config.gemspec".freeze, "config/products.yml".freeze, "lib/complex_config.rb".freeze, "lib/complex_config/config.rb".freeze, "lib/complex_config/encryption.rb".freeze, "lib/complex_config/errors.rb".freeze, "lib/complex_config/key_source.rb".freeze, "lib/complex_config/plugins.rb".freeze, "lib/complex_config/plugins/enable.rb".freeze, "lib/complex_config/plugins/money.rb".freeze, "lib/complex_config/plugins/uri.rb".freeze, "lib/complex_config/provider.rb".freeze, "lib/complex_config/provider/shortcuts.rb".freeze, "lib/complex_config/proxy.rb".freeze, "lib/complex_config/railtie.rb".freeze, "lib/complex_config/rude.rb".freeze, "lib/complex_config/settings.rb".freeze, "lib/complex_config/shortcuts.rb".freeze, "lib/complex_config/version.rb".freeze, "spec/complex_config/config_spec.rb".freeze, "spec/complex_config/encryption_spec.rb".freeze, "spec/complex_config/key_source_spec.rb".freeze, "spec/complex_config/plugins_spec.rb".freeze, "spec/complex_config/provider_spec.rb".freeze, "spec/complex_config/settings_spec.rb".freeze, "spec/complex_config/shortcuts_spec.rb".freeze, "spec/config/broken_config.yml".freeze, "spec/config/config.yml".freeze, "spec/config/config_with_alias.yml".freeze, "spec/config/master.key".freeze, "spec/config/with-key-file.yml.enc".freeze, "spec/config/with-key-file.yml.key".freeze, "spec/config/without-key-file.yml.enc".freeze, "spec/spec_helper.rb".freeze]
   s.homepage = "https://github.com/flori/complex_config".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "ComplexConfig -- configuration library".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.2.3".freeze
+  s.rubygems_version = "3.3.13".freeze
   s.summary = "configuration library".freeze
   s.test_files = ["spec/complex_config/config_spec.rb".freeze, "spec/complex_config/encryption_spec.rb".freeze, "spec/complex_config/key_source_spec.rb".freeze, "spec/complex_config/plugins_spec.rb".freeze, "spec/complex_config/provider_spec.rb".freeze, "spec/complex_config/settings_spec.rb".freeze, "spec/complex_config/shortcuts_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
@@ -26,20 +26,22 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
     s.add_development_dependency(%q<rake>.freeze, [">= 0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_development_dependency(%q<monetize>.freeze, [">= 0"])
+    s.add_development_dependency(%q<utils>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<json>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tins>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])
   else
-    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<monetize>.freeze, [">= 0"])
+    s.add_dependency(%q<utils>.freeze, [">= 0"])
     s.add_dependency(%q<json>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, [">= 0"])
     s.add_dependency(%q<mize>.freeze, ["~> 0.3", ">= 0.3.4"])

data/lib/complex_config/plugins/money.rb

@@ -1,5 +1,4 @@
 begin
-  require 'forwardable' # XXX monetize forgets to require this
   require 'monetize'
 rescue LoadError
   if $DEBUG

data/lib/complex_config/provider.rb

@@ -99,7 +99,12 @@ class ComplexConfig::Provider
         "configuration file #{pathname.to_s.inspect} is missing"
     end
     results = datas.map { |d| evaluate(pathname, d) }
-    hashes = results.map { |r| ::YAML.load(r, pathname) }
+    hashes =
+      if ::Psych::VERSION < "4"
+        results.map { |r| ::YAML.load(r, pathname) }
+      else
+        results.map { |r| ::YAML.load(r, filename: pathname, aliases: true) }
+      end
     settings = ComplexConfig::Settings.build(name, hashes.shift)
     hashes.each { |h| settings.attributes_update(h) }
     if shared = settings.shared?
@@ -169,10 +174,18 @@ class ComplexConfig::Provider
     self
   end
 
-  def evaluate(pathname, data)
-    erb = ::ERB.new(data, nil, '-')
-    erb.filename = pathname.to_s
-    erb.result
+  if RUBY_VERSION >= "3"
+    def evaluate(pathname, data)
+      erb = ::ERB.new(data, trim_mode: '-')
+      erb.filename = pathname.to_s
+      erb.result
+    end
+  else
+    def evaluate(pathname, data)
+      erb = ::ERB.new(data, nil, '-')
+      erb.filename = pathname.to_s
+      erb.result
+    end
   end
 
   def env

data/lib/complex_config/settings.rb

@@ -118,8 +118,8 @@ class ComplexConfig::Settings < BasicObject
     to_h.to_yaml
   end
 
-  def to_json
-    to_h.to_json
+  def to_json(*a)
+    to_h.to_json(*a)
   end
 
   def size

data/lib/complex_config/version.rb

@@ -1,6 +1,6 @@
 module ComplexConfig
   # ComplexConfig version
-  VERSION         = '0.19.0'
+  VERSION         = '0.19.3'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/complex_config/encryption_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe ComplexConfig::Encryption do
   end
 
   it 'can encrypt' do
-    expect(enc.encrypt(value)).to match /\A.+--.+--.+==\z/
+    expect(enc.encrypt(value)).to match(/\A.+--.+--.+==\z/)
   end
 
   it 'can decrypt' do

data/spec/complex_config/provider_spec.rb

@@ -269,6 +269,18 @@ RSpec.describe ComplexConfig::Provider do
     end
   end
 
+  context 'handling configuration files with aliases (considered unsafe)' do
+    before do
+      described_class.config_dir = Pathname.new(__FILE__) + '../../config'
+    end
+
+    it 'reads yaml files with aliases just fine' do
+      expect(
+        described_class.config(asset('config_with_alias.yml')).specific.extended
+      ).to be true
+    end
+  end
+
   context 'evaluating configuration files with ERB' do
     it 'evaluates a config file correctly' do
       expect(

data/spec/complex_config/settings_spec.rb

@@ -122,6 +122,10 @@ EOT
 EOT
   end
 
+  it 'can be converted into JSON' do
+    expect(settings.to_json).to eq '{"foo":{"bar":{"baz":true},"qux":"quux"}}'
+  end
+
   it 'raises exception if expected attribute is missing' do
     expect { settings.nix }.to raise_error(ComplexConfig::AttributeMissing)
   end

data/spec/config/config_with_alias.yml

@@ -0,0 +1,6 @@
+common: &common
+  extended: true
+
+specific:
+  <<: *common
+  foo: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: utils
+  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: json
   requirement: !ruby/object:Gem::Requirement
@@ -153,10 +167,7 @@ extra_rdoc_files:
 - lib/complex_config/shortcuts.rb
 - lib/complex_config/version.rb
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".utilsrc"
+- ".all_images.yml"
 - COPYING
 - Gemfile
 - README.md
@@ -191,6 +202,7 @@ files:
 - spec/complex_config/shortcuts_spec.rb
 - spec/config/broken_config.yml
 - spec/config/config.yml
+- spec/config/config_with_alias.yml
 - spec/config/master.key
 - spec/config/with-key-file.yml.enc
 - spec/config/with-key-file.yml.key
@@ -219,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: configuration library

data/.gitignore

@@ -1,10 +0,0 @@
-.*.sw[pon]
-.AppleDouble
-.DS_Store
-.byebug_history
-.rvmrc
-Gemfile.lock
-coverage
-errors.lst
-pkg
-tags

data/.rspec

@@ -1 +0,0 @@
---color

data/.travis.yml

@@ -1,15 +0,0 @@
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - ruby-head
-  - jruby-head
-sudo: false
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head

data/.utilsrc

@@ -1,26 +0,0 @@
-# vim: set ft=ruby:
-
-search do
-  prune_dirs /\A(\.svn|\.git|CVS|tmp|tags|coverage|pkg)\z/
-  skip_files /(\A\.|\.sw[pon]\z|\.(log|fnm|jpg|jpeg|png|pdf|svg)\z|tags|~\z)/i
-end
-
-discover do
-  prune_dirs /\A(\.svn|\.git|CVS|tmp|tags|coverage|pkg)\z/
-  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
-  binary false
-end
-
-strip_spaces do
-  prune_dirs /\A(\..*|CVS|pkg)\z/
-  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
-end
-
-probe do
-  test_framework :rspec
-  #include_dirs 'features'
-end
-
-ssh_tunnel do
-  terminal_multiplexer :tmux
-end