dryad 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2940ab87fc2f8b45b3c3cd4cd8db68af37159ad71c1412c675ebed3178b28222
-  data.tar.gz: 78561f0fd81400b04547df3e835e71c35094dc64308969419b29f49d0b3bf2a7
+  metadata.gz: 525db97ef5566a76098259f051be94ae2c572732db0e5f18b9acceba854d2dff
+  data.tar.gz: ffa6440cbaac6a8bda53dca85e2a0a963f267c4ace9b060b35c86564b82af015
 SHA512:
-  metadata.gz: 603a45988fca0375328a9edc7bbf0c65ab754674619738f5bbaaa805896351775e68710d30996a12a728cd2a5196e8f6cb09e402780dc869e8d734921c3a3fc1
-  data.tar.gz: 254884b77a97fd7600c0a1bc6d7aaf683703962ce79fa99b7b59d8c82c8fdc57d7581d7308e66abe170ef3e8ea19d9d6b0ee1dade56141c7b73198dbdfc550b0
+  metadata.gz: 4d2f5faf15c93ed44762a61afef719d93af01480fe7deff392330c7b327a006cc69a4159ff82f0de7e5de13472f33e6270e74f4db8795df4d96af7c87d29e26c
+  data.tar.gz: fb2bb883193a16b9e6b3aab42c3c968c1e151182bde77aaad431748c6bb11395ad31e861ac011a14ccd5ecf779f3bb68dfecdba09f4ee4ab6d0adaba11bff10e

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    dryad (0.2.1)
-      dryad-cluster (= 0.2.1)
-      dryad-consul (= 0.2.1)
-      dryad-core (= 0.2.1)
-    dryad-cluster (0.2.1)
+    dryad (0.2.3)
+      dryad-cluster (= 0.2.3)
+      dryad-consul (= 0.2.3)
+      dryad-core (= 0.2.3)
+    dryad-cluster (0.2.3)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-core (= 0.2.1)
-    dryad-consul (0.2.1)
+      dryad-core (= 0.2.3)
+    dryad-consul (0.2.3)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.1)
-    dryad-core (0.2.1)
+      dryad-core (= 0.2.3)
+    dryad-core (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/dryad-cluster/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-cluster (0.2.1)
+    dryad-cluster (0.2.3)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-core (= 0.2.1)
+      dryad-core (= 0.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -14,10 +14,10 @@ GEM
     diplomat (2.2.4)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-consul (0.2.1)
+    dryad-consul (0.2.3)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.1)
-    dryad-core (0.2.1)
+      dryad-core (= 0.2.3)
+    dryad-core (0.2.3)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/dryad-cluster/lib/dryad/cluster/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Cluster
-    VERSION = '0.2.1'
+    VERSION = '0.2.3'
   end
 end

data/dryad-cluster/lib/dryad/cluster.rb

@@ -9,7 +9,6 @@ module Dryad
     class NoServicesError < Error; end
 
     class << self
-      REGISTRY = Object.const_get(Dryad.configuration.registry)
       CLUSTERS = {}
 
       def round_robin(schema, service_name)
@@ -29,7 +28,8 @@ module Dryad
       end
 
       def sorted_instances(service_name, schema, groups)
-        sis = REGISTRY.service_instances(service_name, schema, groups)
+        registry = Object.const_get(Dryad.configuration.registry)
+        sis = registry.service_instances(service_name, schema, groups)
         sis.sort {|a, b| "#{a.address}:#{a.port}" <=> "#{b.address}:#{b.port}"}
       end
     end

data/dryad-cluster/spec/dryad/cluster_spec.rb

@@ -1,5 +1,9 @@
 RSpec.describe Dryad::Cluster do
   before do
+    Dryad.configure do |config|
+      config.registry = 'Dryad::Consul::ServiceRegistry'
+    end
+
     @portal = Dryad::Core::Portal.new(
       schema: Dryad::Core::Schema::HTTP,
       port: 3000,

data/dryad-consul/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.2.1)
+    dryad-consul (0.2.3)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.1)
+      dryad-core (= 0.2.3)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
     diplomat (2.2.4)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.2.1)
+    dryad-core (0.2.3)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/dryad-consul/lib/dryad/consul/railtie.rb

@@ -0,0 +1,28 @@
+require "rails"
+
+module Dryad
+  module Consul
+    class Railtie < Rails::Railtie
+      initializer "dryad_consul.set_consul" do
+        ::Diplomat.configure do |config|
+          config.url = "http://#{Dryad.configuration.consul[:host]}:#{Dryad.configuration.consul[:port]}"
+          config.options = { headers: { "X-Consul-Token" => Dryad.configuration.consul[:token] } } if Dryad.configuration.consul[:token]
+        end
+      end
+
+      initializer "dryad_consul.update_active_record_connection" do
+        config.after_initialize do
+          db_path = "#{Dryad.configuration.namespace}/#{Dryad.configuration.group}/database.yml"
+          db_config = Dryad::Consul::ConfigProvider.load(db_path)
+          ActiveRecord::Base.configurations = YAML.load(ERB.new(db_config.payload).result)
+          ActiveRecord::Base.establish_connection(Rails.env.to_sym)
+        rescue Dryad::Core::ConfigurationNotFound => e
+          raise e
+        rescue e
+          puts e.message
+        end
+      end
+    end
+  end
+  ActiveSupport.run_load_hooks(:dryad_consul, Consul)
+end

data/dryad-consul/lib/dryad/consul/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Consul
-    VERSION = '0.2.1'
+    VERSION = '0.2.3'
   end
 end

data/dryad-consul/lib/dryad/consul.rb

@@ -1,5 +1,6 @@
 require "diplomat"
 require "dryad"
+require "dryad/consul/railtie" if defined?(Rails)
 require "dryad/consul/version"
 require "dryad/consul/service_client"
 require "dryad/consul/service_registry"
@@ -10,10 +11,5 @@ require "dryad/consul/config_provider"
 module Dryad
   module Consul
     class Error < StandardError; end
-
-    ::Diplomat.configure do |config|
-      config.url = "http://#{Dryad.configuration.consul[:host]}:#{Dryad.configuration.consul[:port]}"
-      config.options = { headers: { "X-Consul-Token" => Dryad.configuration.consul[:token] } } if Dryad.configuration.consul[:token]
-    end
   end
 end

data/dryad-consul/spec/dryad/consul_spec.rb

@@ -4,6 +4,6 @@ RSpec.describe Dryad::Consul do
   end
 
   it "has configured dependencies" do
-    expect(::Diplomat.configuration.url).to eq("http://localhost:8500")
+    expect(::Diplomat.configuration.url).to eq("http://127.0.0.1:8500")
   end
 end

data/dryad-core/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dryad-core (0.1.0.alpha)
+    dryad-core (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/dryad-core/lib/dryad/core/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Core
-    VERSION = '0.2.1'
+    VERSION = '0.2.3'
   end
 end

data/dryad-core/lib/dryad.rb

@@ -1,46 +1 @@
-require "dryad/configuration"
 require "dryad/core"
-require "yaml"
-require "erb"
-
-DRYAD_COFNIG_FILE = ENV["DRYAD_CONFIG_FILE"] || "config/dryad.yml"
-
-module Dryad
-  class Error < StandardError; end
-
-  class << self
-    attr_accessor :configuration
-  end
-
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
-  def self.configure
-    yield(configuration)
-  end
-
-  def self.configure_with_file
-    environment = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "default"
-    opts = YAML.load(ERB.new(File.read(DRYAD_COFNIG_FILE)).result)[environment] || Configuration::DEFAULT_OPTIONS
-
-    if opts.respond_to? :deep_symbolize_keys!
-      opts.deep_symbolize_keys!
-    else
-      symbolize_keys_deep!(opts)
-    end
-
-    @configuration = Configuration.new(opts)
-  end
-
-  private
-  def self.symbolize_keys_deep!(hash)
-    hash.keys.each do |k|
-      symkey = k.respond_to?(:to_sym) ? k.to_sym : k
-      hash[symkey] = hash.delete k
-      symbolize_keys_deep! hash[symkey] if hash[symkey].is_a? Hash
-    end
-  end
-end
-
-Dryad.configure_with_file if File.exist?(DRYAD_COFNIG_FILE)

data/dryad-core/spec/spec_helper.rb

@@ -1,10 +1,5 @@
-ENV['DRYAD_CONFIG_FILE'] = File.expand_path("dummy/config/dryad.yml", __dir__)
-
 require "bundler/setup"
-require "yaml"
-require "erb"
 require "dryad"
-require "dryad/core"
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

data/dryad.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
   spec.add_dependency "dryad-core", Dryad::VERSION
   spec.add_dependency "dryad-consul", Dryad::VERSION

data/lib/dryad/railtie.rb

@@ -0,0 +1,14 @@
+require "rails"
+
+module Dryad
+  class Railtie < Rails::Railtie
+    initializer "dryad.set_configs" do
+      ActiveSupport.on_load(:dryad) do
+        environment = ENV["RAILS_ENV"] || "default"
+        config = Dryad.load_config[environment].deep_symbolize_keys
+        Dryad.configuration = Dryad::Configuration.new(config)
+      end
+    end
+  end
+  ActiveSupport.run_load_hooks(:dryad, Core)
+end

data/lib/dryad/version.rb

@@ -1,3 +1,3 @@
 module Dryad
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

data/lib/dryad.rb

@@ -1 +1,40 @@
 require "dryad/version"
+require "dryad/configuration"
+require "dryad/core"
+require "dryad/railtie" if defined?(Rails)
+require "dryad/consul"
+require "dryad/cluster"
+
+module Dryad
+  class << self
+    attr_accessor :configuration
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def configure
+      yield(configuration)
+    end
+
+    def load_config
+      config_file = Pathname.new(Rails.root.join("config/dryad.yml"))
+
+      config = if config_file && config_file.exist?
+        require "yaml"
+        require "erb"
+        YAML.load(ERB.new(config_file.read).result) || {}
+      else
+        raise "Could not load dryad configuration. No such file - #{config_file}"
+      end
+
+      config
+    rescue Psych::SyntaxError => e
+      raise "YAML syntax error occurred while parsing #{config_file}. " \
+            "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+            "Error: #{e.message}"
+    rescue => e
+      raise e, "Cannot load dryad configuration:\n#{e.message}", e.backtrace
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dryad-core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: dryad-cluster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,7 @@ files:
 - dryad-consul/lib/dryad/consul.rb
 - dryad-consul/lib/dryad/consul/config_provider.rb
 - dryad-consul/lib/dryad/consul/key_value_client.rb
+- dryad-consul/lib/dryad/consul/railtie.rb
 - dryad-consul/lib/dryad/consul/service.rb
 - dryad-consul/lib/dryad/consul/service_client.rb
 - dryad-consul/lib/dryad/consul/service_registry.rb
@@ -163,7 +164,6 @@ files:
 - dryad-core/bin/setup
 - dryad-core/dryad-core.gemspec
 - dryad-core/lib/dryad.rb
-- dryad-core/lib/dryad/configuration.rb
 - dryad-core/lib/dryad/core.rb
 - dryad-core/lib/dryad/core/config_desc.rb
 - dryad-core/lib/dryad/core/config_provider.rb
@@ -180,11 +180,12 @@ files:
 - dryad-core/spec/dryad/core/service_instance_spec.rb
 - dryad-core/spec/dryad/core/service_spec.rb
 - dryad-core/spec/dryad/core_spec.rb
-- dryad-core/spec/dryad_spec.rb
 - dryad-core/spec/dummy/config/dryad.yml
 - dryad-core/spec/spec_helper.rb
 - dryad.gemspec
 - lib/dryad.rb
+- lib/dryad/configuration.rb
+- lib/dryad/railtie.rb
 - lib/dryad/version.rb
 homepage: https://github.com/jack0pan/dryad.rb
 licenses:
@@ -205,7 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Config Management & Service Registration and Discovery

data/dryad-core/spec/dryad_spec.rb

@@ -1,21 +0,0 @@
-RSpec.describe Dryad do
-  it "has a valid version number" do
-    expect(Dryad::Core::VERSION).not_to be(nil)
-  end
-
-  it "can be configured with config file" do
-    environment = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "default"
-    default_consul_config = YAML.load(ERB.new(File.read(ENV['DRYAD_CONFIG_FILE'])).result)[environment]["consul"]
-    expect(Dryad.configuration.consul[:host]).to eq(default_consul_config["host"])
-    expect(Dryad.configuration.consul[:port]).to eq(default_consul_config["port"])
-  end
-
-  it "can be configured with block" do
-    consul_config = { host: "block.consul.example", port: 8500 }
-    Dryad.configure do |config|
-      config.consul = consul_config
-    end
-
-    expect(Dryad.configuration.consul).to eq(consul_config)
-  end
-end