tkellem 0.8.7 → 0.8.8

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in ruby-protocol-buffers.gemspec
+# Specify your gem's dependencies in tkellem.gemspec
 gemspec

data/Rakefile

@@ -11,26 +11,3 @@ RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true
   t.rcov_opts = ["--exclude", "spec,gems/,rubygems/"]
 end
-
-require 'yard'
-YARD::Rake::YardocTask.new(:doc) do |t|
-  version = Tkellem::VERSION
-  t.options = ["--title", "tkellem #{version}", "--files", "LICENSE,README.md"]
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'tkellem'
-    gem.summary = 'IRC bouncer with multi-client support'
-    gem.email = 'brian@codekitchen.net'
-    gem.homepage = 'http://github.com/codekitchen/tkellem'
-    gem.authors = ['Brian Palmer']
-    gem.add_dependency 'eventmachine'
-    gem.executables = %w(tkellem)
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  # om nom nom
-end

data/lib/tkellem/bouncer.rb

@@ -183,7 +183,7 @@ class Bouncer
     @conn = nil
     @connected = false
     @connected_at = nil
-    @active_conns.each { |c,s| c.unbind }
+    @active_conns.each { |c,s| c.close_connection }
     connect!
   end
 
@@ -200,19 +200,8 @@ class Bouncer
   end
 
   def connect!
-    span = @last_connect ? Time.now - @last_connect : 1000
-    hosts = @network.hosts(true).map { |h| h }
-
-    if span < 5 || hosts.length < 1
-      EM.add_timer(5) { connect! }
-      return
-    end
-    @last_connect = Time.now
-    @cur_host = (@cur_host || 0) % hosts.length
-    host = hosts[@cur_host]
-    failsafe("connect: #{host}") do
-      EM.connect(host.address, host.port, IrcServerConnection, self, host.ssl)
-    end
+    @connector ||= IrcServerConnection.connector(self, network)
+    @connector.connect!
   end
 
   def ready!

data/lib/tkellem/bouncer_connection.rb

@@ -97,7 +97,7 @@ module BouncerConnection
       command = msg.command
       if @state != :auth && command == 'PRIVMSG' && msg.args.first == '-tkellem'
         msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
-      elsif command == 'TKELLEM'
+      elsif command == 'TKELLEM' || command == 'TK'
         msg_tkellem(msg)
       elsif command == 'CAP'
         # TODO: full support for CAP -- this just gets mobile colloquy connecting

data/lib/tkellem/irc_message.rb

@@ -34,9 +34,11 @@ class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)
   # /msg #someroom hey guys
   def self.parse_client_command(line)
     return nil unless line[0] == '/'[0]
+    if line =~ %r{^/msg\s+(\S+)\s+(.*)$}
+      line = "/PRIVMSG #{$1} :#{$2}"
+    end
     msg = parse(line[1..-1])
     return nil unless msg
-    msg.command = 'PRIVMSG' if msg.command == 'MSG'
     msg
   end
 
@@ -56,7 +58,7 @@ class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)
     line = []
     line << ":#{prefix}" unless prefix.nil?
     line << command
-    ext_arg = args.last if args.last && args.last.match(%r{\s})
+    ext_arg = args.last if args.last && args.last.match(%r{^:|\s})
     line += ext_arg ? args[0...-1] : args
     if ctcp?
       line << ":\x01#{ctcp} #{ext_arg}\x01"

data/lib/tkellem/irc_server.rb

@@ -1,5 +1,7 @@
-require 'set'
 require 'eventmachine'
+require 'set'
+require 'socket'
+
 require 'tkellem/irc_message'
 require 'tkellem/bouncer_connection'
 
@@ -7,45 +9,115 @@ module Tkellem
 
 module IrcServerConnection
   include EM::Protocols::LineText2
-  include Tkellem::EasyLogger
 
-  def initialize(bouncer, do_ssl)
+  def initialize(connection_state, bouncer, do_ssl)
     set_delimiter "\r\n"
     @bouncer = bouncer
     @ssl = do_ssl
+    @connection_state = connection_state
+    @connected = false
   end
 
-  def post_init
-    failsafe(:post_init) do
-      if @ssl
+  def connection_completed
+    if @ssl
+      @bouncer.failsafe(:connection_completed) do
         @bouncer.debug "starting TLS"
         # TODO: support strict cert checks
         start_tls :verify_peer => false
-      else
-        ssl_handshake_completed
       end
+    else
+      ssl_handshake_completed
     end
   end
 
   def ssl_handshake_completed
-    failsafe(:ssl_handshake_completed) do
-      EM.next_tick { @bouncer.connection_established(self) }
+    @bouncer.failsafe(:ssl_handshake_completed) do
+      @connected = true
+      @bouncer.connection_established(self)
     end
   end
 
   def receive_line(line)
-    failsafe(:receive_line) do
-      trace "from server: #{line}"
+    @bouncer.failsafe(:receive_line) do
+      @bouncer.trace "from server: #{line}"
       msg = IrcMessage.parse(line)
       @bouncer.server_msg(msg)
     end
   end
 
   def unbind
-    failsafe(:unbind) do
-      @bouncer.disconnected!
+    @bouncer.failsafe(:unbind) do
+      if @connected
+        @bouncer.disconnected!
+      else
+        @bouncer.debug "Connection failed, trying next"
+        @connection_state.connect!
+      end
     end
   end
+
+  class ConnectionState < Struct.new(:bouncer, :network, :attempted, :getting)
+    def initialize(bouncer, network)
+      super(bouncer, network, Set.new, false)
+      reset
+    end
+
+    def connect!
+      raise("already in the process of getting an address") if getting
+      self.getting = true
+      network.reload
+      host_infos = network.hosts.map { |h| h.attributes }
+      EM.defer(proc { find_address(host_infos) }, method(:got_address))
+    end
+
+    def reset
+      self.attempted.clear
+    end
+
+    # runs in threadpool
+    def find_address(hosts)
+      candidates = Set.new
+      hosts.each do |host|
+        Socket.getaddrinfo(host['address'], host['port'], Socket::AF_INET, Socket::SOCK_STREAM, Socket::IPPROTO_TCP).each do |found|
+          candidates << [found[3], host['port'], host['ssl']]
+        end
+      end
+
+      to_try = candidates.to_a.sort_by { rand }.find { |c| !attempted.include?(c) }
+      if to_try.nil?
+        # we've tried all possible hosts, start over
+        return nil
+      end
+
+      return to_try
+    end
+
+    # back on event thread
+    def got_address(to_try)
+      self.getting = false
+
+      if !to_try
+        # sleep for a bit and try again
+        bouncer.debug "All available addresses failed, sleeping 5s and then trying over"
+        reset
+        EM.add_timer(5) { connect! }
+        return
+      end
+
+      attempted << to_try
+      address, port, ssl = to_try
+
+      bouncer.debug "Connecting to: #{Host.address_string(address, port, ssl)}"
+      bouncer.failsafe("connect: #{Host.address_string(address, port, ssl)}") do
+        EM.connect(address, port, IrcServerConnection, self, bouncer, ssl)
+      end
+    end
+  end
+
+  def self.connector(bouncer, network)
+    ConnectionState.new(bouncer, network)
+  end
+
 end
 
 end

data/lib/tkellem/models/host.rb

@@ -4,6 +4,10 @@ class Host < ActiveRecord::Base
   belongs_to :network
 
   def to_s
+    self.class.address_string(address, port, ssl)
+  end
+
+  def self.address_string(address, port, ssl)
     "#{ssl ? 'ircs' : 'irc'}://#{address}:#{port}"
   end
 end

data/lib/tkellem/plugins/push_service.rb

@@ -1,5 +1,6 @@
 require 'eventmachine'
-require 'json'
+require 'active_support/json'
+require 'active_support/ordered_hash'
 require 'tkellem/irc_message'
 
 module Tkellem

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/spec/irc_message_spec.rb

@@ -22,6 +22,14 @@ describe IrcMessage, ".parse" do
     line.replay.should == orig
   end
 
+  it "should parse and replay messages with leading colons" do
+    orig = "MSG #myroom ::)"
+    line = IrcMessage.parse(orig)
+    line.command.should == "MSG"
+    line.args.should == ["#myroom", ":)"]
+    line.replay.should == orig
+  end
+
   it "should parse with no arguments" do
     line = IrcMessage.parse("AWAY")
     line.command.should == "AWAY"

data/spec/irc_server_spec.rb

@@ -9,7 +9,8 @@ describe Bouncer, "connection" do
   end
 
   def make_server
-    b = Bouncer.new(NetworkUser.new(:user => User.new(:username => 'speccer'), :network => Network.new))
+    network = Network.create!(:hosts => [Host.create!(:address => 'localhost', :port => 4321)], :name => 'test')
+    b = Bouncer.new(NetworkUser.create!(:user => User.new(:username => 'speccer'), :network => network))
     b
   end
 
@@ -66,7 +67,7 @@ describe Bouncer, "connection" do
     network_user
     @bouncer = $tk_server.bouncers.values.last
     if opts[:connect]
-      @server_conn = em(IrcServerConnection).new(@bouncer, false)
+      @server_conn = em(IrcServerConnection).new(nil, @bouncer, false)
       @server_conn.stub!(:send_data)
       @bouncer.connection_established(@server_conn)
       @bouncer.send :ready!
@@ -96,7 +97,7 @@ describe Bouncer, "connection" do
   it "should attempt another nick if the default is taken" do
     network_user(:nick => 'mynick')
     bouncer
-    @server_conn = em(IrcServerConnection).new(@bouncer, false)
+    @server_conn = em(IrcServerConnection).new(nil, @bouncer, false)
     @server_conn.stub!(:send_data)
     @bouncer.connection_established(@server_conn)
     @server_conn.should_receive(:send_data).with("NICK mynick_\r\n")

data/tkellem.gemspec

@@ -18,13 +18,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "eventmachine", "~> 0.12.10"
-  s.add_dependency "daemons", "~> 1.1.0"
-  s.add_dependency "json"
   s.add_dependency "activerecord", "~> 3.0.0"
   s.add_dependency "sqlite3", "~> 1.3.3"
 
   s.add_development_dependency "rspec", "~> 2.5"
   s.add_development_dependency "rcov"
-  s.add_development_dependency "yard"
 end
-

metadata

@@ -2,7 +2,7 @@
 name: tkellem
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors: 
 - Brian Palmer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -06:00
+date: 2011-07-01 00:00:00 -06:00
 default_executable: tkellem
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,83 +24,50 @@ dependencies:
         version: 0.12.10
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.3
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.5"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id005
 description: 
 email: 
 - brian@codekitchen.net