dryad 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 525db97ef5566a76098259f051be94ae2c572732db0e5f18b9acceba854d2dff
-  data.tar.gz: ffa6440cbaac6a8bda53dca85e2a0a963f267c4ace9b060b35c86564b82af015
+  metadata.gz: 739e141a8bf7a1e15e275be41760a7ec3f7f4ca0e195c4dcb737e74020c6dbf0
+  data.tar.gz: 3292e6fe7eb94cc4b6c782599397bccd1ecb28ddca4f2565ee348369970c353e
 SHA512:
-  metadata.gz: 4d2f5faf15c93ed44762a61afef719d93af01480fe7deff392330c7b327a006cc69a4159ff82f0de7e5de13472f33e6270e74f4db8795df4d96af7c87d29e26c
-  data.tar.gz: fb2bb883193a16b9e6b3aab42c3c968c1e151182bde77aaad431748c6bb11395ad31e861ac011a14ccd5ecf779f3bb68dfecdba09f4ee4ab6d0adaba11bff10e
+  metadata.gz: b40ab646fc4cc3241efc6e2209da33e532d56e3ffabcf65c641b768fa80fab22d28c7393a482ac1095a15133aa6ecad728970d7b3568a5c33003d4de6f7923c9
+  data.tar.gz: 3d7e92830c098c8208a055207e4b898f8aabdb8fb1a2e5fe1cb9e40091dd8c057b1de7cf4ad5ede586d71e76814de7d2e41d9a4d86fbab15dc5e01bd8a8ed1ee

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    dryad (0.2.3)
-      dryad-cluster (= 0.2.3)
-      dryad-consul (= 0.2.3)
-      dryad-core (= 0.2.3)
-    dryad-cluster (0.2.3)
+    dryad (0.2.4)
+      dryad-cluster (= 0.2.4)
+      dryad-consul (= 0.2.4)
+      dryad-core (= 0.2.4)
+    dryad-cluster (0.2.4)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-core (= 0.2.3)
-    dryad-consul (0.2.3)
+      dryad-consul (= 0.2.4)
+      dryad-core (= 0.2.4)
+    dryad-consul (0.2.4)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.3)
-    dryad-core (0.2.3)
+      dryad-core (= 0.2.4)
+    dryad-core (0.2.4)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +20,7 @@ GEM
     concurrent-ruby (1.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
-    diplomat (2.2.4)
+    diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
     faraday (0.15.4)

data/dryad-cluster/Gemfile

@@ -2,7 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in dryad-cluster.gemspec
 gemspec
-
-group :test do
-  gem 'dryad-consul'
-end

data/dryad-cluster/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    dryad-cluster (0.2.3)
+    dryad-cluster (0.2.5)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-core (= 0.2.3)
+      dryad-consul (= 0.2.5)
+      dryad-core (= 0.2.5)
 
 GEM
   remote: https://rubygems.org/
@@ -11,13 +12,13 @@ GEM
     concurrent-ruby (1.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
-    diplomat (2.2.4)
+    diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-consul (0.2.3)
+    dryad-consul (0.2.5)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.3)
-    dryad-core (0.2.3)
+      dryad-core (= 0.2.5)
+    dryad-core (0.2.5)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)
@@ -42,7 +43,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   dryad-cluster!
-  dryad-consul
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/dryad-cluster/dryad-cluster.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dryad-core", Dryad::Cluster::VERSION
+  spec.add_dependency "dryad-consul", Dryad::Cluster::VERSION
   spec.add_dependency "concurrent-ruby", "~> 1.1", ">= 1.1.5"
 
   spec.add_development_dependency "bundler", "~> 2.0"

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

@@ -1,5 +1,7 @@
 require 'concurrent'
-require "dryad"
+require "dryad/core"
+require "dryad/consul"
+require "dryad/cluster/railtie" if defined?(Rails)
 require "dryad/cluster/version"
 require "dryad/cluster/round_robin"
 
@@ -9,10 +11,11 @@ module Dryad
     class NoServicesError < Error; end
 
     class << self
+      attr_accessor :configuration
       CLUSTERS = {}
 
       def round_robin(schema, service_name)
-        groups = ['_global_', Dryad.configuration.group]
+        groups = ['_global_', @configuration.group]
         full_name = Dryad::Core::Service.full_name(schema, service_name)
         if CLUSTERS[full_name].nil?
           CLUSTERS[full_name] = Dryad::Cluster::RoundRobin.new
@@ -28,7 +31,7 @@ module Dryad
       end
 
       def sorted_instances(service_name, schema, groups)
-        registry = Object.const_get(Dryad.configuration.registry)
+        registry = Object.const_get(@configuration.registry)
         sis = registry.service_instances(service_name, schema, groups)
         sis.sort {|a, b| "#{a.address}:#{a.port}" <=> "#{b.address}:#{b.port}"}
       end

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

@@ -0,0 +1,15 @@
+require "rails"
+require "dryad"
+
+module Dryad
+  module Cluster
+    class Railtie < Rails::Railtie
+      initializer "dryad_cluster.set_config" do
+        ActiveSupport.on_load(:dryad_cluster) do
+          Dryad::Cluster.configuration = Dryad.configuration
+        end
+      end
+    end
+  end
+  ActiveSupport.run_load_hooks(:dryad_cluster, Cluster)
+end

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

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

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

@@ -1,8 +1,13 @@
 RSpec.describe Dryad::Cluster do
   before do
-    Dryad.configure do |config|
-      config.registry = 'Dryad::Consul::ServiceRegistry'
-    end
+    config = OpenStruct.new({
+      consul: { host: "127.0.0.1", port: 8500 },
+      namespace: "growing-crm",
+      group: "staging",
+      registry: "Dryad::Consul::ServiceRegistry"
+    })
+    Dryad::Consul.configure_consul(config)
+    Dryad::Cluster.configuration = config
 
     @portal = Dryad::Core::Portal.new(
       schema: Dryad::Core::Schema::HTTP,

data/dryad-cluster/spec/spec_helper.rb

@@ -1,7 +1,5 @@
-ENV['DRYAD_CONFIG_FILE'] = File.expand_path("dummy/config/dryad.yml", __dir__)
-
 require "bundler/setup"
-require "dryad"
+require "dryad/core"
 require "dryad/consul"
 require "dryad/cluster"
 

data/dryad-consul/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.2.3)
+    dryad-consul (0.2.5)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.2.3)
+      dryad-core (= 0.2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     deep_merge (1.2.1)
     diff-lcs (1.3)
-    diplomat (2.2.4)
+    diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.2.3)
+    dryad-core (0.2.5)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

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

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

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

@@ -1,12 +1,12 @@
 require "rails"
+require "dryad"
 
 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]
+        ActiveSupport.on_load(:dryad_consul) do
+          Dryad::Consul.configure_consul(Dryad.configuration)
         end
       end
 
@@ -18,8 +18,8 @@ module Dryad
           ActiveRecord::Base.establish_connection(Rails.env.to_sym)
         rescue Dryad::Core::ConfigurationNotFound => e
           raise e
-        rescue e
-          puts e.message
+        rescue Exception => e
+          Rails.logger.warn e.message
         end
       end
     end

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

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

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

@@ -4,6 +4,8 @@ RSpec.describe Dryad::Consul do
   end
 
   it "has configured dependencies" do
+    config = OpenStruct.new({ consul: { host: "127.0.0.1", port: 8500 } })
+    Dryad::Consul.configure_consul(config)
     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.2.2)
+    dryad-core (0.2.3)
 
 GEM
   remote: https://rubygems.org/

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

@@ -1,11 +1,11 @@
-require "dryad/core/version"
-require "dryad/core/service_instance"
-require "dryad/core/service"
-require "dryad/core/portal"
-require "dryad/core/load_balancing"
-require "dryad/core/schema"
 require "dryad/core/config_desc"
 require "dryad/core/config_provider"
+require "dryad/core/load_balancing"
+require "dryad/core/portal"
+require "dryad/core/schema"
+require "dryad/core/service_instance"
+require "dryad/core/service"
+require "dryad/core/version"
 
 module Dryad
   module Core

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

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

data/dryad-core/spec/dryad/core_spec.rb

@@ -1,4 +1,13 @@
 RSpec.describe Dryad::Core do
+  it "raise configuration not found error" do
+    begin
+      raise Dryad::Core::ConfigurationNotFound, "not found config file."
+    rescue Dryad::Core::ConfigurationNotFound => e
+      expect(e).not_to be(nil)
+      expect(e.message).to eq("not found config file.")
+    end
+  end
+
   it "has a version number" do
     expect(Dryad::Core::VERSION).not_to be(nil)
   end

data/dryad-core/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require "bundler/setup"
-require "dryad"
+require "dryad/core"
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure

data/lib/dryad/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-06-04 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.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: dryad-cluster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,11 +121,11 @@ files:
 - dryad-cluster/bin/setup
 - dryad-cluster/dryad-cluster.gemspec
 - dryad-cluster/lib/dryad/cluster.rb
+- dryad-cluster/lib/dryad/cluster/railtie.rb
 - dryad-cluster/lib/dryad/cluster/round_robin.rb
 - dryad-cluster/lib/dryad/cluster/version.rb
 - dryad-cluster/spec/dryad/cluster/round_robin_spec.rb
 - dryad-cluster/spec/dryad/cluster_spec.rb
-- dryad-cluster/spec/dummy/config/dryad.yml
 - dryad-cluster/spec/spec_helper.rb
 - dryad-consul/.gitignore
 - dryad-consul/.rspec
@@ -163,7 +163,6 @@ files:
 - dryad-core/bin/console
 - dryad-core/bin/setup
 - dryad-core/dryad-core.gemspec
-- dryad-core/lib/dryad.rb
 - dryad-core/lib/dryad/core.rb
 - dryad-core/lib/dryad/core/config_desc.rb
 - dryad-core/lib/dryad/core/config_provider.rb
@@ -180,7 +179,6 @@ 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/dummy/config/dryad.yml
 - dryad-core/spec/spec_helper.rb
 - dryad.gemspec
 - lib/dryad.rb

data/dryad-cluster/spec/dummy/config/dryad.yml

@@ -1,15 +0,0 @@
-default: &default
-  consul:
-    host: localhost
-    port: 8500
-  group: staging
-  registry: Dryad::Consul::ServiceRegistry
-
-development:
-  <<: *default
-
-test:
-  <<: *default
-
-production:
-  <<: *default

data/dryad-core/lib/dryad.rb

@@ -1 +0,0 @@
-require "dryad/core"

data/dryad-core/spec/dummy/config/dryad.yml

@@ -1,15 +0,0 @@
-default: &default
-  consul:
-    host: localhost
-    port: 8500
-  group: staging
-  registry: Dryad::Consul::ServiceRegistry
-
-development:
-  <<: *default
-
-test:
-  <<: *default
-
-production:
-  <<: *default