miab 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6911c70d764bfa7d9de2c494403828fbc38c4ffeb85fe7a26db923a898b678b
-  data.tar.gz: 0426ee0f211bc6f7f379acfedb468bb0e6930740e725ef0272b450ba9afc08bb
+  metadata.gz: bbf1ee0a2dd7474a6d8063f6bdf63880f10db17d8edfff2e7e552def3389013a
+  data.tar.gz: e5fb9e2256de496915030beb2d88bfdda3ea63cd42658ff48349cc7fe8f4cd26
 SHA512:
-  metadata.gz: 11d6a71ba658ce25b2b3648b4b2587b3d8912bb5053c3bc9f1a39eafe5127f0e9a97dedde121ee63eec9aa49de7a327fff076159ff94524cf2a1b60b43ef6c4e
-  data.tar.gz: 2ca3773b2c9a3c8acf3fba76ae8fc076d788dccfb4cab21cd163cc1c3c2de16cb733e15453409d3f16772fe7646c765ff59799634d83277741e3a3ce60a3f024
+  metadata.gz: 611b23b205ff761de613fc5624481aaef5be930b171f9aecae360cc71ca2c9b07dee55260b1ee502659483fab7db657c6ad38f3e6b1619bcd74e3cbcf8860519
+  data.tar.gz: f903b55460325b482a1fe967efeb0ea633be35d4b1afbb6a05c5bc258879f41db791cd4e6b08ccbcfed6e3df2cf6c0e10a25e14d7884a61420a19e35629fb2f2

data/lib/miab.rb

@@ -12,179 +12,208 @@ require 'resolv'
 
 class Miab
   using ColouredText
+  
+  class Session
+    
+    def initialize( host, ssh=nil, debug: false)
+      @ssh, @host, @debug = ssh, host, debug
+      @results = {}
+    end
+    
+    def exec(s)
+      eval s
+      @results
+    end
+    
+    protected
+    
+    # return the local date and time
+    #
+    def date()
 
-  def initialize(scroll, domain: nil, target: nil, pwlist: {}, password: nil, 
-    user: nil, debug: false)
-
-    @results = {}
-
-    @scroll, @debug = scroll, debug
+      instructions = 'date'
+      r = @ssh ? @ssh.exec!(instructions) : `#{instructions}`
+      puts 'r: ' + r.inspect if @debug
+      @results[:date] = r.chomp
 
-    @nodes = if target then
+    end
 
-      target = [target] if target.is_a? String
+    # query the available disk space etc.
+    #
+    def disk_space()
 
-      target.inject({}) do |r,x|
-        host = domain ? x + '.' + domain : x
-        passwd = pwlist[x] || password
-        userhost = user ? user + '@' + host : host
-        r.merge({userhost => passwd})
-      end
+      instructions = 'df -h'
+      r = @ssh ? @ssh.exec!(instructions) : `#{instructions}`
 
-    else
-      {}
-    end
-  end
+      @results[:disk_usage] = {}
 
-  # cast out the thing and hope for the best
-  #
-  def cast()
+      a = s.lines.grep(/\/dev\/root/)
 
-    if @nodes.any? then
+      puts ('a: ' + a.inspect).debug if @debug
 
-      @nodes.each do |raw_host, password|
+      if a.any? then
+        size, used, avail = a[0].split(/ +/).values_at(1,2,3)
 
-        host, user = raw_host.split(/@/,2).reverse
-        @host = host
-        @results[host] = {}
-        
-        begin
-          @ssh = Net::SSH.start( host, user, password: password)
-          eval @scroll
-          @ssh.close
-        rescue
-          @results[host] = nil
-        end
-        
+        @results[:disk_usage][:root] = {size: size, used: used, 
+          avail: avail}
       end
 
-    else
-      @results[`hostname`.chomp] = {}
-      eval @scroll if @scroll
-    end
+      a2 = s.lines.grep(/\/dev\/sda1/)
 
-    @scroll = nil
-    @results
-  end
+      puts ('a2: ' + a2.inspect).debug if @debug
 
-  # return the local date and time
-  #
-  def date()
+      if a2.any? then
+        size, used, avail = a2[0].split(/ +/).values_at(1,2,3)
 
-    instructions = 'date'
-    r = @ssh ? @ssh.exec!(instructions) : system(instructions)
-    @results[@host][:date] = r.chomp
+        @results[:disk_usage][:sda1] = {size: size, used: used, 
+          avail: avail}
+      end
 
-  end
+    end
 
-  # query the available disk space etc.
-  #
-  def disk_space()
+    alias df disk_space
 
-    instructions = 'df -h'
-    s = @ssh ? @ssh.exec!(instructions) : system(instructions)
+    # find out available memory etc
+    #
+    def memory()
 
-    @results[@host][:disk_usage] = {}
+      instructions = 'free -h'
 
-    a = s.lines.grep(/\/dev\/root/)
+      puts ('instructions: ' + instructions.inspect).debug if @debug
+      r = @ssh ? @ssh.exec!(instructions) : `#{instructions}`
+      puts ('memory: ' + r.inspect).debug if @debug
+      a = r.lines
+      total, used, avail = a[1].split.values_at(1,2,-1)    
+      @results[:memory] = {total: total, used: used, available: avail}
 
-    puts ('a: ' + a.inspect).debug if @debug
+    end
+    
+    # query the ping time
+    #
+    def ping()
+
+      ip = Resolv.getaddress(@host)
+      puts ('ip: ' + ip.inspect).debug if @debug
+      valid = pingecho(ip)
+      puts ('valid: ' + valid.inspect).debug if @debug    
+      
+      @results[:ping] = if valid then
+        a = [valid]
+        4.times {sleep 0.01; a << pingecho(ip)}
+        (a.min * 1000).round(3)
+      else
+        nil
+      end
 
-    if a.any? then
-      size, used, avail = a[0].split(/ +/).values_at(1,2,3)
+    end
 
-      @results[@host][:disk_usage][:root] = {size: size, used: used, 
-        avail: avail}
+    # query the path of the current working directory
+    #
+    def pwd()
+      instructions = 'pwd'
+      r = @ssh ? @ssh.exec!(instructions) : `#{instructions}`
+      @results[:pwd] = r.chomp
     end
 
-    a2 = s.lines.grep(/\/dev\/sda1/)
+    # query the CPU temperature
+    #
+    def temperature()
+      instructions = 'cat /sys/class/thermal/thermal_zone0/temp'
+      r = @ssh ? @ssh.exec!(instructions) : `#{instructions}`
+      @results[:temperature] = r.chomp
+    end
+    
+    private
+    
+    
+    def pingecho(host, timeout=5, service="echo")
 
-    puts ('a2: ' + a2.inspect).debug if @debug
+      elapsed = nil
+      time = Time.new
 
-    if a2.any? then
-      size, used, avail = a2[0].split(/ +/).values_at(1,2,3)
+      begin
 
-      @results[@host][:disk_usage][:sda1] = {size: size, used: used, 
-        avail: avail}
-    end
+        Timeout.timeout(timeout) do
+          s = TCPSocket.new(host, service)
+          s.close
+        end
 
+      rescue Errno::ECONNREFUSED
+        return Time.now - time
+      rescue Timeout::Error, StandardError
+        return false
+      end
+      
+      # it should not reach this far
+      return true
+    end  
+      
+      
   end
 
-  alias df disk_space
+  def initialize(scroll, domain: nil, target: nil, pwlist: {}, password: nil, 
+    user: nil, debug: false)
 
-  # find out available memory etc
-  #
-  def memory()
+    @results = {}
 
-    instructions = 'free -h'
+    @scroll, @debug = scroll, debug
 
-    puts ('instructions: ' + instructions.inspect).debug if @debug
-    r = @ssh ? @ssh.exec!(instructions) : system(instructions)
-    puts ('memory: ' + r.inspect).debug if @debug
-    a = r.lines
-    total, used, avail = a[1].split.values_at(1,2,-1)    
-    @results[@host][:memory] = {total: total, used: used, available: avail}
+    @nodes = if target then
 
-  end
-  
-  # query the ping time
-  #
-  def ping()
+      target = [target] if target.is_a? String
+
+      target.inject({}) do |r,x|
+        host = domain ? x + '.' + domain : x
+        passwd = pwlist[x] || password
+        userhost = user ? user + '@' + host : host
+        r.merge({userhost => passwd})
+      end
 
-    ip = Resolv.getaddress(@host)
-    puts ('ip: ' + ip.inspect).debug if @debug
-    valid = pingecho(ip)
-    puts ('valid: ' + valid.inspect).debug if @debug    
-    
-    @results[@host][:ping] = if valid then
-      a = [valid]
-      4.times {sleep 0.01; a << pingecho(ip)}
-      (a.min * 1000).round(3)
     else
-      nil
+      {}
     end
-
   end
 
-  # query the path of the current working directory
+  # cast out the thing and hope for the best
   #
-  def pwd()
-    instructions = 'pwd'
-    r = @ssh ? @ssh.exec!(instructions) : system(instructions)
-    @results[@host][:pwd] = r.chomp
-  end
+  def cast()
 
-  # query the CPU temperature
-  #
-  def temperature()
-    instructions = 'cat /sys/class/thermal/thermal_zone0/temp'
-    r = @ssh ? @ssh.exec!(instructions) : system(instructions)
-    @results[@host][:temperature] = r.chomp
-  end
-  
-  private
-  
-  
-  def pingecho(host, timeout=5, service="echo")
+    if @nodes.any? then
+      
+      threads = []
 
-    elapsed = nil
-    time = Time.new
+      @nodes.each do |raw_host, password|
+        
+        host, user = raw_host.split(/@/,2).reverse
+        @results[host] = {}
+        
+        threads << Thread.new do
+          begin
+            puts ('host: ' + host.inspect).debug if @debug
+            ssh = Net::SSH.start( host, user, password: password)
+            @results[host] = Session.new(host, ssh, debug: @debug).exec @scroll
+            ssh.close
+            puts (host + ' result: ' + @results[host].inspect).debug if @debug
+          rescue
+            @results[host] = nil
+          end
+        end
+        
+      end      
 
-    begin
+      threads.each(&:join)
 
-      Timeout.timeout(timeout) do
-        s = TCPSocket.new(host, service)
-        s.close
+    else
+      
+      if @scroll then
+        host = `hostname`.chomp
+        @results[host] = Session.new(host, debug: @debug).exec(@scroll)
       end
-
-    rescue Errno::ECONNREFUSED
-      return Time.now - time
-    rescue Timeout::Error, StandardError
-      return false
+      
     end
-    
-    # it should not reach this far
-    return true
-  end  
+
+    @scroll = nil
+    @results
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miab
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   9irKsAp/hZt3dTbQOtnSlc9XREZZdegwOgu1FEqBqviNIn9R28OR237HExiWXwmw
   HDTFIjk8XBqTunABuFUgr4qx
   -----END CERTIFICATE-----
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh