botbase 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a3376d131dd2f7fd14437f20bfcd5715b56a646
-  data.tar.gz: ce7bb6b2f91974c946c97388190ad08a74a9d914
+SHA256:
+  metadata.gz: 3bbd23516c8209afe0fdb853910f6b0c92c21b8dd62065ce7b7454a2273469b7
+  data.tar.gz: a905535704581fdbbf8fb4857565bff1e238328c911db44cc94c49209a2bc64a
 SHA512:
-  metadata.gz: 2a28663cb9cf43a6c5f98202db7c445b538198f3f34049d0555f0cdfc530564cb037815ec333ba497d086943613ce968f1440ec6b6f995ba7afc0c2792c19cb4
-  data.tar.gz: 292949c8c503273ab8468e7a947774ea3ce7d84eaef5fd2f5133fd220c32622a3302908f571ee46fcf24c266a9aa53596448199993e6e0f98e15314d93ec72b3
+  metadata.gz: aadebb98b3ce7d1f64272e32d67e8bdfe9673043305c0d0135f2757feb44386aa64c6e3e3a216a6ccf04b5da4a16b9e397ca6ff104fee496208f629cda1402df
+  data.tar.gz: 9674b8b047ffbbaa524920c8e1920143854032b32efd50fbe81d77e70ae0aebf83506ffdf30467c68ddd10f4e4fcf3981f98290291286a497b6ac4d81be7ada0

data/lib/botbase.rb

@@ -10,43 +10,76 @@ require 'simple-config'
 class BotBase  
   
   attr_reader :log
+  attr_accessor :channel_lock, :message_prefix
   
-  
-  def initialize(config=nil, botname: 'Nicole', notifier: nil, log: nil)
+  def initialize(config=nil, botname: 'Nicole', notifier: nil, log: nil, 
+                 debug: false)
 
-    @botname, @notifier, @log, @h = botname, notifier, log, nil
+    @botname, @notifier, @log, @h, @debug = botname, notifier, log, nil, debug
     
     if config then
       
       @h = SimpleConfig.new(config).to_h      
+      puts '@h: ' + @h.inspect if @debug
       @modules = initialize_modules(@h[:modules])
       
     end
 
   end
   
-  # used for display debug messages from modules
+  # displays debug messages from modules
   #
   def notice(msg)
     @notifier.notice msg if @notifier
+    puts msg
   end  
   
   def received(sender='user01', msg, mode: :voicechat, echo_node: 'node1')
 
     msg.rstrip!
     
+    if msg.downcase == 'exit' then
+      @channel_lock, @message_prefix = nil, nil
+    end
+    
     log.info 'BotBase/received: ' + msg if log
     self.restart if msg == @botname + ' restart'
     
     r = nil
     
-    detected = @modules.detect do |m| 
-      r = m.query(msg, mode: mode, echo_node: echo_node)
+    detected = if @channel_lock then
+    
+      if @debug then
+        notice 'botbase: inside channel locked'
+        notice 'botbase: fullmsg:' + (@message_prefix.to_s + msg).inspect
+      end
+      
+      r = @modules[@channel_lock].query(@message_prefix.to_s + msg, 
+                                        mode: mode, echo_node: echo_node)
+      puts 'r: ' + r.inspect if @debug
       r and r.length > 0 
+      
+    else
+      
+      if @debug then
+        puts 'before modules.detect'
+        puts '@modules.values: ' + @modules.values\
+            .map {|x| x.inspect[0..100] }.join("\n")
+      end
+    
+      @modules.detect do |name, obj|
+        puts 'name: ' + name.inspect if @debug
+        r = obj.query(msg, mode: mode, echo_node: echo_node)
+        r and r.length > 0 
+      end
+      
     end
     
+    
     if detected then
       
+      puts 'detected: ' + detected.inspect[0..200] + ' ...' if @debug
+      
       if mode == :voicechat then
         MTLite.new(r).to_s.gsub(/ +https:\/\/[\S]+/,'')
       else
@@ -71,9 +104,8 @@ class BotBase
   
   def initialize_modules(modules)
     
-    modules.inject([]) do |r, m|
+    a = modules.map do |name, settings|
       
-      name, settings = m
       settings = {} if settings.is_a? String
       
       if log then
@@ -83,10 +115,15 @@ class BotBase
             
       klass_name = 'BotBaseModule' + name.to_s
       
-      r << Kernel.const_get(klass_name).new(settings.merge({callback: self}))
+      [name, Kernel.const_get(klass_name).new(settings.merge({callback: self, 
+                                                              debug: @debug}))]
 
     end
+    
+    puts 'a: ' + a[0..100].inspect if @debug
+    a.to_h
+    
         
   end  
     
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: botbase
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MTAxNDE2NDUzNVoXDTE4MTAxNDE2NDUzNVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANRgsuAOAgt7b/Ss3HNTIZOuJE3zhRVN8Vm0GjNRHpazL61v3mCFMLQCdqX7
-  AVgM5KGcM2N11UntqBPcrm/ZoH7/QixzdPJ1B3Sm5vgA/XUSLIqFZgo6rmB9gCwj
-  KON+QTbiLNIsA8C0uhvXZrF+JUrMuo3j/b6NUQCLIpo1EYeyv+10s13FrT/7RT/E
-  rt86T1mu8CbJ6Nq9cxgKI0e/xFzydtlsNTOJubRjdHEO2XnkEF9WqODMvOUSWpVv
-  3RcelYfRYl4wqBsinWXoVg4EwPorutq2URIWl1h5uVkDW2NPPnYr0gvLhXI7M3JC
-  hQx/k1hToaoMYA7PgtuyGklsNUkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU9gRQv5gXgRij7LYtMdAIWxKRNEkwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAQJpWwGVk
-  ASO0cL97HjYQZah/Phy87+23hKGZ6rxvjCyP5txDNpW+/kLy/yjvPcU1dFL7ScoA
-  XDdPsZlb+1RnZXh/yICLJWUB6lj5koJpdsBwmgbQRS67rXb7Hh5mqTVSC6A8If93
-  /gtZaNximhmlzQNVR5lEPSM3qMRvMTIrotVMDnGg2QH1NOFeEr4+fmJRSGfwvs6U
-  FJM/wBh5G3mhQ3l8RRDx4Tm4uZkkFkpqDyipEqreMlfkXWq+3KZM0fPQwihFZMTn
-  YxZGLFY3TBqGLKUMyiOYlOa0oKBNAqnib62M7h9nxMt9pixyl6hKzikU6vwApKBU
-  hHWzzAMK8eZsvA==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNzAzMTQ0OTI2WhcN
+  MjEwNzAzMTQ0OTI2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDFxoia
+  PYNMjP1O3i9SZLe1UhZtjLoX72rli5iMRE/dZyXfBa6V9ywF11QBB8EEfXslYRyE
+  4OZ9XC/x8Z3ajxWvV00HwzJVJLTGSy7sMWvkc9a4tbRyEiV0nNX1BBrhOlk2zuKd
+  nM45eldqdpr4YfvvKe7urtWN0v1LoT9bsO+M1t5cjjkZzccc+X+jgtqPBKSllL+O
+  NIaqloYQVetuo6xQstz52P/wFBx9kzC1D7s236ag7boW2GEFqnUZB1W/ypsH6jy0
+  Exzm+xtpRjNnmK0XMnf/ShjqODmTkS+sf0eNqYsdxj7TlitZN4U5xti+YMqQnBnc
+  rMoWBjZovNv4VDBN12bOz1O8xuQiWSskq34bOngeYyg766SilRBiGv37si7/KkZe
+  8P000sRMcBPioDpc31nGJsovjIhjKdPy7YH/WMWzqpKN+T7LvikeB4EeEGeUJoBn
+  pu+mX9QIZTlPWMSt/JZyEERWkaBFFNbEvfAR1Nuc6ouSKag6BzEGRpebVJECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU6ANrSWW7
+  0OJil7fWox20YpPhTcwwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEANqST3Gm40i57l2OKhRbdS4FOR/XkqeHhTwu0WFp3
+  wsjAQukDmPg8vNvNiHTZ5zvN24c0k419zdzzTvL9bCj6it8nsRWJaSIZLkhaL+xM
+  DA4gur/nt5CZKZS0l0EYaJd9WzTTasHtm35zes6P3sWJQYlT0miUFy6EGYoimtvr
+  0w5Ede3UNDxb6pE0WA0a482Jmos9UeHYf9eilENDRyFx+YZa7GSdZXlsiv9GK+IC
+  262I7WGjLgCUNff+IyUpqoamAKS1QnPaESTOuveagyLCFS1vPNHAKYK5AZBFcf6y
+  8ebqh6Juc9VkxCopWu04bDjrjCvNZ04YtbUwvP5ypsK6PqMw+leSn6T9aN8H3jcc
+  als1Sa+uEEug4C+DfnxUhoC0AvbZHy8DfDB8b0CRwqfo4PHDQUEDMSuoq62MuGqw
+  6lxxv/jQ5LA2SHCIatmdVQQqUXVpPmCojcHy4+FB0Vfcq9e/pEdiGEhaJnQkNjMc
+  NH8JIgyRVXldUCa9Ahsubk7V
   -----END CERTIFICATE-----
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mtlite
@@ -62,7 +66,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +76,7 @@ dependencies:
         version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -99,8 +103,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.0.3
 signing_key: 
 specification_version: 4
 summary: Provides bot functionality primarily for use by the sps_bot gem.