config_hound 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 67a3b97b5e40deb8ed9509031898e66a2de9577d
-  data.tar.gz: 53db1854e4cf25048107062b23718de22b15083d
+SHA256:
+  metadata.gz: 33f4e286668dbf7171c50d313cd9339cbb1ccbdc34d9b68c1e732c7a84d0acb9
+  data.tar.gz: 007b751b55b1b1463db129e754572e966f937a890636a16d3506d3b9ca2801b9
 SHA512:
-  metadata.gz: f9db6a68b39dda85488488ab959acd9b962ef61510d6a4e1b182e21aa16b48c30540c46ce61df4c6b80cb8a8710fff4a54c76679e3adea50d4ba03da90baf291
-  data.tar.gz: 5ca8f26c807be682d782c2969c174ce5ca664fafd820fe4ea348b04dac4abf50edb2e3553f415e77d8bb6846d029bf327aad08be96e1db73263728ff160c6f20
+  metadata.gz: bdaa8f5cd09e6a5aee6c35b5a9116e2f7f28b7553472c1b10ece292028d5553ffdfeda9c4358a79729589c33f565b58a4439c42f431cd1a7e9ad0878bba376e4
+  data.tar.gz: b084ffc0661eaf04af3ff1c22bc762158e660a5a0ab0658d9b71b89b1700cb402515c5a2ea01520b2b8d61e0cbe682e5425939e5499e45b5cf0736b600fec0f1

data/.github/workflows/test.yaml

@@ -0,0 +1,20 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    strategy:
+      matrix:
+        ruby: ['2.7', '3.0', '3.1']
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle install
+      - run: bundle exec rake

data/README.md

@@ -1,7 +1,7 @@
 # ConfigHound
 
-[![Gem Version](https://badge.fury.io/rb/config_hound.png)](http://badge.fury.io/rb/config_hound)
-[![Build Status](https://travis-ci.org/mdub/config_hound.svg?branch=master)](https://travis-ci.org/mdub/config_hound)
+[![Gem Version](https://badge.fury.io/rb/config_hound.svg)](http://badge.fury.io/rb/config_hound)
+[![Build Status](https://github.com/mdub/config_hound/actions/workflows/test.yaml/badge.svg?branch=master)](https://github.com/mdub/config_hound/actions/workflows/test.yaml)
 
 ConfigHound makes it easy to load configuration data.
 

data/config_hound.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.7'
+
   spec.add_runtime_dependency "dig_rb"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
 
 end

data/lib/config_hound/interpolation.rb

@@ -1,5 +1,6 @@
 require "config_hound/error"
 require "dig_rb"
+require "set"
 
 module ConfigHound
 
@@ -46,7 +47,7 @@ module ConfigHound
 
       def expand_hash(input)
         input.each_with_object({}) do |(k,v), a|
-          a[k] = expand(v)
+          a[expand(k)] = expand(v)
         end
       end
 

data/lib/config_hound/parser.rb

@@ -16,7 +16,7 @@ module ConfigHound
 
     def parse_yaml(raw)
       require "yaml"
-      YAML.safe_load(raw, [], [], true)
+      YAML.safe_load(raw, permitted_classes: [], permitted_symbols: [], aliases: true)
     end
 
     alias :parse_yml :parse_yaml

data/lib/config_hound/resource.rb

@@ -29,14 +29,16 @@ module ConfigHound
         when %r{^\w+:/}
           URI(arg)
         when %r{^/}
-          URI("file:#{arg}")
+          URI("file://#{arg}")
         else
-          URI("file:#{File.expand_path(arg)}")
+          URI("file://#{File.expand_path(arg)}")
         end
       end
 
     end
 
+    attr_reader :uri
+
     def to_s
       uri.to_s
     end
@@ -46,7 +48,7 @@ module ConfigHound
     end
 
     def read
-      open(uri.scheme == "file" ? uri.path : uri.to_s) do |io|
+      URI.open(uri.scheme == "file" ? uri.path : uri.to_s) do |io|
         io.read
       end
     rescue Errno::ENOENT
@@ -54,7 +56,7 @@ module ConfigHound
     end
 
     def format
-      File.extname(uri.to_s)[1..-1]
+      File.extname(uri.path.to_s)[1..-1]
     end
 
     def load
@@ -67,8 +69,6 @@ module ConfigHound
       @uri = uri
     end
 
-    attr_reader :uri
-
   end
 
 end

data/lib/config_hound/version.rb

@@ -1,3 +1,3 @@
 module ConfigHound
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/spec/config_hound/resource_spec.rb

@@ -13,7 +13,7 @@ describe ConfigHound::Resource do
     let(:path) { uri }
 
     it "retains the URI" do
-      expect(resource.to_s).to eq(uri.to_s)
+      expect(resource.uri).to eq uri
     end
 
   end
@@ -23,7 +23,7 @@ describe ConfigHound::Resource do
     let(:path) { "/path/to/file" }
 
     it "assumes it's a file" do
-      expect(resource.to_s).to eq("file:/path/to/file")
+      expect(resource.uri).to eq URI("file:///path/to/file")
     end
 
     describe "#resolve" do
@@ -32,21 +32,21 @@ describe ConfigHound::Resource do
         it "resolves relatively" do
           other_resource = resource.resolve("other_file")
           expect(other_resource).to be_a(ConfigHound::Resource)
-          expect(other_resource.to_s).to eq("file:/path/to/other_file")
+          expect(other_resource.uri).to eq URI("file:///path/to/other_file")
         end
       end
 
       context "with an absolute file path" do
         it "resolves relatively" do
           other_resource = resource.resolve("/different/path")
-          expect(other_resource.to_s).to eq("file:/different/path")
+          expect(other_resource.uri).to eq URI("file:///different/path")
         end
       end
 
       context "with a fully-qualified URI" do
         it "uses the URI provided" do
           other_resource = resource.resolve("http://foo/bar")
-          expect(other_resource.to_s).to eq("http://foo/bar")
+          expect(other_resource.uri).to eq URI("http://foo/bar")
         end
       end
 
@@ -59,7 +59,7 @@ describe ConfigHound::Resource do
     let(:path) { "config.yml" }
 
     it "assumes it's a file relative to $CWD" do
-      expect(resource.to_s).to eq("file:#{Dir.pwd}/config.yml")
+      expect(resource.uri).to eq URI("file://#{Dir.pwd}/config.yml")
     end
 
   end

data/spec/features/expansion_spec.rb

@@ -16,6 +16,38 @@ describe ConfigHound, "expansion" do
     expect(config["address"]).to eq("host:5678")
   end
 
+  context "with key expansion" do
+
+    given_resource "config-with-key-expansion.yml", %{
+      var:
+        account_id: "123"
+      <(var.account_id)>: value
+    }
+
+    let(:config) { ConfigHound.load("config-with-key-expansion.yml", :expand_refs => true) }
+
+    it "expands key references" do
+      expect(config["123"]).to eq("value")
+    end
+
+  end
+
+  context "with key and value expansion" do
+
+    given_resource "config-with-key-and-value-expansion.yml", %{
+      var:
+        account_id: "123"
+        port: 5678
+      <(var.account_id)>: host:<(var.port)>
+    }
+    let(:config) { ConfigHound.load("config-with-key-and-value-expansion.yml", :expand_refs => true) }
+    
+    it "expands key references" do
+      expect(config["123"]).to eq("host:5678")
+    end
+
+  end
+
   context "with overrides" do
 
     given_resource "overrides.yml", %{

data/spec/features/formats_spec.rb

@@ -20,6 +20,18 @@ describe ConfigHound, "formats" do
     )
   end
 
+  given_resource "s3://s3-test-bucket/config.yml?versionId=123456", %{
+    foo: 1
+    bar: 2
+  }
+
+  it "loads YAML from s3 with version id" do
+    expect(load("s3://s3-test-bucket/config.yml?versionId=123456")).to eq(
+      "foo" => 1,
+       "bar" => 2
+        )
+  end
+
   given_resource "config-with-aliases.yml", %{
     foo: &foo
       bar: 1

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "open-uri"
+require "uri"
+
 module GivenResource
 
   def inputs
@@ -10,7 +13,7 @@ module GivenResource
     end
     content = undent(content)
     before do
-      allow_any_instance_of(ConfigHound::Resource).to receive(:open).with(path) do |_, _, &block|
+      allow(URI).to receive(:open).with(path) do |_, _, &block|
         block.call(StringIO.new(content.dup))
       end
     end
@@ -31,6 +34,7 @@ module GivenResource
 end
 
 RSpec.configure do |config|
+  config.warnings = true
 
   config.extend(GivenResource)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_hound
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Mike Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dig_rb
@@ -30,38 +30,38 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: 
+        version: '13.0'
+description:
 email:
 - mdub@dogbiscuit.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yaml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -87,7 +87,7 @@ homepage: https://github.com/mdub/config_hound
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,16 +95,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Sniffs out config, wherever it may be.
 test_files:

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2
-  - 2.4