dryad-cluster 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49215a5ff2b15fae0c400f02242e8aeabea3da6d2c3362ca595a894a15e3c23e
-  data.tar.gz: 3c36c521649fd58aa1b2cf79963b35a6556a693f82e7dec984419f6638641503
+  metadata.gz: 5037b0674a12f45af60b75b602b6015d9c022f0f831f66d59ece83c5290ec9a7
+  data.tar.gz: ad2c8ecee5104327503916be66ef1a7a8ebc1529d9e531305f90fbeb9cdd2380
 SHA512:
-  metadata.gz: 6cf023db097e0c91af9d49c4be222592ce5ab7287a43743ef1158f4cc37f2697f6b5059dd802ecdf2ac6cee0fce2c0f426a5263adb11adac21a6d008da5e5497
-  data.tar.gz: 594d3f13d20523919c11543bf2db7dd7f933aabc2df314cbdb417d7d6badbb56a9c6ed84ac2c4ab59a4b002418b074221674b49732d6b90a70d44f1cb380ac20
+  metadata.gz: 78124d0349de01f2fe51b5ee57d79e83aa9cf455d2379df15b5bd882b9de8e17deaf612eff63d1f997f2a034d9adf482bce4931c782523bc584ef79895a06130
+  data.tar.gz: 50a44574a8df346f02d3996f10f7632f2e3857505f1bf2a7445413c0179603d31c244d19a5aa624c03f54dd0e5c2e66e738b3eb69a4156aad2ee766dfbd0946d

data/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/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.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/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/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/lib/dryad/cluster/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-cluster
 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,14 +16,28 @@ 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.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ files:
 - bin/setup
 - dryad-cluster.gemspec
 - lib/dryad/cluster.rb
+- lib/dryad/cluster/railtie.rb
 - lib/dryad/cluster/round_robin.rb
 - lib/dryad/cluster/version.rb
 homepage: https://github.com/jack0pan/dryad.rb