psadmin_plus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03e679bf635691b90fb0d7cf75190a02540d332c
-  data.tar.gz: 329b50f2219f13063fd45e7f930af74c88e4a9dd
+  metadata.gz: 94a23ba6cfdca3623387063ce62cde0e70ce170b
+  data.tar.gz: eb8d08c06c86e126b8ddd7d0c360cf516f83e312
 SHA512:
-  metadata.gz: cd9664c5250d3e420f4974bc628822132ad473f1f159185dadb93f12cc1ce86f8fc559a93d532f72f4ac785e72925733dd4f658fbe95c48e5655c75e78e1b8c2
-  data.tar.gz: 128d8f65f4fb0ec03f901d4a45b1b39ff745ec619c2e0409d1bc3cbe84e03f82bfb43316e81386a56a39ec4c89b9b6ffb42e1bf739c4d3830966f2a083277b0c
+  metadata.gz: 69d77322c757cda49389ea64f3bf3ac0500b9231aa38d7adb73fc52aa689aa31c937335e5e0778f7fc0b8e9a1df75620e03471a24f4f91dcf28ce70146fc5186
+  data.tar.gz: a80337c4eac6e8bdf16b39c97fa81b4d75b726bb3cbcc996ff7e3c6103d50a7f433fe3a7601cb8a47bb2edec506c8b124621692c7b8acfe28114bd97f959eb46

data/bin/psa

@@ -60,6 +60,7 @@ commands.each do |c|
                 end
             end
             domains.each do |d|
+                do_cmd_banner(c,t,d)
                 case "#{c}"
                 when "status"
                     do_status(t,d)

data/lib/psadmin_plus.rb

@@ -40,15 +40,19 @@ def do_help
     puts " "
 end
 
-def do_is_runtime_user
-    result = Etc.getlogin == PS_RUNTIME_USER ? true : false
+def do_is_runtime_user_nix
+    result = ENV['USER'] == PS_RUNTIME_USER ? true : false
+end
+
+def do_is_runtime_user_win
+    result = ENV['USERNAME'] == PS_RUNTIME_USER ? true : false
 end
 
 def do_cmd(cmd)
     case "#{OS_CONST}"
     when "linux"
-        if do_is_runtime_user
-            out = `"#{cmd}"`
+        if do_is_runtime_user_nix
+            out = `#{cmd}`
         else
             if "#{PS_PSA_SUDO}" == "on"
                 out = `sudo su - #{PS_RUNTIME_USER} -c "#{cmd}"`
@@ -65,6 +69,11 @@ def do_cmd(cmd)
     puts out
 end
 
+def do_cmd_banner(c,t,d)
+   puts ""
+   puts "### #{c} - #{t} - #{d} ###"
+end
+
 def find_apps
     apps = Dir.glob("#{ENV['PS_CFG_HOME']}/appserv/*/psappsrv.ubx")
     apps.map! {|app| app.split("/")[-2]}
@@ -86,9 +95,15 @@ end
 
 def do_list
     puts "---"
-    puts "hostname:      TODO"
-    puts "ps-home:       #{ENV['PS_HOME']}"
-    puts "ps-cfg-home:   #{ENV['PS_CFG_HOME']}"
+#    puts "hostname:      TODO"
+    puts "ps-home:         #{ENV['PS_HOME']}"
+    puts "ps-cfg-home:     #{ENV['PS_CFG_HOME']}"
+    puts ""
+    puts "PS_RUNTIME_USER: #{PS_RUNTIME_USER}"
+    puts "PS_PSA_SUDO:     #{PS_PSA_SUDO}"
+    puts "PS_POOL_MGMT:    #{PS_POOL_MGMT}"
+    puts "PS_HEALTH_FILE:  #{PS_HEALTH_FILE}"
+    puts "PS_HERALTH_TIME: #{PS_HEALTH_TIME}"
     puts "" 
     puts "app:"
     find_apps.each do |a|
@@ -113,7 +128,6 @@ def do_summary
 end
 
 def do_status(type, domain)
-    puts "status - #{type} - #{domain}"
     case type
     when "app"
         do_cmd("psadmin -c sstatus -d #{domain}")
@@ -121,7 +135,7 @@ def do_status(type, domain)
         do_cmd("psadmin -c qstatus -d #{domain}")
         do_cmd("psadmin -c pslist -d #{domain}")
     when "prcs"
-        do_cmd("psadmin -p status -d #{domain}")
+        do_cmd("#{ENV['PS_HOME']}/bin/psadmin -p status -d #{domain}")
     when "web"
         do_cmd("psadmin -w status -d #{domain}")
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kyle Benson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies: []
 description: A psadmin helper tool
 email: kyle@psadmin.io