docker_toolkit 0.1.13 → 0.1.14

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 8d6d127fd4fbc93569238e201ee3400b5ce8949edc4d22e28fe9a4ff899c66ec
4
- data.tar.gz: db197202c36f8a5afa0588818313288bcffbbbc2319c90be23922eacb3fb0e4d
2
+ SHA1:
3
+ metadata.gz: 7a1ad9e1c31909a98322fdeda209fe2c3c8049d3
4
+ data.tar.gz: 8cbf717e958e41aa84b3108fbd67a266c42a1e0f
5
5
  SHA512:
6
- metadata.gz: fb9cfb56bbdda94b81cdd5ba73d041a3bd12b411a2416869bf8a496848c26d13f9edfdbf9005a11e14a02211fbbeac24a3400b14d9e449840755efdd72800d13
7
- data.tar.gz: 4fad8c01377d15968f83503210a17afb5ee39c34ab3b3ea684a9053cbcdf154e6463f37d647e7a23be38ba2c17591104e56d9762470304ac3ba733c1acb4928a
6
+ metadata.gz: b3c86d1bc46e512a13261364bf8b80c3ad97f54143697e91939cb3603702215bccdf94f7cbcc1bb3437a1063c79393e30cdabeecbb6e625df90db63f1b23b205
7
+ data.tar.gz: b2307a5074354c11ad29bc3b2a32843a04169327992121e36c25069e9f07c047b79019f67a87d04f85b1f8ef365c0f158ebc3bbe0b2266d156c75682e42bfdf8
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- docker_toolkit (0.1.13)
4
+ docker_toolkit (0.1.14)
5
5
  diplomat
6
6
  dotenv
7
7
  json
@@ -50,4 +50,4 @@ DEPENDENCIES
50
50
  rspec-set
51
51
 
52
52
  BUNDLED WITH
53
- 1.16.1
53
+ 1.16.2
data/bin/merger.rb CHANGED
@@ -75,11 +75,13 @@ def process_compose_hash(yml, dirname, parent = {})
75
75
  file.gsub!("${#{k}}", v)
76
76
  end
77
77
 
78
- tmp = if File.exist?(dirname + '/' + file)
79
- YAML.load(File.read(dirname + '/' + file))
78
+ file_to_load = if File.exist?(dirname + '/' + file)
79
+ dirname + '/' + file
80
80
  else
81
- YAML.load(File.read(file))
82
- end
81
+ file
82
+ end
83
+
84
+ tmp = process_compose_hash(YAML.load(File.read(file_to_load)), File.dirname(file_to_load), service)
83
85
 
84
86
  begin
85
87
  (tmp['services'][ext['service']] || {})
@@ -1,5 +1,7 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
+ require 'English'
4
+
3
5
  module DockerToolkit
4
6
 
5
7
  module Runner
@@ -1,5 +1,5 @@
1
1
  module DockerToolkit
2
2
 
3
- VERSION = '0.1.13'.freeze
3
+ VERSION = '0.1.14'.freeze
4
4
 
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker_toolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.13
4
+ version: 0.1.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Godko Ivan
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-08-14 00:00:00.000000000 Z
12
+ date: 2018-08-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: diplomat
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
161
161
  version: '0'
162
162
  requirements: []
163
163
  rubyforge_project:
164
- rubygems_version: 2.7.7
164
+ rubygems_version: 2.6.14
165
165
  signing_key:
166
166
  specification_version: 4
167
167
  summary: Helper scripts for work with docker and consul