dryad 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aa0959a2ba9d45a628ad86863e1a996b5acdf76ebb4f3b35dd26af8e5bfa166
-  data.tar.gz: 0ccfcff2f13a96b2fece1b464f5f46c0a72e6dec1bd2c16c4c9e815a2b71fbe0
+  metadata.gz: 2940ab87fc2f8b45b3c3cd4cd8db68af37159ad71c1412c675ebed3178b28222
+  data.tar.gz: 78561f0fd81400b04547df3e835e71c35094dc64308969419b29f49d0b3bf2a7
 SHA512:
-  metadata.gz: ece57d341bd12a3d76452e81aff1ad944a4d7a9a6ce83d0ca49e996bd28b1ac887e8e4ffdbbcb425382870644747946aae59d9a5c72469a714a8b89bcb98cb31
-  data.tar.gz: d8d33833813226d79c82bcc4772114fd1ec7cd19f85da4d647ae2d6b2f54f151c803ea1989564a296193701d018eb18d5f183c4640c6267534411d35c3f13746
+  metadata.gz: 603a45988fca0375328a9edc7bbf0c65ab754674619738f5bbaaa805896351775e68710d30996a12a728cd2a5196e8f6cb09e402780dc869e8d734921c3a3fc1
+  data.tar.gz: 254884b77a97fd7600c0a1bc6d7aaf683703962ce79fa99b7b59d8c82c8fdc57d7581d7308e66abe170ef3e8ea19d9d6b0ee1dade56141c7b73198dbdfc550b0

data/Gemfile.lock

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

data/dryad-cluster/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-cluster (0.1.1)
+    dryad-cluster (0.2.1)
       concurrent-ruby (~> 1.1, >= 1.1.5)
-      dryad-core (= 0.1.1)
+      dryad-core (= 0.2.1)
 
 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.1.1)
+    dryad-consul (0.2.1)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.1.1)
-    dryad-core (0.1.1)
+      dryad-core (= 0.2.1)
+    dryad-core (0.2.1)
     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.0'
+    VERSION = '0.2.1'
   end
 end

data/dryad-consul/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.1.1)
+    dryad-consul (0.2.1)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.1.1)
+      dryad-core (= 0.2.1)
 
 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.1.1)
+    dryad-core (0.2.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

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

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

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

@@ -13,6 +13,7 @@ module Dryad
 
     ::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

@@ -1,7 +1,6 @@
 RSpec.describe Dryad::Consul do
   it "has a version number" do
-    version = File.read(File.expand_path("../../../DRYAD_VERSION", __dir__)).strip
-    expect(Dryad::Consul::VERSION).to eq(version)
+    expect(Dryad::Consul::VERSION).not_to be(nil)
   end
 
   it "has configured dependencies" do

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

@@ -1,10 +1,10 @@
 module Dryad
   class Configuration
-    attr_accessor :consul, :namespace, :group, :registry, :service
+    attr_accessor :consul, :namespace, :group, :registry, :provider, :service
 
     DEFAULT_OPTIONS = {
       consul: {
-        host: 'localhost',
+        host: '127.0.0.1',
         port: 8500
       },
       service: {}
@@ -16,6 +16,7 @@ module Dryad
       @namespace = opts[:namespace]
       @group = opts[:group]
       @registry = opts[:registry]
+      @provider = opts[:provider]
       @service = opts[:service]
     end
   end

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

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

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

@@ -1,6 +1,5 @@
 RSpec.describe Dryad::Core do
   it "has a version number" do
-    version = File.read(File.expand_path("../../../DRYAD_VERSION", __dir__)).strip
-    expect(Dryad::Core::VERSION).to eq(version)
+    expect(Dryad::Core::VERSION).not_to be(nil)
   end
 end

data/dryad-core/spec/dryad_spec.rb

@@ -1,7 +1,6 @@
 RSpec.describe Dryad do
   it "has a valid version number" do
-    version = File.read(File.expand_path("../../DRYAD_VERSION", __dir__)).strip
-    expect(Dryad::Core::VERSION).to eq(version)
+    expect(Dryad::Core::VERSION).not_to be(nil)
   end
 
   it "can be configured with config file" do

data/dryad.gemspec

@@ -1,9 +1,11 @@
 
-version = File.read(File.expand_path("DRYAD_VERSION", __dir__)).strip
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "dryad/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "dryad"
-  spec.version       = version
+  spec.version       = Dryad::VERSION
   spec.authors       = ["Pan Jie"]
   spec.email         = ["panjie@growingio.com"]
 
@@ -18,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  spec.add_dependency "dryad-core", version
-  spec.add_dependency "dryad-consul", version
-  spec.add_dependency "dryad-cluster", version
+  spec.add_dependency "dryad-core", Dryad::VERSION
+  spec.add_dependency "dryad-consul", Dryad::VERSION
+  spec.add_dependency "dryad-cluster", Dryad::VERSION
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dryad/version.rb

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

data/lib/dryad.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-05-31 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.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: dryad-consul
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: dryad-cluster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- DRYAD_VERSION
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -185,6 +184,8 @@ files:
 - dryad-core/spec/dummy/config/dryad.yml
 - dryad-core/spec/spec_helper.rb
 - dryad.gemspec
+- lib/dryad.rb
+- lib/dryad/version.rb
 homepage: https://github.com/jack0pan/dryad.rb
 licenses:
 - MIT

data/DRYAD_VERSION

@@ -1 +0,0 @@
-0.2.0