tkellem 0.8.11 → 0.9.0.beta1

data/tkellem.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |s|
   s.default_executable = %q{tkellem}
   s.require_paths = ["lib"]
 
-  s.add_dependency "eventmachine", "~> 0.12.10"
-  s.add_dependency "activerecord", "~> 3.0.0"
-  s.add_dependency "sqlite3", "~> 1.3.3"
+  s.add_dependency "celluloid", "~> 0.13.0"
+  s.add_dependency "celluloid-io", "~> 0.13.0"
+  s.add_dependency "activesupport", "3.2.10"
+  s.add_dependency "sequel", "3.42.0"
+  s.add_dependency "sqlite3", "1.3.6"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.5"
-  s.add_development_dependency "rcov"
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: tkellem
 version: !ruby/object:Gem::Version
-  version: 0.8.11
-  prerelease: 
+  version: 0.9.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Brian Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,41 +42,57 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 3.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 3.2.10
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
+        version: 3.42.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 3.42.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: 
 email:
 - brian@codekitchen.net
@@ -120,9 +152,9 @@ files:
 - lib/tkellem.rb
 - lib/tkellem/bouncer.rb
 - lib/tkellem/bouncer_connection.rb
+- lib/tkellem/celluloid_tools.rb
 - lib/tkellem/daemon.rb
 - lib/tkellem/irc_message.rb
-- lib/tkellem/irc_server.rb
 - lib/tkellem/migrations/001_init_db.rb
 - lib/tkellem/migrations/002_at_connect_columns.rb
 - lib/tkellem/migrations/003_settings.rb
@@ -141,9 +173,7 @@ files:
 - lib/tkellem/version.rb
 - resources/bot_command_descriptions.yml
 - resources/setting_descriptions.yml
-- spec/bouncer_connection_spec.rb
 - spec/irc_message_spec.rb
-- spec/irc_server_spec.rb
 - spec/spec_helper.rb
 - tkellem.gemspec
 homepage: http://github.com/codekitchen/tkellem
@@ -161,9 +191,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -171,8 +201,6 @@ signing_key:
 specification_version: 3
 summary: IRC bouncer with multi-client support
 test_files:
-- spec/bouncer_connection_spec.rb
 - spec/irc_message_spec.rb
-- spec/irc_server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/tkellem/irc_server.rb

@@ -1,124 +0,0 @@
-require 'eventmachine'
-require 'set'
-require 'socket'
-
-require 'tkellem/irc_message'
-require 'tkellem/bouncer_connection'
-
-module Tkellem
-
-module IrcServerConnection
-  include EM::Protocols::LineText2
-
-  def initialize(connection_state, bouncer, do_ssl)
-    set_delimiter "\r\n"
-    @bouncer = bouncer
-    @ssl = do_ssl
-    @connection_state = connection_state
-    @connected = false
-  end
-
-  def connection_completed
-    if @ssl
-      @bouncer.failsafe(:connection_completed) do
-        @bouncer.debug "starting TLS"
-        # TODO: support strict cert checks
-        start_tls :verify_peer => false
-      end
-    else
-      ssl_handshake_completed
-    end
-  end
-
-  def ssl_handshake_completed
-    @bouncer.failsafe(:ssl_handshake_completed) do
-      @connected = true
-      @bouncer.connection_established(self)
-    end
-  end
-
-  def receive_line(line)
-    @bouncer.failsafe(:receive_line) do
-      @bouncer.trace "from server: #{line}"
-      return if line.blank?
-      msg = IrcMessage.parse(line)
-      @bouncer.server_msg(msg)
-    end
-  end
-
-  def unbind
-    @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/spec/bouncer_connection_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'tkellem/bouncer_connection'
-
-include Tkellem
-
-describe BouncerConnection, "connect" do
-  before do
-    @u = User.create(:username => 'speccer')
-    @u.password = 'test123'
-    @u.save
-    @tk = mock(TkellemServer)
-    @b = mock(Bouncer)
-    @bc = em(BouncerConnection).new(@tk, false)
-  end
-
-  it "should ignore blank lines" do
-    @bc.should_receive(:error!).never
-    @bc.receive_line("")
-  end
-
-  it "should connect after receiving credentials" do
-    @tk.should_receive(:find_bouncer).with(@u, 'testhost').and_return(@b)
-    @bc.receive_line("NICK speccer")
-    @bc.receive_line("PASS test123")
-    @b.should_receive(:connect_client).with(@bc)
-    @bc.receive_line("USER speccer@testhost")
-  end
-
-  it "should connect when receiving user before pass" do
-    @tk.should_receive(:find_bouncer).with(@u, 'testhost').and_return(@b)
-    @bc.receive_line("USER speccer@testhost")
-    @bc.receive_line("PASS test123")
-    @b.should_receive(:connect_client).with(@bc)
-    @bc.receive_line("NICK speccer")
-  end
-end
-

data/spec/irc_server_spec.rb

