orchestration 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858173e2cca4d0dd95dc6896b1b53a1a87ffb908
-  data.tar.gz: e59a0ddec5571bce20da93b1992c4c23a21ccf96
+  metadata.gz: 3d452624b11c2d2502ad8f063deb3cdf860d471a
+  data.tar.gz: 2d5fc17927a310c894a9f0ea894164d300bc512b
 SHA512:
-  metadata.gz: 28c5c3b2d7574d251936d3e2aa813a91ca5a5669a265d461d019fc8817e6a038dad2c5d447c19867c6b48b934c09f76ea083143b82e1189e08a2e6653b74e269
-  data.tar.gz: 3ab531f3416833e0051809cba2cb9b6bfedc9b20f9ce90d8c857ce985bc9d3d10f60bebf44e14ad9914238dc3dd67ca39894765ef8e29a8aef1792bc979b3108
+  metadata.gz: 5c6ad0de94e5d530ff11d82e5e5c6ddfc24e023bc29abce9daf99c1eaf55160dfea9b6d6e39290dd760b6f28884cfee5df31f09d411cbf12b4548e06cffc9530
+  data.tar.gz: ea8d5d8ea15eb9754e69a2e74b69de1e124b34143342ba3edf3b33f39c37b5ab0fda1d66b8be2659e04c198df965c77dec46d8c28596fe662525b176df61f9ab

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

data/lib/orchestration/docker_compose/mongo_service.rb

@@ -19,15 +19,19 @@ module Orchestration
       private
 
       def local_port
-        _host, _, port = @config.settings
-                                .fetch('clients')
-                                .fetch('default')
+        _host, _, port = clients.fetch('default')
                                 .fetch('hosts')
                                 .first
                                 .partition(':')
         port.empty? ? remote_port : port
       end
 
+      def clients
+        @config.settings.fetch('clients')
+      rescue KeyError
+        @config.settings.fetch('sessions')
+      end
+
       def remote_port
         Orchestration::Services::Mongo::PORT
       end

data/lib/orchestration/install_generator.rb

@@ -49,7 +49,7 @@ module Orchestration
     def gitignore
       path = @env.root.join('.gitignore')
       entries = [
-        'docker/.build',
+        'docker/.build/context.tar.gz',
         'docker/Gemfile',
         'docker/Gemfile.lock',
         'docker/*.gemspec'

data/lib/orchestration/templates/Makefile.erb

@@ -57,21 +57,23 @@ wait-rabbitmq:
 
 docker: build push
 
+GIT_BRANCH:=BRANCH:=$(if $(BRANCH),$(BRANCH),$(shell git rev-parse --abbrev-ref HEAD))
+
 build:
 	@echo "Preparing build."
 	@mkdir -p ./docker/.build
-	@git show master:./Gemfile > ./docker/Gemfile
-	@git show master:./Gemfile.lock > ./docker/Gemfile.lock
+	@git show ${GIT_BRANCH}:./Gemfile > ./docker/Gemfile
+	@git show ${GIT_BRANCH}:./Gemfile.lock > ./docker/Gemfile.lock
 	@echo "Building..."
-	@git archive --format tar.gz -o docker/.build/context.tar.gz master
+	@git archive --format tar.gz -o docker/.build/context.tar.gz ${GIT_BRANCH}
 	@docker build \
 	             --build-arg BUNDLE_GITHUB__COM \
 	             --build-arg BUNDLE_BITBUCKET__ORG \
 		     -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) \
+		     -t $(shell bin/rake orchestration:docker:username)/<%= app_id %>:$(shell git rev-parse --short --verify ${GIT_BRANCH}) \
 		     ./docker/
 	@echo "Build complete."
 
-push: VERSION := $(shell git rev-parse --short --verify master)
+push: VERSION := $(shell git rev-parse --short --verify ${GIT_BRANCH})
 push:
 	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.5'
+  VERSION = '0.2.6'
 end

data/orchestration.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'colorize', '~> 0.8.1'
   spec.add_runtime_dependency 'erubis', '~> 2.7'
   spec.add_runtime_dependency 'i18n', '>= 0.5'
-  spec.add_runtime_dependency 'unicorn'
+  spec.add_runtime_dependency 'unicorn', '~> 5.4'
 
   spec.add_development_dependency 'activerecord', '~> 5.2'
   spec.add_development_dependency 'bundler', '~> 1.16'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orchestration
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Bob Farrell
@@ -56,16 +56,16 @@ dependencies:
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement