netid-tools 0.3.11 → 0.4.0

data/README.md

@@ -43,7 +43,7 @@ Executables
 Methods
 =======
 
-## Netid#validate_netid?(netid)
+## Netid::validate_netid?(netid) / Netid#validate_netid?(netid)
 
 ### What it does
 
@@ -143,6 +143,10 @@ The NetID you want to check
 Version History
 ===============
 
+## 0.4.0
+
+* Switch most methods from Class->Instance
+
 ## 0.3.10
 
 * Add -p flag for full process check on hosts.

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.4.0

data/bin/ua_check

@@ -41,28 +41,29 @@ user.each do |netid|
   puts "#{netid}".bold.green
   puts "-"*netid.length
   results = 0
+  checkr = Netid.new(netid,system_user)
   hosts.each do |host|
-    result = Netid.check_for_mysql_presence(host,netid,system_user)
+    result = checkr.check_for_mysql_presence(host)
     if result
       results += 1
       puts "MySQLd detected on #{result[0]}:#{result[1]}".blue
     end
   end
 
-  result = Netid.check_for_localhome(netid,system_user)
+  result = checkr.check_for_localhome
   if result
     puts "Localhome: #{result}".cyan
   else
     puts "No localhome detected"
   end
 
-  puts "Webtypes set: #{Netid.check_webtype(netid, system_user)}"
+  puts "Webtypes set: #{checkr.check_webtype}"
 
   puts "No MySQLds Detected".bold.blue if results == 0
 
   if options[:processes]
     hosts.each do |host|
-      processes = Netid.get_processes(host,netid,system_user)
+      processes = checkr.get_processes(host)
       if processes
         puts "\nProcesses for #{host}:\n".cyan
         processes.each do |l|
@@ -72,9 +73,9 @@ user.each do |netid|
     end
   end
 
-unless options[:concise]
+  unless options[:concise]
+    puts "\n"
+    checkr.quota_check
+  end
   puts "\n"
-  Netid.quota_check(netid,system_user)
-end
-puts "\n"
 end

data/lib/netid-tools.rb

@@ -2,6 +2,13 @@ require 'net/ssh'
 require 'colored'
 
 class Netid
+  attr_accessor :netid, :system_user
+
+  def initialize(netid,system_user=nil)
+    @netid = netid
+    @system_user = system_user
+  end
+
   def self.validate_netid?(netid)
     if netid.to_s.length > 8 || netid !~ /^[a-zA-Z][\w-]{0,7}$/
       false
@@ -10,9 +17,13 @@ class Netid
     end
   end
 
-  def self.check_for_mysql_presence(host,user,system_user)
+  def validate_netid?(netid)
+    Netid.validate_netid?(netid)
+  end
+
+  def check_for_mysql_presence(host)
     Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-      output = ssh.exec!("ps -U #{user} -u #{user} u")
+      output = ssh.exec!("ps -U #{netid} -u #{netid} u")
       if output =~ /mysql/
         /port=(?<port>\d+)/ =~ output
         [host,port]
@@ -22,13 +33,13 @@ class Netid
     end
   end
 
-  def self.get_processes(host,user,system_user)
+  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 #{user}")
+      if /no such user/i =~ ssh.exec!("id #{netid}")
         output = nil
       else
-        output = ssh.exec!("ps -f --user=#{user}").lines
+        output = ssh.exec!("ps -f --user=#{netid}").lines
       end
     end
     if output.nil? || output.count == 1
@@ -38,10 +49,10 @@ class Netid
     end
   end
 
-  def self.check_for_localhome(user,system_user)
+  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 #{user}")
+      output = ssh.exec!("cpw -poh #{netid}")
       if output =~ /Unknown/
         false
       else
@@ -50,18 +61,18 @@ class Netid
    end
  end
 
- def self.check_webtype(user,system_user)
+ def check_webtype
   host = 'ovid02.u.washington.edu'
   Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-    ssh.exec!("webtype -user #{user}").chomp
+    ssh.exec!("webtype -user #{netid}").chomp
   end
 end
 
 
-def self.quota_check(user,system_user)
+def quota_check
   host = 'ovid02.u.washington.edu'
   Net::SSH.start(host,system_user, {auth_methods: %w( publickey )}) do |ssh|
-    result = ssh.exec!("quota #{user}").chomp
+    result = ssh.exec!("quota #{netid}").chomp
       result = result.split("\n")
       result.delete_at(0) if result.first == ''
       result.each_with_index do |line,index|

data/netid-tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "netid-tools"
-  s.version = "0.3.11"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nikky Southerland"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netid-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -204,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2234475979821287941
+      hash: 3490936327379327628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: