orchestration 0.6.7 → 0.7.2

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

@@ -21,10 +21,10 @@ module Orchestration
         def settings(healthcheck: false)
           {
             adapter: adapter.name,
-            host: host,
-            port: port,
-            username: username,
-            password: password,
+            host:,
+            port:,
+            username:,
+            password:,
             database: healthcheck ? adapter.credentials['database'] : database
           }.transform_keys(&:to_s)
         end
@@ -64,7 +64,7 @@ module Orchestration
           return {} unless File.exist?(database_configuration_path) || custom?
 
           yaml = ERB.new(File.read(database_configuration_path)).result
-          YAML.safe_load(yaml, [], [], true)[@env.environment] || {}
+          YAML.safe_load(yaml, aliases: true)[@env.environment] || {}
         end
 
         def url_config

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

@@ -74,7 +74,7 @@ module Orchestration
 
       def yaml(content)
         # Whitelist `Symbol` and permit aliases:
-        YAML.safe_load(content, [Symbol], [], true)
+        YAML.safe_load(content, permitted_classes: [Symbol], aliases: true)
       end
     end
   end

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

@@ -19,7 +19,7 @@ module Orchestration
 
       def connection_error(code)
         raise HTTPConnectionError,
-              I18n.t('orchestration.http.connection_error', code: code)
+              I18n.t('orchestration.http.connection_error', code:)
       end
 
       def connection_error?(code)

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

@@ -64,7 +64,7 @@ module Orchestration
           return {} unless File.exist?(@env.mongoid_configuration_path)
 
           yaml = File.read(@env.mongoid_configuration_path)
-          config = YAML.safe_load(yaml, [], [], true)
+          config = YAML.safe_load(yaml, aliases: true)
           env = config.fetch(@env.environment, nil)
           return {} if env.nil?
 

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Redis
+      class Configuration
+        include ConfigurationBase
+
+        self.service_name = 'redis'
+
+        def enabled?
+          defined?(::Redis)
+        end
+
+        def friendly_config
+          "[redis] redis://#{host}:#{port}"
+        end
+
+        def host
+          from_url['host'] || super
+        end
+
+        def port
+          from_url['port'] || super
+        end
+
+        private
+
+        def from_url
+          return {} if @env.redis_url.nil?
+
+          uri = URI.parse(@env.redis_url)
+          { 'host' => uri.host, 'port' => uri.port || PORT }
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/redis/healthcheck.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Redis
+      class Healthcheck
+        class NotConnectedError < OrchestrationError; end
+
+        include HealthcheckBase
+
+        dependencies 'redis'
+
+        def connection_errors
+          [NotConnectedError]
+        end
+
+        def connect
+          host = @configuration.host
+          port = @configuration.port
+          return if ::Redis.new(url: "redis://#{host}:#{port}").connected?
+
+          raise NotConnectedError
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/redis.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Redis
+      PORT = 6379
+    end
+  end
+end
+
+require 'orchestration/services/redis/configuration'
+require 'orchestration/services/redis/healthcheck'

data/lib/orchestration/services.rb

@@ -14,3 +14,4 @@ require 'orchestration/services/database'
 require 'orchestration/services/listener'
 require 'orchestration/services/mongo'
 require 'orchestration/services/rabbitmq'
+require 'orchestration/services/redis'

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

@@ -1,8 +1,8 @@
-environment ENV.fetch('RAILS_ENV') { 'development' }
+environment ENV.fetch('RAILS_ENV', 'development')
 
-port ENV.fetch('WEB_PORT') { 3000 }
-workers ENV.fetch('WEB_CONCURRENCY') { 4 }
-threads_count = ENV.fetch('RAILS_MAX_THREADS') { 8 }
+port ENV.fetch('WEB_PORT', 3000)
+workers ENV.fetch('WEB_CONCURRENCY', 4)
+threads_count = ENV.fetch('RAILS_MAX_THREADS', 8)
 
 pidfile './tmp/pids/server.pid'
 threads threads_count, threads_count

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

@@ -0,0 +1,9 @@
+<% if compose.call('development').services.key?('redis') %>
+development:
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('REDIS_URL', 'redis://127.0.0.1:#{compose.call('development').local_port('redis', 6379)}') #{'%' + '>'}" %>
+<% end %>
+
+<% if compose.call('test').services.key?('redis') %>
+test:
+  url: <%= "#{'<' + '%' + '='} ENV.fetch('REDIS_URL', 'redis://127.0.0.1:#{compose.call('test').local_port('redis', 6379)}') #{'%' + '>'}" %>
+<% end %>

