iirc 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3e9c48299d3d224743658cf8f5ccb1fa350fa748c8319fccd0d1a2c7154f81
-  data.tar.gz: 7675b9b55b30fb8a66c96aaccae46a4cd60c1381d8d79a1d4b9e1fdd13ccc6e9
+  metadata.gz: 4c856c393db0b7645fa204d003750816cda3ce860b2be538e523f7d8bcf56b4e
+  data.tar.gz: 74252990a51523295d3dc788579b1f7ea456a995939e35d8c6004556742b7117
 SHA512:
-  metadata.gz: 7f5f6743fd668c3da81091b5ae865e32bc83685166d4802bccd3bcd19c8dc2aebff176cb41b0cbb986b8b01c0e8ebeef527bdc4f099b6d327a4cca15e43ec6a9
-  data.tar.gz: df2a11d9936e4744581fa0cf8196a424692272f72f439acf18384ebb9afb122835637475e7d97618a81a5f291efe37f42dca378021d18b7b0246722dc86b564a
+  metadata.gz: 1c02d3b4eac6f4bebb0d2cb46e9241594021f07cb4fa2464508203bab3f1402f98901dd138efa1676d2de7fa678ac3117b08256ae819658c02819ff7dc2adeed
+  data.tar.gz: bb1fbf17c4f574f099a1b0c47d4e6aa087658c51137c8019facc151ccfd93591125c45b5bd327af6e75a85ae0d3f8ccea434da78b424c5f1c563c8f281413c2e

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.3.0] - 2022-03-26
+
+- [Bot] Include ReplyTarget
+- [Hooks] Refactor
+- Add AcceptInvites module
+- Improve Greeter example
+
 ## [0.2.9] - 2022-03-24
 
 - Add reply target concept (Bot::ReplyTarget)

data/examples/greeter.rb

@@ -3,9 +3,10 @@ require "iirc"
 class Greeter < IIRC::Bot
   include AutoJoin
   include Verbs
+  include PrintIO
 
   def on_join(evt)
-    say evt.target, "Hello #{evt.sender.nick}!"
+    say evt.target, "Hello #{evt.sender.nick}!" unless me === evt.sender
   end
 
   def autojoin_channels

data/lib/iirc/bot/accept_invites.rb

@@ -0,0 +1,22 @@
+module IIRC
+  module Bot::AcceptInvites
+    # Override this to decide whether we should accept a given invite.
+    # By default, all invites are accepted.
+    # @param [Event]
+    # @return [true] if we should join the channel
+    def accept_invite?(evt)
+      true
+    end
+
+    private
+      def configure_accept_invites
+        on :invite, :accept_invites
+      end
+
+      def accept_invites(evt)
+        if me === evt.target and accept_invite?(evt)
+          join evt.args[1]
+        end
+      end
+  end
+end

data/lib/iirc/bot/hooks.rb

@@ -4,6 +4,18 @@ module IIRC
       @hooks ||= Hash.new { |h,v| h[v] = Set.new }
     end
 
+    def run
+      lines { |line|
+        begin
+          evt = parse(line)
+          fire! evt.verb, evt
+        rescue Exception => ex
+          puts ex.message
+          puts ex.backtrace
+        end
+      }
+    end
+
     def on verb=nil, action=nil, &blk
       if action and blk
         define_singleton_method(action, blk)
@@ -17,10 +29,6 @@ module IIRC
       end
     end
 
-    def hook action=nil, &blk
-      on nil, action, &blk
-    end
-
     def off verb, action=nil, &blk
       action ||= blk
       if action
@@ -30,14 +38,12 @@ module IIRC
       end
     end
 
+    def hook action=nil, &blk
+      on nil, action, &blk
+    end
+
     def fire! verb, *args, **kwargs
-      for action in hooks[nil]
-        call action, *args, **kwargs
-      end
-      if respond_to? :"on_#{verb}"
-        send(:"on_#{verb}", *args, **kwargs)
-      end
-      for action in hooks[verb]
+      for action in hook_seq(verb)
         call action, *args, **kwargs
       end
     rescue StopIteration
@@ -54,16 +60,9 @@ module IIRC
       end
     end
 
-    def run
-      lines { |line|
-        begin
-          evt = parse(line)
-          fire! evt.verb, evt
-        rescue Exception => ex
-          puts ex.message
-          puts ex.backtrace
-        end
-      }
-    end
+    protected
+      def hook_seq(verb)
+        [*hooks[nil], (:"on_#{verb}" if respond_to?(:"on_#{verb}")), *hooks[verb]].compact
+      end
   end
-end
+end

data/lib/iirc/bot/ircv3/parsing.rb

@@ -4,7 +4,7 @@ module IIRC
       autoload :IRCParser, 'ircparser'
 
       def parse(line)
-        msg = IRCParser::Message.parse(line.chomp)
+        msg = IRCParser::Message.parse(line.tr("\r", '').chomp)
 
         Event.new.tap { |evt|
           evt.sender = IRCParser::RFCWireFormat.__stringify_prefix(msg.prefix) if msg.prefix

data/lib/iirc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IIRC
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/iirc.rb

@@ -5,6 +5,7 @@ require_relative "iirc/sender"
 require_relative "iirc/user"
 
 require_relative "iirc/bot"
+require_relative "iirc/bot/accept_invites"
 require_relative "iirc/bot/ambient"
 require_relative "iirc/bot/autojoin"
 require_relative "iirc/bot/channels"
@@ -38,9 +39,12 @@ module IIRC
     include Configure
     include Pong
     include TrackOwnNick
+    include ReplyTarget
 
-    def self.run(host, port=6697, ssl_context: SSL.default_context, **user_params, &blk)
-      socket = IIRC.dial(host, port, ssl_context: ssl_context)
+    def self.run(host, port=6697, local_host: nil, local_port: nil, ssl_context: SSL.default_context, **user_params, &blk)
+      socket = IIRC.dial(host, port,
+        local_host: local_host, local_port: local_port,
+        ssl_context: ssl_context)
 
       new(socket, **user_params).tap { |bot|
         bot.register!
@@ -100,10 +104,10 @@ module IIRC
   end
 
   module_function
-    def dial(host, port=6697, ssl_context: SSL.default_context)
+    def dial(host, port=6697, local_host: nil, local_port: nil, ssl_context: SSL.default_context)
       require 'socket'
 
-      Socket.tcp(host, port).then { |socket|
+      Socket.tcp(host, port, local_host, local_port).then { |socket|
         if ssl_context
           OpenSSL::SSL::SSLSocket.new(socket, ssl_context).tap { |socket|
             socket.hostname = host

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iirc
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - mooff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ircparser
@@ -46,6 +46,7 @@ files:
 - iirc.gemspec
 - lib/iirc.rb
 - lib/iirc/bot.rb
+- lib/iirc/bot/accept_invites.rb
 - lib/iirc/bot/ambient.rb
 - lib/iirc/bot/autojoin.rb
 - lib/iirc/bot/channels.rb