docker_toolkit 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8d6d127fd4fbc93569238e201ee3400b5ce8949edc4d22e28fe9a4ff899c66ec
-  data.tar.gz: db197202c36f8a5afa0588818313288bcffbbbc2319c90be23922eacb3fb0e4d
+SHA1:
+  metadata.gz: 7a1ad9e1c31909a98322fdeda209fe2c3c8049d3
+  data.tar.gz: 8cbf717e958e41aa84b3108fbd67a266c42a1e0f
 SHA512:
-  metadata.gz: fb9cfb56bbdda94b81cdd5ba73d041a3bd12b411a2416869bf8a496848c26d13f9edfdbf9005a11e14a02211fbbeac24a3400b14d9e449840755efdd72800d13
-  data.tar.gz: 4fad8c01377d15968f83503210a17afb5ee39c34ab3b3ea684a9053cbcdf154e6463f37d647e7a23be38ba2c17591104e56d9762470304ac3ba733c1acb4928a
+  metadata.gz: b3c86d1bc46e512a13261364bf8b80c3ad97f54143697e91939cb3603702215bccdf94f7cbcc1bb3437a1063c79393e30cdabeecbb6e625df90db63f1b23b205
+  data.tar.gz: b2307a5074354c11ad29bc3b2a32843a04169327992121e36c25069e9f07c047b79019f67a87d04f85b1f8ef365c0f158ebc3bbe0b2266d156c75682e42bfdf8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker_toolkit (0.1.13)
+    docker_toolkit (0.1.14)
       diplomat
       dotenv
       json
@@ -50,4 +50,4 @@ DEPENDENCIES
   rspec-set
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/bin/merger.rb

@@ -75,11 +75,13 @@ def process_compose_hash(yml, dirname, parent = {})
                file.gsub!("${#{k}}", v)
              end
 
-             tmp = if File.exist?(dirname + '/' + file)
-                     YAML.load(File.read(dirname + '/' + file))
+             file_to_load = if File.exist?(dirname + '/' + file)
+                     dirname + '/' + file
                    else
-                     YAML.load(File.read(file))
-             end
+                     file
+                    end
+
+             tmp = process_compose_hash(YAML.load(File.read(file_to_load)), File.dirname(file_to_load), service)
 
              begin
                  (tmp['services'][ext['service']] || {})

data/lib/docker_toolkit/runner.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'English'
+
 module DockerToolkit
 
   module Runner

data/lib/docker_toolkit/version.rb

@@ -1,5 +1,5 @@
 module DockerToolkit
 
-  VERSION = '0.1.13'.freeze
+  VERSION = '0.1.14'.freeze
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Godko Ivan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diplomat
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul