conferred 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8711bba8f2ccbb40233e7818df22ef4429d86cb
-  data.tar.gz: a7eef9286f5ba1ff16c98d47a6b053152114f630
+  metadata.gz: 7d42c798e9698f16e34098f2f240626a6f2528f2
+  data.tar.gz: fcea3291bb6d580ac49db5f7a0cd215d07d87c26
 SHA512:
-  metadata.gz: f653a30ca067c1be29153a5b7bb28801f77746ac060c396b8e559198f8f51e7d3075874df264253419bdfc1bd1755c9a6e0ad825bbcedb6731d54a618a38c32c
-  data.tar.gz: ee5c32b780d81224803a9212609048ac980a35a42cf5fbb5241307a1cb266c8ac0a4da6b206907879e35b7979293b190c45a18cc44fa48cb94f6d8d298660bd7
+  metadata.gz: 7325d9e08923b035096569225b5d1b024cf6bdfe94d149ac4c312f3a80e9f4aab5d93fc575881ad3dd4d27ad8c4f2d8c9e98d8af0c35bc880b2e7f48c7313304
+  data.tar.gz: f6dead5553dbe6c3cde1d1cb41045c5a71df70378884272953451f1ab1183327510af95304ef631dc8b49136ce5be6112b88326d59368546dfb0bc64cf6ba459

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

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.2.0 ruby lib
+# stub: conferred 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "conferred"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   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-22"
+  s.date = "2015-12-05"
   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

@@ -1,8 +1,18 @@
 require 'json'
 
 class Conferred
+  DEFAULT_ETCD_HOST = "172.17.42.1"
+  DEFAULT_ETCD_PORT = "2379"
+  DEFAULT_ETCD_SCHEME = "http"
+
   @@provider = "env"
+  @@etcd_scheme = DEFAULT_ETCD_SCHEME
+  @@etcd_host = DEFAULT_ETCD_HOST
+  @@etcd_port = DEFAULT_ETCD_PORT
+  @@namespace = ""
+
   class << self
+   # attr_writer :etcd_port, :etcd_scheme, :etcd_host
     def provider=(value)
       @@provider=value
     end
@@ -16,11 +26,35 @@ class Conferred
     end
 
     def namespace
-      @@namespace || ENV["CONFERRED_ETC_NAMESPACE"] || ""
+      @@namespace || ENV["CONFERRED_ETCD_NAMESPACE"] || ""
+    end
+
+    def etcd_host
+      # if not provided set host to default docker host ip from within a container 
+      @@etcd_host || ENV["CONFERRED_ETCD_HOST"] || DEFAULT_ETCD_HOST
     end
 
+    def etcd_port
+      @@etcd_port || ENV["CONFERRED_ETCD_PORT"] || DEFAULT_ETCD_PORT
+    end
+
+    def etcd_scheme
+      @@etcd_scheme || ENV["CONFERRED_ETCD_SCHEME"] || DEFAULT_ETCD_SCHEME
+    end
 
-    def method_missing(setting, *args, &block)
+    def etcd_port=(port)
+      @@etcd_port = port
+    end
+
+    def etcd_host=(host)
+      @@etcd_host = host
+    end
+
+    def etcd_scheme=(scheme)
+      @@etcd_scheme = scheme
+    end
+
+   def method_missing(setting, *args, &block)
       super if setting =~ /#{provider}_setting_value/
       method = :setting_value
       method = :setting_value? if setting[-1] == "?"
@@ -33,7 +67,7 @@ class Conferred
     end
 
     def setting_value(key)
-      #raise "iConferred: Undefined provider (#{@@provider})" unless self.responds_to setting_method_name
+      #raise "Conferred: Undefined provider (#{@@provider})" unless self.responds_to setting_method_name
       self.send(setting_method_name, key) 
     end
 
@@ -45,6 +79,10 @@ class Conferred
       self.setting_value(key) || raise("#{self.setting_name(key)} missing from environment")
     end
 
+    def etcd_setting_prefix
+      "#{self.etcd_scheme}://#{self.etcd_host}:#{self.etcd_port}/#{etcd_setting_namespace}"
+    end
+
     private
 
     def env_setting_value(key)
@@ -61,7 +99,7 @@ class Conferred
     end
 
     def etcd_setting_endpoint(key)
-      URI("http://localhost:2379/#{etcd_setting_namespace}#{key}")
+      URI("#{self.etcd_setting_prefix}#{key}")
     end
 
     def etcd_setting_namespace
@@ -70,6 +108,7 @@ class Conferred
       "#{self.namespace}/"
     end
 
+    
     def setting_method_name
       "#{self.provider}_setting_value".to_sym
     end

data/spec/conferred_spec.rb

@@ -70,62 +70,128 @@ describe "Conferred" do
       end
     end
 
-    describe "#namespace" do
+    context "provider: etcd" do
       before do
         Conferred.provider = "etcd"
       end
 
-      context "configured namespace" do
-        before do
-          Conferred.namespace = "section"
+      describe "#namespace" do
+        context "configured namespace" do
+          before do
+            Conferred.namespace = nil
+          end
+
+          it "defaults to empty namespace" do
+            expect(Conferred.namespace).to eq ""
+          end
+            
+          it "sets a namespace" do
+            Conferred.namespace = "section"
+            expect(Conferred.namespace).to eq "section"
+          end
+
+          it "reads from environment" do
+            set_envs "CONFERRED_ETCD_NAMESPACE" => "xyz"
+            expect(Conferred.namespace).to eq "xyz"
+          end
         end
 
-        it "sets a namespace" do
-          expect(Conferred.namespace).to eq "section"
-        end
+        context "inferred namespace" do
+          before do
+            set_envs "CONFERRED_ETCD_NAMESPACE" => "monty"
+          end
 
+          it "defers to the environment" do
+            expect(Conferred.namespace).to eq "monty"
+          end
 
-        it "passes the namespace to etcd" do
-          expect(Net::HTTP).to receive(:get)
-            .with(URI('http://localhost:2379/section/secret'))
-          Conferred.secret
+          it "configured value overides environment" do
+            Conferred.namespace = "sect"
+            expect(Conferred.namespace).to eq "sect"
+          end
         end
       end
 
-      context "inferred namespace" do
+      describe "#etcd_host" do
         before do
-          set_envs "CONFERRED_ETC_NAMESPACE" => "monty"
+          Conferred.etcd_host = nil
+        end 
+
+        it "defaults to docker host" do
+          expect(Conferred.etcd_host).to eq "172.17.42.1"
         end
 
-        it "defers to the environment" do
-          expect(Conferred.namespace).to eq "monty"
+        it "reads from CONFERRED_ETCD_HOST environment" do
+          set_envs "CONFERRED_ETCD_HOST" => "myhost"
+          expect(Conferred.etcd_host).to eq "myhost"
+        end 
+      end
+
+      describe "#etcd_port" do
+        before do
+          Conferred.etcd_port = nil
         end
+        it "defaults to 2379" do
+          expect(Conferred.etcd_port).to eq "2379"
+        end
+
+        it "reads environment" do
+          set_envs "CONFERRED_ETCD_PORT" => "1234"
+          expect(Conferred.etcd_port).to eq "1234"
+        end 
 
-        it "configured value overides environment" do
-          Conferred.namespace = "sect"
-          expect(Conferred.namespace).to eq "sect"
+        it "allows assignment" do
+          Conferred.etcd_port = "4321"
+          expect(Conferred.etcd_port).to eq "4321"
         end
       end
-    end
 
-    describe "etcd" do
-      before do
-        Conferred.provider = "etcd"
+      describe "#etcd_scheme" do
+        before do
+          Conferred.etcd_scheme = nil
+        end
+        it "defaults to http" do
+          expect(Conferred.etcd_scheme).to eq "http"
+        end
+
+        it "reads environment" do
+          set_envs "CONFERRED_ETCD_SCHEME" => "sftp"
+          expect(Conferred.etcd_scheme).to eq "sftp"
+        end 
+
+        it "allows assignment" do
+          Conferred.etcd_scheme = "https"
+          expect(Conferred.etcd_scheme).to eq "https"
+        end
       end
 
-      it "calls the correct lookup function based on provider" do
-        allow(Net::HTTP).to receive(:get)
-          .with(URI('http://localhost:2379/secret'))
-          .and_return('{"action":"get","node":{"key":"/secret","value":"foo","modifiedIndex":2962,"createdIndex":2962}}')
-        expect(Conferred.secret).to eq "foo"
+
+
+      describe "#etc_setting_prefix" do
+        it "uses the provided settings" do
+          Conferred.etcd_scheme = "https"
+          Conferred.etcd_host = "etcd.host"
+          Conferred.etcd_port = "2222"
+          Conferred.namespace = "my-section"
+          expect(Conferred.etcd_setting_prefix).to eq "https://etcd.host:2222/my-section/"
+        end
       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"
+      describe "value lookup" do
+        it "calls the correct lookup function based on provider" do
+          allow(Net::HTTP).to receive(:get)
+            .with(URI("#{Conferred.etcd_setting_prefix}secret"))
+            .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 environment" do
+          ENV["EXTRA_SECRET"] = "shh"
+          allow(Net::HTTP).to receive(:get)
+            .with(URI("#{Conferred.etcd_setting_prefix}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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ian Kenney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec