cconfig 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c9dc2ded01737e8e66212b7a1c17d16e8de42d4a61c518f7903a526513b6b5
-  data.tar.gz: 6d736ae908aab7fcc46cbbc3fb34254a6303f633de099db97f56ac5185e79fdb
+  metadata.gz: 9ea29ed34d129bc2fc6180e948f2cb36e4c023bf2786c28f0292495a493ae37d
+  data.tar.gz: 7b3e82322ca62ad505898e44fa023f38651efdb8f32fdd4360617dbdec965a88
 SHA512:
-  metadata.gz: a873d084f333d824fa6405ec88f9fccabe2399bda0fa1f556a983f60aaa28c2f1864061922db4e5c2a2e12bcb1edb89d8811faef56203718be2cfce8943b50cd
-  data.tar.gz: b05e76c6a8c7d445cda068e78e298c0d0bf670a7af37dce1f1a88f5ba6d035c1254d36c63284c0798057e4019f3da110d809ece9e7a44a060959c8c978994b03
+  metadata.gz: badbe8952eab5a3599ad63d76b9bc9c4a2861268c9aac261957c3829dbdbeada380e02f370b7cf176d8dbca5731b3f445e475244b8890a174fe3a2c44ac12e17
+  data.tar.gz: f56de4c02b6870a0d7a0239b62aad54313ac63bdf75e1363a7e691c99bc62e57d49473584cfab873f3c26389ff00cb6f26f1a80c0cd52c8d55d7115df5680b23

data/.rubocop.yml

@@ -2,12 +2,13 @@ require:
   - rubocop-rspec
 
 AllCops:
+  TargetRubyVersion: 2.3
   DisplayCopNames: true
   DisplayStyleGuide: false
 
 # This is a remnant of old SUSE-style alignment for hashes, The table format
 # looks more human readable.
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -51,3 +52,15 @@ RSpec/ExampleLength:
 # Otherwise CConfig is not allowed ...
 RSpec/FilePath:
   Enabled: false
+
+##
+# Newly added cops
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/.travis.yml

@@ -5,16 +5,16 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 
 before_install:
   - gem update --system
+  - gem install bundler
 
 script:
   - bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.3.0
+
+- Added Ruby on Rails 6.x support. See
+  [commit](dccbf672614d87cd5bc7171d6db1fdad7d5b7657).
+- Added support for Ruby 2.7, although nothing has really been done besides
+  adding it on the CI and checking that it works.
+
 ## 1.2.1
 
 - Added support for Ruby 2.5 and 2.6: nothing has really been done besides

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cconfig (1.2.1)
+    cconfig (1.3.0)
       safe_yaml (~> 1.0.0, >= 1.0.0)
 
 GEM
@@ -9,39 +9,39 @@ GEM
   specs:
     ast (2.4.0)
     diff-lcs (1.3)
-    jaro_winkler (1.5.1)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    jaro_winkler (1.5.4)
+    parallel (1.19.1)
+    parser (2.7.0.5)
       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)
+    rake (13.0.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.57.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.27.0)
-      rubocop (>= 0.56.0)
-    ruby-progressbar (1.10.0)
-    safe_yaml (1.0.4)
-    unicode-display_width (1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-rspec (1.38.1)
+      rubocop (>= 0.68.1)
+    ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
@@ -51,8 +51,8 @@ DEPENDENCIES
   cconfig!
   rake (>= 10.0)
   rspec (>= 3.0)
-  rubocop (~> 0.57.0)
+  rubocop (~> 0.80.0)
   rubocop-rspec
 
 BUNDLED WITH
-   1.16.5
+   1.17.3

data/README.md

@@ -115,6 +115,8 @@ Last but not least, this Railtie also offers a rake task called
 `cconfig:info`. This rake task prints to standard output the evaluated
 configuration.
 
+This gem supports Ruby on Rails `5.x` and `6.x`.
+
 ## License
 
 This project is based on work I did for the
@@ -122,7 +124,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-2018 Miquel Sabaté Solà <msabate@suse.com>
+Copyright (C) 2017-2020 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 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2020 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #

data/cconfig.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep("^spec/")
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.1"
+  spec.required_ruby_version = ">= 2.3"
 
   spec.add_dependency "safe_yaml", "~> 1.0.0", ">= 1.0.0"
 
   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.57.0"
+  spec.add_development_dependency "rubocop", "~> 0.80.0"
   spec.add_development_dependency "rubocop-rspec"
 end

data/lib/cconfig.rb

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

data/lib/cconfig/cconfig.rb

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

data/lib/cconfig/errors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2020 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -21,7 +21,7 @@ module CConfig
   # FormatError is the exception to be raised when a configuration file cannot
   # be parsed.
   class FormatError < StandardError
-    DEFAULT_MSG = "Wrong format for the config-local file!".freeze
+    DEFAULT_MSG = "Wrong format for the config-local file!"
 
     def initialize
       super(DEFAULT_MSG)

data/lib/cconfig/hash_utils.rb

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

data/lib/cconfig/railtie.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2020 Miquel Sabaté Solà <msabate@suse.com>
 #
 # This file is part of CConfig.
 #
@@ -28,7 +28,7 @@ module CConfig
     railtie_name :cconfig
 
     initializer "cconfig" do |app|
-      prefix     = ENV["CCONFIG_PREFIX"] || app.class.parent_name.inspect
+      prefix     = ::CConfig::Railtie.fetch_prefix(app)
       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)
@@ -43,5 +43,19 @@ module CConfig
         load task
       end
     end
+
+    # fetch_prefix returns a string containing the prefix to be used by our
+    # CConfig::Config instance.
+    #
+    # app contains the Rails application as given by the railtie API.
+    def self.fetch_prefix(app)
+      if ENV["CCONFIG_PREFIX"].present?
+        ENV["CCONFIG_PREFIX"]
+      elsif Rails::VERSION::MAJOR >= 6
+        app.class.module_parent_name.inspect
+      else
+        app.class.parent_name.inspect
+      end
+    end
   end
 end

data/lib/cconfig/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2017-2018 Miquel Sabaté Solà <msabate@suse.com>
+# Copyright (C) 2017-2020 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.1".freeze
+  VERSION = "1.3.0"
 end

data/lib/tasks/info.rake

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

data/spec/config_spec.rb

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

data/spec/hash_utils_spec.rb

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

data/spec/spec_helper.rb

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

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: cconfig
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - mssola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.80.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.80.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,15 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Configuration management for container-aware applications.