dryad 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d9594581141bcb13f995274f1c0595bfc9a8c484f3771c93ca670f5d2ccb307
-  data.tar.gz: 0daaea2d4d0ae211b295e95f00102454301c895472100b17bd7bfa75ed205139
+  metadata.gz: 0aa0959a2ba9d45a628ad86863e1a996b5acdf76ebb4f3b35dd26af8e5bfa166
+  data.tar.gz: 0ccfcff2f13a96b2fece1b464f5f46c0a72e6dec1bd2c16c4c9e815a2b71fbe0
 SHA512:
-  metadata.gz: a849308bd935c9baff26091a94285f4856196db8e376c64b16f57bfed4274dfbc82f5f2492574f5b545a08872e48ef60dbe1b3afc1a7dbeb4c93af9d5b773fb0
-  data.tar.gz: 70bf1b581b64e1924cb340620b8e93a556ea8d1a0465eb83f641bdc1cdf966241717260bfcc0ae6e37d39aedd80d7b4c30e543eb5b12d0ffb6f226586455f2e9
+  metadata.gz: ece57d341bd12a3d76452e81aff1ad944a4d7a9a6ce83d0ca49e996bd28b1ac887e8e4ffdbbcb425382870644747946aae59d9a5c72469a714a8b89bcb98cb31
+  data.tar.gz: d8d33833813226d79c82bcc4772114fd1ec7cd19f85da4d647ae2d6b2f54f151c803ea1989564a296193701d018eb18d5f183c4640c6267534411d35c3f13746

data/DRYAD_VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

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

@@ -1,10 +1,5 @@
 module Dryad
   module Cluster
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 1
-    PRE   = nil
-  
-    VERSION = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+    VERSION = '0.2.0'
   end
 end

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

@@ -0,0 +1,16 @@
+module Dryad
+  module Consul
+    class ConfigProvider < Dryad::Core::ConfigProvider
+      class << self
+        def load(path, listener = nil)
+          config = Dryad::Consul::KeyValueClient.get(path)
+          if config.nil?
+            raise Dryad::Core::ConfigurationNotFound, path
+          else
+            Dryad::Core::ConfigDesc.new(path, config.Value, config.ModifyIndex)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require "ostruct"
+
+module Dryad
+  module Consul
+    class KeyValueClient
+      class << self
+
+        # Get a value by its key, potentially blocking for the first or next value
+        # @param key [String] the key
+        # @return [OpenStruct] The base64-decoded value associated with the key
+        def get(path)
+          OpenStruct.new ::Diplomat::Kv.get(path, decode_values: true).first
+        rescue Diplomat::KeyNotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,5 @@
 module Dryad
   module Consul
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 1
-    PRE   = nil
-  
-    VERSION = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+    VERSION = '0.2.0'
   end
 end

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

@@ -4,6 +4,8 @@ require "dryad/consul/version"
 require "dryad/consul/service_client"
 require "dryad/consul/service_registry"
 require "dryad/consul/service"
+require "dryad/consul/key_value_client"
+require "dryad/consul/config_provider"
 
 module Dryad
   module Consul

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

@@ -0,0 +1,18 @@
+RSpec.describe Dryad::Consul::ConfigProvider do
+  before do
+    @key = "path/of/key"
+    @value = "value of key"
+    ::Diplomat::Kv.put(@key, @value)
+  end
+
+  after do
+    ::Diplomat::Kv.delete(@key)
+  end
+
+  it "load configuration with path" do
+    cd = Dryad::Consul::ConfigProvider.load(@key)
+    expect(cd.path).to eq(@key)
+    expect(cd.payload).to eq(@value)
+    expect(cd.version).to be > 0
+  end
+end

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

@@ -0,0 +1,22 @@
+RSpec.describe Dryad::Consul::KeyValueClient do
+  before do
+    @key = "path/of/key"
+    @value = "value of key"
+    ::Diplomat::Kv.put(@key, @value)
+  end
+
+  after do
+    ::Diplomat::Kv.delete(@key)
+  end
+
+  it "gets value with index" do
+    response = Dryad::Consul::KeyValueClient.get(@key)
+    expect(response.Value).to eq(@value)
+    expect(response.ModifyIndex).to be >= response.CreateIndex
+  end
+
+  it "gets value the key which is not existed" do
+    response = Dryad::Consul::KeyValueClient.get('key')
+    expect(response).to be nil
+  end
+end

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

@@ -0,0 +1,13 @@
+module Dryad
+  module Core
+    class ConfigDesc
+      attr_accessor :path, :payload, :version
+
+      def initialize(path, payload, version)
+        @path = path
+        @payload = payload
+        @version = version
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Dryad
+  module Core
+    class ConfigProvider
+      def load
+        raise "Implement this method"
+      end
+    end
+  end
+end

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

@@ -1,10 +1,5 @@
 module Dryad
   module Core
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 1
-    PRE   = nil
-  
-    VERSION = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+    VERSION = '0.2.0'
   end
 end

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

@@ -4,9 +4,12 @@ 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"
 
 module Dryad
   module Core
     class Error < StandardError; end
+    class ConfigurationNotFound < Error; end
   end
 end

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

@@ -0,0 +1,11 @@
+RSpec.describe Dryad::Core::ConfigDesc do
+  it "can be created and accessed" do
+    path = 'path/to/key'
+    payload = 'payload for path'
+    version = 1
+    cd = Dryad::Core::ConfigDesc.new(path, payload, version)
+    expect(cd.path).to eq(path)
+    expect(cd.payload).to eq(payload)
+    expect(cd.version).to eq(version)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2019-05-29 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.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: dryad-cluster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,10 +139,14 @@ files:
 - dryad-consul/bin/setup
 - dryad-consul/dryad-consul.gemspec
 - 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/service.rb
 - dryad-consul/lib/dryad/consul/service_client.rb
 - dryad-consul/lib/dryad/consul/service_registry.rb
 - dryad-consul/lib/dryad/consul/version.rb
+- dryad-consul/spec/dryad/consul/config_provider_spec.rb
+- dryad-consul/spec/dryad/consul/key_value_client_spec.rb
 - dryad-consul/spec/dryad/consul/service_client_spec.rb
 - dryad-consul/spec/dryad/consul/service_registry_spec.rb
 - dryad-consul/spec/dryad/consul/service_spec.rb
@@ -162,12 +166,15 @@ files:
 - 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
 - dryad-core/lib/dryad/core/load_balancing.rb
 - dryad-core/lib/dryad/core/portal.rb
 - dryad-core/lib/dryad/core/schema.rb
 - dryad-core/lib/dryad/core/service.rb
 - dryad-core/lib/dryad/core/service_instance.rb
 - dryad-core/lib/dryad/core/version.rb
+- dryad-core/spec/dryad/core/config_desc_spec.rb
 - dryad-core/spec/dryad/core/load_balancing_spec.rb
 - dryad-core/spec/dryad/core/portal_spec.rb
 - dryad-core/spec/dryad/core/schema_spec.rb