sensu-settings 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465a54c899448ee7c064f1228578e3fd226daecf
-  data.tar.gz: 4e1254a5e35fbdaee4e01be93e14e3e1295a0928
+  metadata.gz: ea3160019d1e51d06445c7127de83cee7b3b2ed8
+  data.tar.gz: e11e7fa4e4b5249952e5282c75202e85f0a74db5
 SHA512:
-  metadata.gz: 9bd57ce2da4854212f624673af2da4d7c96e0ca1c74c9a825c4f71f4723a041ff1f3ea6f70e878016cfd1e14c92c2cf0c7c33c8c62f1b75b7cbcab69931b391d
-  data.tar.gz: bd9d90d96bdf5546b13b796321410897c2d2d80a39688d055759fd4ab10cfff074f1fcd02b90b30b688d004410c288e83df4d3683f4762b82f683ec5c3aac578
+  metadata.gz: a505d51dfe881de20edfd91c4759dd3df12f29884ad27c1f3ce5663b19fcf4acfee79d5b5757a8330deb38624222818c8656fef40eeae527c4daa7f25861c788
+  data.tar.gz: 2b3f4cca5fa7372596aa0c58eb973dd2081333df062c96ccc13e5b0ae45f93a4d14d5e4ded40dc5b0a59ded6f3eb0aa4002f3ce8727ef10c5512cce1df424516

data/lib/sensu/settings/loader.rb

@@ -124,7 +124,7 @@ module Sensu
       def load_directory(directory)
         warning("loading config files from directory", :directory => directory)
         path = directory.gsub(/\\(?=\S)/, "/")
-        Dir.glob(File.join(path, "**/*.json")).each do |file|
+        Dir.glob(File.join(path, "**{,/*/**}/*.json")).uniq.each do |file|
           load_file(file)
         end
       end

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "3.0.0"
+  spec.version       = "3.1.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

data/spec/assets/alternative/conf.d/symlinked.json

@@ -0,0 +1,11 @@
+{
+  "checks": {
+    "symlinked": {
+      "command": "echo -n symlinked",
+      "subscribers": [
+        "baz"
+      ],
+     "interval": 60
+    }
+  }
+}

data/spec/loader_spec.rb

@@ -139,7 +139,7 @@ describe "Sensu::Settings::Loader" do
   it "can load settings from files in a directory" do
     @loader.load_directory(@config_dir)
     warnings = @loader.warnings
-    expect(warnings.size).to eq(4)
+    expect(warnings.size).to eq(6)
     messages = warnings.map do |warning|
       warning[:message]
     end
@@ -159,7 +159,7 @@ describe "Sensu::Settings::Loader" do
   it "can set environment variables for child processes" do
     @loader.load_file(@config_file)
     @loader.load_directory(@config_dir)
-    expect(@loader.loaded_files.size).to eq(3)
+    expect(@loader.loaded_files.size).to eq(4)
     @loader.set_env!
     expect(ENV["SENSU_LOADED_TEMPFILE"]).to match(/sensu_rspec_loaded_files/)
     loaded_files = IO.read(ENV["SENSU_LOADED_TEMPFILE"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -108,6 +108,7 @@ files:
 - lib/sensu/settings/validators/subdue.rb
 - lib/sensu/settings/validators/transport.rb
 - sensu-settings.gemspec
+- spec/assets/alternative/conf.d/symlinked.json
 - spec/assets/app/config/sensu/app_http_endpoint.json
 - spec/assets/bom.json
 - spec/assets/conf.d/merger.json
@@ -144,6 +145,7 @@ signing_key:
 specification_version: 4
 summary: The Sensu settings library, loader and validator
 test_files:
+- spec/assets/alternative/conf.d/symlinked.json
 - spec/assets/app/config/sensu/app_http_endpoint.json
 - spec/assets/bom.json
 - spec/assets/conf.d/merger.json