orchestration 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d452624b11c2d2502ad8f063deb3cdf860d471a
-  data.tar.gz: 2d5fc17927a310c894a9f0ea894164d300bc512b
+  metadata.gz: 7371c8d7691770e73a17feb1c67095e5ff6d4f68
+  data.tar.gz: 6438dc68182cf8673c25137ac3b9676f69284fe7
 SHA512:
-  metadata.gz: 5c6ad0de94e5d530ff11d82e5e5c6ddfc24e023bc29abce9daf99c1eaf55160dfea9b6d6e39290dd760b6f28884cfee5df31f09d411cbf12b4548e06cffc9530
-  data.tar.gz: ea8d5d8ea15eb9754e69a2e74b69de1e124b34143342ba3edf3b33f39c37b5ab0fda1d66b8be2659e04c198df965c77dec46d8c28596fe662525b176df61f9ab
+  metadata.gz: '0888c846560554ea5b5d767b764af902c60902344501b18786283d033050d96f76a6a4ecc5906da48c00e959c22a3f8d1c318a1c3ee25651538fad932285d841'
+  data.tar.gz: 313e67474a01c8a3f9014fa914af1be67df44c94ec947b5dfd5c62bf62a109cd06964117764c6193cce940d079bf06e2a579b98926d7e2dd6fc5e97ac24533a1

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.6'
+gem 'orchestration', '~> 0.2.7'
 ```
 
 And then build your bundle:

data/config/locales/en.yml

@@ -1,6 +1,5 @@
 en:
   orchestration:
-    unknown_scheme: "Unrecognised database adapter for URL scheme: %{scheme}"
     attempt_limit: "Unable to reconnect after %{limit} attempts. Aborting."
 
     application:

data/lib/orchestration/docker_compose/mongo_service.rb

@@ -3,6 +3,8 @@
 module Orchestration
   module DockerCompose
     class MongoService
+      PORT = 27_020
+
       def initialize(config)
         @config = config
       end

data/lib/orchestration/services/configuration_base.rb

@@ -28,7 +28,7 @@ module Orchestration
       end
 
       def host
-        'localhost'
+        '127.0.0.1'
       end
 
       def local_port

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

@@ -34,7 +34,7 @@ module Orchestration
           @adapter = adapter_object(base['adapter'])
           @settings = base.merge(@adapter.credentials)
                           .merge(
-                            'scheme' => scheme_name(base['adapter']),
+                            'scheme' => base['adapter'],
                             'port' => DockerCompose::DatabaseService::PORT
                           )
         end
@@ -90,37 +90,16 @@ module Orchestration
 
           {
             'host' => uri.hostname,
-            'adapter' => adapter_name(uri.scheme),
+            'adapter' => uri.scheme,
             'port' => uri.port
           }.merge(query_params(uri))
         end
 
-        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)
-        end
-
         def query_params(uri)
           return {} if uri.query.nil?
 
           Hash[URI.decode_www_form(uri.query)]
         end
-
-        def adapter_mapping
-          {
-            'mysql' => 'mysql2',
-            'postgres' => 'postgresql',
-            'sqlite3' => 'sqlite3'
-          }
-        end
       end
     end
   end

data/lib/orchestration/services/healthcheck_base.rb

@@ -50,6 +50,10 @@ module Orchestration
         # class we happen to be included in.
         self.class.parent.const_get(:Configuration)
       end
+
+      def devnull
+        File.open(File::NULL, 'w')
+      end
     end
   end
 end

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

@@ -14,17 +14,45 @@ module Orchestration
           return unless defined?(Mongoid)
           return unless File.exist?(@env.mongoid_configuration_path)
 
-          @settings = config.fetch(@env.environment)
+          @settings = { clients_key => hosts_config }
         end
 
         def friendly_config
-          "[mongoid] #{host}:#{local_port}"
+          "[mongoid] #{host}:#{local_port}/#{database}"
         end
 
         private
 
+        def hosts_config
+          {
+            'default' => {
+              'hosts' => ["#{host}:#{port}"],
+              'database' => database
+            }
+          }
+        end
+
+        def database
+          config
+            .fetch(@env.environment)
+            .fetch(clients_key)
+            .fetch('default')
+            .fetch('database')
+        end
+
+        def port
+          DockerCompose::MongoService::PORT
+        end
+
+        def clients_key
+          return 'clients' if config.fetch(@env.environment).key?('clients')
+
+          # Support older Mongoid versions
+          'sessions'
+        end
+
         def config
-          YAML.safe_load(
+          @config ||= YAML.safe_load(
             File.read(@env.mongoid_configuration_path), [], [], true
           )
         end

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

@@ -9,14 +9,35 @@ module Orchestration
         dependencies 'mongoid'
 
         def connection_errors
+          return [Moped::Errors::ConnectionFailure] if defined?(Moped)
+
           [::Mongo::Error::NoServerAvailable]
         end
 
         def connect
+          silence_warnings
+
           # REVIEW: For some reason this is extremely slow. Worth trying
           # to see if there's a faster way to fail.
           Mongoid.load_configuration(@configuration.settings)
-          !Mongoid.default_client.database_names.empty?
+          !default_client.database_names.empty?
+        end
+
+        private
+
+        def default_client
+          return Mongoid.default_client if Mongoid.respond_to?(:default_client)
+
+          # Support older versions of Mongoid
+          Mongoid.default_session
+        end
+
+        def silence_warnings
+          if defined?(Moped)
+            Moped.logger = Logger.new(devnull)
+          else
+            Mongoid.logger = Logger.new(devnull)
+          end
         end
       end
     end

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

@@ -22,12 +22,6 @@ module Orchestration
           connection.start
           connection.stop
         end
-
-        private
-
-        def devnull
-          File.open(File::NULL, 'w')
-        end
       end
     end
   end

data/lib/orchestration/templates/Makefile.erb

@@ -57,10 +57,10 @@ wait-rabbitmq:
 
 docker: build push
 
-GIT_BRANCH:=BRANCH:=$(if $(BRANCH),$(BRANCH),$(shell git rev-parse --abbrev-ref HEAD))
+GIT_BRANCH:=$(if $(BRANCH),$(BRANCH),$(shell git rev-parse --abbrev-ref HEAD))
 
 build:
-	@echo "Preparing build."
+	@echo "Preparing build from ${GIT_BRANCH}"
 	@mkdir -p ./docker/.build
 	@git show ${GIT_BRANCH}:./Gemfile > ./docker/Gemfile
 	@git show ${GIT_BRANCH}:./Gemfile.lock > ./docker/Gemfile.lock

data/lib/orchestration/templates/entrypoint.sh.erb

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -u
-useradd -u ${HOST_UID} -m -o owner
+id owner >/dev/null 2>&1 || useradd -u ${HOST_UID} -m -o owner
 mkdir -p /application/tmp/pids
 chown -R owner:owner /application/tmp /application/log /application/db
+rm -f /application/tmp/pids/unicorn.pid
 exec gosu owner "$@"

data/lib/orchestration/version.rb

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

data/orchestration.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'orchestration/version'
 
 Gem::Specification.new do |spec|
-  url = 'https://bitbucket.org/orchestration_developers/orchestration/src'
+  url = 'https://github.com/bobf/orchestration'
   spec.name = 'orchestration'
   spec.version = Orchestration::VERSION
   spec.authors = ['Bob Farrell']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Bob Farrell
@@ -336,7 +336,7 @@ files:
 - lib/orchestration/version.rb
 - lib/tasks/orchestration.rake
 - orchestration.gemspec
-homepage: https://bitbucket.org/orchestration_developers/orchestration/src
+homepage: https://github.com/bobf/orchestration
 licenses: []
 metadata: {}
 post_install_message: