orchestration 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5689d665c79d3bc7efb105043c7bae48b9ebc2b
-  data.tar.gz: 795623463bfbe0e52935f35e00e950be6956691c
+  metadata.gz: f8ceff8fc2dd990496a6de51dddca57caa2e7000
+  data.tar.gz: dd0507265efb67c67ea5164cb2a7ff8b22675f0d
 SHA512:
-  metadata.gz: 5505726c481848f3a3276e8be6b53b772b081657bc8401e0c97b0fb18254847f09b14efec8cc56bad53099cfbedddbc8948eef8344db6e04d64051e969bae4ae
-  data.tar.gz: 37d7a6798a61fc5c6d6531d0b99b3eef0842672b99a404b91e02995b1bcbb90a53f663fd043231ca7b35eb134ccabeebb31d04c551fb7839997f95744c09f5fd
+  metadata.gz: 6f254e30b288a9d20aba6b55abd7fc01fd8973690bb31f430904f870a40088a6b0b7b4c5f7677c81c1cf02c6ed99c2fc8552a3a2ead211ed3bf877757dccea80
+  data.tar.gz: fc397b5f3341a7f6b2eda9e3231159c5fa5460a9feb3b5059472c5ea21de94796a3f55a4b7ad18571ef6a99eeb1ba3c3896efa7868024ccc577679777ae621fb

data/README.md

@@ -18,7 +18,7 @@ Containers are automatically created for the following dependencies:
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'orchestration', '~> 0.2.1'
+gem 'orchestration', '~> 0.2.2'
 ```
 
 And then build your bundle:

data/TODO

@@ -1,2 +1,9 @@
 Be aware of yarn and include build steps in Dockerfile if present. Use dashboard
 front end as a reference.
+
+Create a production docker-compose.yml and set:
+  - RAILS_ENV
+  - SECRET_KEY_BASE
+  - DATABASE_URL (from config/database.yml)
+
+Provide volumes for databases and mount appropriate directories for adapter

data/lib/orchestration/docker_compose/application_service.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module DockerCompose
+    class ApplicationService
+      PORT = 3000
+
+      def initialize(config)
+        @config = config
+        @env = config.environment
+      end
+
+      def definition
+        {
+          'image' => image,
+          'environment' => environment,
+          'ports' => ["#{PORT}:#{PORT}"]
+        }
+      end
+
+      private
+
+      def image
+        "#{@env.settings.get('docker.username')}/#{@env.application_name}"
+      end
+
+      def environment
+        {
+          # `nil` values will inherit from environment or `.env` file.
+          'RAILS_ENV' => nil,
+          'SECRET_KEY_BASE' => nil,
+          'DATABASE_URL' => database_url,
+          'RAILS_LOG_TO_STDOUT' => '1'
+        }
+      end
+
+      def database_url
+        settings = @config.database_settings
+        return nil if settings.fetch('adapter') == 'sqlite3'
+
+        scheme = settings.fetch('scheme')
+        database = settings.fetch('database')
+        username = settings.fetch('username')
+        password = settings.fetch('password')
+        port = DatabaseService::PORT
+
+        "#{scheme}://#{username}:#{password}@database:#{port}/#{database}"
+      end
+    end
+  end
+end

data/lib/orchestration/docker_compose/services.rb

@@ -5,6 +5,7 @@ module Orchestration
     class Services
       def initialize(options = {})
         @configurations = {
+          'application' => options.fetch(:application, nil),
           'database' => options.fetch(:database, nil),
           'mongo' => options.fetch(:mongo, nil),
           'rabbitmq' => options.fetch(:rabbitmq, nil)
@@ -27,6 +28,7 @@ module Orchestration
 
       def services_available
         [
+          { name: 'application', class: ApplicationService },
           { name: 'database', class: DatabaseService },
           { name: 'mongo', class: MongoService },
           { name: 'rabbitmq', class: RabbitMQService }

data/lib/orchestration/docker_compose.rb

@@ -6,6 +6,8 @@ module Orchestration
 end
 
 require 'orchestration/docker_compose/services'
+
+require 'orchestration/docker_compose/application_service'
 require 'orchestration/docker_compose/database_service'
 require 'orchestration/docker_compose/mongo_service'
 require 'orchestration/docker_compose/rabbitmq_service'

data/lib/orchestration/install_generator.rb

@@ -9,7 +9,7 @@ module Orchestration
 
     def initialize(*_args)
       super
-      @env = Environment.new(environment: 'test')
+      @env = Environment.new
       @terminal ||= Terminal.new
     end
 
@@ -58,6 +58,7 @@ module Orchestration
       return if File.exist?(path)
 
       docker_compose = DockerCompose::Services.new(
+        application: configuration(:application),
         database: configuration(:database),
         mongo: configuration(:mongo),
         rabbitmq: configuration(:rabbitmq)
@@ -68,9 +69,8 @@ module Orchestration
     private
 
     def configuration(service)
-      # REVIEW: At the moment we only handle test dependencies - it would be
-      # nice to also handle development dependencies.
       {
+        application: Services::Application::Configuration,
         database: Services::Database::Configuration,
         mongo: Services::Mongo::Configuration,
         rabbitmq: Services::RabbitMQ::Configuration

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Application
+      class Configuration
+        def initialize(env)
+          @env = env
+        end
+
+        def environment
+          @env
+        end
+
+        def database_settings
+          Database::Configuration.new(@env).settings
+        end
+      end
+    end
+  end
+end

data/lib/orchestration/services/application.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Orchestration
+  module Services
+    module Application
+    end
+  end
+end
+
+require 'orchestration/services/application/configuration'

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

@@ -33,6 +33,7 @@ module Orchestration
           base = base_config(environments)
           @adapter = adapter_object(base['adapter'])
           @settings = base.merge(@adapter.credentials)
+                          .merge('scheme' => scheme_name(base['adapter']))
           @settings.merge!(default_port) unless @settings.key?('port')
         end
 
@@ -84,15 +85,19 @@ module Orchestration
 
           {
             'host' => uri.hostname,
-            'adapter' => adapter_name_from_scheme(uri.scheme),
+            'adapter' => adapter_name(uri.scheme),
             'port' => uri.port
           }.merge(query_params(uri))
         end
 
-        def adapter_name_from_scheme(scheme)
-          return 'mysql2' if scheme == 'mysql'
-          return 'postgresql' if scheme == 'postgres'
-          return 'sqlite3' if scheme == 'sqlite3'
+        def scheme_name(adapter_name)
+          adapter_mapping.invert.fetch(adapter_name)
+        end
+
+        def adapter_name(scheme)
+          name = adapter_mapping.fetch(scheme, nil)
+
+          return name unless name.nil?
 
           raise ArgumentError,
                 I18n.t('orchestration.unknown_scheme', scheme: scheme)
@@ -108,6 +113,14 @@ module Orchestration
           raise DatabaseConfigurationError,
                 I18n.t('orchestration.database.missing_default')
         end
+
+        def adapter_mapping
+          {
+            'mysql' => 'mysql2',
+            'postgres' => 'postgresql',
+            'sqlite3' => 'sqlite3'
+          }
+        end
       end
     end
   end

data/lib/orchestration/services.rb

@@ -5,6 +5,7 @@ module Orchestration
   end
 end
 
+require 'orchestration/services/application'
 require 'orchestration/services/database'
 require 'orchestration/services/mongo'
 require 'orchestration/services/rabbitmq'

data/lib/orchestration/templates/Dockerfile.tt

@@ -6,6 +6,6 @@ RUN apt-get update \
  && mkdir /application
 WORKDIR /application
 COPY Gemfile Gemfile.lock ./
-RUN bundle install --deployment --without development test
+RUN bundle install --deployment
 ADD .build/context.tar.gz .
-CMD ["bundle", "exec", "rails", "server", "-p", "3000"]
+CMD ["bundle", "exec", "rails", "server", "-p", "3000", "-b", "0.0.0.0"]

data/lib/orchestration/templates/Makefile.tt

@@ -20,19 +20,26 @@ start:
 stop:
 	docker-compose down
 
+### Database utility commands ###
+
+migrate: wait-database
+	@echo "Running migrations..."
+	@docker-compose run application bundle exec rake db:migrate
+	@echo "Migrations complete."
+
 ### Service healthcheck commands ###
 
 wait: <%= wait_commands %>
 	@echo "All Containers ready."
 
 wait-database:
-	@RAILS_ENV=test bundle exec rake orchestration:db:wait
+	@bin/rake orchestration:db:wait
 
 wait-mongo:
-	@RAILS_ENV=test bundle exec rake orchestration:mongo:wait
+	@bin/rake orchestration:mongo:wait
 
 wait-rabbitmq:
-	@RAILS_ENV=test bundle exec rake orchestration:rabbitmq:wait
+	@bin/rake orchestration:rabbitmq:wait
 
 ### Docker build commands ###
 
@@ -45,9 +52,10 @@ docker-build:
 	git archive --format tar.gz -o docker/.build/context.tar.gz master
 	docker build --build-arg BUNDLE_GITHUB__COM \
 	             --build-arg BUNDLE_BITBUCKET__ORG \
-		     -t $(shell bundle exec rake orchestration:docker:username)/<%= app_id %>:$(shell git rev-parse --short --verify master) \
+		     -t $(shell bin/rake orchestration:docker:username)/<%= app_id %> \
+		     -t $(shell bin/rake orchestration:docker:username)/<%= app_id %>:$(shell git rev-parse --short --verify master) \
 		     ./docker/
 
 docker-push: VERSION := $(shell git rev-parse --short --verify master)
 docker-push:
-	docker push $(shell bundle exec rake orchestration:docker:username)/<%= app_id %>:${VERSION}
+	docker push $(shell bin/rake orchestration:docker:username)/<%= app_id %>:${VERSION}

data/lib/orchestration/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -247,6 +247,7 @@ files:
 - config/locales/en.yml
 - lib/orchestration.rb
 - lib/orchestration/docker_compose.rb
+- lib/orchestration/docker_compose/application_service.rb
 - lib/orchestration/docker_compose/database_service.rb
 - lib/orchestration/docker_compose/mongo_service.rb
 - lib/orchestration/docker_compose/rabbitmq_service.rb
@@ -259,6 +260,8 @@ files:
 - lib/orchestration/railtie.rb
 - lib/orchestration/service_check.rb
 - lib/orchestration/services.rb
+- lib/orchestration/services/application.rb
+- lib/orchestration/services/application/configuration.rb
 - lib/orchestration/services/database.rb
 - lib/orchestration/services/database/adapters.rb
 - lib/orchestration/services/database/adapters/mysql2.rb