docker_toolkit 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7a1ad9e1c31909a98322fdeda209fe2c3c8049d3
-  data.tar.gz: 8cbf717e958e41aa84b3108fbd67a266c42a1e0f
+SHA256:
+  metadata.gz: 60acec8c3e29be81601ffc99e34d5da1b63f3467a2eda6a870fbcefc90134880
+  data.tar.gz: 5b179fdafd5178d42ec6572d20b69b762f37be4c6e836a58bd5382f7d5d265f5
 SHA512:
-  metadata.gz: b3c86d1bc46e512a13261364bf8b80c3ad97f54143697e91939cb3603702215bccdf94f7cbcc1bb3437a1063c79393e30cdabeecbb6e625df90db63f1b23b205
-  data.tar.gz: b2307a5074354c11ad29bc3b2a32843a04169327992121e36c25069e9f07c047b79019f67a87d04f85b1f8ef365c0f158ebc3bbe0b2266d156c75682e42bfdf8
+  metadata.gz: ff8169dd7ae877f49cfd7caec7eb2e6b69581811e1e9be4adb598cb9ee2d600adf41a65b4b7d09ece3133f24795e66d6bb4f00ca3ea2655f69cea2cef269b9b3
+  data.tar.gz: 93581ad68dc53cb5629bdd146838e6ef36c340f8a22eaaff31ad4c7d2e4e5bd84b0fa5c8bbe38f35d0d913acb2a42f4a6ae90cdafdf4dce1302283be238b7ea4

data/.rubocop.yml

@@ -39,6 +39,9 @@ Style/Lambda:
   
 Style/RaiseArgs:
   EnforcedStyle: compact
+
+Style/SpecialGlobalVars:
+  Enabled: false
     
 Metrics/LineLength:
   Max: 100

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker_toolkit (0.1.14)
+    docker_toolkit (0.1.15)
       diplomat
       dotenv
       json

data/bin/merger.rb

@@ -76,9 +76,9 @@ def process_compose_hash(yml, dirname, parent = {})
              end
 
              file_to_load = if File.exist?(dirname + '/' + file)
-                     dirname + '/' + file
-                   else
-                     file
+                              dirname + '/' + file
+                            else
+                              file
                     end
 
              tmp = process_compose_hash(YAML.load(File.read(file_to_load)), File.dirname(file_to_load), service)

data/bin/waiter.rb

@@ -134,7 +134,7 @@ def wait_for_consul
   ret = wait_for @opts[:timeout] do
     cmd = "consul operator raft list-peers -http-addr=#{@opts[:consul_addr]} > /dev/null 2>&1"
     system(cmd)
-    $CHILD_STATUS.success?
+    $?.success?
   end
 
   yield(ret)
@@ -156,7 +156,7 @@ def wait_for_tcp
   ret = wait_for @opts[:timeout] do
     cmd = "nc -z #{@opts[:host]} #{@opts[:port]} > /dev/null 2>&1"
     system(cmd)
-    $CHILD_STATUS.success?
+    $?.success?
   end
 
   yield(ret)
@@ -167,7 +167,7 @@ def wait_for_db
   ret = wait_for @opts[:timeout] do
     cmd = "psql -lqt #{@pg[:user]} #{@pg[:pass]} #{@pg[:host]} #{@pg[:port]} #{@pg[:db]} 2>/dev/null | cut -d \\| -f 1 | grep -qw #{@opts[:db]} > /dev/null 2>&1"
     system(cmd)
-    $CHILD_STATUS.success?
+    $?.success?
   end
 
   yield(ret)
@@ -178,7 +178,7 @@ def wait_for_tb
   ret = wait_for @opts[:timeout] do
     cmd = "echo \"\\dt\" | psql -qt #{@pg[:user]} #{@pg[:pass]} #{@pg[:host]} #{@pg[:port]} #{@pg[:db]} 2>/dev/null | cut -d \\| -f 2 | grep -qw #{@pg[:tb]} > /dev/null 2>&1"
     system(cmd)
-    $CHILD_STATUS.success?
+    $?.success?
   end
 
   yield(ret)

data/lib/docker_toolkit/runner.rb

@@ -30,7 +30,7 @@ module DockerToolkit
 
     def execute!(cmd, error = nil)
       output = execute(cmd)
-      $CHILD_STATUS.success? || die(error || "Can't execute: #{cmd}")
+      $?.success? || die(error || "Can't execute: #{cmd}")
       output
     end
 

data/lib/docker_toolkit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_toolkit
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Godko Ivan
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Helper scripts for work with docker and consul