netid-tools 0.5.2 → 0.5.4

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 gem "nokogiri"
 gem "colored"
 gem "net-ssh"
+gem 'terminal-table'
 group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"

data/README.md

@@ -143,6 +143,14 @@ The NetID you want to check
 Version History
 ===============
 
+## 0.5.4
+
+* Switch table formatting on ua_check binary
+
+## 0.5.3
+
+* Remove debug function
+
 ## 0.5.2
 
 * Expand cluster paths if available in quota output

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.4

data/bin/ua_check

@@ -3,6 +3,7 @@ require 'net/ssh'
 require 'colored'
 require 'netid-tools'
 require 'optparse'
+require 'terminal-table'
 
 options = {}
 OptionParser.new do |opts|
@@ -78,9 +79,18 @@ user.each do |netid|
 
   unless options[:concise]
     puts "\n"
-    checkr.check_quota.each do |l|
-      puts l.join(" ")
+    raw_quota = checkr.check_quota
+    headers = raw_quota.rotate!.pop
+    table = Terminal::Table.new do |t|
+      t.headings = headers
+      raw_quota.each do |line|
+        if line[1].to_f > line[2].to_f
+          line[1] = "#{line[1]} (Over Quota!)"
+        end
+        t << line
+      end
     end
+    puts table
   end
   puts "\n"
 end

data/lib/netid-tools.rb

@@ -47,7 +47,7 @@ class Netid
     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 = run_remote_command("ps -F --user=#{netid}",host).lines.map{|l| l.chomp}
       result = remove_extra_processes(result)
     end
     if result.nil? || result.count == 1
@@ -119,7 +119,6 @@ class Netid
       asking_cluster_string = line.first
 
       search = clusters.find_index do |c|
-        puts "searching for #{asking_cluster_string} in #{c}"
         c =~ /#{asking_cluster_string}/
       end
 
@@ -132,7 +131,7 @@ class Netid
       if user_clusters
         user_clusters
       else
-        command = "gpw -D | sed '1d' | sed 'N;$!P;$!D;$d' | sort | uniq"
+        command = "gpw -D #{netid} | sed '1d' | sed 'N;$!P;$!D;$d' | sort | uniq"
         run_remote_command(command,single_host).split("\n").map do |line|
           line.chomp
         end

data/lib/system-connect.rb

@@ -1,14 +1,6 @@
 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
+  private
 
   def connect(host,user)
     Net::SSH.start(host,user,{auth_methods: %w(publickey)})
@@ -17,21 +9,24 @@ module SystemConnect
   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 queue_multithreaded_command(command,host)
+    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 find_connection_for_host(host)
     @connections ||= []
     unless @connections.select{ |conn| conn.hostname == host}.empty?

data/netid-tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "netid-tools"
-  s.version = "0.5.2"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nikky Southerland"]
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<colored>, [">= 0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
+      s.add_runtime_dependency(%q<terminal-table>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -55,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<colored>, [">= 0"])
       s.add_dependency(%q<net-ssh>, [">= 0"])
+      s.add_dependency(%q<terminal-table>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<colored>, [">= 0"])
     s.add_dependency(%q<net-ssh>, [">= 0"])
+    s.add_dependency(%q<terminal-table>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netid-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1308523131387062882
+      hash: 2601252175228595680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: