sensu-settings 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b6fd2ff7cfbb87b1395809280a22abac6b15f82
-  data.tar.gz: 5a6bfcdd10dcd7cb836e95788e7abc032ce2dd9a
+  metadata.gz: ad536528eb8bf91f1470fae3523172d95a5385e5
+  data.tar.gz: 23d2d733d4b216b7660d4d58216edeb0070e041c
 SHA512:
-  metadata.gz: bfb6873c4156668eff7b9a76d577f46632d98fca2e6c93c38ba4ab2f1c97668c8f39919dffa86dc3538686a088f04687b8246a46b283ad49d9a55475c2e32f5d
-  data.tar.gz: cdd96c0197b1b9c32dce6b582571e807b8f86d6fdeb6ea419e0a71132239bc195c36170d3b6e4a7dc539fda4aba68637f1faf1c7c242b7855492bf15911eb1e2
+  metadata.gz: b61759a73625b9dc32700ed75fba57c2be7ab41fe5478eeed317c536a51097ebfb3a4263e22a848b4c3aa8f695dd3f404000619b5408bf050ac05ef1e5a9303a
+  data.tar.gz: 69b96d5e8b2e9511ac5404649066457f2175bcf5bee6edbc71c45e3a2ac661f8b4287870ad20373d96f5888a79e682cd51044a4853d83645ea1ec40999b162fc

data/lib/sensu/settings.rb

@@ -2,29 +2,41 @@ require "sensu/settings/loader"
 
 module Sensu
   module Settings
-    # Load Sensu settings.
-    #
-    # @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_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)
+    class << self
+      # Load Sensu settings.
+      #
+      # @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 load(options={})
+        @loader = Loader.new
+        @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
+
+      # Retrieve the current loaded settings loader or load one up if
+      # there isn't one. Note: We may need to add a mutex for thread
+      # safety.
+      #
+      # @param [Hash] options to pass to load().
+      # @return [Loader] instance of a loaded loader.
+      def get(options={})
+        @loader || load(options)
       end
-      loader.set_env!
-      loader
     end
   end
 end

data/sensu-settings.gemspec

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

data/spec/settings_spec.rb

@@ -18,6 +18,18 @@ describe "Sensu::Settings" do
     settings.should respond_to(:validate)
   end
 
+  it "can retrive the current loaded loader" do
+    settings = Sensu::Settings.load
+    Sensu::Settings.get.should eq(settings)
+    Sensu::Settings.get.should eq(settings)
+  end
+
+  it "can load up a loader if one doesn't exist" do
+    settings = Sensu::Settings.get
+    settings.should be_an_instance_of(Sensu::Settings::Loader)
+    Sensu::Settings.get.should eq(settings)
+  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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json