beerbot 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f864e883bbc7374b90bc57465a35e14ebc9f7d
-  data.tar.gz: df19b2f182e991e2db92400d0dd29764a751f237
+  metadata.gz: 6483fc83799ee9b532e10c4f96a1c7d1b7eb0a29
+  data.tar.gz: 9564a54aa28c251d87b09f72222f63284b7f5d35
 SHA512:
-  metadata.gz: fa4f36bd206392242e866a96756e57a38a8e9178bb1928b4eaf6f45ec608b6a368cea96c19aab781f7e2b7c71c12b0a5f52502741dca3f6755df2f2941a54547
-  data.tar.gz: 4201d0fc06a58b7cc6cdd6dbb91ef7d680600eefb52b6f74963cd3753dbbe41b3945099d45ddd77292b1b3817da894cbc3efa04bf6c669228aef4398c816f7e6
+  metadata.gz: d857137c3322faabef1fc1da6a9155c0acd4c185a18de60cb87d57404ba67896b48137bd72de91ea2d157224da0cbefce57aa880465ada41f5c59ce30ddb24ef
+  data.tar.gz: 452fca254f50a355a141dab0c4ea7d758c85debde316eb8023e257424913e52f4f85b3e7e12afe06e26756169db693961285eb40e05076ae300b351506961780

data/lib/BeerBot/00.utils/utils.rb

@@ -61,6 +61,32 @@ module BeerBot
       }x
     end
 
+    # Could use in a botmsg
+    #
+    # [to:to,msg:weighted_sample({90=>['yes','ok','fine'],10=>[...]})]
+
+    def weighted_sample thing
+      case thing
+      when Hash
+        keys = thing.keys
+        total = keys.reduce{|s,i|s+i}
+        i = Kernel.rand(total)
+        k = keys.reduce{|s,k|s+=k; if s>=i then break k; else s end}
+        case thing[k]
+        when Array
+          thing[k].sample
+        when String
+          thing[k]
+        when Hash
+          weight_sample(thing[k])
+        else
+          nil
+        end
+      else
+        nil
+      end
+    end
+
   end
 
 end

data/lib/BeerBot/01.bot/Bot.rb

@@ -120,6 +120,10 @@ module BeerBot
       end
     end
 
+    def action action,from:nil,to:nil,me:false,world:nil
+      self.run(:action,action,from:from,to:to,me:me,world:world)
+    end
+
     # Handle events other than being messaged.
     #
     # IRC events like joining channels, changing nicks etc.

data/lib/BeerBot/02.protocols/irc.rb

@@ -115,7 +115,11 @@ module BeerBot
           msg  = m[:trailing].strip
           from = m[:prefix][:nick].strip
           to   = m[:params][0].strip unless m[:params].empty?
-          result = [:msg,from,to,msg]
+          if action = self.match_action(msg) then
+            result = [:action,from,to,action]
+          else
+            result = [:msg,from,to,msg]
+          end
 
         else # command we don't handle
           result = [:default,m]
@@ -272,6 +276,22 @@ module BeerBot
         "PRIVMSG #{to} :\u0001#{'ACTION'} #{str}\u0001"
       end
 
+      ACTION_REGEX = /\u0001ACTION\s+(.+)\u0001/
+
+      # Returns string matching the action (the bit after ACTION) or nil.
+      #
+      # eg
+      #   danb does something => "does something"
+
+      def self.match_action str
+        m = ACTION_REGEX.match(str)
+        if m then
+          m[1].strip
+        else
+          nil
+        end
+      end
+
       # Join a channel
 
       def self.join chan

data/lib/BeerBot/06.dispatchers/dispatcher.rb

@@ -90,6 +90,7 @@ module BeerBot
         when :quit
           nick,msg = args
           @world.quit(nick) if @world
+          replies = @bot.event(event,nick:nick,msg:msg)
         when :part
           nick,channel = args
           @world.part(nick,channel) if @world
@@ -110,8 +111,12 @@ module BeerBot
         when :chanlistend
           # ignore
 
-        when :msg
+        when :action
+          from,to,action = args
+          me = (@nickrx === to)
+          replies = @bot.action(action,from:from,to:to,me:me,world:world)
 
+        when :msg
           from,to,msg = args
 
           # Somebody messaging us privately:

data/lib/BeerBot/70.scheduler/scheduler.rb

@@ -8,15 +8,11 @@
 module BeerBot
   module Scheduler
     def self.instance timezone=nil
-      @@instance ||= CronR::Cron.new
+      @instance ||= CronR::Cron.new
       if timezone then
-        @@instance.time {
-          Time.use_zone(timezone) {
-            Time.zone.now
-          }
-        }
+        @instance.timezone = timezone
       end
-      @@instance
+      @instance
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beerbot
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Bush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -42,16 +42,16 @@ dependencies:
   name: CronR
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement