sensu-settings 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b95af032c4b3a94e59a491db3c04ba24eb8379b0
-  data.tar.gz: 2e86d492aa3f2f2e8cfb55e078e351a4812a3df6
+  metadata.gz: 574e3cda48e7886857ddee4f8dd6b299304726cb
+  data.tar.gz: 6cb9b7a031ae185dda7ffc341d80ef6e5497ebd9
 SHA512:
-  metadata.gz: 54a52ab2912061d6eca52dc9f4dbfc84c0532cf9b4593275e653272fdaeb62e2989db94783a120eeb1b08c2630cd8567f261b6dec506c55636a4cffb932a5c72
-  data.tar.gz: b4410e0f99ce6cba6d820ef90e7503147a794001c20fcd476f8ef94cc04169b38bf9e19aa3af504d8dbc0a527d14bcdf70310e191c590cfd552e9303f26ff5b2
+  metadata.gz: 7e5136184244c730101a4bb0dd859f4471c3cbe36761e17b0d0b5abba694b0a4c8dde879dd5ca15cea2d262d74eee0544c23bb595da3cf304a1b9456ce2cd263
+  data.tar.gz: ab0ee858e81fa3f116b3693a2dc2d616f1463df69a0633ce3c6317fad969584a39e3704a3ac49b32607d5435b398f804f77907c22e8ac38657014c9d1b01dbd6

data/lib/sensu/settings.rb

@@ -4,11 +4,26 @@ module Sensu
   module Settings
     # Load Sensu settings.
     #
-    # @param options [Hash]
+    # @param [Hash] options
+    # @option options [String] :config_file to load.
+    # @option options [String] :config_dir to load.
+    # @option options [Array] :config_dirs to load.
     # @return [Loader] a loaded instance of Loader.
     def self.load(options={})
       loader = Loader.new
-      loader.load(options)
+      loader.load_env
+      if options[:config_file]
+        loader.load_file(options[:config_file])
+      end
+      if options[:config_dir]
+        loader.load_directory(options[:config_dir])
+      end
+      if options[:config_dirs]
+        options[:config_dirs].each do |directory|
+          loader.load_directory(directory)
+        end
+      end
+      loader.set_env!
       loader
     end
   end

data/lib/sensu/settings/loader.rb

@@ -118,29 +118,10 @@ module Sensu
       # Set Sensu settings related environment variables. This method
       # currently sets SENSU_CONFIG_FILES, a colon delimited list of
       # loaded config files.
-      def set_env
+      def set_env!
         ENV["SENSU_CONFIG_FILES"] = @loaded_files.join(":")
       end
 
-      # Load settings from the environment and the paths provided, set
-      # appropriate environment variables.
-      #
-      # @param [Hash] options
-      # @option options [String] :config_file to load.
-      # @option options [String] :config_dir to load.
-      # @return [Hash] loaded settings.
-      def load(options={})
-        load_env
-        if options[:config_file]
-          load_file(options[:config_file])
-        end
-        if options[:config_dir]
-          load_directory(options[:config_dir])
-        end
-        set_env
-        to_hash
-      end
-
       # Validate the loaded settings.
       #
       # @return [Array] validation failures.

data/sensu-settings.gemspec

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

data/spec/assets/app/config/sensu/app_http_endpoint.json

@@ -0,0 +1,9 @@
+{
+  "checks": {
+    "app_http_endpoint": {
+      "command": "check-http.rb -u https://localhost/ping -q pong",
+      "standalone": true,
+      "interval": 30
+    }
+  }
+}

data/spec/loader_spec.rb

@@ -12,7 +12,7 @@ describe "Sensu::Settings::Loader" do
   end
 
   it "can provide a loader API" do
-    @loader.should respond_to(:load, :validate!)
+    @loader.should respond_to(:load_env, :load_file, :load_directory, :set_env!, :validate!)
   end
 
   it "can provide indifferent access to settings" do
@@ -117,20 +117,17 @@ describe "Sensu::Settings::Loader" do
     warning[:message].should eq("loading config files from directory")
   end
 
-  it "can load settings from the environment, a file, and a directory" do
-    ENV["RABBITMQ_URL"] = "amqp://guest:guest@localhost:5672/"
-    settings = @loader.load(:config_file => @config_file, :config_dir => @config_dir)
-    settings[:rabbitmq].should eq(ENV["RABBITMQ_URL"])
-    settings[:api][:port].should eq(4567)
-    settings[:checks][:merger][:command].should eq("echo -n merger")
-    settings[:checks][:merger][:subscribers].should eq(["foo", "bar"])
-    settings[:checks][:nested][:command].should eq("true")
+  it "can set environment variables for child processes" do
+    @loader.load_file(@config_file)
+    @loader.load_directory(@config_dir)
+    @loader.loaded_files.size.should eq(3)
+    @loader.set_env!
     ENV["SENSU_CONFIG_FILES"].split(":").should eq(@loader.loaded_files)
-    ENV["RABBITMQ_URL"] = nil
   end
 
   it "can load settings and determine if certain definitions exist" do
-    @loader.load(:config_file => @config_file, :config_dir => @config_dir)
+    @loader.load_file(@config_file)
+    @loader.load_directory(@config_dir)
     @loader.check_exists?("nonexistent").should be_false
     @loader.check_exists?("tokens").should be_true
     @loader.filter_exists?("nonexistent").should be_false
@@ -142,7 +139,8 @@ describe "Sensu::Settings::Loader" do
   end
 
   it "can load settings and provide setting category accessors" do
-    @loader.load(:config_file => @config_file, :config_dir => @config_dir)
+    @loader.load_file(@config_file)
+    @loader.load_directory(@config_dir)
     @loader.checks.should be_kind_of(Array)
     @loader.checks.should_not be_empty
     check = @loader.checks.detect do |check|

data/spec/settings_spec.rb

@@ -4,10 +4,35 @@ require "sensu/settings"
 describe "Sensu::Settings" do
   include Helpers
 
+  before do
+    @assets_dir = File.join(File.dirname(__FILE__), "assets")
+    @config_file = File.join(@assets_dir, "config.json")
+    @config_dir = File.join(@assets_dir, "conf.d")
+    @app_dir = File.join(@assets_dir, "app")
+  end
+
   it "can provide a loader" do
     Sensu::Settings.should respond_to(:load)
     Sensu::Settings.load.should be_an_instance_of(Sensu::Settings::Loader)
     settings = Sensu::Settings.load
     settings.should respond_to(:validate!)
   end
+
+  it "can load settings from the environment, a file, and a directory" do
+    ENV["RABBITMQ_URL"] = "amqp://guest:guest@localhost:5672/"
+    settings = Sensu::Settings.load(:config_file => @config_file, :config_dir => @config_dir)
+    settings[:rabbitmq].should eq(ENV["RABBITMQ_URL"])
+    settings[:api][:port].should eq(4567)
+    settings[:checks][:merger][:command].should eq("echo -n merger")
+    settings[:checks][:merger][:subscribers].should eq(["foo", "bar"])
+    settings[:checks][:nested][:command].should eq("true")
+    ENV["SENSU_CONFIG_FILES"].split(":").should eq(settings.loaded_files)
+    ENV["RABBITMQ_URL"] = nil
+  end
+
+  it "can load settings from files in multiple directories" do
+    settings = Sensu::Settings.load(:config_dirs => [@config_dir, @app_dir])
+    settings[:checks][:merger][:command].should eq("echo -n merger")
+    settings[:checks][:app_http_endpoint][:command].should eq("check-http.rb -u https://localhost/ping -q pong")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sean Porter
@@ -108,6 +108,7 @@ files:
 - lib/sensu/settings/validators/subdue.rb
 - lib/sensu/settings/validators/transport.rb
 - sensu-settings.gemspec
+- spec/assets/app/config/sensu/app_http_endpoint.json
 - spec/assets/conf.d/merger.json
 - spec/assets/conf.d/nested/file.json
 - spec/assets/config.json
@@ -142,6 +143,7 @@ signing_key:
 specification_version: 4
 summary: The Sensu settings library, loader and validator
 test_files:
+- spec/assets/app/config/sensu/app_http_endpoint.json
 - spec/assets/conf.d/merger.json
 - spec/assets/conf.d/nested/file.json
 - spec/assets/config.json