orchestration 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5c9bd9b0a391d077e39e8447c38483f7149c3435b150289d2bebee4ca951b9
-  data.tar.gz: '08d6fdbd61e22b9ab3b5f3367250c7adfa0ad65dfecccc128a1075db8e6a478c'
+  metadata.gz: 99bdeb106830843d2a0e600151a4d80b411d21e86f25010d6c2379810ef85273
+  data.tar.gz: 4b3828ec78541d1680d3e5749c0a2e428bed328313d17e13d3f4e0dc1bdb0e8b
 SHA512:
-  metadata.gz: f07f4b6ad5d5ce98cf65f94ccc9ae6ae280fab784a1760ede004a0cecdc4c90294e781d585868da9784603fca08f7e530b87ad94bf886e9c6f4c78e48264e7f3
-  data.tar.gz: 2cf4176c26c23d05733a926a8d22871a0e801a35d7e4b5643e92d7adfdb6a7627b23ee37dd97c01250937ebb31a7c9d638a5902377b91d512a48bcf90e5a0d90
+  metadata.gz: 0e5a03e78c1e442daa079a5d92540df52a148b7ea08b8fa3ecd55919d045e7fc239d5638d8a850565044b9c1d7065b39c4401a72db0daef0d299c622e86ee02f
+  data.tar.gz: e2061ef7628599f65c05d28380376ef841a329f85408c2dfa84172907ada7392dc0ba556b01a6559f3869b1f7b6809304615ebe91a9970e71adc31d04a0e82ed

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

data/config/locales/en.yml

@@ -29,6 +29,7 @@ en:
     rake:
       config: "Parse and output Orchestration config (internal use)"
       healthcheck: "Execute healthcheck; used for HEALTHCHECK command in Docker image"
+      compose_services: "Output configured services for a given environment (RAILS_ENV)"
       install: "Install Orchestration tools"
       install_makefile: "(Re)create orchestration/Makefile"
       wait: "Wait for development/test dependencies to be available"

data/lib/orchestration/docker_compose/app_service.rb

@@ -98,10 +98,10 @@ module Orchestration
           'RAILS_LOG_TO_STDOUT' => '1',
           'RAILS_SERVE_STATIC_FILES' => '1',
           'WEB_PRELOAD_APP' => '1',
-          'WEB_HEALTHCHECK_PATH' => '/',
+          'WEB_HEALTHCHECK_PATH' => '/healthcheck',
           'WEB_PORT' => 8080,
           'DATABASE_URL' => database_url
-        }.merge(inherited_environment.map { |key| [key, nil] }.to_h).merge(rabbitmq_urls)
+        }.merge(inherited_environment.to_h { |key| [key, nil] }).merge(rabbitmq_urls)
       end
 
       def rabbitmq_urls
@@ -115,7 +115,7 @@ module Orchestration
           'postgresql' => 'postgresql://postgres:password@database-local:5432/production',
           'mysql2' => 'mysql2://root:password@database-local:3306/production',
           'sqlite3' => 'sqlite3:db/production.sqlite3'
-        }.fetch(DockerCompose::ComposeConfiguration.database_adapter_name)
+        }.fetch(DockerCompose::ComposeConfiguration.database_adapter_name, nil)
       end
 
       def inherited_environment

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -48,6 +48,8 @@ module Orchestration
 
       def config
         @config ||= @env.docker_compose_config
+      rescue Errno::ENOENT
+        {}
       end
 
       def listener?(name)

data/lib/orchestration/environment.rb

@@ -69,12 +69,12 @@ module Orchestration
     end
 
     def default_app_name
-      default = docker_filter(root.basename.to_s)
+      default = docker_filter(root.basename.to_s, underscore: true)
       return default unless defined?(Rails)
       # Edge case if Rails is used as a dependency but we are not a Rails app:
       return default if rails_application == Object
 
-      docker_filter(rails_application.name.underscore)
+      docker_filter(rails_application.name.underscore, underscore: true)
     end
 
     def rabbitmq_url
@@ -126,10 +126,14 @@ module Orchestration
       app_class.parent
     end
 
-    def docker_filter(string)
+    def docker_filter(string, underscore: false)
       # Filter out characters not accepted by Docker Hub
       permitted = [('0'..'9'), ('a'..'z')].map(&:to_a).flatten
-      string.chars.select { |char| permitted.include?(char) }.join
+      string.chars.select do |char|
+        next true if underscore && char == '_'
+
+        permitted.include?(char)
+      end.join
     end
   end
 end

data/lib/orchestration/make/orchestration.mk

@@ -141,6 +141,8 @@ docker_config:=$(shell DEVPACK_DISABLE=1 RAILS_ENV=development ${bundle_cmd} rak
 docker_organization=$(word 1,$(docker_config))
 docker_repository=$(word 2,$(docker_config))
 
+compose_services:=$(shell ${rake} orchestration:compose_services RAILS_ENV=${env})
+
 ifeq (,$(project_name))
   project_base = ${docker_repository}_${env}
 else
@@ -209,9 +211,10 @@ ifndef network
 start: network := ${compose_project_name}
 endif
 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})) ; \
@@ -229,10 +232,12 @@ endif
 	@$(call echo,${env_human} containers started ${tick})
 	@$(call echo,Waiting for services to become available)
 	@$(call make,wait) 2>${stderr} || ${exit_fail}
+endif
 
 .PHONY: stop
 stop: network := ${compose_project_name}
 stop:
+ifneq (,${compose_services})
 	@$(call echo,Stopping ${env_human} containers)
 	@$(call system,${compose_human} down)
 	@if docker ps --format "{{.ID}}" | grep -q $(shell hostname) ; \
@@ -244,6 +249,7 @@ stop:
             ${compose} down ${log} || ${exit_fail} ; \
           fi
 	@$(call echo,${env_human} containers stopped ${tick})
+endif
 
 .PHONY: logs
 logs:
@@ -288,7 +294,9 @@ db-console:
 	@${rake} orchestration:db:console RAILS_ENV=${env}
 
 .PHONY: setup
+ifneq (,$(wildcard config/database.yml))
 setup: url = $(shell ${rake} orchestration:db:url RAILS_ENV=${env})
+endif
 setup: _log-notify
 	@$(call echo,Setting up ${env_human} environment)
 	@$(call make,start env=${env})
@@ -306,9 +314,9 @@ ifneq (,$(wildcard config/database.yml))
 	@$(call system,rake db:migrate DATABASE_URL="${url}")
 	@${rake} db:migrate RAILS_ENV=${env}
 endif
-	@$(MAKE) -n post-setup >/dev/null 2>&1 \
-          && $(call system,make post-setup RAILS_ENV=${env}) \
-          && $(MAKE) post-setup RAILS_ENV=${env}
+	@if $(MAKE) -n post-setup >/dev/null 2>&1; then \
+          $(call system,make post-setup RAILS_ENV=${env}) \
+          && $(MAKE) post-setup RAILS_ENV=${env}; fi
 	@$(call echo,${env_human} environment setup complete ${tick})
 
 .PHONY: dump

data/lib/orchestration/version.rb

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

data/lib/tasks/orchestration.rake

@@ -39,6 +39,12 @@ namespace :orchestration do
     end
   end
 
+  desc I18n.t('orchestration.rake.compose_services')
+  task :compose_services do
+    config = Orchestration::DockerCompose::ComposeConfiguration.new(Orchestration::Environment.new)
+    puts config.services.keys.join(' ') unless config.services.nil? || config.services.empty?
+  end
+
   desc I18n.t('orchestration.rake.healthcheck')
   task :healthcheck do
     Orchestration::DockerHealthcheck.execute

data/orchestration.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'Docker orchestration toolkit'
   spec.description = 'Tools to help launch apps in Docker'
   spec.homepage = url
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -21,7 +22,7 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.required_ruby_version = '~> 2.6'
+  spec.required_ruby_version = '~> 2.7'
   spec.bindir = 'bin'
   spec.executables = []
   spec.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -414,7 +414,8 @@ files:
 - orchestration.gemspec
 homepage: https://github.com/bobf/orchestration
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -423,14 +424,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit