netid-tools 0.4.2 → 0.5.1

data/README.md

@@ -143,6 +143,12 @@ The NetID you want to check
 Version History
 ===============
 
+## 0.5.0
+
+* Switch to new SSH connection method; reuse already existing SSH connection for host if it exists
+* Tighten up code
+* Fix bugs
+
 ## 0.4.2
 
 * Rename check_quota -> quota_check

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.1

data/bin/ua_check

@@ -23,7 +23,10 @@ raise "No NetID(s) specified. Bailing." if ARGV.empty?
 
 user = ARGV.map{|n| n.downcase}
 user.each do |netid|
-  raise "#{netid} is not a valid NetID! Exiting." unless Netid.validate_netid?(netid)
+  unless Netid.validate_netid?(netid)
+    puts "#{netid} is not a valid NetID! Exiting."
+    exit 1
+  end
 end
 
 system_user = `whoami`.chomp
@@ -75,7 +78,9 @@ user.each do |netid|
 
   unless options[:concise]
     puts "\n"
-    checkr.check_quota
+    checkr.check_quota.each do |l|
+      puts l.join(" ")
+    end
   end
   puts "\n"
 end

data/lib/generic-response.rb

@@ -0,0 +1,4 @@
+class GenericResponse
+  attr_accessor :response, :error
+end
+

data/lib/netid-tools.rb

@@ -1,94 +1,105 @@
 require 'net/ssh'
 require 'colored'
+require 'netid-validator'
+require 'system-connect'
+require 'generic-response'
 
 class Netid
-  attr_accessor :netid, :system_user
+  include SystemConnect
 
-  def initialize(netid,system_user=nil)
+  attr_accessor :netid, :system_user, :systems, :single_host
+
+  def initialize(netid,system_user=nil,systems=nil,single_host=nil)
     @netid = netid
-    @system_user = system_user
+    @system_user = system_user || `whoami`.chomp
+    @systems = systems || ["ovid01.u.washington.edu",
+                           "ovid02.u.washington.edu",
+                           "ovid03.u.washington.edu",
+                           "vergil.u.washington.edu"
+                           ]
+    @single_host = single_host || "ovid02.u.washington.edu"
+  end
+
+  def validate_netid
+    NetidValidator.do(netid)
   end
 
   def self.validate_netid?(netid)
-    if netid.to_s.length > 8 || netid !~ /^[a-zA-Z][\w-]{0,7}$/
-      false
-    else
-      true
-    end
+    NetidValidator.do(netid).response
   end
 
-  def validate_netid?(netid)
-    Netid.validate_netid?(netid)
+  def validate_netid?
+    NetidValidator.do(netid).response
   end
 
   def check_for_mysql_presence(host)
-    Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-      output = ssh.exec!("ps -U #{netid} -u #{netid} u")
-      if output =~ /mysql/
-        /port=(?<port>\d+)/ =~ output
-        [host,port]
-      else
-        false
-      end
+    command = "ps -F -U #{netid} -u #{netid}"
+    result = run_remote_command(command,host)
+    if result =~ /mysql/
+      /port=(?<port>\d+)/ =~ result
+      [host,port]
+    else
+      false
     end
   end
 
   def get_processes(host)
-    output = ""
-    Net::SSH.start(host,system_user,{auth_methods: %w(publickey)}) do |ssh|
-      if /no such user/i =~ ssh.exec!("id #{netid}")
-        output = nil
-      else
-        output = ssh.exec!("ps -f --user=#{netid}").lines
-      end
+    if /no such user/i =~ run_remote_command("id #{netid}",host)
+      result = nil
+    else
+      result = run_remote_command("ps -F --user=#{netid}",host).lines
+      result = remove_extra_processes(result)
     end
-    if output.nil? || output.count == 1
+    if result.nil? || result.count == 1
       false
     else
-      output
+      result
     end
   end
 
   def check_for_localhome
-    host = 'ovid02.u.washington.edu'
-    Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-      output = ssh.exec!("cpw -poh #{netid}")
-      if output =~ /Unknown/
-        false
-      else
-       output.chomp
-     end
-   end
- end
+    result = run_remote_command("cpw -poh #{netid}",single_host)
+    if result =~ /Unknown/
+      false
+    else
+      result.chomp
+    end
+  end
 
- def check_webtype
-  host = 'ovid02.u.washington.edu'
-  Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-    ssh.exec!("webtype -user #{netid}").chomp.split(" ")
+  def check_webtype
+    result = []
+    command = "webtype -user #{netid}"
+    result = run_remote_command(command,single_host).chomp.split
+    if result[0] == "user"
+      result = run_remote_command(command,host).chomp.split(" ")
+    else
+      result
+    end
   end
