deplomat 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63793edf4cb9a8171fcd79e69826ee39e5659db2
-  data.tar.gz: 3b57e5f56f8fedb0ebd3955f7290de0f9ff06631
+SHA256:
+  metadata.gz: dbe01ba773bbcd64d26dcde79e074984816494d0111840223e5c19cef8dd8dc8
+  data.tar.gz: f93e3b3beaa99612c9fc6eac272b00b00017383905197cfaee7121e868473082
 SHA512:
-  metadata.gz: d7339345739a63555611385e8562f13a67468430507ec0ab9eb64326c830dd01b5de67105a47603c2c414645b362f4d465307f206803fbee220f59f23a05a7ed
-  data.tar.gz: b182de477fd7236858c80d3bc08e5b2f398e2ea6fd7f071f310b82cb07264c839d1f41c5d01f8591d2ba1469fb6ddf0bb9a12469a24fd52f98421cc94314929d
+  metadata.gz: e188aaa8a668b33d377951ffaf8c539f7fdadd08f3e35429013ac3c38a637723d675b33e0be52d44df38b6c0b10ee8ee513554d3842afba459aaae8c330bd284
+  data.tar.gz: 328e5d6bd8f29dbed2f195cb67e1f90a2d22d5fba6b3f725bdc6866618d943ed16334386eb8ff7c186e3ce64845511d067c0e91f52168ae285ab1b521ecb6834

data/Gemfile.lock

@@ -3,13 +3,14 @@ GEM
   specs:
     addressable (2.4.0)
     builder (3.2.3)
-    colorize (0.7.7)
+    colorize (0.8.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.3.0)
+    ffi (1.9.25)
+    git (1.4.0)
     github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
@@ -17,26 +18,26 @@ GEM
       hashie (>= 3.4)
       mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    hashie (3.5.6)
-    highline (1.7.8)
-    jeweler (2.3.7)
+    hashie (3.5.7)
+    highline (1.7.10)
+    jeweler (2.3.9)
       builder
-      bundler (>= 1)
+      bundler
       git (>= 1.2.5)
       github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
-      psych (~> 2.2)
+      psych
       rake
       rdoc
       semver2
     jwt (1.5.6)
     mime-types (2.99.3)
     mini_portile2 (2.3.0)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
@@ -44,25 +45,26 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (2.2.4)
-    rack (2.0.3)
-    rake (12.3.0)
-    rdoc (5.1.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    psych (3.0.2)
+    rack (2.0.5)
+    rake (12.3.1)
+    rdoc (6.0.4)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     semver2 (3.4.2)
-    sys-proctable (1.0.0)
+    sys-proctable (1.2.0)
+      ffi
     thread_safe (0.3.6)
 
 PLATFORMS
@@ -76,4 +78,4 @@ DEPENDENCIES
   sys-proctable
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/deplomat/remote_node.rb

@@ -14,13 +14,18 @@ module Deplomat
       system first_ssh_command
 
       # get background process id by the full command name
+      @pids = []
       Sys::ProcTable.ps.each do |process|
         if process.cmdline.match(first_ssh_command)
-          @pid = process.pid.to_i 
-          puts "Connected with ssh, host #{host}, pid #{@pid}."
-          break
+          @pids << process.pid.to_i 
         end
       end
+      if @pids.length > 1
+        puts "Connected with ssh, host #{host}, but looks like another connection has been opened before..."
+        puts "connection pids: #{@pids.join(", ")}. We'll be closing them all when finished."
+      else
+        puts "Connected with ssh, host #{host}, pid #{@pids.first}"
+      end
 
       @ssh_command = "ssh -S #{ENV['HOME']}/.ssh/controlmasters/%r@%h:%p #{user}@#{host} -p #{port}"
 
@@ -45,8 +50,8 @@ module Deplomat
 
     def close
       begin
-        puts "Closing connection to #{@host}."
-        Process.kill 'KILL', @pid
+        puts "Closing connection(s) to #{@host}, ssh pid(s): #{@pids.join(", ")}."
+        @pids.each { |pid| Process.kill 'KILL', pid }
       rescue Errno::ESRCH
         puts "WARNING: no process with #{@pid} found, no connection to close!"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Stack agnostic deployment system that uses bash and ssh commands