orchestration 0.5.8 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68a281672878086f5ebc086998c3e37aba04dabaff40b6d677144e59ee6ca4a
-  data.tar.gz: f601425345ad35f9b0e5478e62901fbddf91261b3f2f36071d07e365664ec794
+  metadata.gz: 037e3ae31fd0262ecde552e105f6313346a790cd8a0325d5162343352c9e972a
+  data.tar.gz: '057219101c53b9046d4b3d5e56c8ee8232aa12bcac73e33aa13e60bf5c831b22'
 SHA512:
-  metadata.gz: f33f122d8098d2eae2157e94e6c65b2b548d752d1339ab1f83170913264e09b01b2db8e835b5fbee8c48a1cad346622ca4875d0d253f5f0d946801164288a8f2
-  data.tar.gz: a34869f47a254f369ca41d487bc13186e367f4671c22d02d503f0a1b8f86557ce26faa712c7dff9db5f44ff7ab01cadbbc579b04670366fc17b986d8f2458d5f
+  metadata.gz: 7e678adc9b3ec89927df730b2f18e6a32dd3da17c84c6dfb77926309523854b7abfa8d29422b00fce976ec269dc48285bded35c3995004d71cca56328d73223f
+  data.tar.gz: 4f25a1bbb55d3bda4df651045f9919de417e9c8eada7cbcd6b5c00ce77308db3793b019e2b1a102771c73c2c878c032c5ac0cb75d0f8de9b7d1de3da5fb59471

data/README.md

@@ -27,7 +27,7 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 Add _Orchestration_ to your Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.5.8'
+gem 'orchestration', '~> 0.5.13'
 ```
 
 Install:
@@ -191,12 +191,20 @@ make serve server='-p 3001 -b 192.168.0.1'
 A default `test` target is provided in your application's main `Makefile`. You are encouraged to modify this target to suit your application's requirements.
 
 To launch all dependency containers, run database migrations, and run tests:
-```
+```bash
 make test
 ```
 
-If you prefer to run tests manually (e.g. if you want to run tests for a specific file) then the `test-setup` target can be used:
+The default `test` command can (and should) be extended. This command is defined in the root `Makefile` in the project and, by defaults, runs `rspec` and `rubocop`.
+
+To run only the `test` command, without test setup (i.e. without restarting containers etc.), pass the `light` option:
+
+```bash
+make test light=1
 ```
+
+If you prefer to run tests manually (e.g. if you want to run tests for a specific file) then the `test-setup` target can be used:
+```bash
 make test-setup
 bundle exec rspec spec/my_class_spec.rb
 ```
@@ -394,12 +402,15 @@ _Orchestration_ generates the following `config/rabbitmq.yml`:
 ```
 development:
   url: amqp://127.0.0.1:51070
+  management_url: http://127.0.0.1:5069
 
 test:
   url: amqp://127.0.0.1:51068
+  management_url: http://127.0.0.1:5067
 
 production:
   url: <%= ENV['RABBITMQ_URL'] %>
+  management_url: <%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
 ```
 
 Using this approach, the environment variable `RABBITMQ_URL` can be used to configure _Bunny_ in production (similar to `DATABASE_URL` and `MONGO_URL`).

data/lib/orchestration/docker_compose/app_service.rb

@@ -100,7 +100,13 @@ module Orchestration
           'WEB_PRELOAD_APP' => '1',
           'WEB_HEALTHCHECK_PATH' => '/',
           'DATABASE_URL' => database_url
-        }.merge(Hash[inherited_environment.map { |key| [key, nil] }])
+        }.merge(inherited_environment.map { |key| [key, nil] }.to_h).merge(rabbitmq_urls)
+      end
+
+      def rabbitmq_urls
+        return {} unless Services::RabbitMQ::Configuration.new(Environment.new).enabled?
+
+        { 'RABBITMQ_URL' => 'amqp://rabbitmq:5672', 'RABBITMQ_MANAGEMENT_URL' => 'http://rabbitmq:15672' }
       end
 
       def database_url

data/lib/orchestration/docker_compose/configuration.rb

@@ -14,7 +14,7 @@ module Orchestration
       end
 
       def services
-        Hash[services_enabled]
+        services_enabled.to_h
       end
 
       def volumes
@@ -62,6 +62,7 @@ module Orchestration
           .fetch(service)
           .new(config, @environment)
           .definition
+          &.tap { |definition| definition['networks'] ||= { 'local' => {} } }
       end
     end
   end

data/lib/orchestration/docker_compose/install_generator.rb

@@ -42,7 +42,7 @@ module Orchestration
           'version' => compose_config(environment).version,
           'services' => services(environment),
           'volumes' => volumes(environment),
-          'networks' => networks(environment)
+          'networks' => compose_config(environment).networks
         }
       end
 
@@ -56,17 +56,11 @@ module Orchestration
         compose_config(environment).volumes
       end
 
-      def networks(environment)
-        return {} unless environment == :production
-
-        compose_config(environment).networks
-      end
-
       def compose_config(environment)
         DockerCompose::Configuration.new(
           @env,
           environment,
-          Hash[configurations(environment)]
+          configurations(environment).to_h
         )
       end
 

data/lib/orchestration/docker_compose/rabbitmq_service.rb

@@ -13,15 +13,17 @@ module Orchestration
       def definition
         return nil unless @config.enabled?
 
-        { 'image' => 'library/rabbitmq' }.merge(ports)
+        { 'image' => 'library/rabbitmq:management' }.merge(ports)
       end
 
       def ports
         return {} unless %i[development test].include?(@environment)
 
         container_port = Orchestration::Services::RabbitMQ::PORT
+        management_port = Orchestration::Services::RabbitMQ::MANAGEMENT_PORT
 
-        { 'ports' => ["#{sidecar_port(@environment)}#{container_port}"] }
+        { 'ports' => ["#{sidecar_port(@environment)}#{container_port}",
+                      "#{sidecar_port(@environment)}#{management_port}"] }
       end
     end
   end

data/lib/orchestration/environment.rb

@@ -129,7 +129,7 @@ module Orchestration
     def docker_filter(string)
       # Filter out characters not accepted by Docker Hub
       permitted = [('0'..'9'), ('a'..'z')].map(&:to_a).flatten
-      string.split('').select { |char| permitted.include?(char) }.join
+      string.chars.select { |char| permitted.include?(char) }.join
     end
   end
 end

data/lib/orchestration/errors.rb

@@ -4,7 +4,9 @@ module Orchestration
   class OrchestrationError < StandardError; end
 
   class HTTPConnectionError < OrchestrationError; end
+
   class DatabaseConfigurationError < OrchestrationError; end
+
   class MongoConfigurationError < OrchestrationError; end
 
   class UnknownEnvironmentError < DatabaseConfigurationError; end

data/lib/orchestration/services/database/adapters/mysql2.rb

@@ -10,7 +10,7 @@ module Orchestration
           end
 
           def image
-            return mysql5_7 if gem_version < Gem::Version.new('0.4')
+            return mysql57 if gem_version < Gem::Version.new('0.4')
 
             'library/mysql'
           end
@@ -43,7 +43,7 @@ module Orchestration
 
           private
 
-          def mysql5_7
+          def mysql57
             'library/mysql:5.7'
           end
 

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

@@ -15,7 +15,7 @@ module Orchestration
         def friendly_config
           return "[#{adapter.name}]" if sqlite?
 
-          "[#{adapter.name}] #{host}:#{port}"
+          "[#{adapter.name}] #{adapter.name}://#{username}:#{password}@#{host}:#{port}/#{database}"
         end
 
         def settings(healthcheck: false)
@@ -82,37 +82,31 @@ module Orchestration
         end
 
         def host
-          url_config['host'] || file_config['host'] || super
+          chained_config('host') || super
         end
 
         def port
           return nil if sqlite?
 
-          url_config['port'] || file_config['port'] || super
+          chained_config('port') || super
         end
 
         def username
-          (
-            url_config['username'] ||
-            file_config['username'] ||
-            (adapter && adapter.credentials['username'])
-          )
+          chained_config('username') || (adapter && adapter.credentials['username'])
         end
 
         def password
-          (
-            url_config['password'] ||
-            file_config['password'] ||
-            (adapter && adapter.credentials['password'])
-          )
+          chained_config('password') || (adapter && adapter.credentials['password'])
         end
 
         def database
-          (
-            url_config['database'] ||
-            file_config['database'] ||
-            (adapter && adapter.credentials['database'])
-          )
+          chained_config('database') || (adapter && adapter.credentials['database'])
+        end
+
+        def chained_config(key)
+          return url_config[key] || file_config[key] if @env.environment == 'test'
+
+          file_config[key] || url_config[key]
         end
 
         def adapter_by_name(name)

data/lib/orchestration/services/rabbitmq.rb

@@ -4,6 +4,7 @@ module Orchestration
   module Services
     module RabbitMQ
       PORT = 5672
+      MANAGEMENT_PORT = 15_672
     end
   end
 end

data/lib/orchestration/templates/env.erb

@@ -2,5 +2,3 @@
 # e.g.:
 #
 # DISABLE_SPRING=1
-
-PUBLISH_PORT=3000

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

@@ -112,7 +112,7 @@ all: build
 
 .PHONY: start
 ifndef network
-start: network := ${compose_project_name}_default
+start: network := ${compose_project_name}
 endif
 start: _create-log-directory _clean-logs
 	@$(call print,'${yellow}Starting ${cyan}${env}${yellow} containers${reset} ...')
@@ -144,7 +144,7 @@ start-<%= service %>:
 <% end %>
 
 .PHONY: stop
-stop: network := ${compose_project_name}_default
+stop: network := ${compose_project_name}
 stop:
 	@$(call print,'${yellow}Stopping ${cyan}${env}${yellow} containers${reset} ...')
 	@if docker ps --format "{{.ID}}" | grep -q $(shell hostname) ; \
@@ -238,7 +238,6 @@ ifndef verbose
           $(call hr,${red}) ; \
         )
 endif
-ifneq (,$(findstring deploy,$(MAKECMDGOALS)))
 	@echo ; \
         $(call hr,${yellow}) ; \
         $(call println,'${gray}docker-compose logs${reset}') ; \
@@ -247,7 +246,6 @@ ifneq (,$(findstring deploy,$(MAKECMDGOALS)))
 	@${compose} logs
 	@echo ; \
         $(call hr,${yellow})
-endif
 	@$(NOOP)
 
 .PHONY: image

data/lib/orchestration/templates/puma.rb.erb

@@ -1,6 +1,6 @@
 environment ENV.fetch('RAILS_ENV') { 'development' }
 
-port ENV.fetch('WEB_PORT') { 3000 }
+port ENV.fetch('WEB_PORT') { 8080 }
 workers ENV.fetch('WEB_CONCURRENCY') { 4 }
 threads_count = ENV.fetch('RAILS_MAX_THREADS') { 8 }
 

data/lib/orchestration/templates/rabbitmq.yml.erb

@@ -1,12 +1,15 @@
 <% if compose.call('development').services.key?('rabbitmq') %>
 development:
-  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('development').local_port('rabbitmq')}') #{'%' + '>'}" %>
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('development').local_port('rabbitmq', 5672)}') #{'%' + '>'}" %>
+  management_url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_MANAGEMENT_URL', 'http://guest:guest@127.0.0.1:#{compose.call('development').local_port('rabbitmq', 15672)}') #{'%' + '>'}" %>
 <% end %>
 
 <% if compose.call('test').services.key?('rabbitmq') %>
 test:
-  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('test').local_port('rabbitmq')}') #{'%' + '>'}" %>
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_URL', 'amqp://127.0.0.1:#{compose.call('test').local_port('rabbitmq', 5672)}') #{'%' + '>'}" %>
+  management_url: <%= "#{'<' + '%' + '='} ENV.fetch('RABBITMQ_MANAGEMENT_URL', 'http://guest:guest@127.0.0.1:#{compose.call('test').local_port('rabbitmq', 15672)}') #{'%' + '>'}" %>
 <% end %>
 
 production:
   url: <%%= ENV['RABBITMQ_URL'] %>
+  url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>

data/lib/orchestration/version.rb

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

data/orchestration.gemspec

@@ -33,9 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thor', '~> 1.0'
 
   spec.add_development_dependency 'activerecord', '~> 6.0'
-  spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'bunny', '~> 2.12'
-  spec.add_development_dependency 'devpack', '~> 0.3.0'
+  spec.add_development_dependency 'devpack', '~> 0.3.2'
   spec.add_development_dependency 'mongoid', '~> 7.0'
   spec.add_development_dependency 'mysql2', '~> 0.5.2'
   spec.add_development_dependency 'pg', '~> 1.1'
@@ -43,7 +42,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
-  spec.add_development_dependency 'rubocop', '~> 0.90.0'
+  spec.add_development_dependency 'rubocop', '~> 1.12'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.9'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'strong_versions', '~> 0.4.5'
   spec.add_development_dependency 'webmock', '~> 3.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.13
 platform: ruby
 authors:
 - Bob Farrell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +226,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.90.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -371,7 +399,7 @@ files:
 homepage: https://github.com/bobf/orchestration
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -387,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit
 test_files: []