app-mgr 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 19554bb1a7aad5dc3f001f6dfa583ce7d324138f
-  data.tar.gz: e65dcd8093b4ebabffe02c71b93683ae6c2d8fe2
+SHA256:
+  metadata.gz: 3230c5bba90440fdeef08992f6f099f6d5fd452c05d907e9fbd42ab346f1355e
+  data.tar.gz: 01a8d05fcc809791b44492403ced88a59a22e4538fcf5d55c6d3c4d344505dab
 SHA512:
-  metadata.gz: f867b4649393116e46b3c9a3b97bbb4b5868a07823b9cd5d13e87ac24bf39c40b60c5d4d54c7c730c63e3d17667cb0a283a5730d53c1bccce1b6d718421834bb
-  data.tar.gz: bec5af08ac8301c5e0f4cee5f46dbd1be023aefec1c67676d686e1faeeb2fcffbd56eeb48f6a2ac5549e6600bb49fbf6c8408786a97049d6477abda3101e1656
+  metadata.gz: f8baeb4e49782dfe2764bdf124e04db1b7559276e73c41b0df73a6b1ed1e0ff9a3afc9e03156341193fe934bdd228713718feffd0771176025cc453ff304d23c
+  data.tar.gz: 1b5c292f4f4a7b688c96c2abdccb3c6c15c5e26cb06211f889825a91aaf516b1778b223bf3a32be876abbe74dfb48bf2efa44f0f43b773ffadc7a2daa805eca4

data/lib/app-mgr.rb

@@ -4,41 +4,49 @@
 
 require 'rscript'
 
+class Runner
+  def run(s)
+    eval(s)
+  end
+end
+
 
 class AppMgr
 
-  attr_reader :app
+  def initialize(rsf: nil, type: 'app', debug: false)
 
-  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)    
+    @rsf, @type, @debug = rsf, type, debug
+    @rscript = RScript.new(type: type, cache: nil, debug: debug)
     @app = {}
 
     load_all(rsf)
-    
+
+  end
+
+  def [](name)
+
+    app = @app[name.to_sym]
+
+    return app[:running] if app and app[:running]
+
   end
 
   def available()
     @app.keys
   end
-  
-  def call(app_name)
-    
-    run(app_name) unless running? app_name
-    @app[app_name.to_sym][:running].call
-    
-  end
 
-  def execute(name, method, params='')
-    @app[name.to_sym][:running].method(method.to_sym).call(params)
+  def restart(name)
+    load_app(name)
+    run(name)
+    name.to_s + ' restarted'
   end
 
   def run(name)
 
     app = @app[name.to_sym]
-    class_name = app[:code][/(?<=class )\w+/]    
-    app[:running] = eval(class_name + '.new')
+
+    #app[:running] = eval(app[:code])
+    app[:running] = Runner.new.run(app[:code])
 
   end
 
@@ -48,20 +56,9 @@ class AppMgr
 
   def running?(name)
     @app[name.to_sym][:running] ? true : false
-  end  
-
-  def connect(name)
-
-    app = @app[name.to_sym]
-    
-    if app and app[:running] then 
-      yield(app[:running])
-    else
-      return "app %s not running" % name
-    end
-    
   end
 
+
   def stop(name)
 
     app = @app[name.to_sym]
@@ -71,21 +68,22 @@ class AppMgr
     else
       return "couldn't find app %s" % name
     end
-    
+
   end
 
   def unload(name)
 
-    class_name = @app[name.to_sym][:running].class.name
-    
+    app = @app[name.to_sym]
+
     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
 
   private
@@ -95,15 +93,32 @@ class AppMgr
     @rscript.jobs(rsf_package).each do |app_name|
 
       puts 'app_name: ' + app_name.inspect if @debug
-      app = @app[app_name] = {}
 
-      codeblock = @rscript.read(['//app:' + app_name.to_s, @rsf]).first      
+      @app[app_name] = {}
+      codeblock, _, attr = @rscript.read(["//#{@type}:" + app_name.to_s, @rsf])
+
+      next if attr[:disabled] == 'true'
+
+      puts 'codeblock: ' + codeblock.inspect if @debug
+      @app[app_name][:code] = codeblock
+      app = @app[app_name]
+
+      puts 'app: ' + app.inspect
+      next unless app
+
+      app[:running] = Runner.new.run(app[:code])
+
+    end
+
+    def load_app(name)
+
+      codeblock, _, attr = @rscript.read(["//#{@type}:" + name.to_s, @rsf])
+
+      return if attr[:disabled] == 'true'
+
       puts 'codeblock: ' + codeblock.inspect if @debug
-      app[:code] = codeblock
-      
-      reg, rsc = @reg, @rsc      
-      eval codeblock
-      
+      @app[name][:code] = codeblock
+      return @app[name]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app-mgr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwNDI0MTg0NTMyWhcN
+  MjMwNDI0MTg0NTMyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCy/bQ6
+  +zlVxMZ2dkNjN6NXcSHGDXRkBUpQ15ARwQ7Nwe86H/I3ZXCsf91xZNn2oMbhXjSj
+  wJjbbORibZHQcnJxU7lIJuL0W0HuJEBVPNstUJhEkkXPGRxEDIPIUSrcdGkFdm5z
+  IWTmVskKJ9WKA3mc3vMnKIndtA1EI/9k4Pct1FVcJZ9lFy+MGlfc2NbpMwZfihnH
+  3NsbO80cBo4E1ub+fHnUyED2rHfKAAJJ1Uowaln+WyrKYgSSgCqOwYqsh5UtYm8Z
+  9w19nxDg8tq8J/+aifcjPsFna0JFh/aEeMnJiFVzTYIMdcIp9vEplveZgLHBCvtn
+  2N8Kj7cl92D3yvKupBK25UOmx4wj0dpz0NHJ0cKLJBybXgQhjEJ2cqRik3yWJK3J
+  XzugEbXBhldh4snctFFfBQj2+pNcxkoX3/64LRgrn1E8UDGIssTfsS91+rYQaOpu
+  oTenkdBjj43qszBmsgn5MLXO5vsu6NUCcZPWFSgCPR0/vYo+WEmDFsBoRIMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU8sSS1sEw
+  5ZV4fz5YY66FFiqV4lkwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAsfATj4aER/l+5WpvQRcLkEHBSrlcRvgDkK7geiP5
+  lzDVU06ndUwBszXoiGbO1oqvSPQYlGY9B5ITqsUY/pEcvSXw6sJ0IrUrGgze25Ha
+  sMc5EKYXjTD01FTGyzbsEeijUKT3AMKREOv+htuPxtorHjvZFqG/XQVKITb0SjF9
+  Eu8CSq9tXwpS/H7g2NPR3BWOgpRtaBmqtmN6u5Xpx53YX7EfUIOCAEdjbLH83ewU
+  o1qWubtMwnFvZzEd7AhASE6zMevhN/x6Y+e8D6YDzIgEmh0N8BD6IjYggzq2T8iE
+  Z1siRlr4sgUZd8mLi0o2nG+zqq/9DkV3S7rygERkGccM+tAsakwl0wKIyHJYibNM
+  F0SeCKO+Jsn433fz0woyhqdSpuOEEL88twKvwzHS1gzV2RRIy/db8PRsrjsaNhy3
+  8W1C1GMiIJ0XiC7HJfZ9gdjiGK6QbbiqPhA0yRtNjQJWU1id4Nn7ZkaMvjc56Zto
+  wgl6kIb23YwRPlLR4VAcERqL
   -----END CERTIFICATE-----
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rscript
@@ -38,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.9.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Runs 1 or more headless apps from a kind of XML file for use in a back-end