orchestration 0.6.7 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cb2b72a148e2687680311cd050b426ccd06c063e4ab01e0affc03be0afbc16d
-  data.tar.gz: 97210bd8c3133b7d246ed4b8cd92f56c148a91c283b3ad51f8c4d61e8d6ed690
+  metadata.gz: 3423dc31e2b526868cb869c930d6f73039437939aa7b2ceb859e0e8106536344
+  data.tar.gz: 4669fd75876e047f52d256dd2f2e3840ecd42f157b04c6f4f81e315ae96ca6ff
 SHA512:
-  metadata.gz: 751f8433ec5094ee87639115d4c0f43e14ed0d7f2c5382fd8d79dd050d9ae27073f962304776d83d74e2b57bb97ae3e2bf774fff9a967a0b534e950462914689
-  data.tar.gz: 19b986c4ec255c2f451d99616d310235e10abcf8c403f87ef02bd1b5551da4189fdf7bf72be47f07499ed12142193b7d16e3c67b803f6c0951c6227d02d9b380
+  metadata.gz: 2a4f0579b2698d30103975b175b8a4cdc1df51c5ce883560f2b11f24b8fd3307fd1e6a35868689f6152d182e07ddbc65b6f081fe4b33ae1114e7957b64338c02
+  data.tar.gz: 380413ccb1b108614ad09247a2435178a042c352775712b287c79e707938aa409290ab42f9b0b5d7cc32184fe73de200a8a551ae5c24ba37b3c08655e4caeaf0

data/.ruby-version

@@ -1 +1 @@
-2.6.9
+3.1.2

data/.strong_versions.yml

@@ -1,3 +1,4 @@
 ignore:
   - i18n
   - rails
+  - activerecord

data/Gemfile.lock

@@ -1,76 +1,82 @@
 PATH
   remote: .
   specs:
-    orchestration (0.6.7)
+    orchestration (0.7.2)
       database_url (~> 0.1.2)
       erubis (~> 2.7)
