psadmin_plus 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a23ba6cfdca3623387063ce62cde0e70ce170b
-  data.tar.gz: eb8d08c06c86e126b8ddd7d0c360cf516f83e312
+  metadata.gz: 8f578164acadfe6f58fdf06b7c7f0e8648cd46bc
+  data.tar.gz: 3e8bf500b195186d4494ec1ed228d524b4066828
 SHA512:
-  metadata.gz: 69d77322c757cda49389ea64f3bf3ac0500b9231aa38d7adb73fc52aa689aa31c937335e5e0778f7fc0b8e9a1df75620e03471a24f4f91dcf28ce70146fc5186
-  data.tar.gz: a80337c4eac6e8bdf16b39c97fa81b4d75b726bb3cbcc996ff7e3c6103d50a7f433fe3a7601cb8a47bb2edec506c8b124621692c7b8acfe28114bd97f959eb46
+  metadata.gz: 9ae2d5e6bcad971ee900bcae76a0caa3bb4228b78517b80cc9373fc8417280629bd9bb661ad771c4f6ac8e2d5746f58a33ecdbeb0e4af278b813a99edffee129
+  data.tar.gz: 5b49479ca1e65765fbfa566367ae06b66f3eaf38d6d213b1ecc0e41248e789573e07454833a44f55185a789a580939ae7de1595a798a2b5635c744b5b6a222b9

data/bin/psa

@@ -35,6 +35,7 @@ PS_POOL_MGMT = ENV['PS_POOL_MGMT'] || "on"
 PS_HEALTH_FILE = ENV['PS_HEALTH_FILE'] || "health.html"
 PS_HEALTH_TIME = ENV['PS_HEALTH_TIME'] || "60"
 PS_PSA_SUDO = ENV['PS_PSA_SUDO'] || "on"
+PS_PSADMIN_PATH = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "#{env('PS_HOME')}/appserv"
 
 # process
 commands.each do |c|

data/lib/psadmin_plus.rb

@@ -48,25 +48,29 @@ def do_is_runtime_user_win
     result = ENV['USERNAME'] == PS_RUNTIME_USER ? true : false
 end
 
-def do_cmd(cmd)
+def env(var)
+   result = "#{OS_CONST}" == "linux" ? "${#{var}}" : "$env:#{var}"
+end
+
+def do_cmd(cmd, print = true)
     case "#{OS_CONST}"
     when "linux"
         if do_is_runtime_user_nix
             out = `#{cmd}`
         else
             if "#{PS_PSA_SUDO}" == "on"
-                out = `sudo su - #{PS_RUNTIME_USER} -c "#{cmd}"`
+                out = `sudo su - #{PS_RUNTIME_USER} -c '#{cmd}'`
             else
                 print "#{PS_RUNTIME_USER} "
-                out = `su - #{PS_RUNTIME_USER} -c "#{cmd}"`
+                out = `su - #{PS_RUNTIME_USER} -c '#{cmd}'`
             end
         end
     when "windows"
-        out = `"#{cmd}"`
+        out = `powershell -command "#{cmd}"`
     else
         out = "Invalid OS"
     end
-    puts out
+    print ? (puts out) : result = out 
 end
 
 def do_cmd_banner(c,t,d)
@@ -74,30 +78,57 @@ def do_cmd_banner(c,t,d)
    puts "### #{c} - #{t} - #{d} ###"
 end
 
-def find_apps
-    apps = Dir.glob("#{ENV['PS_CFG_HOME']}/appserv/*/psappsrv.ubx")
+def find_apps_nix
+    apps = do_cmd("find #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx",false).split(/\n+/)
     apps.map! {|app| app.split("/")[-2]}
 end
 
-def find_prcss
-    prcss = Dir.glob("#{ENV['PS_CFG_HOME']}/appserv/prcs/*/psprcsrv.ubx")
+def find_prcss_nix
+    prcss = do_cmd("find #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx",false).split(/\n+/)
     prcss.map! {|prcs| prcs.split("/")[-2]}
 end
 
-def find_webs
-    webs = Dir.glob("#{ENV['PS_CFG_HOME']}/webserv/*/piaconfig")
+def find_webs_nix
+    webs = do_cmd("find #{env('PS_CFG_HOME')}/webserv/*/piaconfig -maxdepth 0",false).split(/\n+/)
     webs.map! {|web| web.split("/")[-2]}
 end
 
+def find_apps_win
+    apps = do_cmd("get-childitem #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx | select fullname | Format-Table -HideTableHeaders",false).split(/\n+/)
+    apps.map! {|app| app.split('\\')[-2]}
+end
+
+def find_prcss_win
+    prcss = do_cmd("get-childitem #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx | select fullname | Format-Table -HideTableHeaders",false).split(/\n+/)
+    prcss.map! {|prcs| prcs.split("\\")[-2]}
+end
+
+def find_webs_win
+    webs = do_cmd("get-childitem #{env('PS_CFG_HOME')}/webserv/*/piaconfig | select fullname | Format-Table -HideTableHeaders",false).split(/\n+/)
+    webs.map! {|web| web.split("\\")[-2]}
+end
+
+def find_apps
+    apps = "#{OS_CONST}" == "linux" ? find_apps_nix : find_apps_win
+end
+
+def find_prcss
+    prcss = "#{OS_CONST}" == "linux" ? find_prcss_nix : find_prcss_win
+end
+
+def find_webs
+    webs = "#{OS_CONST}" == "linux" ? find_webs_nix : find_webs_win
+end
+
 def do_util
     puts "TODO: util"
 end
 
 def do_list
     puts "---"
-#    puts "hostname:      TODO"
-    puts "ps-home:         #{ENV['PS_HOME']}"
-    puts "ps-cfg-home:     #{ENV['PS_CFG_HOME']}"
+    print "hostname:        " ; do_cmd('hostname')
+    print "ps-home:         " ; do_cmd('echo ' + env('PS_HOME'))
+    print "ps-cfg-home:     " ; do_cmd('echo ' + env('PS_CFG_HOME'))
     puts ""
     puts "PS_RUNTIME_USER: #{PS_RUNTIME_USER}"
     puts "PS_PSA_SUDO:     #{PS_PSA_SUDO}"
@@ -130,14 +161,14 @@ end
 def do_status(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c sstatus -d #{domain}")
-        do_cmd("psadmin -c cstatus -d #{domain}")
-        do_cmd("psadmin -c qstatus -d #{domain}")
-        do_cmd("psadmin -c pslist -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c sstatus -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c cstatus -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c qstatus -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c pslist -d #{domain}")
     when "prcs"
-        do_cmd("#{ENV['PS_HOME']}/bin/psadmin -p status -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p status -d #{domain}")
     when "web"
-        do_cmd("psadmin -w status -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -w status -d #{domain}")
     else
         puts "Invalid type, see psa help"
     end
@@ -146,12 +177,11 @@ end
 def do_start(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c boot -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c boot -d #{domain}")
     when "prcs"
-        do_cmd("psadmin -p start -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p start -d #{domain}")
     when "web"
-        do_cmd("${PS_CFG_HOME?}/webserv/#{domain}/bin/startPIA.sh")
-        #psadmin -w start -d #{domain}") # TODO - this isn't working, do we want it?
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -w start -d #{domain}")
     else
         puts "Invalid type, see psa help"
     end
@@ -160,11 +190,11 @@ end
 def do_stop(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c shutdown -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown -d #{domain}")
     when "prcs"
-        do_cmd("psadmin -p stop -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}")
     when "web"
-        do_cmd("${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh")
+        do_cmd("#{env('PS_CFG_HOME')}/webserv/#{domain}/bin/stopPIA.sh")
     else
         puts "Invalid type, see psa help"
     end
@@ -173,9 +203,9 @@ end
 def do_kill(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c shutdown! -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c shutdown! -d #{domain}")
     when "prcs"
-        do_cmd("psadmin -p kill -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p kill -d #{domain}")
     when "web"
         return # web kill n/a
     else
@@ -186,9 +216,9 @@ end
 def do_configure(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c configure -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c configure -d #{domain}")
     when "prcs"
-        do_cmd("psadmin -p configure -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p configure -d #{domain}")
     when "web"
         return # web configure n/a
     else
@@ -199,11 +229,11 @@ end
 def do_purge(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c purge -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c purge -d #{domain}")
     when "prcs"
         do_cmd("echo purge todo")
     when "web"
-        do_cmd("rm -rf ${PS_CFG_HOME?}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/")
+        do_cmd("rm -rf #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/")
         puts "web cache purged"
     else
         puts "Invalid type, see psa help"
@@ -213,9 +243,9 @@ end
 def do_flush(type, domain)
     case type
     when "app"
-        do_cmd("psadmin -c cleanipc -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -c cleanipc -d #{domain}")
     when "prcs"
-        do_cmd("psadmin -p cleanipc -d #{domain}")
+        do_cmd("#{PS_PSADMIN_PATH}/psadmin -p cleanipc -d #{domain}")
     when "web"
         return # web flush n/a
     else
@@ -240,12 +270,12 @@ def do_pooladd(type, domain)
     if PS_POOL_MGMT == "on" then
         # Change this function to match your pool member addtion process
         puts "Adding web domain to load balanced pool..."
-        do_cmd("echo 'true' > ${PS_CFG_HOME?}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/${PS_HEALTH_FILE?}")
+        do_cmd("echo 'true' > #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{ENV['PS_HEALTH_FILE']}")
         sleep(PS_HEALTH_TIME.to_i)
         puts "...domain added to pool."
         puts ""
     else
-        puts "Skipping pool managment. To enable, set $PS_POOL_MGMT to 'on'."
+        puts "Skipping pool managment. To enable, set PS_POOL_MGMT to 'on'."
     end
 end 
 
@@ -253,12 +283,12 @@ def do_poolrm(type,domain)
     if PS_POOL_MGMT == "on" then
         # Change this function to match your pool member removal process
         puts "Removing domain from load balanced pool..."
-        do_cmd("rm -f \${PS_CFG_HOME?}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/${PS_HEALTH_FILE?}")
+        do_cmd("rm -f #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{ENV['PS_HEALTH_FILE']}")
         sleep(PS_HEALTH_TIME.to_i)
         puts "...domain removed from pool."
         puts ""
     else
-        puts "Skipping pool managment. To enable, set $PS_POOL_MGMT to 'on'."
+        puts "Skipping pool managment. To enable, set PS_POOL_MGMT to 'on'."
     end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Kyle Benson