@@ -1,145 +0,0 @@
-require 'spec_helper'
-require 'tkellem/irc_server'
-
-include Tkellem
-
-describe Bouncer, "connection" do
-  before do
-    EM.stub!(:add_timer).and_return(nil)
-  end
-
-  def make_server
-    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
-
-  def send_welcome(s, &just_before_last)
-    s.should_receive(:send_msg).with("USER speccer somehost tkellem :speccer@tkellem")
-    s.should_receive(:send_msg).with("NICK speccer")
-    s.should_receive(:send_msg).with("AWAY :Away")
-    s.connection_established(nil)
-    s.server_msg(IrcMessage.parse("001 blah blah"))
-    s.server_msg(IrcMessage.parse("002 more blah"))
-    s.server_msg(IrcMessage.parse("003 even more blah"))
-    just_before_last && just_before_last.call
-    s.server_msg(IrcMessage.parse("376 :end of MOTD"))
-  end
-
-  def connected_server
-    s = make_server
-    send_welcome(s)
-    s.connected?.should be_true
-    s
-  end
-
-  it "should connect to the server on creation" do
-    s = make_server
-    s.connected?.should_not be_true
-    s.should_receive(:send_msg).with("USER speccer somehost tkellem :speccer@tkellem")
-    s.should_receive(:send_msg).with("NICK speccer")
-    s.connection_established(nil)
-  end
-
-  it "should pong" do
-    s = connected_server
-    s.should_receive(:send_msg).with("PONG tkellem!tkellem :HAI")
-    s.server_msg(IrcMessage.parse(":speccer!test@host ping :HAI"))
-  end
-
-  it "should ignore blank lines" do
-    b = mock("bouncer", :trace => nil)
-    b.should_receive(:failsafe).and_yield
-    s = em(IrcServerConnection).new('connected', b, false)
-    b.should_receive(:server_msg).never
-    s.receive_line("")
-  end
-
-  def tk_server
-    $tk_server ||= TkellemServer.new
-  end
-
-  after(:each) do
-    $tk_server.stop if $tk_server
-    $tk_server = nil
-  end
-
-  def network_user(opts = {})
-    opts[:user] ||= @user ||= User.create!(:username => 'speccer', :password => 'test123')
-    opts[:network] ||= @network ||= Network.create!(:name => 'localhost')
-    @network_user ||= NetworkUser.create!(opts)
-  end
-
-  def bouncer(opts = {})
-    tk_server
-    network_user
-    @bouncer = $tk_server.bouncers.values.last
-    if opts[:connect]
-      @server_conn = em(IrcServerConnection).new(nil, @bouncer, false)
-      @server_conn.stub!(:send_data)
-      @bouncer.connection_established(@server_conn)
-      @bouncer.send :ready!
-    end
-    @bouncer
-  end
-
-  def client_connection(opts = {})
-    @client ||= em(BouncerConnection).new(tk_server, false)
-    if opts[:connect]
-    end
-    @client
-  end
-
-  it "should force the client nick on connect" do
-    network_user(:nick => 'mynick')
-    bouncer(:connect => true)
-    @bouncer.server_msg(m ":mynick JOIN #t1")
-    client_connection
-    @client.should_receive(:send_msg).with(":some_other_nick NICK mynick")
-    @client.should_receive(:send_msg).with(":mynick JOIN #t1")
-    @client.receive_line("PASS test123")
-    @client.receive_line("NICK some_other_nick")
-    @client.receive_line("USER #{@user.username}@#{@network.name} a b :c")
-  end
-
-  it "should attempt another nick if the default is taken" do
-    network_user(:nick => 'mynick')
-    bouncer
-    @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")
-    @bouncer.server_msg(m ":server 433 * mynick :Nickname already in use")
-    @bouncer.nick.should == 'mynick_'
-    @bouncer.send :ready!
-  end
-
-  it "should change nicks if a client sends nick after connecting" do
-    network_user(:nick => 'mynick')
-    bouncer(:connect => true)
-    @bouncer.server_msg(m ":mynick JOIN #t1")
-    client_connection
-    @client.should_receive(:send_msg).with(":mynick JOIN #t1")
-    @client.receive_line("PASS test123")
-    @client.receive_line("NICK mynick")
-    @client.receive_line("USER #{@user.username}@#{@network.name} a b :c")
-    @bouncer.nick.should == 'mynick'
-    @bouncer.client_msg(@client, m("NICK some_other"))
-    @bouncer.nick.should == 'some_other'
-  end
-
-  it "should change nicks if a server forces nick change" do
-    network_user(:nick => 'mynick')
-    bouncer(:connect => true)
-    @bouncer.server_msg(m ":mynick JOIN #t1")
-    client_connection
-    @client.should_receive(:send_msg).with(":mynick JOIN #t1")
-    @client.receive_line("PASS test123")
-    @client.receive_line("NICK mynick")
-    @client.receive_line("USER #{@user.username}@#{@network.name} a b :c")
-    @bouncer.nick.should == 'mynick'
-    @client.should_receive(:send_msg).with(m ":mynick NICK some_other")
-    @bouncer.server_msg(m ":mynick NICK some_other")
-    @bouncer.nick.should == 'some_other'
-  end
-end