app-mgr 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca85f8abea6e44df322504a0a23e380f7b77e519
-  data.tar.gz: f9e41aa1cc6712c7e70b81c5abcb5ee7517ead7c
+  metadata.gz: d1b7f9478ff5a8baa6ca8fe533dd7d0ed1c2ff31
+  data.tar.gz: 82c38a2ae61cf314e15f8475d38c4bc7f984d2ee
 SHA512:
-  metadata.gz: 44f9864a6ee9dec5b93f2e03bf237cf8c50b4b73a28282287c245e1d1bd52895550a072db13974fa771e0582c3abfe2a5923001f7c6ca6fbc2f5a69de1ccbb1c
-  data.tar.gz: 0f6fd3c56ea64dbf366affc57bb3fe3b8e258b79baf62ec6f273c2290b84a5cef07d554175d8dbe0be527332ab9a1fc630f568678199ed715ae1ffa476e49f7c
+  metadata.gz: f680a411fe83caf47a19127138c43cf4b2db29c1973d03f0afe517e8783da6cabbae9dfc3ebf35d018867a2969ba0bf81985b7d1b07fd0270e8db75c00bfd7c4
+  data.tar.gz: 562307f3909b8517b739183f97f8f9e5a0d70e00bef588f6983be93e976b06870e2e519f57274695d3c5aa354a0c1b4f187d6dd39f836ba95d723ba944cc9956

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-|�����!$@�ι�9��k�~��@&�%����
r���y��8����ɥ�'..x��l=��þ
;�fݸ3�X���
+g5�0a���ɸn��4Swx��v�zpb�C�?Ϥ��c��䢑8>����'yТ��G곈ٌ|or5@%N�? |�~\H�2���"���PA��V���!���]��z-f:+�&�4P�?U���@ �)>�O̯n]
+f��֭��-t�
+��R����5~��

data/lib/app-mgr.rb

@@ -1,122 +1,108 @@
 #!/usr/bin/ruby
 
 # file: app-mgr.rb
+
+require 'rscript'
+
+
 class AppMgr
-  def initialize()
-    @app = {}
-    @content_type = 'text/xml'
-    super()
-  end
 
-  def load(opt={})        
-    o = {name: '', object: nil, config: {}, public: {}}.merge!(opt)
+  attr_reader :app
 
-    key, name = o.shift
-    @app[name] = o
-    "'%s' loaded" % name
-  end
+  def initialize(rsf: nil, reg: nil, rsc: nil, debug: true)
+    
+    @rsf, @reg, @rsc, @debug = rsf, reg, rsc, debug
+    @rscript = RScript.new(type: 'app', debug: debug)    
+    @app = {}
 
-  def run(app_name)
-    app = @app[app_name]
-    if app then
-      options = {public: app[:public]}
-      options[:config] = app[:config] unless app[:config].empty?
-      app[:running] = app[:object].new(options, self)
+    load_all(rsf)
+    
+  end
 
-      return "'%s' running ..." % app_name
-    else
-      return "app %s not available" % app_name
-      end      
+  def available()
+    @app.select {|k,v| v[:available] == true}.keys
   end
   
-  def connect(app_name)
-    app = @app[app_name]
-    if app and app[:running] then 
-      yield(app[:public])
-    else
-      return "app %s not running" % app_name
-    end
+  def call(app_name)
+    @app[app_name.to_sym][:running].call
   end
-  
-  def execute(app_name, method, params='')
-    @app[app_name][:running].method('call_' + method.gsub(/-/,'_').to_sym).call(params)
+
+  def execute(name, method, params='')
+    @app[name.to_sym][:running].method(method.to_sym).call(params)
   end
 
-  def stop(app_name)
-    if @app[app_name].delete(:running) then
-      return "app %s stopped" % app_name
-    else
-      return "couldn't find app %s" % app_name
-    end
+  def run(name)
+
+    app = @app[name.to_sym]
+    class_name = app[:code][/(?<=class )\w+/]    
+    app[:running] = eval(class_name + '.new')
+
   end
 
   def running()
     @app.select {|k,v| v[:running]}.keys
   end
 
-  def running?(app_name)
-    @app[app_name][:running]
+  def running?(name)
+    @app[name.to_sym][:running] ? true : false
   end  
-  
-  def available()
-    @app.select {|k,v| v[:available] == true}.keys
-  end
 
-  def unload(app_name)
+  def connect(name)
 
-    handler_name = @app[app_name][:running].name
+    app = @app[name.to_sym]
     
-    if handler_name then
-      Object.send(:remove_const, handler_name)
-      @app.delete app_name
-      return "app %s unloaded" % app_name
+    if app and app[:running] then 
+      yield(app[:running])
     else
-      return "couldn't find app %s" % app_name
+      return "app %s not running" % name
     end
+    
   end
 
-  def show_public_methods(app_name)
-    app = @app[app_name]
-    if app and app[:running] then
-      return app[:running].public_methods.map(&:to_s).grep(/call_/).map {|x| x.gsub(/call_/,'').gsub(/_/,'-')}.sort.join(', ')
+  def stop(name)
+
+    app = @app[name.to_sym]
+
+    if app.delete(:running) then
+      return "app %s stopped" % name
     else
-      return "app %s not running" % app_name
+      return "couldn't find app %s" % name
     end
+    
   end
 
-  
-  def run_projectx(project_name, method_name, qparams=[])
+  def unload(name)
 
-    params = "<params>%s</params>" % qparams.map{|k,v| "<param var='%s'>%s</param>" % [k,v]}.join
-    xml_project = project = "<project name='%s'><methods><method name='%s'>%s</method></methods></project>" % [project_name, method_name, params]
-    projectx_handler(xml_project)
-  end
+    class_name = @app[name.to_sym][:running].class.name
     
-  def projectx_handler(xml_project)
-    out = ''
-    doc = Document.new(xml_project)
-    project_name = doc.root.attribute('name').to_s
+    if class_name then
+      Object.send(:remove_const, class_name)
+      @app.delete name.to_sym
+      return "app %s unloaded" % name
+    else
+      return "couldn't find app %s" % name
+    end
+    
+  end
 
-    if self.running? project_name then
+  private
 
-      out = XPath.match(doc.root, 'methods/method').map  do |node_method|
-        methodx = node_method.attributes.get_attribute('name').to_s
-        params = node_method.elements['params'].to_s
+  def load_all(rsf_package)
 
-        method_out, @content_type = self.execute(project_name, methodx, params)
-        method_out
-      end
+    @rscript.jobs(rsf_package).each do |app_name|
 
-      out = out.first if out.length == 1
-    else
-      out = "that project doesn't exist"
+      puts 'app_name: ' + app_name.inspect if @debug
+      app = @app[app_name] = {}
+
+      codeblock = @rscript.read(['//app:' + app_name.to_s, @rsf]).first      
+      puts 'codeblock: ' + codeblock.inspect if @debug
+      app[:code] = codeblock
+      
+      reg, rsc = @reg, @rsc      
+      eval codeblock
+      
     end
-    
-    @content_type ||= 'text/xml'
-  
-    [out, @content_type]
+
   end
 
-  
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app-mgr
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,29 +10,50 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIwNTMyOFoXDTE0MDIwNjIwNTMyOFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMM35ArfzPXVCoU/ffYxPQiB1SW9fCGCsLPoxPNuDb0/RHzAjWHvAi/5S536
-  2gXMdm5btNF+0fEit63CRHhzoNIlHK4SUkhi6Og2G46kpx9OktQWn6romI219UP3
-  sFWG17qYotRQUgPEejSrUU2ncq/ALvU4P0M0N1SXk37cz32ZieS50rMaBZHCnu6w
-  50koks+rTiksxzaRAY7mAKzlsIgEBwvXnCT1tWVtk9VXgFPcrCJYNThjCXVoSTwx
-  X3C67dgHp17qGu96yfaaFrpvB41QG0wZIxL78zKqxZHWw2S1xKCCOdjTX3zOb3Rv
-  Ibbw8WEcOhybr1ESWsm4wrPQsqMCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUHUBdcVX1WFnDH7MjKYjHkVg13yQwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQAmDsqgoCe1uwYkLg/OT6+QsrZCPHBAlThigAkQnr0hYl73JWN7SLHr
-  VAUuzMSqrboHpfVfgJ2Kjso1o/YUhKIBs4+XcEz1taTvd+PjTV5/TfmBA+IJ16iC
-  28AsWPYCYcRdK/mlZnpDsFIU9NtGC7TgFtpIx5SWXPbKPYCtWG4rkjw58qaL8ios
-  bMUV1u1iPr3f/22lSF7qQeS4cP9Usr00TREErLFREwMO+hlICZWW9oSgmtuFcvIf
-  /rJd9id4h2BwJk0W8O2oMLD+ItWH9StgKT7+nfCwkHqV7G1463d1N/22EyGmFrF9
-  SN4lYNPPFni+X6e5+YeYtXexhj0fl/GP
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzMwMjIxMjU1WhcN
+  MTkwNzMwMjIxMjU1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQEOnA
+  GJ3ksMw8AjH3o2qGvN/2pUUV9w9BPemOxJD0A1cN9Bxiqldhq2rOasa5R7NWYJVb
+  XqNRzoX+ZM+o34N94Rs084bmt4UY3AIB8Qwh7b6hrPOcIMmXxvUKlTGPQmbT3xTf
+  0U3stPA6bSjvVoe6S1SaAufvofhPf6RK3Ha85B9rnJ6SwhXMBfefT9+46G9rg4e8
+  Dl5hStoXpzMvZbjRl8k+chSYIkrZRUgY2DPB4uYIGhou7pdvXz8OG44eG2emHAoP
+  Hq7gKRjfLEJU7Lcvuy7TW1DHQawd9fJLETF4OCe3tfmrz+paKgIGdRsBZlhcVYFi
+  H+CwReKpsten5B0nAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFMPdyMUkpkMm4orIvKu+1K0RBEHBMCYGA1UdEQQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAFMKmUscAAsNitItdGmM
+  fER7OWnQRkNGgQQh4c0vHz4K634HXaX8Mnq76reEkbKzyeHmwFww1EV8XpkCLLjN
+  k7TP/AD9LJzUtXa2M3rMuLBPu98TZZvDBP/NBFXUvW6HzH77n4D2EfO+Zn/pwnb/
+  H47c680aCpzYPb+7x4atUtx3UGahHg6GXT5T6x+5RzCe9iNDqnC5RW6Hj9FKybsc
+  CiRE+GvZQcTC3EhUyHYe9A9tXqIzzaqRh3s9YdltXryzuocM/dwlT8zu4BzYKHTe
+  jZi4xFnZ2LNxhD09t1Ag0wOhNh+yHsyECmyU5Zu7FKG0ZNnX0zc5IAupPGBsMKXf
+  at4=
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
-dependencies: []
+date: 2018-07-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rscript
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -48,18 +69,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: app-mgr
+summary: Runs 1 or more headless apps from a kind of XML file for use in a back-end
+  server
 test_files: []