deplomat 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f3f28b7c61b018e8c5d0c4ca7124b022f51bb741f36ff9ded70c65f54bd900
-  data.tar.gz: c62691d8f74aed43afd4cd73f41eae83fa4b7be88d697770e4c5e62c62c7c4c4
+  metadata.gz: 66ae898f5e989d5a0d75e1bc1553c4b5fbf0b72985f56d567196b45245a29e34
+  data.tar.gz: 7997c279e5efa60157e363a9f2a364652ab63d9043cdd4776d46518d9e9adc43
 SHA512:
-  metadata.gz: 121320dbe76071c5b79f19d85b5157461b29e45e6bafe1cfe42ec90680327d4d0cd4193221d34635f70bfaef935d6c476fe3de131899c56be4bd19f54e4a8e32
-  data.tar.gz: df10942d990399297fc97bcdd15d9d7ae802115b15074f5c989eaccbd7a1e52d902d6254afd0701dbac96e66bce0c07b429ba68bf6aa2fe70ed259709c46d014
+  metadata.gz: 7e39f88db17fb163497d22f7df5e1852d4400d2cf7cf4fe95e8d17a7adaf79763bfff8d871ba3504f84a43077510fb2d92168c8980e6aba6169349476768d370
+  data.tar.gz: bc9bb50fa861aeedb8e5ca8efdebeefa7b0172beb0a46eca85e4541e35dbe7d8981603918a159bc22a3453b2c38626b78938ac75c8611b0bb5f129cf5cc38090

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/deplomat.gemspec

@@ -2,21 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: deplomat 0.2.9 ruby lib
+# stub: deplomat 0.2.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "deplomat".freeze
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Roman Snitko".freeze]
-  s.date = "2018-12-17"
+  s.date = "2019-06-16"
   s.description = "Stack agnostic deployment system that uses bash and ssh commands".freeze
   s.email = "roman.snitko@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
     ".document",
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
+    "README.md",
     "Rakefile",
     "VERSION",
     "deplomat.gemspec",

data/lib/deplomat/remote_node.rb

@@ -1,7 +1,7 @@
 module Deplomat
   class RemoteNode < Node
 
-    def initialize(host:, port: 22, user: "deploy", raise_exceptions: true, path: nil, logfile: '~/deplomat.log', log_to: [:stdout])
+    def initialize(host:, port: nil, user: "deploy", raise_exceptions: true, path: nil, logfile: '~/deplomat.log', log_to: [:stdout])
 
       @log_to  = log_to
       @logfile = logfile
@@ -12,14 +12,14 @@ module Deplomat
       end
 
       # Establish connection
-      first_ssh_command = "ssh -MNfS #{ENV['HOME']}/.ssh/controlmasters/%r@%h:%p #{user}@#{host} -p #{port} -o ControlPersist=10m"
+      first_ssh_command = "ssh -MNfS #{ENV['HOME']}/.ssh/controlmasters/%r@%h:%p #{user}@#{host} #{port ? "-p #{port.to_s} " : ""}-o ControlPersist=10m"
       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)
-          @pids << process.pid.to_i 
+          @pids << process.pid.to_i
         end
       end
       @pids.compact!
@@ -33,7 +33,7 @@ module Deplomat
         log("Connected with ssh, host #{host}, pid #{@pids.first}", color: "white")
       end
 
-      @ssh_command = "ssh -S #{ENV['HOME']}/.ssh/controlmasters/%r@%h:%p #{user}@#{host} -p #{port}"
+      @ssh_command = "ssh -S #{ENV['HOME']}/.ssh/controlmasters/%r@%h:%p #{user}@#{host} #{port ? "-p #{port.to_s} " : ""}"
 
       @host = host
       @user = user
@@ -53,12 +53,12 @@ module Deplomat
 
     def upload(what, where, except: nil)
       except = "--exclude '#{except}'" if except
-      local_execute "rsync -arzve 'ssh -p #{@port}' #{except} --delete #{what} #{@user}@#{@host}:#{where}", nil
+      local_execute "rsync -arzve 'ssh #{@port ? "-p #{@port.to_s} " : ""}' #{except} --delete #{what} #{@user}@#{@host}:#{where}", nil
     end
 
     def download(what, where, except: nil)
       except = "--exclude '#{except}'" if except
-      local_execute "rsync -arzve 'ssh -p #{@port}' #{except} --delete #{@user}@#{@host}:#{what} #{where}", nil
+      local_execute "rsync -arzve 'ssh #{@port ? "-p #{@port.to_s} " : ""}' #{except} --delete #{@user}@#{@host}:#{what} #{where}", nil
     end
 
     def close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable