uoregon-multissh 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50dffc0f04f0205fb1b0cd28c65497c6bd1a788ea2c9980f7e7fd29fa9e6119
-  data.tar.gz: 7571b3c5ae53384e7cf1279a2ae72fd454ccbb2ac762a1b321aacf8201e70657
+  metadata.gz: d3715c72b56b4b20bb515810e186294c20a870b2931f0a27224ded025bd21b31
+  data.tar.gz: b3c4f68e47301b098cf1159050092aa11ca94838ee7de1b165087a5dc6a848b3
 SHA512:
-  metadata.gz: b0fe50fe1f5cc7211f777e9ce39b3f1f1a65ccb61bebffe6264effc10bbd174d6467c332b9c8c4c262e280308506aef9dcf760673af77d4aa4dbc4e7f45dcb89
-  data.tar.gz: a12b9c780a98df4fcca029cf41857b7bcdb0455cb066827e30acb16cc54f769671cb3f269c852cbb74cd30d730a4960429546af96104a588c846a6955df6e576
+  metadata.gz: e57fa55e276b3bc1601fcfd8c7ff2fba53fdf1854c11a3f828d70436cbf4a28f168eac5e94e5ed8dfd293e62fe3d40b18b15e5bd8d4b64fc78d040d49c5c74fe
+  data.tar.gz: c15568482425b969e0e64fec6a456d8ed8ff6cb15ca0288cf9b046ed0d5c57bc93f7318e988e5b399f9a5b3cd862d62f891c88001cad60afbdbcca8fbf1ccd96

data/lib/cli.rb

@@ -1,7 +1,7 @@
 require_relative 'credential'
 
 class Cli
-  attr_accessor :username, :password, :key_password, :nodes, :command, :block, :debug, :credential
+  attr_accessor :username, :password, :key_password, :nodes, :command, :block, :header_max_length, :debug, :credential
 
   def initialize
 
@@ -15,6 +15,7 @@ class Cli
       opt.on('--pkey_password "PASSWORD"', 'OPTIONAL: will prompt if needed') { |o| @options[:pkey_password] = o }
       opt.on('--disable_sudo', 'OPTIONAL: disable_sudo requirement and run as current user') { @options[:disable_sudo] = true }
       opt.on('--block', 'OPTIONAL: block mode for command ouptut') { @options[:block] = true }
+      opt.on('--match_width', 'OPTIONAL: matches hostname width for easier comparison of results') { @options[:match_width] = true }
       opt.on('--regenerate_config', 'OPTIONAL: regenerate configuration file') { @options[:regenerate_config] = true }
       opt.on('--debug', 'OPTIONAL: debug mode') { @options[:debug] = true }
     end
@@ -56,6 +57,8 @@ class Cli
     @command        = parse_command(@options[:command])
     @block          = true if @options[:block]
 
+    @header_max_length = @options[:match_width] ? @nodes.max_by(&:length).length : nil
+
   rescue Interrupt
     puts "\nCtrl+C Interrupt\n"
     exit 1

data/lib/multissh.rb

@@ -16,14 +16,15 @@ class Multissh < Cli
     tasks = []
     @nodes.each do |node|
       worker = Worker.new(
-        hostname=node.chomp, 
-        username=@username, 
-        password=@password,
-        pkey_password=@pkey_password,
-        sudo_password=@sudo_password,
-        command=@command, 
-        block=@block, 
-        debug=@debug,
+        hostname: node.chomp, 
+        username: @username, 
+        password: @password,
+        pkey_password: @pkey_password,
+        sudo_password: @sudo_password,
+        command: @command, 
+        block: @block, 
+        header_max_length: @header_max_length,
+        debug: @debug,
       )
       tasks.append(worker)
     end

data/lib/worker.rb

@@ -1,5 +1,5 @@
 class Worker
-  def initialize(hostname, username, password, pkey_password, sudo_password, command, block, debug)
+  def initialize(hostname: nil, username: nil, password: nil, pkey_password: nil, sudo_password: nil, command: nil, block: nil, header_max_length: nil, debug: nil)
     @hostname       = hostname
     @username       = username
     @password       = password
@@ -8,7 +8,9 @@ class Worker
     @command        = command
     @block          = block
 
-    @header         = "#{hostname} -- "
+    @header_begin   = hostname
+    @header_padding = header_max_length ? " " * (header_max_length - hostname.length) : ""
+    @header_end     = " -- "
     @util           = Util.new(debug)
   end
 
@@ -17,6 +19,8 @@ class Worker
     @util.show_summary(self)
 
     result = ''
+    @header = @header_begin + @header_padding + @header_end
+
     begin
       Net::SSH.start(@hostname, @username, :password => @password, :passphrase => @pkey_password, :non_interactive => true) do |ssh|
         channel = ssh.open_channel do |channel, success|

data/uoregon-multissh.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'uoregon-multissh'
-  spec.version     = '0.3.5'
+  spec.version     = '0.3.6'
   spec.date        = '2019-05-14'
   spec.summary     = "Do all the things everywhere at the same time"
   spec.description = "Quickly run multiple commands on many boxes at the same time"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uoregon-multissh
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Lucas Crownover