-      i18n (>= 0.5)
-      paint (~> 2.0)
-      rails (>= 4.1)
-      thor (~> 1.0)
+      i18n
+      paint (~> 2.2)
+      rails (>= 6.1)
+      thor (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actioncable (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    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)
-    actionmailer (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+      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 (6.1.4.7)
-      actionview (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      rack (~> 2.0, >= 2.0.9)
+    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 (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    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 (6.1.4.7)
-      activesupport (= 6.1.4.7)
+    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 (6.1.4.7)
-      activesupport (= 6.1.4.7)
+    activejob (7.0.3)
+      activesupport (= 7.0.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activerecord (6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activestorage (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      marcel (~> 1.0.0)
+    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 (6.1.4.7)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.2)
@@ -85,8 +91,9 @@ GEM
       rexml
     crass (1.0.6)
     database_url (0.1.2)
-    devpack (0.3.3)
+    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)
@@ -110,6 +117,20 @@ GEM
       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)
@@ -123,35 +144,36 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.7)
-      actioncable (= 6.1.4.7)
-      actionmailbox (= 6.1.4.7)
-      actionmailer (= 6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actiontext (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    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 (= 6.1.4.7)
-      sprockets-rails (>= 2.0.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 (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    railties (7.0.3)
+      actionpack (= 7.0.3)
+      activesupport (= 7.0.3)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (10.5.0)
+    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)
@@ -185,8 +207,8 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
     rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
@@ -195,18 +217,13 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    sprockets (4.0.3)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.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)
@@ -223,24 +240,25 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activerecord (~> 6.0)
-  bunny (~> 2.12)
-  devpack (~> 0.3.2)
-  mongoid (~> 7.0)
-  mysql2 (~> 0.5.2)
+  activerecord (>= 6.0)
+  bunny (~> 2.19)
+  devpack (~> 0.4.0)
+  mongoid (~> 7.4)
+  mysql2 (~> 0.5.3)
   orchestration!
-  pg (~> 1.1)
-  rails (~> 6.0)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec-its (~> 1.2)
-  rubocop (~> 1.12)
-  rubocop-rails (~> 2.9)
-  rubocop-rake (~> 0.5.1)
-  rubocop-rspec (~> 2.2)
-  sqlite3 (~> 1.3)
+  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.4)
+  webmock (~> 3.14)
 
 BUNDLED WITH
-   2.3.11
+   2.3.14

data/README.md

@@ -26,7 +26,15 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
 
 ### Install
 
-Add _Orchestration_ to your Gemfile:
+Add _Orchestration_ to your `Gemfile`:
+
+_Ruby 3.x_:
+
+```ruby
+gem 'orchestration', '~> 0.7.2'
+```
+
+_Ruby 2.x_:
 
 ```ruby
 gem 'orchestration', '~> 0.6.7'
@@ -50,11 +58,6 @@ rake orchestration:install server=unicorn # (or 'puma' [default], etc.)
 
 To rebuild all build-out at any time, pass `force=yes` to the above install command.
 
-To rebuild just `orchestration/Makefile` (useful after upgrading the _Orchestration_ gem):
-```bash
-rake orchestration:install:makefile
-```
-
 You will be prompted to enter values for your _Docker_ organisation and repository name. For example, the _organisation_ and _repository_ for https://hub.docker.com/r/rubyorchestration/sampleapp are `rubyorchestration` and `sampleapp` respectively. If you are unsure of these values, they can be modified later by editing `.orchestration.yml` in the root of your project directory.
 
 #### Configuration files
@@ -64,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`
 
@@ -393,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`:
 
 ```
@@ -416,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
 
@@ -54,7 +55,7 @@ module Orchestration
           raise ArgumentError,
                 I18n.t(
                   'orchestration.rake.app.unspported_web_server',
-                  server: server,
+                  server:,
                   expected: %w[puma unicorn]
                 )
         end
@@ -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
@@ -77,7 +77,7 @@ module Orchestration
         # '{sidecar-27018:}27017' => '27018:27017'
         local, _, remote = mapping.sub(/\${sidecar-(\d+):}/, '\1:')
                                   .partition(':')
-        { local: local, remote: remote }
+        { local:, remote: }
       end
     end
   end

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)
@@ -9,7 +10,7 @@ module Orchestration
     def environment
       return @environment unless @environment.nil?
 
-      ENV.fetch('RAILS_ENV') { ENV.fetch('RACK_ENV', 'development') }
+      ENV.fetch('RAILS_ENV', nil) || ENV.fetch('RACK_ENV', nil) || 'development'
     end
 
     def web_server
@@ -20,9 +21,9 @@ module Orchestration
     def database_url
       case environment
       when 'development'
-        ENV.fetch('DEVELOPMENT_DATABASE_URL') { ENV.fetch('DATABASE_URL', nil) }
+        ENV.fetch('DEVELOPMENT_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
       when 'test'
-        ENV.fetch('TEST_DATABASE_URL') { ENV.fetch('DATABASE_URL', nil) }
+        ENV.fetch('TEST_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
       else
         ENV.fetch('DATABASE_URL', nil)
       end
@@ -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/file_helpers.rb

@@ -95,9 +95,9 @@ module Orchestration
     end
 
     def ensure_line_in_file(path, line, echo: true, regex: nil)
-      return if line_in_file?(path, line: line, regex: regex)
+      return if line_in_file?(path, line:, regex:)
 
-      append_file(path, "\n#{line.chomp}\n", echo: echo)
+      append_file(path, "\n#{line.chomp}\n", echo:)
       true
     end
 
@@ -131,7 +131,7 @@ module Orchestration
 
     def force?
       # Rake task was invoked with `force=yes`
-      ENV['force'] == 'yes'
+      ENV.fetch('force', nil) == 'yes'
     end
   end
 end

data/lib/orchestration/install_generator.rb

@@ -68,11 +68,11 @@ module Orchestration
       path = @env.root.join('config', 'unicorn.rb')
       create_file(path, content, backup: true)
       regex = /gem\s+['"]unicorn['"]/
-      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex: regex)
+      ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex:)
     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

@@ -316,16 +316,16 @@ 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}")
+	@$(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}" ${url_prefix}DATABASE_URL="${url}")
+	@$(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}
   else ifneq (,$(wildcard db/schema.rb))
-	@$(call system,rake db:schema:load RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@$(call system,rake db:schema:load RAILS_ENV="${env}" DATABASE_URL="${url}")
 	@${rake} db:schema:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
   endif
-	@$(call system,rake db:migrate RAILS_ENV="${env}" ${url_prefix}DATABASE_URL="${url}")
+	@$(call system,rake db:migrate RAILS_ENV="${env}" DATABASE_URL="${url}")
 	@${rake} db:migrate RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
 endif
 	@if $(MAKE) -n post-setup >/dev/null 2>&1; then \