netid-tools 0.5.1 → 0.5.2

data/README.md

@@ -143,6 +143,10 @@ The NetID you want to check
 Version History
 ===============
 
+## 0.5.2
+
+* Expand cluster paths if available in quota output
+
 ## 0.5.0
 
 * Switch to new SSH connection method; reuse already existing SSH connection for host if it exists

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/netid-tools.rb

@@ -7,7 +7,7 @@ require 'generic-response'
 class Netid
   include SystemConnect
 
-  attr_accessor :netid, :system_user, :systems, :single_host
+  attr_accessor :netid, :system_user, :systems, :single_host, :user_clusters
 
   def initialize(netid,system_user=nil,systems=nil,single_host=nil)
     @netid = netid
@@ -84,13 +84,17 @@ class Netid
     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)
+
+    headings = process_quota_headers(result)
+
     results = []
     results << headings
     result.each do |line|
       line = line.split
       line.insert(4, 'n/a') if line.size == 6
+
+      expand_cluster_path(line)
+
       results << line
     end
     results
@@ -102,4 +106,36 @@ class Netid
         line !~ /ps -F --user|ssh(d:|-agent)|bash|zsh/
       end
     end
+
+    def process_quota_headers(quota_results)
+      headings = quota_results.first.split
+      quota_results.delete_at(0)
+      headings
+    end
+
+    def expand_cluster_path(line)
+      clusters = get_user_clusters
+
+      asking_cluster_string = line.first
+
+      search = clusters.find_index do |c|
+        puts "searching for #{asking_cluster_string} in #{c}"
+        c =~ /#{asking_cluster_string}/
+      end
+
+      line[0] = clusters[search] if search
+
+      line
+    end
+
+    def get_user_clusters
+      if user_clusters
+        user_clusters
+      else
+        command = "gpw -D | sed '1d' | sed 'N;$!P;$!D;$d' | sort | uniq"
+        run_remote_command(command,single_host).split("\n").map do |line|
+          line.chomp
+        end
+      end
+    end
 end

data/netid-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "netid-tools"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nikky Southerland"]
-  s.date = "2013-06-25"
+  s.date = "2013-06-26"
   s.description = "Gem with various methods to support UW NetIDs"
   s.email = "nikky@uw.edu"
   s.executables = ["ua_check"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netid-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -207,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1029826805295521850
+      hash: -1308523131387062882
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: