botbase-module-phrases 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bed7185367531df951f26f1d5d054cb5bacbe12b48f6924b4d63f7423b82a7
-  data.tar.gz: fbe966df79dc3137dcf9d9f6d141cc00952b9db03cf450c2f00349d125914b33
+  metadata.gz: 8fb52bd6f5c10bc8237a853279c20d03cef0853a46f429567339c1b186e72ca5
+  data.tar.gz: acd4bd1ee6ff205e2fb0e29f7aa9cc5e06a6722cda038c0b8b6f49351443dc09
 SHA512:
-  metadata.gz: 5ac5c1ffeb8c92981ad317634ff2f5809a4a84ead4f161e011587b0c24b30f3f19802896261fcc12640de76e698404640359a2a0c8878a5e1e389965988b9978
-  data.tar.gz: 10e2e42af58377c6f1e1ae62f170096bd53b6580d5897e6fed2e26bc9b117dc08949e319a5e0a07eb6f0a5f29a881950bb3d0ae96d5049b8f77090f9f599a9a0
+  metadata.gz: dcf077f4a846aa51971a2618f8c59fbf6a0e1985a2142627c81c8fc49b5b1528a3628e1cf2d12fa79ab07c4223520dd22cc101d7f67604a9f3d611ccd789a0ba
+  data.tar.gz: d47be80b35a8245fb0c93f66feb26a49c941086307126795e21f761321273cbe5e46221a61f69b758b87d40121044ee966cb81fe223d1a4b30166b02761bcc8c

checksums.yaml.gz.sig

@@ -1 +1,5 @@
-$�i�����A�ҵ,�!������U��*M�{�~bIk2�N� ����X�4t�㸠���0Cƛ�\����t>�~`�.O�Yr�Ez�?y�*f�����$��{���§S�N�j�3&�U�����l�*_�k�U]��}�5����y����}~������w�(eOX�P0���H7�׽0�]v�R
C��y�`M�`��_��$����A᚞]x�KK�&�\��?:�}Fڰv<<��'�U�A�n���Lf�p<V�D;���C�Q��s
��S�i�?�;l�6�&��Vi�m�%���}>�"�/�a���H�MȶY�H���U
��_�����=���We:)��WHY��Է��Ah{"����Z���^�	�onL�n
+
+�m/�#q��rK�O%�`���
+�--&ɥ.��z�`�é
+�	
+?�X�gߊk�ǟ

data/lib/botbase-module-phrases.rb

@@ -46,6 +46,11 @@ class BotBaseModulePhrases
           
           rsc.run_job package, job, {}, args=x, package_path: package_path
         }, 
+        rse_uri: ->(x, rsc){
+        
+          Rse.call x          
+          
+        },         
         sps: ->(x, rsc){
                         
           topic, msg = x.split(':',2)
@@ -63,39 +68,41 @@ class BotBaseModulePhrases
     
     r = nil
             
-    a.each do |type, x| 
+    a2 = a.map do |type, x| 
       
-      Thread.new do
         
-        if @bot.log then
-          
-          instruction = x.length > 60 ? x[0..57] + '...' : x
-          @bot.log.info "BotBaseModulePhrases/query: matched type: %," + 
-              " instruction: %s in response to %s" % [type, instruction, said]
-          
-        end
+      if @bot.log then
         
-        begin
-          h[type].call x, @rsc
-        rescue
-
-          if @bot.log then
-            @bot.log.debug 'BotBaseModulePhrases/query/error: ' + ($!).inspect
-          end
+        instruction = x.length > 60 ? x[0..57] + '...' : x
+        @bot.log.info "BotBaseModulePhrases/query: matched type: %," + 
+            " instruction: %s in response to %s" % [type, instruction, said]
+        
+      end
+      
+      begin
+        r = h[type].call x, @rsc
+      rescue
 
+        if @bot.log then
+          @bot.log.debug 'BotBaseModulePhrases/query/error: ' + ($!).inspect
         end
-        
-      end # /thread
+
+      end
+      
       
       if type == :sps and x[/^reply/] and mode != :voicechat then
 
         r = x[/:\s*(.*)/,1].to_s
+        
+      else
+        
+        r
 
       end
       
     end # /each           
     
-    return r      
+    return a2.join(' ')      
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botbase-module-phrases
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzI4MDkzMDQ3WhcN
-  MjAwMzI3MDkzMDQ3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCs8kvT
-  iwiuVJ2iM7mQyH85Ib4CI6tShc6rnDi/AejjvJu4D64Yc9iGl62JHwsj6yBiMYQW
-  3/VBMRrs4OIMnlVSnAVNJS7PjRQ6lW9WGmia8kpJyVH/CrlBSTpOvLSV7GcvlYWc
-  LWP3lbZGBxBkiR+XbmnpRDgpW1w0TVXUNbj8MLcja0+SjFhScvfDSv+gzKN/SU3I
-  Rw2kh5oQYTGqmYflfsvc1h6CSGdnHjMEsNSwRrpndD3z8KUvRBz55f00e6LqNgbh
-  ty7dfnLpZslI87AvStp0Bb7Jq/EkSEnOYAEUFAmq6S6m7IkMwdfNgkhgBgVry6Js
-  FeivIghDcaCAVMLifC/Nma8DfbRl30koRnH8wB9gqE5sN18e4N5vUtA9eUyaIK7B
-  hygDd/0vJu7g0Wnn/HcbJKggmN8UV1RhTf7X4gt5rdIe8EY378M8XYbgs58IP2QL
-  UCQl6SNUju9ju3BcGWQd8HnuCARsYHLYBLOxMo6LFFRhPErTkpRK53zin8UCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUpfRXMOB2
-  uOw5eo16UUNWC2yOSe0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjMwMDkzNDAwWhcN
+  MjEwNjMwMDkzNDAwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDDuTM6
+  kya8GeO2EF0lXBLlWwacQEH7YsKNxFRFfPsRMOXV0N6ztxOlRxnn7lIrwhOH8LjM
+  AkmbEdFZDnffL5Nf2aaoY1h5hWM4TyHxBmlJjGOyWlHBEi/cxg+OBifVjPIFFYGT
+  eeOepWPFFPHTyzCZZ8VDssk3Oh2c0B2VXtqyQmzOA+c8ybRWMVYkyfQuguvzffYh
+  4ibATHwriRpgRN+kZAUEa2mdQOHxqfwRbcCLZD6AjBR5MWPNaNjPSk/QZY079m7b
+  rDQyxJI0dcgDuQTF+QPjK0P2NdgYdKlqXnK/ZsLmB2XkVTqykLwcs6XHWS6bMPvq
+  HHPmbAfhIjZGuk9tMlyRHG0IyuNMFbf38mEVo2jH5psrGprCZiZG3hhJI9ha6TqZ
+  LynRRKa+Qzqo3CqbIT3muQjYn5fXDclx4CktuopzHFFsphr+OHYZwWnV9VXyWDpG
+  jwW4TuZRbwY65pgxCirxXRJxnSGReU6r7CMzYw2EUMiV13xZW6Zrx/IDXQcCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUNxgwYoj8
+  iyo0EBfMQ2sYH5b+S2QwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAclWEOt7cumja+t1s1zSDMnbxhHI6zGYS04qXmcb3
-  Q+fO4K585bQ3IBf++AyWAVGtzmc9QOE8xOdE/0mfdmMukI9vBUec0C6MKYv+g0j1
-  EiOsVGN5ZX9tNJtYvERHYufnFw8aaYPSLOEVVvrcrEXiVwDDyMZsLzKKSuB7VbEo
-  bkrHmd1Vk55zTVT1VsixKFlFYmTsMbvV53QoGudVaAPzoq0RbZrUvzheZ2ykqPZ8
-  35r+N2ZCXhI56x5JP7cgf1MhqwglZYi49R3XVh1jCf9xgdakUvlGlQpzKVw8becz
-  O91Iqj1w1Yjld/MrQLEYFQHzJasc+8urScv7VaVA6FL8MQkPkUVaM76j8I7qz/vZ
-  BEJNXpwhjKEtW8csoFpsTlu5XyGLSM5Gg4gEAfZjj6t0OivxkSX1I/XsOBLsI7qY
-  +jk8OhPNN7xb+HjdnrdYkSA3VuM4xBteoO373ogFb+eAql/WMzPEAvx8ghRDMGrc
-  IY08CxwY6d54nljSdu63ildj
+  BgkqhkiG9w0BAQsFAAOCAYEAVc7c1nZgu/I3R9lmqMtYNIGcVIqxEElIe+/ZlBCo
+  ugpNqKYLQ3SWauyleJxblQb3bdmOfwJyD/QVLVxEB6JJ5r6GoJcTP4q0sRtipmkt
+  kLAECP/NzXo5ddIUWYNXOAecPCS8JYFqzfZkYCNYdiS7c3EFnZW0ZF/BI+MNM1jD
+  faxvZFsD4JBjSl6sW6Qn0UNorhp4AzBXlAWMMHvRx8N2MkHsdvrvI+lG954i6mB2
+  7h5ay2yXOAgxqIJPl7lvU+6dDH/o0qUcpPbSQ+RQs72chrSrohovRv9ajivHD/Od
+  mAKCPsv4m8oDrypNEN7d4XjQdenAVqv9EVopuY0/2FjTChQsFfqsWGlOuh+3Gm+x
+  vLmttuvduLoy/X/GnoH5KmfwELeTU1g52fFZ4gei+GT64Cpd2rcCv1bDttmmql8o
+  zJeJvMM+IyBvJlppieIezSGxMZ9INu/2o5OyJGNmBETYbsWbt0EnbY2xT9+xKgB5
+  TzZHYncJZRgc+rpXe9YDypIB
   -----END CERTIFICATE-----
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsc
@@ -63,20 +63,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
@@ -103,20 +103,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.5.11
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A botbase module for matching a speech keyword which then triggers a general