orchestration 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7891efd1c4930036b2245fad46bc9bc78c0de97b3c2cce26ede48d5a6de34a2c
-  data.tar.gz: c56d7d3193fd6cafe76dc823924bcc1ba74fda288090d1424bfdce148789cb51
+  metadata.gz: fd668d1ea77820075d2ad454dde1691304daed2c1e26d7e446e2e729a62625db
+  data.tar.gz: 0d3e1d8796810142973303a530972b9bb38e165822c7b403c52ddfb439d91947
 SHA512:
-  metadata.gz: c82db0ac9646d8b93ad2ef72cff3216106e8558f670c086cd0647f5496559f0a0c32309b8e2680323e627345a9f6da9f2745d4d67a5a1d8d1e7a56d2fc91417c
-  data.tar.gz: c0fc26b8ea7f66f7a50b52de3991fe5f4a99ec73b9186312e397fce229c184f8bdf8182d8bca991a79cb5b95f24ed3ce1907048bf27dceff482437129ce18ad4
+  metadata.gz: d308e88beaaf4c792c2aea6c7ac3ea78c5249ac956da2f1a8ae0637432321a1118a02d9ccef59ae6abf51ac0f381e4bf7e7be249721d1bd2138a51e4fda63f4a
+  data.tar.gz: 322620f4c68eb845f63006531355d93193df31757dae2ca97b6bc5d45186262557da6a4f9381fd8dfa6754e619cb370d0b5d93aa6e155f053fb3265e2639ab06

data/.gitignore

@@ -9,8 +9,6 @@
 # rspec failure tracking
 .rspec_status
 
-Gemfile.lock
-
 *.swp
 *.swo
 
@@ -34,5 +32,3 @@ docker/.build/
 docker/.context.tar
 
 .DS_Store
-
-.ruby-version

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/Gemfile.lock

@@ -0,0 +1,264 @@
+PATH
+  remote: .
+  specs:
+    orchestration (0.7.2)
+      database_url (~> 0.1.2)
+      erubis (~> 2.7)
+      i18n
+      paint (~> 2.2)
+      rails (>= 6.1)
+      thor (~> 1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3)
+      actionpack (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activesupport (= 7.0.3)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.3)
+      actionview (= 7.0.3)
+      activesupport (= 7.0.3)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.3)
+      actionpack (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.3)
+      activesupport (= 7.0.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
+      globalid (>= 0.3.6)
+    activemodel (7.0.3)
+      activesupport (= 7.0.3)
+    activerecord (7.0.3)
+      activemodel (= 7.0.3)
+      activesupport (= 7.0.3)
+    activestorage (7.0.3)
+      actionpack (= 7.0.3)
+      activejob (= 7.0.3)
+      activerecord (= 7.0.3)
+      activesupport (= 7.0.3)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    amq-protocol (2.3.2)
+    ast (2.4.2)
+    bson (4.15.0)
+    builder (3.2.4)
+    bunny (2.19.0)
+      amq-protocol (~> 2.3, >= 2.3.1)
+      sorted_set (~> 1, >= 1.0.2)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    database_url (0.1.2)
+    devpack (0.4.0)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
+    erubi (1.10.0)
+    erubis (2.7.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    hashdiff (1.0.1)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.18.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.15.0)
+    mongo (2.17.1)
+      bson (>= 4.8.2, < 5.0.0)
+    mongoid (7.4.0)
+      activemodel (>= 5.1, < 7.1, != 7.0.0)
+      mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
+    mysql2 (0.5.4)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.6-x86_64-linux)
+      racc (~> 1.4)
+    paint (2.2.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    pg (1.3.5)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (7.0.3)
+      actioncable (= 7.0.3)
+      actionmailbox (= 7.0.3)
+      actionmailer (= 7.0.3)
+      actionpack (= 7.0.3)
+      actiontext (= 7.0.3)
+      actionview (= 7.0.3)
+      activejob (= 7.0.3)
+      activemodel (= 7.0.3)
+      activerecord (= 7.0.3)
+      activestorage (= 7.0.3)
+      activesupport (= 7.0.3)
+      bundler (>= 1.15.0)
+      railties (= 7.0.3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rbtree (0.4.5)
+    redis (4.6.0)
+    regexp_parser (2.4.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-rails (2.14.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    set (1.0.2)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    sqlite3 (1.4.2)
+    strong_versions (0.4.5)
+      i18n (>= 0.5)
+      paint (~> 2.0)
+    strscan (3.0.3)
+    thor (1.2.1)
+    timeout (0.3.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (>= 6.0)
+  bunny (~> 2.19)
+  devpack (~> 0.4.0)
+  mongoid (~> 7.4)
+  mysql2 (~> 0.5.3)
+  orchestration!
+  pg (~> 1.3)
+  rails
+  rake (~> 13.0)
+  redis (~> 4.6)
+  rspec (~> 3.11)
+  rspec-its (~> 1.3)
+  rubocop (~> 1.28)
+  rubocop-rails (~> 2.14)
+  rubocop-rake (~> 0.6.0)
+  rubocop-rspec (~> 2.10)
+  sqlite3 (~> 1.4)
+  strong_versions (~> 0.4.5)
+  webmock (~> 3.14)
+
+BUNDLED WITH
+   2.3.14

data/README.md

@@ -31,13 +31,13 @@ Add _Orchestration_ to your `Gemfile`:
 _Ruby 3.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.7.0'
+gem 'orchestration', '~> 0.7.3'
 ```
 
 _Ruby 2.x_:
 
 ```ruby
-gem 'orchestration', '~> 0.6.6'
+gem 'orchestration', '~> 0.6.7'
 ```
 
 Install:
@@ -67,6 +67,7 @@ _Orchestration_ generates the following files where appropriate. Backups are cre
 * `config/database.yml`
 * `config/mongoid.yml`
 * `config/rabbitmq.yml` (see [RabbitMQ Configuration](#rabbitmq-configuration) for more details)
+* `config/redis.yml` (see [Redis Configuration](#redis-configuration) for more details)
 * `config/unicorn.rb`
 * `config/puma.rb`
 
@@ -396,13 +397,6 @@ make stop RAILS_ENV=test
 <a name="rabbitmq-configuration"></a>
 ## RabbitMQ Configuration
 
-The [Bunny](https://github.com/ruby-amqp/bunny) _RabbitMQ_ gem does not recognise `config/rabbitmq.yml` or `RABBITMQ_URL`. If your application uses _RabbitMQ_ then you must manually update your code to reference this file, e.g.:
-
-```ruby
-connection = Bunny.new(config_for(:rabbit_mq)['url'])
-connection.start
-```
-
 _Orchestration_ generates the following `config/rabbitmq.yml`:
 
 ```
@@ -419,10 +413,42 @@ production:
   management_url: <%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
 ```
 
+The [Bunny](https://github.com/ruby-amqp/bunny) _RabbitMQ_ gem does not recognise `config/rabbitmq.yml` or `RABBITMQ_URL`. If your application uses _RabbitMQ_ then you must manually update your code to reference this file, e.g.:
+
+```ruby
+connection = Bunny.new(Rails.application.config_for(:rabbit_mq)['url'])
+connection.start
+```
+
 Using this approach, the environment variable `RABBITMQ_URL` can be used to configure _Bunny_ in production (similar to `DATABASE_URL` and `MONGO_URL`).
 
 This is a convention of the _Orchestration_ gem intended to make _RabbitMQ_ configuration consistent with other services.
 
+<a name="redis-configuration"></a>
+## Redis Configuration
+
+_Orchestration_ generates the following `config/redis.yml`:
+
+```
+development:
+  url: redis://127.0.0.1:51071
+
+test:
+  url: redis://127.0.0.1:51069
+```
+
+The [Redis](https://github.com/redis/redis-rb) gem does not recognise `config/redis.yml`. If your application uses _Redis_ then you must manually update your code to reference this file, e.g.:
+
+```ruby
+# config/initializers/redis.rb
+
+ENV['REDIS_URL'] ||= Rails.application.config_for(:redis)['url']
+```
+_Redis_ will then use `REDIS_URL` for all connections.
+
+This allows `development` and `test` environments to auto-load the correct config for the relevant containers while also allowing `production` to use either the auto-generated _Redis_ service or an external _Redis_ instance.
+
+
 ## Alternate Database Configuration Files
 
 If you have multiple databases configured in various `config/database.*.yml` files then the `make wait` command will automatically detect database configurations.

data/lib/orchestration/docker_compose/app_service.rb

@@ -2,6 +2,7 @@
 
 module Orchestration
   module DockerCompose
+    # rubocop:disable Metrics/ClassLength
     class AppService
       include ComposeHelpers
 
@@ -99,13 +100,19 @@ module Orchestration
           'WEB_HEALTHCHECK_PATH' => '/healthcheck',
           'WEB_PORT' => 8080,
           'DATABASE_URL' => database_url
-        }.merge(inherited_environment.to_h { |key| [key, nil] }).merge(rabbitmq_urls)
+        }.merge(inherited_environment.to_h { |key| [key, nil] }).merge(rabbitmq_urls).merge(redis_url)
       end
 
       def rabbitmq_urls
         return {} unless Services::RabbitMQ::Configuration.new(Environment.new).enabled?
 
-        { 'RABBITMQ_URL' => 'amqp://rabbitmq:5672', 'RABBITMQ_MANAGEMENT_URL' => 'http://rabbitmq:15672' }
+        { 'RABBITMQ_URL' => 'amqp://rabbitmq-local:5672', 'RABBITMQ_MANAGEMENT_URL' => 'http://rabbitmq-local:15672' }
+      end
+
+      def redis_url
+        return {} unless Services::Redis::Configuration.new(Environment.new).enabled?
+
+        { 'REDIS_URL' => "redis://redis-local:#{Services::Redis::PORT}" }
       end
 
       def database_url
@@ -124,5 +131,6 @@ module Orchestration
         ['${PUBLISH_PORT:?PUBLISH_PORT must be provided}:8080']
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/orchestration/docker_compose/compose_configuration.rb

@@ -39,7 +39,7 @@ module Orchestration
         return nil unless listener?(name)
         return ports(name).first[:local].to_i if remote_port.nil?
 
-        ports(name).find { |mapping| mapping[:remote] == remote_port }
+        ports(name).find { |mapping| mapping[:remote].to_i == remote_port.to_i }
                    .fetch(:local)
                    .to_i
       rescue NoMethodError

data/lib/orchestration/docker_compose/configuration.rb

@@ -32,7 +32,8 @@ module Orchestration
           app: AppService,
           database: DatabaseService,
           mongo: MongoService,
-          rabbitmq: RabbitMQService
+          rabbitmq: RabbitMQService,
+          redis: RedisService
         }
       end
 

data/lib/orchestration/docker_compose/install_generator.rb

@@ -67,9 +67,9 @@ module Orchestration
       def service_names(environment)
         case environment
         when :test, :development
-          %i[database mongo rabbitmq]
+          %i[database mongo rabbitmq redis]
         when :deployment
-          %i[app database mongo rabbitmq]
+          %i[app database mongo rabbitmq redis]
         when :local, nil
           []
         else
@@ -88,7 +88,8 @@ module Orchestration
           app: Orchestration::Services::App::Configuration,
           database: Orchestration::Services::Database::Configuration,
           mongo: Orchestration::Services::Mongo::Configuration,
-          rabbitmq: Orchestration::Services::RabbitMQ::Configuration
+          rabbitmq: Orchestration::Services::RabbitMQ::Configuration,
+          redis: Orchestration::Services::Redis::Configuration
         }.fetch(service).new(@env)
       end
 

data/lib/orchestration/docker_compose/redis_service.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module DockerCompose
+    class RedisService
+      include ComposeHelpers
+
+      def initialize(config, environment)
+        @config = config
+        @environment = environment
+      end
+
+      def definition
+        return nil unless @config.enabled?
+
+        { 'image' => 'library/redis:7.0', 'networks' => networks }.merge(ports)
+      end
+
+      def ports
+        return {} unless %i[development test].include?(@environment)
+
+        container_port = Orchestration::Services::Redis::PORT
+
+        { 'ports' => ["#{sidecar_port(@environment)}#{container_port}"] }
+      end
+    end
+  end
+end

data/lib/orchestration/docker_compose.rb

@@ -14,3 +14,4 @@ require 'orchestration/docker_compose/app_service'
 require 'orchestration/docker_compose/database_service'
 require 'orchestration/docker_compose/mongo_service'
 require 'orchestration/docker_compose/rabbitmq_service'
+require 'orchestration/docker_compose/redis_service'

data/lib/orchestration/environment.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Orchestration
+  # rubocop:disable Metrics/ClassLength
   class Environment
     def initialize(options = {})
       @environment = options.fetch(:environment, nil)
@@ -44,6 +45,10 @@ module Orchestration
       root.join('config', 'rabbitmq.yml')
     end
 
+    def redis_configuration_path
+      root.join('config', 'redis.yml')
+    end
+
     def orchestration_configuration_path
       root.join('.orchestration.yml')
     end
@@ -136,4 +141,5 @@ module Orchestration
       end.join
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/orchestration/install_generator.rb

@@ -72,7 +72,7 @@ module Orchestration
     end
 
     def database_yml
-      return unless defined?(ActiveRecord)
+      return unless defined?(::ActiveRecord)
 
       adapter = DockerCompose::ComposeConfiguration.database_adapter_name
       return if adapter == 'sqlite3'
@@ -81,17 +81,23 @@ module Orchestration
     end
 
     def mongoid_yml
-      return unless defined?(Mongoid)
+      return unless defined?(::Mongoid)
 
       service_config('mongoid.yml', Services::Mongo::Configuration)
     end
 
     def rabbitmq_yml
-      return unless defined?(Bunny)
+      return unless defined?(::Bunny)
 
       service_config('rabbitmq.yml', Services::RabbitMQ::Configuration)
     end
 
+    def redis_yml
+      return unless defined?(::Redis)
+
+      service_config('redis.yml', Services::Redis::Configuration)
+    end
+
     def env
       simple_copy('env', @env.root.join('.env'), overwrite: false)
     end

data/lib/orchestration/make/orchestration.mk

@@ -107,7 +107,9 @@ endif
 ifneq (${env},test)
   ifeq (,$(findstring test,$(MAKECMDGOALS)))
     ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
-      -include ${env_path}
+      ifeq (,$(findstring setup,$(MAKECMDGOALS)))
+        -include ${env_path}
+      endif
     endif
   endif
 endif
@@ -122,7 +124,9 @@ ifneq (,$(findstring test,$(MAKECMDGOALS)))
   env=test
 endif
 
-ifneq (,$(env))
+ifneq (,$(RAILS_ENV))
+  env=$(RAILS_ENV)
+else ifneq (,$(env))
   # `env` set by current shell.
 else ifneq (,$(RAILS_ENV))
   env=$(RAILS_ENV)
@@ -216,11 +220,16 @@ all: build
 
 ### Container management commands ###
 
+.PHONY: pull
+pull:
+	@$(call system,${compose_human} pull)
+	@${compose} pull
+
 .PHONY: start
 ifndef network
 start: network := ${compose_project_name}
 endif
-start: _create-log-directory _clean-logs
+start: _create-log-directory _clean-logs pull
 ifneq (,${compose_services})
 	@$(call system,${compose_human} up --detach)
 ifeq (${env},$(filter ${env},test development))
@@ -312,8 +321,8 @@ setup: _log-notify
 	@$(call make,start env=${env})
 ifneq (,$(wildcard config/database.yml))
 	@$(call echo,Preparing ${env_human} database)
-	@$(call system,rake db:create RAILS_ENV="${env}")
-	@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
+	@$(call system,rake db:create RAILS_ENV="${env}" DATABASE_URL='${url}')
+	@${rake} db:create RAILS_ENV=${env} DATABASE_URL='${url}' ${log} || : ${log}
   ifneq (,$(wildcard db/structure.sql))
 	@$(call system,rake db:structure:load RAILS_ENV="${env}" DATABASE_URL="${url}")
 	@${rake} db:structure:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
@@ -322,7 +331,7 @@ ifneq (,$(wildcard config/database.yml))
 	@${rake} db:schema:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
   endif
 	@$(call system,rake db:migrate RAILS_ENV="${env}" DATABASE_URL="${url}")
-	@${rake} db:migrate RAILS_ENV=${env} ${log} || ${exit_fail}
+	@${rake} db:migrate RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
 endif
 	@if $(MAKE) -n post-setup >/dev/null 2>&1; then \
           $(call system,make post-setup RAILS_ENV="${env}") \

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/rabbitmq.yml.erb

@@ -12,4 +12,4 @@ test:
 
 production:
   url: <%%= ENV['RABBITMQ_URL'] %>
-  url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
+  management_url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>

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.7.0'
+  VERSION = '0.7.3'
 end

data/lib/tasks/orchestration.rake

@@ -110,6 +110,9 @@ post-setup:
   namespace :db do
     desc I18n.t('orchestration.rake.db.url')
     task :url do
+      ENV['DATABASE_URL'] = nil
+      ENV['DEVELOPMENT_DATABASE_URL'] = nil
+      ENV['TEST_DATABASE_URL'] = nil
       config = Rails.application.config_for(:database).transform_keys(&:to_sym)
 
       if config[:adapter] == 'sqlite3'

data/orchestration.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
   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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_url
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -342,9 +356,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".strong_versions.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - Makefile
 - README.md
@@ -365,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
@@ -398,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
@@ -407,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