miu-irc 0.0.1 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: afbf8d374be8d7fd2583538fe2fc791b41ae9538
+  data.tar.gz: 0b2fde222cb446b126f54839eaf9ce7be632d5e1
+SHA512:
+  metadata.gz: 8883d235a562ed3dbdb0a54faf9cdd7798f4bc0d951efd4cec74385d7213cfbff1dc4ab9fe68f0dd15eb3f4ddcb044977bd62b54b9b14498a6cb408ee39781d8
+  data.tar.gz: 005cb785d8bfa83b77962d5c71f60857aaf732e92a41e79cc5ee5217da0abad1f06bcbdfc5d7ea84ea93b2bc43ef75ecd94e7a1b828e4653f78769882e736fdf

data/README.md

@@ -1,6 +1,6 @@
-# Miu::IRC
+# Miu::Nodes::IRC
 
-TODO: Write a gem description
+IRC node for Miu
 
 ## Installation
 
@@ -18,7 +18,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+miu irc init
+vim config/miu.god # edit your settings
+miu supervise
+```
 
 ## Contributing
 

data/lib/miu-irc.rb

@@ -1,5 +1 @@
-require 'miu-irc/version'
-require 'miu/plugins/irc'
-
-require 'celluloid'
-Celluloid.logger = nil
+require 'miu/nodes/irc'

data/lib/miu/nodes/irc.rb

@@ -0,0 +1,6 @@
+require 'miu'
+require 'celluloid/io'
+require 'celluloid/zmq'
+require 'miu/nodes/irc/version'
+require 'miu/nodes/irc/node'
+Celluloid.logger = nil

data/lib/miu/nodes/irc/client.rb

@@ -0,0 +1,95 @@
+require 'miu/nodes/irc/connection'
+require 'miu/nodes/irc/publisher'
+require 'miu/nodes/irc/subscriber'
+
+module Miu
+  module Nodes
+    module IRC
+      class Client < Connection
+        attr_reader :channels
+        attr_reader :node, :publisher, :subscriber
+
+        def initialize(node, options)
+          super options
+          @node = node
+          @channels = Array(options[:channels])
+          @publisher = Publisher.new @node.options['pub-host'], @node.options['pub-port'], @node.options['pub-tag']
+          @subscriber = Subscriber.new @node.options['sub-host'], @node.options['sub-port'], @node.options['sub-tag']
+
+          async.run
+        end
+
+        def close
+          @publisher.close
+          @subscriber.close
+          super
+        end
+
+        def on_376(msg)
+          @channels.each do |channel|
+            send_message 'JOIN', *channel.split(/ +/)
+          end
+
+          @subscriber.async.run self
+        end
+
+        def on_ping(msg)
+          send_message 'PONG', msg.params[0]
+        end
+
+        def on_privmsg(msg)
+          publish_text msg, false
+        end
+
+        def on_notice(msg)
+          publish_text msg, true
+        end
+
+        def on_join(msg)
+          channels = msg.params[0].split(',') rescue []
+          channels.each do |channel|
+            publish Miu::Messages::Enter do |c|
+              c.room.name = channel
+              c.user.name = to_name(msg)
+            end
+          end
+        end
+
+        def on_part(msg)
+          channels = msg.params[0].split(',') rescue []
+          channels.each do |channel|
+            publish Miu::Messages::Leave do |c|
+              c.room.name = channel
+              c.user.name = to_name(msg)
+            end
+          end
+        end
+
+        private
+
+        def to_name(msg)
+          msg.prefix.nick || msg.prefix.servername
+        end
+
+        def publish_text(msg, notice)
+          publish Miu::Messages::Text do |c|
+            c.room.name = msg.params[0]
+            c.user.name = to_name(msg)
+            c.text = msg.params[1]
+            c.meta = {
+              :notice => notice
+            }
+          end
+        end
+
+        def publish(type)
+          msg = type.new do |m|
+            m.network.name = @node.options[:network]
+            yield m.content
+          end
+          @publisher.write msg
+        end
+      end
+    end
+  end
+end

data/lib/miu/nodes/irc/connection.rb

@@ -0,0 +1,83 @@
+require 'celluloid/io'
+require 'ircp'
+require 'forwardable'
+
+module Miu
+  module Nodes
+    module IRC
+      class Connection
+        include Celluloid::IO
+
+        BUFFER_SIZE = 1024 * 4
+
+        attr_reader :host, :port
+        attr_reader :nick, :user, :real, :pass
+        attr_reader :encoding
+        attr_reader :socket
+
+        def initialize(options)
+          @host = options[:host]
+          @port = options[:port] || 6667
+          @nick = options[:nick]
+          @user = options[:user] || @nick
+          @real = options[:real] || @nick
+          @pass = options[:pass]
+          @encoding = options[:encoding] || 'UTF-8'
+
+          @socket = TCPSocket.new @host, @port
+        end
+
+        def close
+          @socket.close if @socket && !@socket.closed?
+        end
+
+        def send_message(*args)
+          msg = Ircp::Message.new(*args)
+          Miu::Logger.debug "<< #{msg.to_s.strip}"
+          @socket.write msg.to_irc
+        end
+
+        def run
+          attach
+          readlines do |data|
+            msg = Ircp.parse data rescue nil
+            if msg
+              Miu::Logger.debug ">> #{msg.to_s.strip}"
+              on_message msg
+            end
+          end
+        end
+
+        def readlines(buffer_size = BUFFER_SIZE, &block)
+          readbuf = ''.force_encoding('ASCII-8BIT')
+          loop do
+            readbuf << @socket.readpartial(buffer_size).force_encoding('ASCII-8BIT')
+            while data = readbuf.slice!(/.+\r\n/)
+              block.call encode(data, @encoding)
+            end
+          end
+        end
+
+        def encode(str, encoding)
+          str.force_encoding(encoding).encode!(:invalid => :replace, :undef => :replace)
+          str.chars.select { |c| c.valid_encoding? }.join
+        end
+
+        def attach
+          send_message 'PASS', @pass if @pass
+          send_message 'NICK', @nick
+          send_message 'USER', @user, '*', '*', @real
+        end
+
+        def on_message(msg)
+          begin
+            method = "on_#{msg.command.to_s.downcase}"
+            __send__ method, msg if respond_to? method
+          rescue => e
+            Miu::Logger.exception e
+          end
+        end
+      end
+    end
+  end
+end

data/lib/miu/nodes/irc/node.rb

@@ -0,0 +1,75 @@
+require 'miu/nodes/irc/client'
+
+module Miu
+  module Nodes
+    module IRC
+      class Node
+        include Miu::Node
+        description 'IRC node for miu'
+
+        attr_reader :options
+
+        def initialize(options)
+          @options = options
+
+          Miu::Logger.info "Options:"
+          @options.each do |k, v|
+            Miu::Logger.info "  #{k}: #{v}"
+          end
+
+          @client = Client.new(self, {
+            :host => options[:host], :port => options[:port],
+            :nick => options[:nick], :user => options[:user], :real => options[:real],
+            :pass => options[:pass],
+            :channels => options[:channels],
+          })
+
+          [:INT, :TERM].each do |sig|
+            trap(sig) { exit }
+          end
+
+          sleep
+        end
+
+        private
+
+        def shutdown
+          @client.close
+        end
+
+        register :irc do
+          desc 'start', %(Start miu-irc node)
+          option 'host', :type => :string, :desc => 'irc host', :required => true, :aliases => '-a'
+          option 'port', :type => :numeric, :default => 6667, :desc => 'irc port', :aliases => '-p'
+          option 'nick', :type => :string, :desc => 'irc nick', :required => true, :aliases => '-n'
+          option 'user', :type => :string, :desc => 'irc user'
+          option 'real', :type => :string, :desc => 'irc real'
+          option 'pass', :type => :string, :desc => 'irc pass'
+          option 'encoding', :type => :string, :default => 'utf-8', :desc => 'irc encoding'
+          option 'channels', :type => :array, :default => [], :desc => 'irc join channels', :banner => %('#channel1 password' '#channel2')
+          option 'network', :type => :string, :default => 'irc', :desc => 'network name'
+          add_miu_pub_options 'miu.input.irc.'
+          add_miu_sub_options 'miu.output.irc.'
+          def start
+            Node.new options
+          end
+
+          desc 'init', %(Generates a miu-irc configurations)
+          def init
+            config <<-EOS
+Miu.watch 'irc' do |w|
+  w.start = 'miu irc start', {
+    '--host' => 'chat.freenode.net',
+    '--nick' => 'miu',
+    '--channels' => ['#miu'],
+    '--verbose' => false
+  }
+  w.keepalive
+end
+            EOS
+          end
+        end
+      end
+    end
+  end
+end

data/lib/miu/nodes/irc/publisher.rb

@@ -0,0 +1,20 @@
+require 'miu'
+require 'celluloid/zmq'
+
+module Miu
+  module Nodes
+    module IRC
+      class Publisher
+        include Miu::Publisher
+        include Celluloid::ZMQ
+        socket_type Celluloid::ZMQ::PubSocket
+
+        def write(msg)
+          packet = super
+          Miu::Logger.debug "[PUB] #{packet}"
+          packet
+        end
+      end
+    end
+  end
+end

data/lib/miu/nodes/irc/subscriber.rb

@@ -0,0 +1,45 @@
+require 'miu'
+require 'celluloid/zmq'
+
+module Miu
+  module Nodes
+    module IRC
+      class Subscriber
+        include Miu::Subscriber
+        include Celluloid::ZMQ
+        socket_type Celluloid::ZMQ::SubSocket
+
+        def run(irc)
+          @irc = irc
+          super
+        end
+
+        private
+
+        def on_packet(packet)
+          Miu::Logger.debug "[SUB] #{packet}"
+          super
+        end
+
+        def on_text(tag, msg)
+          target = msg.content.room.name
+          text = msg.content.text
+          notice = !!msg.content.meta['notice']
+
+          command = notice ? 'NOTICE' : 'PRIVMSG'
+          irc.send_message command, target, text
+        end
+
+        def on_enter(tag, msg)
+          channel = msg.content.room.name
+          irc.send_message 'JOIN', channel
+        end
+
+        def on_leave(tag, msg)
+          channel = msg.content.room.name
+          irc.send_message 'PART', channel
+        end
+      end
+    end
+  end
+end

data/lib/miu/nodes/irc/version.rb

@@ -0,0 +1,7 @@
+module Miu
+  module Nodes
+    module IRC
+      VERSION = '0.1.0'
+    end
+  end
+end

data/miu-irc.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'miu-irc/version'
+require 'miu/nodes/irc/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "miu-irc"
-  gem.version       = Miu::IRC::VERSION
+  gem.version       = Miu::Nodes::IRC::VERSION
   gem.authors       = ["mashiro"]
   gem.email         = ["mail@mashiro.org"]
   gem.description   = %q{irc plugin for miu}
@@ -17,8 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'miu'
-  gem.add_dependency 'ircp'
-  gem.add_dependency 'celluloid-io'
-  gem.add_development_dependency 'rake'
+  gem.add_dependency 'miu', '>= 0.2.2'
+  gem.add_dependency 'ircp', '>= 1.1.7'
+  gem.add_dependency 'celluloid-io', '>= 0.14.0'
+  gem.add_dependency 'celluloid-zmq', '>= 0.14.0'
+  gem.add_development_dependency 'rake', '>= 10.0.3'
 end

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: miu-irc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: ircp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: celluloid-zmq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.0.3
 description: irc plugin for miu
 email:
 - mail@mashiro.org
@@ -88,38 +93,35 @@ files:
 - README.md
 - Rakefile
 - lib/miu-irc.rb
-- lib/miu-irc/connection.rb
-- lib/miu-irc/version.rb
-- lib/miu/plugins/irc.rb
+- lib/miu/nodes/irc.rb
+- lib/miu/nodes/irc/client.rb
+- lib/miu/nodes/irc/connection.rb
+- lib/miu/nodes/irc/node.rb
+- lib/miu/nodes/irc/publisher.rb
+- lib/miu/nodes/irc/subscriber.rb
+- lib/miu/nodes/irc/version.rb
 - miu-irc.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 866858604891186946
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 866858604891186946
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: irc plugin for miu
 test_files: []

data/lib/miu-irc/connection.rb

@@ -1,92 +0,0 @@
-require 'celluloid/io'
-require 'ircp'
-require 'forwardable'
-
-module Miu
-  module IRC
-    class Connection
-      include Celluloid::IO
-
-      BUFFER_SIZE = 1024 * 4
-
-      attr_reader :host, :port
-      attr_reader :nick, :user, :real, :pass
-      attr_reader :encoding, :channels
-      attr_reader :socket
-
-      def initialize(options)
-        @host = options[:host]
-        @port = options[:port] || 6667
-        @nick = options[:nick]
-        @user = options[:user] || @nick
-        @real = options[:real] || @nick
-        @pass = options[:pass]
-        @encoding = options[:encoding] || 'UTF-8'
-        @channels = options[:channels] || []
-
-        @socket = TCPSocket.new @host, @port
-      end
-
-      def finalize
-        close
-      end
-
-      def close
-        @socket.close if @socket && !@socket.closed?
-      end
-
-      def send_message(*args)
-        msg = Ircp::Message.new(*args)
-        puts "[SEND] #{msg}"
-        @socket.write msg.to_irc
-      end
-
-      def run
-        attach
-        readlines do |data|
-          msg = Ircp.parse data rescue nil
-          if msg
-            puts "[RECV] #{msg}"
-            on_message msg
-          end
-        end
-      end
-
-      def readlines(buffer_size = BUFFER_SIZE, &block)
-        readbuf = ''.force_encoding('ASCII-8BIT')
-        loop do
-          readbuf << @socket.readpartial(buffer_size).force_encoding('ASCII-8BIT')
-          while data = readbuf.slice!(/.+\r\n/)
-            block.call encode(data, @encoding)
-          end
-        end
-      end
-
-      def encode(str, encoding)
-        str.force_encoding(encoding).encode!(:invalid => :replace, :undef => :replace)
-        str.chars.select { |c| c.valid_encoding? }.join
-      end
-
-      def attach
-        send_message 'PASS', @pass if @pass
-        send_message 'NICK', @nick
-        send_message 'USER', @user, '*', '*', @real
-      end
-
-      def on_message(msg)
-        method = "on_#{msg.command.to_s.downcase}"
-        __send__ method, msg if respond_to? method
-      end
-
-      def on_376(msg)
-        @channels.each do |channel|
-          send_message 'JOIN', *channel.split(/ +/)
-        end
-      end
-
-      def on_ping(msg)
-        send_message 'PONG'
-      end
-    end
-  end
-end

data/lib/miu-irc/version.rb

@@ -1,5 +0,0 @@
-module Miu
-  module IRC
-    VERSION = '0.0.1'
-  end
-end

data/lib/miu/plugins/irc.rb

@@ -1,127 +0,0 @@
-require 'miu'
-require 'miu-irc/connection'
-
-module Miu
-  module Plugins
-    class IRC
-      include Miu::Plugin
-
-      def initialize(options)
-        @publisher = Miu::Publisher.new({
-          :host => options[:'miu-pub-host'],
-          :port => options[:'miu-pub-port'],
-        })
-        @subscriber = Miu::Subscriber.new({
-          :host => options[:'miu-sub-host'],
-          :port => options[:'miu-sub-port'],
-          :subscribe => 'miu.output.irc.',
-        })
-        @irc_client = IRCClient.new(@publisher, {
-          :host => options[:host],
-          :port => options[:port],
-          :nick => options[:nick],
-          :user => options[:user],
-          :real => options[:real],
-          :pass => options[:pass],
-          :channels => options[:channels],
-        })
-
-        @publisher.connect
-        @subscriber.connect
-        @irc_client.async.run
-
-        @future = Celluloid::Future.new do
-          @subscriber.each do |msg|
-            p msg
-          end
-        end
-
-        [:INT, :TERM].each do |sig|
-          trap(sig) do
-            shutdown
-            exit
-          end
-        end
-
-        sleep
-      end
-
-      private
-
-      def shutdown
-        @irc_client.close
-        @subscriber.close
-        @publisher.close
-      end
-
-      class IRCClient < Miu::IRC::Connection
-        def initialize(publisher, options)
-          @publisher = publisher
-          super options
-        end
-
-        def on_privmsg(msg)
-          publish_text_message msg
-        end
-
-        def on_notice(msg)
-          publish_text_message msg, 'notice'
-        end
-
-        private
-
-        def publish_text_message(msg, sub_type = nil)
-          return unless msg.prefix
-
-          m = Miu::Messages::Text.new(:sub_type => sub_type) do |m|
-            m.network.name = 'irc'
-            m.content.tap do |c|
-              c.room.name = msg.params[0]
-              c.user.name = msg.prefix.nick || msg.prefix.servername
-              c.text = msg.params[1]
-            end
-          end
-
-          @publisher.send 'miu.input.irc.', m
-        rescue => e
-          Mou::Logger.exception e 
-        end
-      end
-
-      register :irc, :desc => %(IRC plugin for miu) do
-        desc 'start', %(Start miu-irc plugin)
-        option 'host', :type => :string, :desc => 'irc host', :required => true, :aliases => '-a'
-        option 'port', :type => :numeric, :default => 6667, :desc => 'irc port', :aliases => '-p'
-        option 'nick', :type => :string, :desc => 'irc nick', :required => true, :aliases => '-n'
-        option 'user', :type => :string, :desc => 'irc user'
-        option 'real', :type => :string, :desc => 'irc real'
-        option 'pass', :type => :string, :desc => 'irc pass'
-        option 'encoding', :type => :string, :default => 'UTF-8', :desc => 'irc encoding'
-        option 'channels', :type => :array, :default => [], :desc => 'irc join channels', :banner => '#channel1 #channel2'
-        add_miu_pub_options!
-        add_miu_sub_options!
-        def start
-          IRC.new options
-        end
-
-        desc 'init', %(Generates a miu-irc configurations)
-        def init
-          append_to_file 'config/miu.god', <<-CONF
-
-God.watch do |w|
-  w.dir = Miu.root
-  w.log = Miu.root.join('log/irc.log')
-  w.name = 'irc'
-
-  host = 'chat.freenode.net'
-  nick = 'miu'
-  w.start = "bundle exec miu irc start --host=\#{host} --nick=\#{nick}"
-
-  w.keepalive
-end
-          CONF
-        end
-      end
-    end
-  end
-end