-end
 
 
-def check_quota 
-  host = 'ovid02.u.washington.edu'
-  Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-    result = ssh.exec!("quota #{netid}").chomp
-      result = result.split("\n")
-      result.delete_at(0) if result.first == ''
-      result.each_with_index do |line,index|
-        if index == 0 || index == 1
-          puts line
-          next
-        end
-        line_components = line.squeeze(" ").split(" ")
-        if line_components[1].to_f > line_components[2].to_f
-          puts "#{line.bold.red}"
-        elsif line_components[4] =~ /day/i || line_components[4].to_i > line_components[5].to_i
-          puts line.bold.red+'\n'
-        else
-          puts line
-        end
-      end
+  def check_quota
+    result = run_remote_command("quota #{netid}",single_host)
+    result = result.chomp.split("\n")
+    result.delete_at(0) if result.first == ''
+    uid = /uid\s(\d+)/.match(result.first)[1].to_i
+    result.delete_at(0)
+    headings = result.first.split
+    result.delete_at(0)
+    results = []
+    results << headings
+    result.each do |line|
+      line = line.split
+      line.insert(4, 'n/a') if line.size == 6
+      results << line
     end
+    results
   end
+
+  private
+    def remove_extra_processes(processes)
+      processes.select do |line|
+        line !~ /ps -F --user|ssh(d:|-agent)|bash|zsh/
+      end
+    end
 end

data/lib/netid-validator.rb

@@ -0,0 +1,12 @@
+class NetidValidator
+  def self.do(netid)
+    response = GenericResponse.new
+    if netid.to_s.length > 8 || netid !~ /^[a-zA-Z][\w-]{0,7}$/
+      response.response = false
+      response.error = 'Not a valid NetID'
+    else
+      response.response = true
+    end
+    response
+  end
+end

data/lib/system-connect.rb

@@ -0,0 +1,57 @@
+module SystemConnect
+
+  # def initialize_ssh_connections
+  #   connections = []
+  #   systems.each do |host|
+  #     puts "Attempting connection for #{system_user}@#{host}"
+  #     connections << SystemSSH.new(host,connect(host, system_user))
+  #     puts "Connection successful for #{host}"
+  #   end
+  #   @connections = connections
+  # end
+
+  def connect(host,user)
+    Net::SSH.start(host,user,{auth_methods: %w(publickey)})
+  end
+
+  def run_remote_command(command, host)
+    connection = find_connection_for_host(host)
+    connection.exec!(command)
+    # if connection
+    #   connection.exec(command) do |ch, stream, data|
+    #     unless stream == :stderr
+    #       puts data
+    #     end
+    #   end
+    # else
+    #   puts "No connection found for host: #{host}"
+    # end
+  end
+
+  def loop
+    connection.loop
+  end
+
+  def find_connection_for_host(host)
+    @connections ||= []
+    unless @connections.select{ |conn| conn.hostname == host}.empty?
+      @connections.select{ |conn| conn.hostname == host}.first.connection_object
+    else
+      lazy_load_connection_for_host(host)
+      find_connection_for_host(host)
+    end
+  end
+
+  def lazy_load_connection_for_host(host)
+    @connections << SystemSSH.new(host,connect(host,system_user))
+  end
+end
+
+
+class SystemSSH
+  attr_accessor :hostname, :connection_object
+  def initialize(hostname, connection_object)
+    @hostname = hostname
+    @connection_object = connection_object
+  end
+end

data/netid-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "netid-tools"
-  s.version = "0.4.2"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nikky Southerland"]
-  s.date = "2013-06-21"
+  s.date = "2013-06-25"
   s.description = "Gem with various methods to support UW NetIDs"
   s.email = "nikky@uw.edu"
   s.executables = ["ua_check"]
@@ -25,7 +25,10 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/ua_check",
+    "lib/generic-response.rb",
     "lib/netid-tools.rb",
+    "lib/netid-validator.rb",
+    "lib/system-connect.rb",
     "netid-tools.gemspec"
   ]
   s.homepage = "http://github.com/allynfolksjr/netid-tools"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netid-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -187,7 +187,10 @@ files:
 - Rakefile
 - VERSION
 - bin/ua_check
+- lib/generic-response.rb
 - lib/netid-tools.rb
+- lib/netid-validator.rb
+- lib/system-connect.rb
 - netid-tools.gemspec
 homepage: http://github.com/allynfolksjr/netid-tools
 licenses:
@@ -204,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1556345222836037651
+      hash: 1029826805295521850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: