orchestration 0.3.3 → 0.3.4

data/lib/orchestration/templates/env.erb

@@ -0,0 +1,6 @@
+# Set VIRTUAL_HOST to whatever host(s) your application will be available on.
+# See https://github.com/jwilder/nginx-proxy for more details on this variable.
+VIRTUAL_HOST=localhost
+
+# Set the port your application will be available on (via Nginx proxy)
+LISTEN_PORT=3000

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

@@ -1,4 +1,4 @@
-listen '0.0.0.0:8080', :tcp_nopush => true
+listen '0.0.0.0:8080', tcp_nopush: true
 
 pid '/app/tmp/pids/unicorn.pid'
 

data/lib/orchestration/terminal.rb

@@ -15,6 +15,10 @@ module Orchestration
   }.freeze
 
   class Terminal
+    def initialize(settings)
+      @settings = settings
+    end
+
     def write(desc, message, color_name = nil, newline = true)
       output = newline ? "#{message}\n" : message.to_s
       STDOUT.print colorize(desc, output, color_name)
@@ -28,12 +32,20 @@ module Orchestration
       result
     end
 
+    def ask_setting(setting, default = nil)
+      return unless @settings.get(setting).nil?
+
+      write(:setup, t("settings.#{setting}.description"))
+      prompt = t("settings.#{setting}.prompt")
+      @settings.set(setting, read(prompt, default))
+    end
+
     private
 
     def prompt(message, default)
       return "(#{message}): " if default.nil?
 
-      "(#{message}) [#{I18n.t('orchestration.default')}: #{default}]: "
+      "(#{message}) [#{t('default')}: #{default}]: "
     end
 
     def colorize(desc, message, color_name)
@@ -48,5 +60,9 @@ module Orchestration
         .colorize(mode: :default, color: color)
         .concat(' ' + message)
     end
+
+    def t(key)
+      I18n.t("orchestration.#{key}")
+    end
   end
 end

data/lib/orchestration/version.rb

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

data/lib/orchestration.rb

@@ -8,10 +8,11 @@ require 'rails'
 I18n.load_path += Dir[File.join(File.expand_path('..', __dir__),
                                 'config', 'locales', '**', '*.yml')]
 
+require 'orchestration/file_helpers'
+
 require 'orchestration/docker_compose'
 require 'orchestration/environment'
 require 'orchestration/errors'
-require 'orchestration/file_helpers'
 require 'orchestration/install_generator'
 require 'orchestration/railtie'
 require 'orchestration/service_check'

data/lib/tasks/orchestration.rake

@@ -8,51 +8,41 @@ namespace :orchestration do
     Orchestration::InstallGenerator.start
   end
 
-  namespace :application do
-    desc I18n.t('orchestration.application.wait')
+  namespace :app do
+    desc I18n.t('orchestration.rake.app.wait')
     task :wait do
-      Orchestration::Services::Application::Healthcheck.start
+      Orchestration::Services::App::Healthcheck.start
     end
   end
 
   namespace :database do
-    desc I18n.t('orchestration.database.wait')
+    desc I18n.t('orchestration.rake.database.wait')
     task :wait do
       Orchestration::Services::Database::Healthcheck.start
     end
   end
 
   namespace :mongo do
-    desc I18n.t('orchestration.mongo.wait')
+    desc I18n.t('orchestration.rake.mongo.wait')
     task :wait do
       Orchestration::Services::Mongo::Healthcheck.start
     end
   end
 
   namespace :nginx_proxy do
-    desc I18n.t('orchestration.nginx-proxy.wait')
+    desc I18n.t('orchestration.rake.nginx_proxy.wait')
     task :wait do
       Orchestration::Services::NginxProxy::Healthcheck.start
     end
   end
 
   namespace :rabbitmq do
-    desc I18n.t('orchestration.rabbitmq.wait')
+    desc I18n.t('orchestration.rake.rabbitmq.wait')
     task :wait do
       Orchestration::Services::RabbitMQ::Healthcheck.start
     end
   end
 
-  namespace :docker do
-    desc I18n.t('orchestration.rake.docker.username')
-    task :username do
-      STDOUT.write(
-        Orchestration::Environment.new.settings.get('docker.username')
-      )
-      STDOUT.flush
-    end
-  end
-
   namespace :listener do
     desc I18n.t('orchestration.rake.listener.wait')
     task :wait do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Bob Farrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -307,12 +307,13 @@ files:
 - lib/Rakefile
 - lib/orchestration.rb
 - lib/orchestration/docker_compose.rb
-- lib/orchestration/docker_compose/application_service.rb
+- lib/orchestration/docker_compose/app_service.rb
+- lib/orchestration/docker_compose/configuration.rb
 - lib/orchestration/docker_compose/database_service.rb
+- lib/orchestration/docker_compose/install_generator.rb
 - lib/orchestration/docker_compose/mongo_service.rb
 - lib/orchestration/docker_compose/nginx_proxy_service.rb
 - lib/orchestration/docker_compose/rabbitmq_service.rb
-- lib/orchestration/docker_compose/services.rb
 - lib/orchestration/environment.rb
 - lib/orchestration/errors.rb
 - lib/orchestration/file_helpers.rb
@@ -320,9 +321,9 @@ 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/application/healthcheck.rb
+- lib/orchestration/services/app.rb
+- lib/orchestration/services/app/configuration.rb
+- lib/orchestration/services/app/healthcheck.rb
 - lib/orchestration/services/configuration_base.rb
 - lib/orchestration/services/database.rb
 - lib/orchestration/services/database/adapters.rb
@@ -347,7 +348,11 @@ files:
 - lib/orchestration/settings.rb
 - lib/orchestration/templates/Dockerfile.erb
 - lib/orchestration/templates/Makefile.erb
+- lib/orchestration/templates/application.mk.erb
+- lib/orchestration/templates/deploy.mk.erb
+- lib/orchestration/templates/docker-compose.override.yml.erb
 - lib/orchestration/templates/entrypoint.sh.erb
+- lib/orchestration/templates/env.erb
 - lib/orchestration/templates/nginx.tmpl.erb
 - lib/orchestration/templates/unicorn.rb.erb
 - lib/orchestration/templates/yaml.bash.erb
@@ -374,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Docker orchestration toolkit

data/lib/orchestration/docker_compose/services.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-module Orchestration
-  module DockerCompose
-    class Services
-      def initialize(env, options = {})
-        @env = env
-        @configurations = {
-          'application' => options.fetch(:application, nil),
-          'database' => options.fetch(:database, nil),
-          'mongo' => options.fetch(:mongo, nil),
-          'rabbitmq' => options.fetch(:rabbitmq, nil),
-          'nginx-proxy' => options.fetch(:nginx_proxy, nil)
-        }
-      end
-
-      def structure
-        {
-          'version' => '3.7',
-          'services' => services,
-          'volumes' => {
-            @env.public_volume => nil
-          }
-        }
-      end
-
-      def services
-        Hash[filtered_services]
-      end
-
-      private
-
-      def filtered_services
-        services_enabled.compact.reject { |_name, definition| definition.nil? }
-      end
-
-      def services_available
-        [
-          { name: 'application', class: ApplicationService },
-          { name: 'database', class: DatabaseService },
-          { name: 'mongo', class: MongoService },
-          { name: 'rabbitmq', class: RabbitMQService },
-          { name: 'nginx-proxy', class: NginxProxyService }
-        ]
-      end
-
-      def services_enabled
-        services_available.map do |service|
-          config = @configurations[service[:name]]
-          # REVIEW: This is mostly here for testing - we may not need it once
-          # everything's implemented.
-          next if config.nil?
-
-          [service[:name], service[:class].new(config).definition]
-        end
-      end
-    end
-  end
-end

data/lib/orchestration/services/application.rb

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