orchestration 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99bdeb106830843d2a0e600151a4d80b411d21e86f25010d6c2379810ef85273
-  data.tar.gz: 4b3828ec78541d1680d3e5749c0a2e428bed328313d17e13d3f4e0dc1bdb0e8b
+  metadata.gz: 22c01beaeb79e418062c87c7d0d8d9fdc472cc479c16a47d9be01ca0278abc04
+  data.tar.gz: 78ad03978e9fcdb0ebf9cf1a02af1395dc356cdf5dac048eb06ab741396f4166
 SHA512:
-  metadata.gz: 0e5a03e78c1e442daa079a5d92540df52a148b7ea08b8fa3ecd55919d045e7fc239d5638d8a850565044b9c1d7065b39c4401a72db0daef0d299c622e86ee02f
-  data.tar.gz: e2061ef7628599f65c05d28380376ef841a329f85408c2dfa84172907ada7392dc0ba556b01a6559f3869b1f7b6809304615ebe91a9970e71adc31d04a0e82ed
+  metadata.gz: 94d8bdc996d37ae9b51bfd3a44f945e0f30b466d3bebb753b535c9e63558962d0661905fd4690677e946789bef76d9276f7047c4c990e7d9cfe6518b584e752f
+  data.tar.gz: 9f785e2f76dac85f01c36db3fbc3d24724e52e4f36aaffe95f388e782b98b0d6f351b173383a42950405b3fe427901c4ba49c5a6e64d61f0b88c385e0a581393

data/README.md

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

data/lib/orchestration/docker_compose/app_service.rb

@@ -3,6 +3,8 @@
 module Orchestration
   module DockerCompose
     class AppService
+      include ComposeHelpers
+
       def initialize(config, environment)
         @environment = environment
         @config = config
@@ -89,10 +91,6 @@ module Orchestration
         }
       end
 
-      def networks
-        { 'local' => {} }
-      end
-
       def environment
         {
           'RAILS_LOG_TO_STDOUT' => '1',

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -42,6 +42,8 @@ module Orchestration
         ports(name).find { |mapping| mapping[:remote] == remote_port }
                    .fetch(:local)
                    .to_i
+      rescue NoMethodError
+        nil
       end
 
       private

data/lib/orchestration/docker_compose/compose_helpers.rb

@@ -13,6 +13,12 @@ module Orchestration
         # "3306" (docker will use an ephemeral host port which we will not use)
         "${sidecar-#{port}:}"
       end
+
+      def networks
+        service = self.class.name.rpartition('::').last.partition('Service').first.downcase
+        network_alias = %i[development test].include?(@environment) ? service : "#{service}-local"
+        { 'local' => { 'aliases' => [network_alias] } }
+      end
     end
   end
 end

data/lib/orchestration/docker_compose/database_service.rb

@@ -33,12 +33,6 @@ module Orchestration
         adapter.default_port
       end
 
-      def networks
-        return {} unless @environment == :deployment
-
-        { 'local' => { 'aliases' => ['database-local'] } }
-      end
-
       def ports
         return {} unless %i[development test].include?(@environment)
 

data/lib/orchestration/docker_compose/mongo_service.rb

@@ -15,7 +15,7 @@ module Orchestration
       def definition
         return nil unless @config.enabled?
 
-        { 'image' => 'library/mongo' }.merge(ports).merge(volumes)
+        { 'image' => 'library/mongo', 'networks' => networks }.merge(ports).merge(volumes)
       end
 
       private

data/lib/orchestration/docker_compose/rabbitmq_service.rb

@@ -13,7 +13,7 @@ module Orchestration
       def definition
         return nil unless @config.enabled?
 
-        { 'image' => 'library/rabbitmq:management' }.merge(ports)
+        { 'image' => 'library/rabbitmq:management', 'networks' => networks }.merge(ports)
       end
 
       def ports

data/lib/orchestration/make/orchestration.mk

@@ -214,7 +214,7 @@ start: _create-log-directory _clean-logs
 ifneq (,${compose_services})
 	@$(call system,${compose_human} up --detach)
 ifeq (${env},$(filter ${env},test development))
-	${compose} up --detach --force-recreate --renew-anon-volumes --remove-orphans ${services} ${log} || ${exit_fail}
+	@${compose} up --detach --force-recreate --renew-anon-volumes --remove-orphans ${services} ${log} || ${exit_fail}
 	@[ -n '${sidecar}' ] && \
          ( \
            $(call echo,(joining dependency network ${cyan}${network}${reset})) ; \

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

@@ -30,11 +30,8 @@ post-setup:
 # Launch all dependencies needed for a development environment and set up the
 # development database.
 #
-.PHONY: setup
+.PHONY: develop
 develop:
 	bundle install
-	@$(MAKE) start env=test
-	@$(MAKE) start env=development
-	bundle exec rake db:create
-	bundle exec rake db:migrate
-	bundle exec rake db:seed
+	@$(MAKE) setup env=test
+	@$(MAKE) setup env=development

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url