collapsium-config 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2e09619cf514355f44f452ca59fd28a7843346
-  data.tar.gz: efbe2423aa303a6fc3ec19d94ebe95a7064a3186
+  metadata.gz: 2f73bde177ede4ff9e18afef840427c05f50f512
+  data.tar.gz: bbc9fc38003b7353d28137deeaf719990eb8c53a
 SHA512:
-  metadata.gz: 609a05eefe1d7a6db2a11787bdee3ae865b642b30295e00b4e3192452789fad9c664895c20c0945faa59ae1c1be8d7a8f3ebd02b7c97bda09547f5a8c142c7d7
-  data.tar.gz: adc2a47d375e899e828028ebc1fedf021aa78782f70d9d1c43f682102bdda1720297eab3b315be51aee9199e4fa68c7f88cb49f178f5f921f5af75e899841c7f
+  metadata.gz: 5173c739f0c6c9a368238791f642850be2991d4ef74b78eec967a835fd33027b67842d6897940b5f7f3961d37045b88a9fcc0e3c3cd3f087ff321a54e236c4c7
+  data.tar.gz: 94f98c030682cce256543d6dc93647afec109edd5db1868437bfe7a13958d3a547d266831b87fd521a9c48e3f37d2199045e8ae635913ba682077b9fe8cb6a6e

data/.travis.yml

