conferred 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d37687a4734e2bbd21bc79d368a6a69510027223
-  data.tar.gz: 50bab863bc36a9e863d641db70f19f98ae2a39c3
+  metadata.gz: 3ca81ecce48b54d2665c4a672136ba54f6dd123e
+  data.tar.gz: b804e9540b55f7adcdfb89f1959f1bf4f0dbd51b
 SHA512:
-  metadata.gz: 470ce41582ee20909870f7b9516bf8391e9316f1b9114bfc71992e33530cf3fd9a02063b3eb3443c2595629673632ecc14a186682ab1bd88409b58a7e45fddae
-  data.tar.gz: 60dab8126270cf4f7ed233d7e1317dda111e20998b90ef201b6eee6ef98ba5d426e1e17885339d0646e56b6a26108d9ac88cbdba1635e0c3182af7490b573d69
+  metadata.gz: 81afad6a3bab313c253f9b0c8dd72992f05c952e78f526823a1b2ed6a92e8e8e41855c9d53dc2adf58d90acf3531d6ca62ad8d342449e35dc52d985def799ad0
+  data.tar.gz: 16ef081d0d2289deae6b13aff81f58d29f717223d6343052055ba1b110c8d0edc1223a3b1214179c1556916f7f8d7046773b690ea1750060217cbe2a3d244ec4

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/conferred.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: conferred 0.1.1 ruby lib
+# stub: conferred 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "conferred"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Ian Kenney"]
-  s.date = "2015-11-17"
+  s.date = "2015-11-22"
   s.description = "inspired by the 12 factor app http://12factor.net/config "
   s.email = "ian@lostock.co.uk"
   s.extra_rdoc_files = [

data/lib/conferred.rb

@@ -10,7 +10,7 @@ class Conferred
     end
 
     def provider
-      @@provider || "env"
+      @@provider || ENV["CONFERRED_PROVIDER"] || "env"
     end
 
     def method_missing(setting, *args, &block)
@@ -52,7 +52,7 @@ class Conferred
         resp = JSON.parse(Net::HTTP.get(etcd_setting_endpoint(key)))
         resp["node"]["value"]
       rescue
-        ""
+        env_setting_value(key)
       end
     end
 

data/spec/conferred_spec.rb

@@ -43,6 +43,10 @@ describe "Conferred" do
 
   describe "providers" do
     describe "#provider" do
+      before do
+        Conferred.provider= nil
+      end
+
       it "defaults to 'env'" do
         expect(Conferred.provider).to eq "env"
       end
@@ -52,6 +56,11 @@ describe "Conferred" do
         expect{Conferred.foo}.to raise_error NoMethodError
       end
 
+      it "takes a provider from the environment" do
+        ENV["CONFERRED_PROVIDER"] = "new"
+        expect(Conferred.provider).to eq "new"
+      end
+
       it "sets a provider" do
         Conferred.provider = "etcd"
         expect(Conferred.provider).to eq "etcd"
@@ -84,6 +93,14 @@ describe "Conferred" do
           .and_return('{"action":"get","node":{"key":"/secret","value":"foo","modifiedIndex":2962,"createdIndex":2962}}')
         expect(Conferred.secret).to eq "foo"
       end
+
+      it "falls back to the envorinment" do
+        ENV["EXTRA_SECRET"] = "shh"
+        allow(Net::HTTP).to receive(:get)
+          .with(URI('http://localhost:2379/extra_secret'))
+          .and_return("")
+        expect(Conferred.extra_secret).to eq "shh"
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conferred
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ian Kenney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec