ruby_eureka 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1875fd7a6c301426bffec920bb6b226c7a6edbe
-  data.tar.gz: de7a746ac5d82d2e467f90cb2b505911ddfae58d
+  metadata.gz: 0bf87fcaf9dd300df93f7c440af812db8f37ba63
+  data.tar.gz: 02535e322400c3be8e2c2c69dea494af6060b01a
 SHA512:
-  metadata.gz: 78e0abca602b6f165006d6c8c5bbcf02b96e3a6384921d53d2f0d433a2a5cfa8e46a20e6af1bb8f7e1bfaa2dd6bc8b559b8fe6d73c411d9fca94e90e510c4c89
-  data.tar.gz: d895d135fc294592909b98350b24d912d0cbdeb5f274120e67c5eb82354c5364ab29e12a3914107903f04f8aa61f3e6142f84119339e93c5de3ac157a76754ad
+  metadata.gz: '093d1ed1e44da7e4cd7885a2f3e72a719a4d00940356ccc71275f701e76dc7394c461389c05a6ebf56c9e134840e4fd8fcbc9dcd4977e5fd6d934ebb1e868759'
+  data.tar.gz: 4122c206a08d707d6b00d1e99f9feb9e9733eb7964d06154248af662d02038d56ce05b3f639f08a0c34ab130257713b78203cb732f5507a1ede0bc52675a5cbe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_eureka (0.0.3)
+    ruby_eureka (0.0.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'ruby-eureka'
+gem 'ruby_eureka'
 ```
 
 And then execute:
@@ -28,6 +28,7 @@ Create YAML config files config/eureka_sidecar.yml
       port: 3000 (Optional default to 3000)
     sidecar:
       port: 9091 (Optional default to 9090)
+      instance_id: service-a:9091 (Optional, required when register multiple instances of the same service)
 
 Run the bundle exec command from the application root directory
 

data/bin/sidecar

@@ -10,8 +10,9 @@ opt = YAML.load(ERB.new(IO.read('config/eureka_sidecar.yml')).result) || opts
 Eureka.setup do |config|
   config.side_app_name = opt['eureka']['service_name']
   config.eureka_url    = opt['eureka']['url']
-  config.app_port      = opt['service']['port'] if opt['service'] && opt['service']['port']
-  config.sidecar_port  = opt['sidecar']['port'] if opt['sidecar'] && opt['sidecar']['port']
+  config.app_port      = opt['service']['port']        if opt['service'] && opt['service']['port']
+  config.sidecar_port  = opt['sidecar']['port']        if opt['sidecar'] && opt['sidecar']['port']
+  config.instance_id   = opt['sidecar']['instance_id'] if opt['sidecar'] && opt['sidecar']['instance_id']
 end
 
 begin

data/lib/eureka.rb

@@ -49,12 +49,21 @@ module Eureka
     @sidecar_port = sidecar_port
   end
 
+  def self.instance_id
+    @instance_id
+  end
+
+  def self.instance_id=(instance_id)
+    @instance_id = instance_id
+  end
+
   # Default way to set up Euraka
   def self.setup
     yield self
   end
 
   def self.reset
+    @instance_id = nil
     @side_app_name = nil
     @eureka_url = nil
     @jar = 'bin/sidecar-1.0.jar'

data/lib/eureka/execute.rb

@@ -15,15 +15,19 @@ module Eureka
       end
 
       def options
-        %w[jar_path side_app_name eureka_url app_port sidecar_port].map do |option|
+        %w[jar_path side_app_name eureka_url app_port sidecar_port instance_id].map do |option|
           send(option)
-        end.join(' ')
+        end.select{ |option| !option.to_s.strip.empty? }.join(' ')
       end
 
       def jar_path
         Eureka.jar
       end
 
+      def instance_id
+        "--instance-id=#{Eureka.instance_id}" if Eureka.instance_id
+      end
+
       def sidecar_port
         "--sidecar-port=#{Eureka.sidecar_port}"
       end

data/lib/eureka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eureka
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_eureka
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jianbo Cui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-11 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler