psadmin_plus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9bddc67f558875f725ab1803cf2cd354d1d066
-  data.tar.gz: a38a484a73f2cf661ab4b9050609dc004df6a16a
+  metadata.gz: 03e679bf635691b90fb0d7cf75190a02540d332c
+  data.tar.gz: 329b50f2219f13063fd45e7f930af74c88e4a9dd
 SHA512:
-  metadata.gz: 73855abc830cb4aa4bb33dc7e6f827ce2128e82b77697eea960415fb7579415fb4257d290b05923522ed6f99ae5a3c8cd14b175489242eee80706058ed1a2f73
-  data.tar.gz: 9ae5bd3812fcb3d69b9f2b91fbcb924eca0a1ba626178c2066487d87aea1010a9b48e475e4102735bff0c78092d13fa6c52a6449048bf4458ca44a473dd7d160
+  metadata.gz: cd9664c5250d3e420f4974bc628822132ad473f1f159185dadb93f12cc1ce86f8fc559a93d532f72f4ac785e72925733dd4f658fbe95c48e5655c75e78e1b8c2
+  data.tar.gz: 128d8f65f4fb0ec03f901d4a45b1b39ff745ec619c2e0409d1bc3cbe84e03f82bfb43316e81386a56a39ec4c89b9b6ffb42e1bf739c4d3830966f2a083277b0c

data/bin/psa

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'psadmin_plus'
+#require_relative '../lib/psadmin_plus.rb'
 
 # options
 opts_c = ARGV.shift || "help"
@@ -14,14 +15,26 @@ domains = opts_d.split(',')
 if types.include? "all" then types = ['app','prcs','web'] end
 if domains.include? "all" then all_domains = true end
 
+# setup environment
+PS_PSA_CONF = ENV['PS_PSA_CONF'] || "#{ENV['HOME']}/.psa.conf"
+if File.exists?(PS_PSA_CONF) then
+    File.readlines(PS_PSA_CONF).each do |line|
+        if line.start_with? "#" then
+            next 
+        else
+            key, value = line.split "="
+            ENV[key] = value.strip
+        end
+    end
+end
+
 # constants
 OS_CONST = os
-PS_RUNTIME_USER = "psadm2"     # TODO
-PS_POOL_MGMT = "on"           # TODO
-PS_HEALTH_FILE = "health.html" # TODO
-PS_HEALTH_TIME = "60"          # TODO
-PS_PSA_SUDO = "on"             # TODO
-IS_RUNTIME_USER = false        # TODO
+PS_RUNTIME_USER = ENV['PS_RUNTIME_USER'] || "psadm2"
+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"
 
 # process
 commands.each do |c|

data/lib/psadmin_plus.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rbconfig'
+require 'etc'
 
 def do_help
     puts "Usage: psa [command] <type> <domain>"
@@ -39,17 +40,21 @@ def do_help
     puts " "
 end
 
+def do_is_runtime_user
+    result = Etc.getlogin == PS_RUNTIME_USER ? true : false
+end
+
 def do_cmd(cmd)
     case "#{OS_CONST}"
     when "linux"
-        if IS_RUNTIME_USER
+        if do_is_runtime_user
             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"
@@ -259,4 +264,4 @@ def os
                 raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
             end
      )
-end
+end

metadata

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