collapsium-config 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31e518d37d4cdaa12f8a8718c3ca5816939b6ab2
-  data.tar.gz: 3d466b1b37734a90beafa962991fd9735734ea39
+  metadata.gz: c2687bbef9363025cb6a364a2c5a6a657d946498
+  data.tar.gz: ba5bc47c143f7a80013801d04fea0cb3ba32b965
 SHA512:
-  metadata.gz: 7052b7b696d6b7cb5422fa2e6236656de330ffc28ecf08fdb0db52593b36a5fab2d219333ef8ea0c55b3ae83c7a18704d0c7fb998c77caece40e8ebac69fd94a
-  data.tar.gz: 85bddfd097bce75d0285c01e1f1da0dfc612f127be4bfc769481669e75df7425a6e67ecd9b11f551378da7edef29cd944a8ca38928a49cfd2da4305023145fc1
+  metadata.gz: 9a994068fe63ddfd1c08e0969e2187a9b5e9ca9c66ef8773dd5f549868680a64cc82d577331c1e07809c98142ad7c79189b45ec3d5abaaf192872118d897a895
+  data.tar.gz: c2665c7335a45185e83c4c4eb38ac4ac1df904167844af338b79afff45b42b473f1207f135eb57a34e84b3eb87a7b7d8834a540550c1e592f30f67a1718631da

data/.gitignore

@@ -29,7 +29,7 @@ build/
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
 # Gemfile.lock
-# .ruby-version
+.ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:

data/.rubocop.yml

@@ -1,13 +1,13 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 # Metrics
 
 Metrics/LineLength:
-  Max: 83
+  Max: 84
   Details: >-
     Line length of 80 is ideal for readability and compatibility; we'll accept
-    an extra 3 for minor edge cases.
+    an extra 4 for minor edge cases (e.g. copyright notice).
 
 Metrics/MethodLength:
   Max: 35
@@ -30,6 +30,9 @@ Metrics/ClassLength:
 Metrics/ModuleLength:
   Max: 300
 
+Metrics/BlockLength:
+  Max: 300
+
 # Style
 
 Style/StringLiterals:
@@ -38,9 +41,6 @@ Style/StringLiterals:
 Style/ConditionalAssignment:
   Enabled: false
 
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
 Style/AndOr:
   Enabled: false
 
@@ -59,9 +59,6 @@ Style/IfUnlessModifier:
 Style/TrailingCommaInLiteral:
   Enabled: false
 
-Style/FirstParameterIndentation:
-  Enabled: false
-
 Style/TrailingUnderscoreVariable:
   Enabled: false
 
@@ -71,5 +68,27 @@ Style/NumericLiterals:
 Style/FileName:
   Enabled: false
 
-Style/SpaceAfterNot:
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false  # Not compatible with <= 2.2
+
+# Layout
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+Layout/SpaceAfterNot:
+  Enabled: false
+
+Layout/FirstParameterIndentation:
+  Enabled: false
+
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
+
+

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
+  - 2.4
 script:
   - bundle exec rake
   - bundle exec codeclimate-test-reporter || true

data/Gemfile.lock

@@ -1,64 +1,67 @@
 PATH
   remote: .
   specs:
-    collapsium-config (0.5.0)
-      collapsium (~> 0.8)
+    collapsium-config (0.6.0)
+      collapsium (~> 0.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.3.0)
-    codeclimate-test-reporter (1.0.4)
-      simplecov
-    collapsium (0.8.2)
-    diff-lcs (1.2.5)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
+    collapsium (0.9.0)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (2.0.2)
-    parser (2.3.3.1)
+    json (2.1.0)
+    parallel (1.12.0)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    unicode-display_width (1.1.2)
-    yard (0.9.6)
+    simplecov-html (0.10.2)
+    unicode-display_width (1.3.0)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  bundler (~> 1.15)
   codeclimate-test-reporter
   collapsium-config!
   rake (~> 11.3)