@@ -3,6 +3,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+script:
+  - bundle exec rake
+  - bundle exec codeclimate-test-reporter
 addons:
   code_climate:
     repo_token: 3cca4d10a51839bc5d115d41a0c12b98cbdb27a21e9c86544324fa028b799b84

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    collapsium-config (0.4.0)
+    collapsium-config (0.4.1)
       collapsium (~> 0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    codeclimate-test-reporter (0.6.0)
-      simplecov (>= 0.7.1, < 1.0.0)
+    codeclimate-test-reporter (1.0.1)
     collapsium (0.6.1)
     diff-lcs (1.2.5)
     docile (1.1.5)

data/README.md

@@ -10,20 +10,12 @@ various configuration sources into one configuration object.
 [![Code Climate](https://codeclimate.com/github/jfinkhaeuser/collapsium-config/badges/gpa.svg)](https://codeclimate.com/github/jfinkhaeuser/collapsium-config)
 [![Test Coverage](https://codeclimate.com/github/jfinkhaeuser/collapsium-config/badges/coverage.svg)](https://codeclimate.com/github/jfinkhaeuser/collapsium-config/coverage)
 
-# Functionality
+# Summary
 
 - Supports [JSON](http://www.json.org/) and [YAML](http://yaml.org/) file
   formats.
-- Given a main configuration file `foo.yml` to load, also loads `foo-local.yml`
-  if that exists, and merges it's contents recursively into the main
-  configuration.
+- Generates configuration files from ERB templates, includes, local override files and an extension mechanism.
 - Pathed access to configuration variables.
-- Using the special `extends` configuration key, allows a configuration Hash
-  to include all values from other configuration Hash(es).
-- Using the special, top-level `include` configuration key, allows a
-  configuration file to be split into multiple included files.
-- As of `v0.2`, configuration files are [ERB templates](http://ruby-doc.org/stdlib-2.3.1/libdoc/erb/rdoc/ERB.html).
-  Do your templating stuff as you'd usually do it.
 - Allows overriding of configuration values from the environment.
 
 # Basic Usage
@@ -196,6 +188,10 @@ bases merged into the value.
 - You can also specify an Array of paths, with the same effect.
 - This feature means that `extends` and `base` are reserved configuration keys!
 - Multiple levels of extension are supported.
+- The order of items in `base` is deterministic:
+  1. Items are added in the order in which they appear in `extends`, but...
+  1. ... after each item, the items it itself extends are added before the next
+     item is processed.
 
 ### Includes
 

data/lib/collapsium-config/configuration.rb

@@ -191,7 +191,9 @@ module Collapsium
         def resolve_includes(base, config, options)
           # Only process Hashes
           if not config.is_a? Hash
+            # :nocov:
             return config
+            # :nocov:
           end
 
           # Figure out includes. We have to recursively fetch the string and
@@ -290,11 +292,20 @@ module Collapsium
         end
 
         # Now to resolve the path to the base and remove the "extends" keyword.
+        bases = fetch_base_values(root, parent_path(path), value)
+
+        # Merge the bases
+        merge_base_values(root, value, bases)
+
+        # And we're done, set the value to what was being merged.
+        root[path] = value
+      end
+
+      def fetch_base_values(root, parent, value)
         base_paths = array_value(value["extends"])
-        bases = {}
+        bases = []
         base_paths.each do |base_path|
           if not base_path.start_with?(separator)
-            parent = parent_path(path)
             base_path = "#{parent}#{separator}#{base_path}"
           end
           base_path = normalize_path(base_path)
@@ -307,7 +318,7 @@ module Collapsium
             next
           end
 
-          bases[base_path] = base_value
+          bases << [base_path, base_value]
         end
 
         # Only delete the "extends" keyword if we found all base.
@@ -315,6 +326,10 @@ module Collapsium
           value.delete("extends")
         end
 
+        return bases
+      end
+
+      def merge_base_values(root, value, bases)
         # We need to recursively resolve the base values before merging them into
         # value. To preserve the override order, we need to overwrite values when
         # merging bases...
@@ -328,11 +343,14 @@ module Collapsium
         value.recursive_merge!(merged_base, false)
 
         # Set the base if all is well.
-        if value["base"].nil? and not bases.keys.empty?
-          value["base"] = bases.keys
+        base_val = value["base"] || []
+        base_val += bases.map { |p, _| p }
+        base_val.uniq!
+        if base_val.empty?
+          return
         end
 
-        root[path] = value
+        value["base"] = base_val
       end
     end # class Configuration
   end # module Config

data/lib/collapsium-config/version.rb

@@ -9,6 +9,6 @@
 module Collapsium
   module Config
     # The current release version
-    VERSION = "0.4.0".freeze
+    VERSION = "0.4.1".freeze
   end # module Config
 end # module Collapsium

data/spec/configuration_spec.rb

@@ -104,6 +104,7 @@ describe Collapsium::Config::Configuration do
       expect(cfg["drivers.mock.mockoption"]).to eql 42
       expect(cfg["drivers.branch1.branch1option"]).to eql "foo"
       expect(cfg["drivers.branch2.branch2option"]).to eql "bar"
+      expect(cfg["drivers.branch3.branch3option"]).to eql "baz"
       expect(cfg["drivers.leaf.leafoption"]).to eql "baz"
 
       # Now test extended values
@@ -115,11 +116,16 @@ describe Collapsium::Config::Configuration do
       expect(cfg["drivers.leaf.branch1option"]).to eql "override" # not "foo" !
 
       expect(cfg["drivers.leaf.branch2option"]).to eql "bar"
+      expect(cfg["drivers.leaf.global_opt"]).to eql "set"
+
+      expect(cfg["drivers.branch3.global_opt"]).to eql "set"
 
       # Also test that all levels go back to base == mock
       expect(cfg["drivers.branch1.base"]).to eql %w(.drivers.mock)
-      expect(cfg["drivers.branch2.base"]).to eql %w(.drivers.mock)
-      expect(cfg["drivers.leaf.base"]).to eql %w(.drivers.mock)
+      expect(cfg["drivers.branch2.base"]).to eql %w(.drivers.mock .drivers.branch1)
+      expect(cfg["drivers.branch3.base"]).to eql %w(.global)
+      expect(cfg["drivers.leaf.base"]).to eql %w(.drivers.mock .drivers.branch1
+                                                 .drivers.branch2 .global)
 
       # We expect that 'derived' is extended with '.other.base', too
       expect(cfg["derived.test.foo"]).to eql 'bar'

data/spec/data/driverconfig.yml

@@ -7,6 +7,9 @@
 #
 # so the order in this file has to be mock -> branch2 -> branch1 -> leaf
 ---
+global:
+  global_opt: set
+
 drivers:
   mock:
     mockoption: 42
@@ -16,8 +19,11 @@ drivers:
   branch1:
     extends: mock
     branch1option: foo
+  branch3:
+    extends: .global
+    branch3option: baz
   leaf:
-    extends: branch2
+    extends: branch2,.global
     leafoption: baz
     branch1option: override
   base_does_not_exist:

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
-# Only start CodeClimate from travis
-if ENV['CODECLIMATE_REPO_TOKEN']
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
-end
-
 # Always start SimpleCov
 require 'simplecov'
 SimpleCov.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collapsium-config
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler