cconfig 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f377c3a860f4c0bcb82f5f8cc4601921d0a1536
-  data.tar.gz: 0016898111f22120de5fd23ff97215388a44596b
+SHA256:
+  metadata.gz: f2c9dc2ded01737e8e66212b7a1c17d16e8de42d4a61c518f7903a526513b6b5
+  data.tar.gz: 6d736ae908aab7fcc46cbbc3fb34254a6303f633de099db97f56ac5185e79fdb
 SHA512:
-  metadata.gz: fabee37df15fa57f9ee82b408348a11829bac6616bd5a63e9b76b36052ce6e3ee23e7fed3301c2f55add43223a67bb571c0fcd64f2440cb92fd4cb8cb671724c
-  data.tar.gz: 288e140df8d6b47f3d7efa3d5980b96c3881c8f36aa17ed888824f7e9f443eb0da6f3fac42934a6b0a5dd512ee37c20379c2ba38994f1f4453efdcced5f27113
+  metadata.gz: a873d084f333d824fa6405ec88f9fccabe2399bda0fa1f556a983f60aaa28c2f1864061922db4e5c2a2e12bcb1edb89d8811faef56203718be2cfce8943b50cd
+  data.tar.gz: b05e76c6a8c7d445cda068e78e298c0d0bf670a7af37dce1f1a88f5ba6d035c1254d36c63284c0798057e4019f3da110d809ece9e7a44a060959c8c978994b03

data/.rubocop.yml

@@ -1,8 +1,15 @@
 require:
   - rubocop-rspec
 
-inherit_from:
-- ./config/rubocop-suse.yml
+AllCops:
+  DisplayCopNames: true
+  DisplayStyleGuide: false
+
+# This is a remnant of old SUSE-style alignment for hashes, The table format
+# looks more human readable.
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
 
 # Both my last names contain non-ascii characters :) (license notice)
 Style/AsciiComments:
@@ -14,9 +21,24 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*
 
+# The default is just too small. A limit of 100 looks reasonable and many other
+# projects (including inside of SUSE) are also using this value.
+Metrics/LineLength:
+  Max: 100
+
 Metrics/MethodLength:
   Max: 20
 
+# This is a common SUSE configuration value: the performance difference between
+# single and double quotes is no longer there, and so it's better to be
+# consistent and force only double quotes.
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# Same as Style/StringLiterals.
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
 # Sometimes we need more than one "expect" command to build our actual
 # expectation.
 RSpec/MultipleExpectations:

data/.travis.yml

@@ -5,12 +5,17 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
   - ruby-head
 
+before_install:
+  - gem update --system
+
 script:
   - bundle exec rspec
   - bundle exec rubocop -V

data/CHANGELOG.md

@@ -1,17 +1,24 @@
 # Changelog
 
-## Next version
+## 1.2.1
+
+- Added support for Ruby 2.5 and 2.6: nothing has really been done besides
+  adding 2.5 and 2.6 into the CI system and such.
+- Fixed the `#enabled?` method for nested `enabled` directives. See
+  [commit](ec0d01c153d5157b08865821b9c679eeae450c35).
 
 ## 1.2.0
 
 - Added the `#default_of` method for the returned hash (hence `APP_CONFIG` as
   well). This method returns the default value for a given key. It can be useful
   to check whether a configuration value has been set by either environment
-  variables or the local configuration. See [commit](50d638c8d81bab6b17164a1a5661dc2ca730cf92).
+  variables or the local configuration. See
+  [commit](50d638c8d81bab6b17164a1a5661dc2ca730cf92).
 
 ## 1.1.1
 
-- Fixed crash on nested values on the `#enabled?` method. See [#3](https://github.com/mssola/cconfig/issues/3).
+- Fixed crash on nested values on the `#enabled?` method. See
+  [#3](https://github.com/mssola/cconfig/issues/3).
 - The `prefix` argument from the constructor now takes a default
   (`cconfig`). This will make things more predictable I hope.
 
@@ -22,8 +29,8 @@
 ## 1.0.0
 
 - First release which includes the following features:
-  - You can have a `config.yml` and a `config-local.yml` file. The first file
-    is the reference configuration, while the other overwrites it with the given
+  - You can have a `config.yml` and a `config-local.yml` file. The first file is
+    the reference configuration, while the other overwrites it with the given
     values.
   - You can override either the `config.yml` and the `config-local.yml` files
     with environment variables that start with a given prefix.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,46 +1,47 @@
 PATH
   remote: .
   specs:
-    cconfig (1.2.0)
+    cconfig (1.2.1)
       safe_yaml (~> 1.0.0, >= 1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
+    ast (2.4.0)
     diff-lcs (1.3)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.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)
+    jaro_winkler (1.5.1)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.49.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.1)
-      rubocop (>= 0.42.0)
-    ruby-progressbar (1.8.1)
+    rubocop-rspec (1.27.0)
+      rubocop (>= 0.56.0)
+    ruby-progressbar (1.10.0)
     safe_yaml (1.0.4)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -50,8 +51,8 @@ DEPENDENCIES
   cconfig!
   rake (>= 10.0)
   rspec (>= 3.0)
-  rubocop (~> 0.49.1)
+  rubocop (~> 0.57.0)
   rubocop-rspec
 
 BUNDLED WITH
-   1.15.3
+   1.16.5

data/README.md

@@ -122,7 +122,7 @@ This project is based on work I did for the
 gem so it can be also used for other projects that might be interested in this.
 
 ```
-Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 
 CConfig is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by

data/Rakefile

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #

data/cconfig.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "cconfig/version"
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.0.0"
   spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", ">= 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.49.1"
+  spec.add_development_dependency "rubocop", "~> 0.57.0"
   spec.add_development_dependency "rubocop-rspec"
 end

data/lib/cconfig.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #

data/lib/cconfig/cconfig.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -66,6 +66,7 @@ module CConfig
         # Check for bad user input in the local config.yml file.
         local = YAML.load_file(@local)
         raise FormatError unless local.is_a?(::Hash)
+
         local
       else
         {}

data/lib/cconfig/errors.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #

data/lib/cconfig/hash_utils.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -39,10 +39,9 @@ module CConfig
         parts.each do |part|
           cur = cur[part]
           return false if !cur || cur.empty?
-          return true  if cur.key?("enabled") && cur["enabled"].eql?(true)
         end
 
-        false
+        cur.key?("enabled") && cur["enabled"].eql?(true)
       end
 
       # Returns true if the given feature is disabled or doesn't exist. This is
@@ -58,7 +57,7 @@ module CConfig
 
         key.split(".").each do |part|
           cur = cur[part]
-          return if cur.nil?
+          break if cur.nil?
         end
 
         cur

data/lib/cconfig/railtie.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -29,8 +29,8 @@ module CConfig
 
     initializer "cconfig" do |app|
       prefix     = ENV["CCONFIG_PREFIX"] || app.class.parent_name.inspect
-      default    = File.join(Rails.root, "config", "config.yml")
-      local      = File.join(Rails.root, "config", "config-local.yml")
+      default    = Rails.root.join("config", "config.yml")
+      local      = Rails.root.join("config", "config-local.yml")
       cfg        = ::CConfig::Config.new(default: default, local: local, prefix: prefix)
 
       # NOTE: this is a global constant from now on. The Rails application

data/lib/cconfig/version.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -19,5 +19,5 @@
 
 module CConfig
   # The current version of CConfig.
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

data/lib/tasks/info.rake

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #

data/spec/config_spec.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -29,8 +29,8 @@ end
 
 describe CConfig::Config do
   after do
-    ["TEST_LOCAL_CONFIG_PATH"].each { |key| ENV[key] = nil }
-    ["TEST_LDAP_COUNT", "TEST_ANOTHER_ENABLED", "TEST_LDAP_STRING"].each do |key|
+    %w[TEST_LOCAL_CONFIG_PATH TEST_EMAIL_SMTP_ENABLED].each { |key| ENV[key] = nil }
+    %w[TEST_LDAP_COUNT TEST_ANOTHER_ENABLED TEST_LDAP_STRING].each do |key|
       ENV[key] = nil
     end
   end
@@ -61,8 +61,8 @@ describe CConfig::Config do
     it "merges both config files and work as expected" do
       cfg = get_config("config.yml", "local.yml").fetch
 
-      expect(cfg.enabled?("gravatar")).to be_truthy
-      expect(cfg.enabled?("ldap")).to be_truthy
+      expect(cfg).to be_enabled("gravatar")
+      expect(cfg).to be_enabled("ldap")
       expect(cfg["ldap"]["hostname"]).to eq "ldap.example.com"
       expect(cfg["ldap"]["port"]).to eq 389
       expect(cfg["ldap"]["base"]).to eq "ou=users,dc=example,dc=com"
@@ -92,9 +92,21 @@ describe CConfig::Config do
       expect(cfg.enabled?("email.smtp")).to be true
     end
 
+    it "works with environment variables" do
+      ENV["TEST_EMAIL_SMTP_ENABLED"] = "false"
+      cfg = get_config("config.yml", "").fetch
+      expect(cfg.enabled?("email.smtp")).to be false
+    end
+
     it "offers the #disabled? method" do
       cfg = get_config("config.yml", "").fetch
-      expect(cfg.disabled?("ldap")).to be_truthy
+      expect(cfg).to be_disabled("ldap")
+    end
+
+    it "handles enabled on nested elements" do
+      cfg = get_config("config.yml", "").fetch
+      expect(cfg).to be_enabled("delete")
+      expect(cfg).to be_disabled("delete.garbage_collector")
     end
   end
 

data/spec/fixtures/config.yml

@@ -14,3 +14,8 @@ ldap:
 email:
   smtp:
     enabled: true
+
+delete:
+  enabled: true
+  garbage_collector:
+    enabled: false

data/spec/hash_utils_spec.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -27,7 +27,7 @@ end
 
 describe ::CConfig::HashUtils do
   after do
-    ["TEST_LDAP_COUNT", "TEST_ANOTHER_ENABLED", "TEST_LDAP_STRING"].each do |key|
+    %w[TEST_LDAP_COUNT TEST_ANOTHER_ENABLED TEST_LDAP_STRING].each do |key|
       ENV[key] = nil
     end
   end
@@ -71,8 +71,8 @@ describe ::CConfig::HashUtils do
     cfg = ConfigMock.new.strict_merge_with_env_test(default: default, local: local, prefix: "test")
 
     cfg.extend(::CConfig::HashUtils::Extensions)
-    expect(cfg.enabled?("gravatar")).to be_truthy
-    expect(cfg.enabled?("oauth.google_oauth2")).to be_falsey
-    expect(cfg.enabled?("something.that.does.not.exist")).to be_falsey
+    expect(cfg).to be_enabled("gravatar")
+    expect(cfg).not_to be_enabled("oauth.google_oauth2")
+    expect(cfg).not_to be_enabled("something.that.does.not.exist")
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-# Copyright (C) 2017 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cconfig
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - mssola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.57.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -121,7 +120,6 @@ files:
 - README.md
 - Rakefile
 - cconfig.gemspec
-- config/rubocop-suse.yml
 - lib/cconfig.rb
 - lib/cconfig/cconfig.rb
 - lib/cconfig/errors.rb
@@ -155,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Configuration management for container-aware applications.

data/.ruby-version

@@ -1 +0,0 @@
-2.1.10

data/config/rubocop-suse.yml

@@ -1,74 +0,0 @@
-# This is the shared Rubocop configuration for SUSE projects. It is maintained
-# at https://github.com/SUSE/style-guides/blob/master/rubocop-suse.yml
-#
-# The configuration is tested and used with the Rubocop version used by Hound
-# (https://houndci.com).
-#
-# We use the default Hound config as a baseline:
-#
-#   https://raw.githubusercontent.com/thoughtbot/hound/master/config/style_guides/ruby.yml
-#
-# This file contains the rules with derive from this.
-
-Lint/EndAlignment:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#lintendalignment
-  EnforcedStyleAlignWith: variable
-
-Metrics/AbcSize:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricsabcsize
-  Max: 30
-
-Metrics/LineLength:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength
-  Max: 100
-  # To make it possible to copy or click on URIs in the code, we allow lines
-  # contaning a URI to be longer than Max.
-  AllowURI: true
-  URISchemes:
-    - http
-    - https
-
-Layout/AlignHash:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylealignhash
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-
-Layout/AlignParameters:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylealignparameters
-  Enabled: false
-
-Style/CollectionMethods:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylecollectionmethods
-  Enabled: false
-
-Layout/EmptyLinesAroundBlockBody:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#styleemptylinesaroundblockbody
-  Enabled: false
-
-Layout/MultilineOperationIndentation:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylemultilineoperationindentation
-  EnforcedStyle: indented
-
-Style/StringLiterals:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliterals
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliteralsininterpolation
-  EnforcedStyle: double_quotes
-
-Style/WordArray:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#deviations-from-the-upstream-style-guide
-  Enabled: false
-
-Style/RegexpLiteral:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#deviations-from-the-upstream-style-guide
-  Enabled: false
-
-Style/SignalException:
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
-  EnforcedStyle: only_raise
-
-Style/NumericLiterals:
-  StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylenumericliterals
-  Enabled: false