-  rspec (~> 3.5)
-  rubocop (~> 0.46)
-  simplecov (~> 0.12)
+  rspec (~> 3.6)
+  rubocop (~> 0.49)
+  simplecov (~> 0.13)
   yard (~> 0.9)
 
 BUNDLED WITH
-   1.13.6
+   1.15.4

data/README.md

@@ -55,6 +55,17 @@ too:
 my_config = Collapsium::Config::Configuration.load_config('filename.yaml')
 ```
 
+#### Loading Options
+
+- `data` can be passed for resolving references in ERB templating (see below)
+- `resolve_extensions` is a flag that determines whether the `extends` keyword
+  is honoured (see below), and defaults to `true`.
+- `nonexistent_base` can be one of `:ignore` and `:extend` and determines how
+  `extends` should behave if a base is referenced that does not exist:
+  - `:ignore` behaves as if the base simply wasn't mentioned.
+  - `:extend` behaves as if the base did in fact exist, but was an empty
+    configuration Hash.
+
 ### Array Files
 
 Configuration files can also contain Arrays at the top level. While that may

data/collapsium-config.gemspec

@@ -3,7 +3,7 @@
 # collapsium-config
 # https://github.com/jfinkhaeuser/collapsium-config
 #
-# Copyright (c) 2016 Jens Finkhaeuser and other collapsium-config contributors.
+# Copyright (c) 2016-2017 Jens Finkhaeuser and other collapsium-config contributors.
 # All rights reserved.
 #
 
@@ -11,9 +11,8 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'collapsium-config/version'
 
-# rubocop:disable Style/UnneededPercentQ, Style/ExtraSpacing
-# rubocop:disable Style/SpaceAroundOperators
-# rubocop:disable Metrics/BlockLength
+# rubocop:disable Style/UnneededPercentQ, Layout/ExtraSpacing
+# rubocop:disable Layout/SpaceAroundOperators
 Gem::Specification.new do |spec|
   spec.name          = "collapsium-config"
   spec.version       = Collapsium::Config::VERSION
@@ -37,15 +36,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rubocop", "~> 0.46"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rubocop", "~> 0.49"
   spec.add_development_dependency "rake", "~> 11.3"
-  spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "simplecov", "~> 0.12"
+  spec.add_development_dependency "rspec", "~> 3.6"
+  spec.add_development_dependency "simplecov", "~> 0.13"
   spec.add_development_dependency "yard", "~> 0.9"
 
-  spec.add_dependency 'collapsium', '~> 0.8'
+  spec.add_dependency 'collapsium', '~> 0.9'
 end
-# rubocop:enable Metrics/BlockLength
-# rubocop:enable Style/SpaceAroundOperators
-# rubocop:enable Style/UnneededPercentQ, Style/ExtraSpacing
+# rubocop:enable Layout/SpaceAroundOperators
+# rubocop:enable Style/UnneededPercentQ, Layout/ExtraSpacing

data/lib/collapsium-config.rb

@@ -3,7 +3,7 @@
 # collapsium-config
 # https://github.com/jfinkhaeuser/collapsium-config
 #
-# Copyright (c) 2016 Jens Finkhaeuser and other collapsium-config contributors.
+# Copyright (c) 2016-2017 Jens Finkhaeuser and other collapsium-config contributors.
 # All rights reserved.
 #
 

data/lib/collapsium-config/configuration.rb

@@ -3,7 +3,7 @@
 # collapsium-config
 # https://github.com/jfinkhaeuser/collapsium-config
 #
-# Copyright (c) 2016 Jens Finkhaeuser and other collapsium-config contributors.
+# Copyright (c) 2016-2017 Jens Finkhaeuser and other collapsium-config contributors.
 # All rights reserved.
 #
 
@@ -51,7 +51,12 @@ module Collapsium
 
         # @return parsed string
         def self.parse(string)
+          if YAML.respond_to?(:safe_load)
+            return YAML.safe_load(string)
+          end
+          # rubocop:disable Security/YAMLLoad
           return YAML.load(string)
+          # rubocop:enable Security/YAMLLoad
         end
       end
       private_constant :YAMLParser
@@ -116,7 +121,7 @@ module Collapsium
           if options[:nonexistent_base].nil?
             options[:nonexistent_base] = :ignore
           end
-          if not [:extend, :ignore].include?(options[:nonexistent_base])
+          if not %i[extend ignore].include?(options[:nonexistent_base])
             raise "The :nonexistent_base option must be one of :ignore or :extend!"
           end
           options[:data] ||= {}

data/lib/collapsium-config/support/values.rb

@@ -3,7 +3,7 @@
 # collapsium-config
 # https://github.com/jfinkhaeuser/collapsium-config
 #
-# Copyright (c) 2016 Jens Finkhaeuser and other collapsium-config contributors.
+# Copyright (c) 2016-2017 Jens Finkhaeuser and other collapsium-config contributors.
 # All rights reserved.
 #
 

data/lib/collapsium-config/version.rb

@@ -3,12 +3,12 @@
 # collapsium-config
 # https://github.com/jfinkhaeuser/collapsium-config
 #
-# Copyright (c) 2016 Jens Finkhaeuser and other collapsium-config contributors.
+# Copyright (c) 2016-2017 Jens Finkhaeuser and other collapsium-config contributors.
 # All rights reserved.
 #
 module Collapsium
   module Config
     # The current release version
-    VERSION = "0.5.0".freeze
+    VERSION = "0.6.0".freeze
   end # module Config
 end # module Collapsium

data/spec/configuration_spec.rb

@@ -33,7 +33,7 @@ describe Collapsium::Config::Configuration do
       config = File.join(@data_path, 'array.yaml')
       cfg = Collapsium::Config::Configuration.load_config(config)
 
-      expect(cfg["config"]).to eql %w(foo bar)
+      expect(cfg["config"]).to eql %w[foo bar]
     end
 
     it "loads a JSON config correctly" do
@@ -86,14 +86,14 @@ describe Collapsium::Config::Configuration do
       config = File.join(@data_path, 'merge-array.yaml')
       cfg = Collapsium::Config::Configuration.load_config(config)
 
-      expect(cfg["config"]).to eql %w(foo bar baz)
+      expect(cfg["config"]).to eql %w[foo bar baz]
     end
 
     it "merges an array and hash config" do
       config = File.join(@data_path, 'merge-fail.yaml')
       cfg = Collapsium::Config::Configuration.load_config(config)
 
-      expect(cfg["config"]).to eql %w(array in main config)
+      expect(cfg["config"]).to eql %w[array in main config]
       expect(cfg["local"]).to eql "override is a hash"
     end
 
@@ -137,7 +137,7 @@ describe Collapsium::Config::Configuration do
 
           # Check merge metadata
           expect(@config["drivers.branch1.extends"]).to be_nil
-          expect(@config["drivers.branch1.base"]).to eql %w(.drivers.mock)
+          expect(@config["drivers.branch1.base"]).to eql %w[.drivers.mock]
         end
 
         it "merges multiple ancestor depths" do
@@ -148,8 +148,8 @@ describe Collapsium::Config::Configuration do
 
           # Check merge metadata
           expect(@config["drivers.branch2.extends"]).to be_nil
-          expect(@config["drivers.branch2.base"]).to eql %w(.drivers.mock
-                                                            .drivers.branch1)
+          expect(@config["drivers.branch2.base"]).to eql %w[.drivers.mock
+                                                            .drivers.branch1]
         end
 
         it "merges from absolute paths" do
@@ -159,7 +159,7 @@ describe Collapsium::Config::Configuration do
 
           # Check merge metadata
           expect(@config["drivers.branch3.extends"]).to be_nil
-          expect(@config["drivers.branch3.base"]).to eql %w(.global)
+          expect(@config["drivers.branch3.base"]).to eql %w[.global]
         end
 
         it "merges from sibling and absolute path" do
@@ -172,10 +172,10 @@ describe Collapsium::Config::Configuration do
 
           # Check merge metadata
           expect(@config["drivers.leaf.extends"]).to be_nil
-          expect(@config["drivers.leaf.base"]).to eql %w(.drivers.mock
+          expect(@config["drivers.leaf.base"]).to eql %w[.drivers.mock
                                                          .drivers.branch1
                                                          .drivers.branch2
-                                                         .global)
+                                                         .global]
         end
 
         it "merges from global and absolute path" do
@@ -188,10 +188,10 @@ describe Collapsium::Config::Configuration do
 
           # Check merge metadata
           expect(@config["drivers.leaf2.extends"]).to be_nil
-          expect(@config["drivers.leaf2.base"]).to eql %w(.global
+          expect(@config["drivers.leaf2.base"]).to eql %w[.global
                                                           .drivers.mock
                                                           .drivers.branch1
-                                                          .drivers.branch2)
+                                                          .drivers.branch2]
         end
 
         context "Extension" do
@@ -217,7 +217,7 @@ describe Collapsium::Config::Configuration do
 
             # Here, the base must be set!
             expect(config["drivers.base_does_not_exist.base"]).to eql \
-              %w(.drivers.nonexistent_base)
+              %w[.drivers.nonexistent_base]
 
             # Then "extends" needs to vanish.
             expect(config["drivers.base_does_not_exist.extends"]).to be_nil
@@ -310,7 +310,7 @@ describe Collapsium::Config::Configuration do
       cfg = Collapsium::Config::Configuration.load_config(config)
 
       expect(cfg["quux"]).to eql "baz"
-      expect(cfg["config"]).to eql %w(foo bar)
+      expect(cfg["config"]).to eql %w[foo bar]
     end
 
     it "works in nested structures" do
@@ -319,7 +319,7 @@ describe Collapsium::Config::Configuration do
 
       expect(cfg["foo"]).to eql "bar"
       expect(cfg["baz.quux"]).to eql "baz" # Overridden from include!
-      expect(cfg["baz.config"]).to eql %w(foo bar)
+      expect(cfg["baz.config"]).to eql %w[foo bar]
     end
   end
 

data/spec/support_values_spec.rb

@@ -6,23 +6,23 @@ describe Collapsium::Config::Support::Values do
 
   context "#array_value" do
     it "splits a comma separated string" do
-      expect(tester.array_value("foo,bar")).to eql %w(foo bar)
+      expect(tester.array_value("foo,bar")).to eql %w[foo bar]
     end
 
     it "strips spaces from comma separated strings" do
-      expect(tester.array_value(" foo ,  bar ")).to eql %w(foo bar)
+      expect(tester.array_value(" foo ,  bar ")).to eql %w[foo bar]
     end
 
     it "turns single strings into an array" do
-      expect(tester.array_value("foo")).to eql %w(foo)
+      expect(tester.array_value("foo")).to eql %w[foo]
     end
 
     it "strips spaces from single strings" do
-      expect(tester.array_value(" foo ")).to eql %w(foo)
+      expect(tester.array_value(" foo ")).to eql %w[foo]
     end
 
     it "strips array elements" do
-      expect(tester.array_value(['foo ', ' bar'])).to eql %w(foo bar)
+      expect(tester.array_value(['foo ', ' bar'])).to eql %w[foo bar]
     end
 
     it "wraps other values into arrays" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collapsium-config
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.49'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: "\n    Using collapsium's UberHash class for easy access to configuration
   values,\n    this gem reads and merges various configuration sources into one\n
   \   configuration object.\n  "
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Collapse multiple configuration sources into one collapsium UberHash.