orchestration 0.2.5 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/lib/orchestration/docker_compose/mongo_service.rb +7 -3
  4. data/lib/orchestration/install_generator.rb +1 -1
  5. data/lib/orchestration/templates/Makefile.erb +7 -5
  6. data/lib/orchestration/version.rb +1 -1
  7. data/orchestration.gemspec +1 -1
  8. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 858173e2cca4d0dd95dc6896b1b53a1a87ffb908
4
- data.tar.gz: e59a0ddec5571bce20da93b1992c4c23a21ccf96
3
+ metadata.gz: 3d452624b11c2d2502ad8f063deb3cdf860d471a
4
+ data.tar.gz: 2d5fc17927a310c894a9f0ea894164d300bc512b
5
5
  SHA512:
6
- metadata.gz: 28c5c3b2d7574d251936d3e2aa813a91ca5a5669a265d461d019fc8817e6a038dad2c5d447c19867c6b48b934c09f76ea083143b82e1189e08a2e6653b74e269
7
- data.tar.gz: 3ab531f3416833e0051809cba2cb9b6bfedc9b20f9ce90d8c857ce985bc9d3d10f60bebf44e14ad9914238dc3dd67ca39894765ef8e29a8aef1792bc979b3108
6
+ metadata.gz: 5c6ad0de94e5d530ff11d82e5e5c6ddfc24e023bc29abce9daf99c1eaf55160dfea9b6d6e39290dd760b6f28884cfee5df31f09d411cbf12b4548e06cffc9530
7
+ data.tar.gz: ea8d5d8ea15eb9754e69a2e74b69de1e124b34143342ba3edf3b33f39c37b5ab0fda1d66b8be2659e04c198df965c77dec46d8c28596fe662525b176df61f9ab
data/README.md CHANGED
@@ -18,7 +18,7 @@ Containers are automatically created for the following dependencies:
18
18
  Add this line to your application's Gemfile:
19
19
 
20
20
  ```ruby
21
- gem 'orchestration', '~> 0.2.5'
21
+ gem 'orchestration', '~> 0.2.6'
22
22
  ```
23
23
 
24
24
  And then build your bundle:
data/lib/orchestration/docker_compose/mongo_service.rb CHANGED
@@ -19,15 +19,19 @@ module Orchestration
19
19
  private
20
20
 
21
21
  def local_port
22
- _host, _, port = @config.settings
23
- .fetch('clients')
24
- .fetch('default')
22
+ _host, _, port = clients.fetch('default')
25
23
  .fetch('hosts')
26
24
  .first
27
25
  .partition(':')
28
26
  port.empty? ? remote_port : port
29
27
  end
30
28
 
29
+ def clients
30
+ @config.settings.fetch('clients')
31
+ rescue KeyError
32
+ @config.settings.fetch('sessions')
33
+ end
34
+
31
35
  def remote_port
32
36
  Orchestration::Services::Mongo::PORT
33
37
  end
data/lib/orchestration/install_generator.rb CHANGED
@@ -49,7 +49,7 @@ module Orchestration
49
49
  def gitignore
50
50
  path = @env.root.join('.gitignore')
51
51
  entries = [
52
- 'docker/.build',
52
+ 'docker/.build/context.tar.gz',
53
53
  'docker/Gemfile',
54
54
  'docker/Gemfile.lock',
55
55
  'docker/*.gemspec'
data/lib/orchestration/templates/Makefile.erb CHANGED
@@ -57,21 +57,23 @@ wait-rabbitmq:
57
57
 
58
58
  docker: build push
59
59
 
60
+ GIT_BRANCH:=BRANCH:=$(if $(BRANCH),$(BRANCH),$(shell git rev-parse --abbrev-ref HEAD))
61
+
60
62
  build:
61
63
  @echo "Preparing build."
62
64
  @mkdir -p ./docker/.build
63
- @git show master:./Gemfile > ./docker/Gemfile
64
- @git show master:./Gemfile.lock > ./docker/Gemfile.lock
65
+ @git show ${GIT_BRANCH}:./Gemfile > ./docker/Gemfile
66
+ @git show ${GIT_BRANCH}:./Gemfile.lock > ./docker/Gemfile.lock
65
67
  @echo "Building..."
66
- @git archive --format tar.gz -o docker/.build/context.tar.gz master
68
+ @git archive --format tar.gz -o docker/.build/context.tar.gz ${GIT_BRANCH}
67
69
  @docker build \
68
70
  --build-arg BUNDLE_GITHUB__COM \
69
71
  --build-arg BUNDLE_BITBUCKET__ORG \
70
72
  -t $(shell bin/rake orchestration:docker:username)/<%= app_id %> \
71
- -t $(shell bin/rake orchestration:docker:username)/<%= app_id %>:$(shell git rev-parse --short --verify master) \
73
+ -t $(shell bin/rake orchestration:docker:username)/<%= app_id %>:$(shell git rev-parse --short --verify ${GIT_BRANCH}) \
72
74
  ./docker/
73
75
  @echo "Build complete."
74
76
 
75
- push: VERSION := $(shell git rev-parse --short --verify master)
77
+ push: VERSION := $(shell git rev-parse --short --verify ${GIT_BRANCH})
76
78
  push:
77
79
  docker push $(shell bin/rake orchestration:docker:username)/<%= app_id %>:${VERSION}
data/lib/orchestration/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Orchestration
4
- VERSION = '0.2.5'
4
+ VERSION = '0.2.6'
5
5
  end
data/orchestration.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.add_runtime_dependency 'colorize', '~> 0.8.1'
28
28
  spec.add_runtime_dependency 'erubis', '~> 2.7'
29
29
  spec.add_runtime_dependency 'i18n', '>= 0.5'
30
- spec.add_runtime_dependency 'unicorn'
30
+ spec.add_runtime_dependency 'unicorn', '~> 5.4'
31
31
 
32
32
  spec.add_development_dependency 'activerecord', '~> 5.2'
33
33
  spec.add_development_dependency 'bundler', '~> 1.16'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: orchestration
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bob Farrell
@@ -56,16 +56,16 @@ dependencies:
56
56
  name: unicorn
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '0'
61
+ version: '5.4'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '0'
68
+ version: '5.4'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: activerecord
71
71
  requirement: !ruby/object:Gem::Requirement