data/lib/orchestration/version.rb

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

data/lib/tasks/orchestration.rake

@@ -127,7 +127,7 @@ post-setup:
     desc I18n.t('orchestration.rake.db.console')
     task :console do
       env = Orchestration::Environment.new
-      options = ENV['db'] ? { config_path: "config/database.#{ENV['db']}.yml" } : {}
+      options = ENV['db'] ? { config_path: "config/database.#{ENV.fetch('db', nil)}.yml" } : {}
       sh Orchestration::Services::Database::Configuration.new(env, nil, options).console_command
     end
   end

data/orchestration.gemspec

@@ -22,33 +22,34 @@ Gem::Specification.new do |spec|
     end
   end
 
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 3.1'
   spec.bindir = 'bin'
   spec.executables = []
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'database_url', '~> 0.1.2'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
-  spec.add_runtime_dependency 'i18n', '>= 0.5'
-  spec.add_runtime_dependency 'paint', '~> 2.0'
-  spec.add_runtime_dependency 'rails', '>= 4.1'
-  spec.add_runtime_dependency 'thor', '~> 1.0'
+  spec.add_runtime_dependency 'i18n'
+  spec.add_runtime_dependency 'paint', '~> 2.2'
+  spec.add_runtime_dependency 'rails', '>= 6.1'
+  spec.add_runtime_dependency 'thor', '~> 1.2'
 
-  spec.add_development_dependency 'activerecord', '~> 6.0'
-  spec.add_development_dependency 'bunny', '~> 2.12'
-  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'
-  spec.add_development_dependency 'rails', '~> 6.0'
-  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', '~> 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 'activerecord', '>= 6.0'
+  spec.add_development_dependency 'bunny', '~> 2.19'
+  spec.add_development_dependency 'devpack', '~> 0.4.0'
+  spec.add_development_dependency 'mongoid', '~> 7.4'
+  spec.add_development_dependency 'mysql2', '~> 0.5.3'
+  spec.add_development_dependency 'pg', '~> 1.3'
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'redis', '~> 4.6'
+  spec.add_development_dependency 'rspec', '~> 3.11'
+  spec.add_development_dependency 'rspec-its', '~> 1.3'
+  spec.add_development_dependency 'rubocop', '~> 1.28'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.14'
+  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.10'
+  spec.add_development_dependency 'sqlite3', '~> 1.4'
   spec.add_development_dependency 'strong_versions', '~> 0.4.5'
-  spec.add_development_dependency 'webmock', '~> 3.4'
+  spec.add_development_dependency 'webmock', '~> 3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.2
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-27 00:00:00.000000000 Z
+date: 2022-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -44,68 +44,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -114,196 +114,210 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.19'
 - !ruby/object:Gem::Dependency
   name: devpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.4'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: strong_versions
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.14'
 description: Tools to help launch apps in Docker
 email:
 - git@bob.frl
@@ -367,6 +381,7 @@ files:
 - lib/orchestration/docker_compose/install_generator.rb
 - lib/orchestration/docker_compose/mongo_service.rb
 - lib/orchestration/docker_compose/rabbitmq_service.rb
+- lib/orchestration/docker_compose/redis_service.rb
 - lib/orchestration/docker_healthcheck.rb
 - lib/orchestration/environment.rb
 - lib/orchestration/errors.rb
@@ -400,6 +415,9 @@ files:
 - lib/orchestration/services/rabbitmq.rb
 - lib/orchestration/services/rabbitmq/configuration.rb
 - lib/orchestration/services/rabbitmq/healthcheck.rb
+- lib/orchestration/services/redis.rb
+- lib/orchestration/services/redis/configuration.rb
+- lib/orchestration/services/redis/healthcheck.rb
 - lib/orchestration/settings.rb
 - lib/orchestration/templates/Dockerfile.erb
 - lib/orchestration/templates/application.mk.erb
@@ -409,6 +427,7 @@ files:
 - lib/orchestration/templates/mongoid.yml.erb
 - lib/orchestration/templates/puma.rb.erb
 - lib/orchestration/templates/rabbitmq.yml.erb
+- lib/orchestration/templates/redis.yml.erb
 - lib/orchestration/templates/unicorn.rb.erb
 - lib/orchestration/terminal.rb
 - lib/orchestration/version.rb
@@ -426,14 +445,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Docker orchestration toolkit