orchestration 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3265e0faa40fac54e9e684952a390165dc06da0c5e3d9afbacbfb720a4e829a9
-  data.tar.gz: 0f458afd34c415f79aa4d93d0abbfa8213bff1b2ad4fe2efb8abd1af870e9081
+  metadata.gz: d8603abb707884b67824a5f71c402bff863e53a812be3172cfeb4e9229d448d5
+  data.tar.gz: 9b7cc45a5c9abec3fec6b6e09101dd8f04c9c1dbf54ce7e0b280942345fe5a6d
 SHA512:
-  metadata.gz: fda5849834e82a0c28731244aacf2737188316159aca07a430eed870cefb2563633e95529b157f27f730ae20fe060d9cfcc41854a74471e5f05533961b01c42c
-  data.tar.gz: 7516092d74f95892d476c22c6f6157ab6ab7352f201ef30c4995a3a3fa114393bdf5989712c83a107516c42d1a16b1c7519581419980d2adc83b8b1865b3918a
+  metadata.gz: d51f959f91e6d740fa6491037561364035ec489131003877f973a1ce3827c1baba24e96f533cbce9e146b5fd30b89e8b8d0b79aec81e543d26f0b27d7711f6c6
+  data.tar.gz: a59cf9b833da91425f07c4cc798e2f0949a6fe01ff06f77fed9bfb5c1bce8f2c7f4b97f2b9f2d562d0cd5f262b43a3291cc66e7293d282bff6ffaa90f9a7b2e7

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.13'
+gem 'orchestration', '~> 0.4.14'
 ```
 
 Install:

data/lib/orchestration/docker_compose/compose_helpers.rb

@@ -11,7 +11,7 @@ module Orchestration
         # "50123:3306"
         # otherwise it will be:
         # "3306" (docker will use an ephemeral host port which we will not use)
-        "${#{port}\:-sidecar}"
+        "${sidecar-#{port}:}"
       end
     end
   end

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

@@ -45,16 +45,24 @@ module Orchestration
       def port
         return @env.app_port if @service_name == 'app'
 
-        local, _, remote = @env.docker_compose_config
-                               .fetch('services')
-                               .fetch(@service_name)
-                               .fetch('ports')
-                               .first
-                               .partition(':')
+        service = @env.docker_compose_config
+                      .fetch('services')
+                      .fetch(@service_name)
 
+        local, remote = parse_port(service)
         (@env.environment == 'production' ? remote : local).to_i
       end
 
+      def parse_port(service)
+        # Remove our sidecar variable for easier parsing
+        # '{sidecar-27018:}27017' => '27018:27017'
+        local, _, remote = service.fetch('ports')
+                                  .first
+                                  .sub(/\${sidecar-(\d+):}/, '\1:')
+                                  .partition(':')
+        [local, remote]
+      end
+
       def yaml(content)
         # Whitelist `Symbol` and permit aliases:
         YAML.safe_load(content, [Symbol], [], true)

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

@@ -17,20 +17,18 @@ module Orchestration
         end
 
         def host
-          return from_url['host'] unless @env.rabbitmq_url.nil?
-
-          super
+          from_url['host'] || super
         end
 
         def port
-          return from_url['port'] unless @env.rabbitmq_url.nil?
-
-          super
+          from_url['port'] || super
         end
 
         private
 
         def from_url
+          return {} if @env.rabbitmq_url.nil?
+
           uri = URI.parse(@env.rabbitmq_url)
           { 'host' => uri.host, 'port' => uri.port || 5672 }
         end

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url