muchkeys 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e81c8deded76555843a5242334ae71417521d1f3
-  data.tar.gz: 3c71a228e84eb175b81cec46fa903140dcf76006
+  metadata.gz: 99f31bc721d5cc91d2e22d326c82bfd0a98def83
+  data.tar.gz: e9bc30d7ad9a81cb75c4e94eaa7e21ee0c27ecdf
 SHA512:
-  metadata.gz: c635fa24d92c441d5e777238c3beed8472942704a8efb0d907e504ec2f72f08ad6ab6c5ee02ffe61bd81405b277c414a8341d1041e998cde631b85b7b16a896d
-  data.tar.gz: 572192537944c62a1960be30603f9be0cc0e6de4a5383af8f4c271a47d9395a1a5cf30137d65260c6f667bff813e3617c061415f860b59ed25ca7e24f122815c
+  metadata.gz: e4da7727785879d4455f282c0521031d46a10b4a0d77c6d6820d4eaad2246d8e7c0a2472207f2c77cc20e7cab4a3362e4671acba7fae8795be42c5fb7f92acf6
+  data.tar.gz: 708b3dd75c7bc29a6d49ac78e08f18521145ecff997a263881230a7eb907c13087d0f34d5f9d3356ad886e5d44683a9899cb30d2e107d699d84362cc87f5ec88

data/lib/muchkeys.rb

@@ -1,6 +1,7 @@
 require "active_support/configurable"
 require "net/http"
 require "json"
+require 'yaml'
 
 if defined? ::Rails
   require 'muchkeys/rails'
@@ -54,6 +55,19 @@ module Muchkeys
     File.read(check_dir.join(".env")).each_line.select(&:presence).map { |x| x.split("=")[0] }
   end
 
+  def self.configure_from_yaml(file)
+    app_config = YAML.load(File.read(file)).with_indifferent_access
+    Muchkeys.configure do |config|
+      config.application_name = app_config[:application_name] if app_config.has_key?(:application_name)
+      config.consul_url       = app_config[:consul_url]       if app_config.has_key?(:consul_url)
+      config.keys_dir         = app_config[:keys_dir]         if app_config.has_key?(:keys_dir)
+      config.private_key      = app_config[:private_key]      if app_config.has_key?(:private_key)
+      config.public_key       = app_config[:public_key]       if app_config.has_key?(:public_key)
+      config.search_paths     = app_config[:search_paths]     if app_config.has_key?(:search_paths)
+      config.secrets_hint     = app_config[:secrets_hint]     if app_config.has_key?(:secrets_hint)
+    end
+  end
+
   def self.populate_environment!(*required_keys)
     app = ApplicationClient.new(config)
     app.verify_keys(*required_keys)

data/lib/muchkeys/rails.rb

@@ -1,17 +1,7 @@
 module Muchkeys
   class Rails < Rails::Railtie
     config.before_configuration do
-      app_config = YAML.load(File.read(::Rails.root.join("config", "muchkeys.yml")))
-      Muchkeys.configure do |config|
-        config.application_name ||= app_config[:application_name] || ::Rails.application.class.parent_name.underscore
-        config.consul_url       ||= app_config[:consul_url] || "http://localhost:8500"
-        config.keys_dir         ||= app_config[:keys_dir]
-        config.private_key      ||= app_config[:private_key]
-        config.public_key       ||= app_config[:public_key]
-        config.search_paths     ||= app_config[:search_paths]
-        config.secrets_hint     ||= app_config[:secrets_hint]
-      end
-
+      Muchkeys.configure_from_yaml(::Rails.root.join("config", "muchkeys.yml"))
       Muchkeys.populate_environment!(*Muchkeys.env_keys)
     end
   end

data/lib/muchkeys/version.rb

@@ -1,3 +1,3 @@
 module Muchkeys
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muchkeys
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Pat O'Brien
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor