orchestration 0.4.20 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc36f50df9f55e1edf2cefa9bde6fb76bc9a9682cf4f4692f9bcd822a49abe60
-  data.tar.gz: 155fa0c6af9f37ca0c5c7e259b641ec023a3f5eb58d4cf42f217e7dc2a181b3b
+  metadata.gz: a5364dca18181a903cf48ab9e3f41a09e1701644a4761a44a4df14ae0d967840
+  data.tar.gz: '0930a75b039913e18f4fa921edaaaf42937cfd66564336cfe2068403e1ca18e5'
 SHA512:
-  metadata.gz: d851ca72e1521f2042a79ebae4486de7cb8bbafff38a5f33be243efe2a9a152e69cfbf0c0ce5fb4178fcc562e3c2a025ff2b3ef6d732d27fc21011d65ed23b7b
-  data.tar.gz: 784ec5045ad62e360258f93c7ae8b4a9adb9277a63a4b6f0c9126bf8a08869e551a459318f44de50c3a5459d689e96516f6093d2ad867667ac3cc498bc938644
+  metadata.gz: 281d9cb2713d9e172847b495702541e82a1396281a29553b820988ea5f5f66c8e772b01ee138158e73d84c719b8317167903fcbc446e746ddb6d3ede4e7568c3
+  data.tar.gz: 041ebd73730d0531d4ffd649bf2b68125b84aea3a4bfd1b5027c3c68d3451437fddd2126bec0c7958e54906ba7f9ef2cfeb388bfeec95230dc69aa39028707d6

data/README.md

@@ -35,7 +35,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.4.20'
+gem 'orchestration', '~> 0.4.21'
 ```
 
 Install:

data/lib/orchestration/services/listener/configuration.rb

@@ -11,7 +11,7 @@ module Orchestration
         end
 
         def friendly_config
-          "[#{@service_name}] #{host}:#{port}"
+          "[#{image || @service_name}] #{host}:#{port}"
         end
       end
     end

data/lib/orchestration/services/mixins/configuration_base.rb

@@ -29,6 +29,7 @@ module Orchestration
       end
 
       def host
+        return @service_name if @env.environment == 'test' && @options[:sidecar]
         return '127.0.0.1' if %w[test development].include?(@env.environment)
 
         @service_name
@@ -42,15 +43,23 @@ module Orchestration
         false
       end
 
+      def image
+        service['image']
+      end
+
       def port
         return @env.app_port if @service_name == 'app'
 
-        service = @env.docker_compose_config
-                      .fetch('services')
-                      .fetch(@service_name)
+        local, remote = parse_port(service).map(&:to_i)
+        return remote if @env.environment == 'test' && @options[:sidecar]
+
+        (@env.environment == 'production' ? remote : local)
+      end
 
-        local, remote = parse_port(service)
-        (@env.environment == 'production' ? remote : local).to_i
+      def service
+        @service ||= @env.docker_compose_config
+                         .fetch('services')
+                         .fetch(@service_name)
       end
 
       def parse_port(service)

data/lib/orchestration/services/mixins/healthcheck_base.rb

@@ -37,7 +37,8 @@ module Orchestration
 
       def initialize(env, service_name = nil, options = {})
         @options = options
-        @configuration = configuration_class.new(env, service_name, options)
+        @options[:sidecar] = options[:sidecar] && !options[:sidecar].empty?
+        @configuration = configuration_class.new(env, service_name, @options)
       end
 
       def service_name

data/lib/orchestration/templates/orchestration.mk.erb

@@ -309,7 +309,7 @@ endif
 ## Generic Listener healthcheck for TCP services ##
 
 wait-listener:
-	@${rake} orchestration:listener:wait service=${service}
+	@${rake} orchestration:listener:wait service=${service} sidecar=${sidecar}
 
 ## Test/development wait commands
 

data/lib/orchestration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orchestration
-  VERSION = '0.4.20'
+  VERSION = '0.4.21'
 end

data/lib/tasks/orchestration.rake

@@ -55,7 +55,8 @@ namespace :orchestration do
     desc I18n.t('orchestration.rake.listener.wait')
     task :wait do
       Orchestration::Services::Listener::Healthcheck.start(
-        nil, nil, service_name: ENV.fetch('service')
+        nil, nil, service_name: ENV.fetch('service'),
+                  sidecar: ENV['sidecar']
       )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.21
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url