psadmin_plus 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f578164acadfe6f58fdf06b7c7f0e8648cd46bc
-  data.tar.gz: 3e8bf500b195186d4494ec1ed228d524b4066828
+  metadata.gz: 08053857b9d46dfc80c308ea92265216f267c7da
+  data.tar.gz: 81df426b700e5bb882bf93f7fd7979fdaa22d03d
 SHA512:
-  metadata.gz: 9ae2d5e6bcad971ee900bcae76a0caa3bb4228b78517b80cc9373fc8417280629bd9bb661ad771c4f6ac8e2d5746f58a33ecdbeb0e4af278b813a99edffee129
-  data.tar.gz: 5b49479ca1e65765fbfa566367ae06b66f3eaf38d6d213b1ecc0e41248e789573e07454833a44f55185a789a580939ae7de1595a798a2b5635c744b5b6a222b9
+  metadata.gz: 87bec5891e6a3bb8952ba9485a24c3ef8ccf05746117ab98b242dcd829a546d6e6bf448ca0f11b6e41d95fd37b7919a306e77e0bc029137ae45e45ab083f42ee
+  data.tar.gz: 9efbe7b0ccdb11fbca9fc24be60a6bc8d59fd0e1653c06b0f3395b654a039769ce24edf12bf8ad005a404e75e2229489de1aa0cc2f385dc9bcbfeb1a4e47f25b

data/bin/psa

@@ -35,13 +35,26 @@ 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"
+PS_PSADMIN_PATH = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "cmd /c #{env('PS_HOME')}/appserv"
+
+# validation
+# check runtime user
+if "#{OS_CONST}" == "linux" then
+    if !system("id #{PS_RUNTIME_USER} &> /dev/null") then
+	puts "#{PS_RUNTIME_USER} is not valid. Please correct PS_RUNTIME_USER, then try again."
+        exit
+    end
+else
+    # windows - TODO
+end
 
 # process
 commands.each do |c|
     case "#{c}"
     when "help"
         do_help
+    when "admin"
+        do_admin
     when "util"
         do_util
     when "list"
@@ -61,30 +74,44 @@ commands.each do |c|
                 end
             end
             domains.each do |d|
-                do_cmd_banner(c,t,d)
                 case "#{c}"
                 when "status"
+                    do_cmd_banner(c,t,d)
                     do_status(t,d)
                 when "start"
+                    do_cmd_banner(c,t,d)
                     do_start(t,d)
                 when "stop"
+                    do_cmd_banner(c,t,d)
                     do_stop(t,d)
                 when "kill"
+                    do_cmd_banner(c,t,d)
                     do_kill(t,d)
                 when "configure"
+                    do_cmd_banner(c,t,d)
                     do_configure(t,d)
                 when "purge"
+                    do_cmd_banner(c,t,d)
                     do_purge(t,d)
                 when "flush"
+                    do_cmd_banner(c,t,d)
                     do_flush(t,d)
                 when "restart"
+                    do_cmd_banner(c,t,d)
                     do_restart(t,d)
                 when "bounce"
+                    do_cmd_banner(c,t,d)
                     do_bounce(t,d)
                 when "pooladd"
-                    do_pooladd(t,d)
+                    if t == "web"
+                        do_cmd_banner(c,t,d)
+		        do_pooladd(t,d)
+		    end
                 when "poolrm"
-                    do_poolrm(t,d)
+                    if t == "web"
+                        do_cmd_banner(c,t,d)
+                        do_poolrm(t,d)
+                    end
                 else
                     puts "Not a valid command. See psa help"
                 end

data/lib/psadmin_plus.rb

@@ -2,6 +2,7 @@
 
 require 'rbconfig'
 require 'etc'
+require 'open3'
 
 def do_help
     puts "Usage: psa [command] <type> <domain>"
@@ -10,7 +11,7 @@ def do_help
     puts "        "
     puts "    help           display this help message"
     puts "    list           list domains"
-    puts "    admin          launch psadmin"
+    #puts "    admin          launch psadmin"
     puts "    summary        PS_CFG_HOME summary, no type or domain needed"
     puts "    status         status of the domain"
     puts "    start          pooladd, if enabled, then start the domain"
@@ -66,7 +67,7 @@ def do_cmd(cmd, print = true)
             end
         end
     when "windows"
-        out = `powershell -command "#{cmd}"`
+        out = `powershell -NoProfile -Command "#{cmd}"`
     else
         out = "Invalid OS"
     end
@@ -74,8 +75,8 @@ def do_cmd(cmd, print = true)
 end
 
 def do_cmd_banner(c,t,d)
-   puts ""
-   puts "### #{c} - #{t} - #{d} ###"
+    puts ""
+    puts "### #{c} - #{t} - #{d} ###"
 end
 
 def find_apps_nix
@@ -94,17 +95,17 @@ def find_webs_nix
 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 = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/appserv/*/psappsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",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 = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/appserv/prcs/*/psprcsrv.ubx | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",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 = do_cmd("(get-childitem #{env('PS_CFG_HOME')}/webserv/*/piaconfig | Format-Table -property FullName -HideTableHeaders | Out-String).Trim()",false).split(/\n+/)
     webs.map! {|web| web.split("\\")[-2]}
 end
 
@@ -124,6 +125,10 @@ def do_util
     puts "TODO: util"
 end
 
+def do_admin
+    do_cmd("#{PS_PSADMIN_PATH}/psadmin") 
+end
+
 def do_list
     puts "---"
     print "hostname:        " ; do_cmd('hostname')
@@ -134,7 +139,7 @@ def do_list
     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 "PS_HEALTH_TIME:  #{PS_HEALTH_TIME}"
     puts "" 
     puts "app:"
     find_apps.each do |a|
@@ -154,7 +159,7 @@ def do_list
 end
 
 def do_summary
-    do_cmd("psadmin -envsummary")
+    do_cmd("#{PS_PSADMIN_PATH}/psadmin -envsummary")
     #do_status("web","all")
 end
 
@@ -194,7 +199,13 @@ def do_stop(type, domain)
     when "prcs"
         do_cmd("#{PS_PSADMIN_PATH}/psadmin -p stop -d #{domain}")
     when "web"
-        do_cmd("#{env('PS_CFG_HOME')}/webserv/#{domain}/bin/stopPIA.sh")
+        case "#{OS_CONST}"
+        when "linux"
+            do_cmd("${PS_CFG_HOME?}/webserv/#{domain}/bin/stopPIA.sh")
+        when "windows"
+            # do_cmd("#{PS_PSADMIN_PATH}/psadmin -w shutdown! -d #{domain}".gsub('/','\\'))
+            do_cmd("cmd /c ${env:PS_CFG_HOME}/webserv/#{domain}/bin/stopPIA.cmd".gsub('/','\\'))
+        end
     else
         puts "Invalid type, see psa help"
     end
@@ -233,8 +244,13 @@ def do_purge(type, domain)
     when "prcs"
         do_cmd("echo purge todo")
     when "web"
-        do_cmd("rm -rf #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/")
-        puts "web cache purged"
+        case "#{OS_CONST}"
+        when "linux"
+            do_cmd("rm -rf ${PS_CFG_HOME?}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/")
+            puts "web cache purged"
+        when "windows"
+            do_cmd("Remove-Item $(Get-ChildItem ${env:PS_CFG_HOME}/webserv/#{domain}/applications/peoplesoft/PORTAL*/*/cache*/ | ?{ $_.PSIsContainer}) -recurse -force".gsub('/','\\'))
+        end
     else
         puts "Invalid type, see psa help"
     end
@@ -270,7 +286,7 @@ 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' > #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{ENV['PS_HEALTH_FILE']}")
+        do_cmd("echo 'true' > #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
         sleep(PS_HEALTH_TIME.to_i)
         puts "...domain added to pool."
         puts ""
@@ -283,7 +299,14 @@ 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 #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{ENV['PS_HEALTH_FILE']}")
+        case "#{OS_CONST}"
+        when "linux"
+            do_cmd("rm -f #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
+        when "windows"
+            do_cmd("remove-item -force #{env('PS_CFG_HOME')}/webserv/#{domain}/applications/peoplesoft/PORTAL.war/#{PS_HEALTH_FILE}")
+        else
+            puts " badOS - #{OS_CONST}"
+        end
         sleep(PS_HEALTH_TIME.to_i)
         puts "...domain removed from pool."
         puts ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psadmin_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kyle Benson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies: []
 description: A psadmin helper tool
 email: kyle@psadmin.io
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: psadmin plus