tkellem 0.9.0.beta3 → 0.9.0.beta4

data/spec/irc_server_spec.rb

@@ -0,0 +1,145 @@
+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

data/spec/spec_helper.rb

@@ -5,17 +5,30 @@ require 'tkellem'
 require 'rspec'
 
 Tkellem::EasyLogger.logger = Logger.new("test.log")
+ActiveRecord::Base.logger = Tkellem::EasyLogger.logger
 
-TestDB = Tkellem::TkellemServer.initialize_database(':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Migrator.migrate(File.expand_path("../../lib/tkellem/migrations", __FILE__), nil)
 
 RSpec.configure do |config|
-  config.around(:each) do |block|
-    TestDB.transaction(:rollback => :always) do
-      block.run()
+  config.around(:each) do |test|
+    EM.run do
+      ActiveRecord::Base.transaction do
+        test.run
+        raise ActiveRecord::Rollback
+      end
+      EM.stop
     end
   end
 
   def m(line)
     IrcMessage.parse(line)
   end
+
+  def em(mod)
+    c = Class.new
+    c.send(:include, mod)
+    c
+  end
 end

data/tkellem.gemspec

@@ -17,12 +17,11 @@ Gem::Specification.new do |s|
   s.default_executable = %q{tkellem}
   s.require_paths = ["lib"]
 
-  s.add_dependency "celluloid", "~> 0.14.1"
-  s.add_dependency "celluloid-io", "~> 0.14.1"
-  s.add_dependency "activesupport", "3.2.10"
-  s.add_dependency "sequel", "3.42.0"
-  s.add_dependency "sqlite3", "1.3.6"
+  s.add_dependency "eventmachine", "~> 1.0.3"
+  s.add_dependency "activerecord", "~> 4.0.0.rc2"
+  s.add_dependency "sqlite3", "~> 1.3.3"
+  s.add_dependency "rails-observers"
 
-  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.5"
+  s.add_development_dependency "simplecov"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkellem
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta3
+  version: 0.9.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: celluloid-io
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,57 +42,57 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.10
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.10
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rails-observers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.42.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.42.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
+        version: '2.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,22 +107,6 @@ 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
@@ -152,9 +136,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
@@ -173,7 +157,9 @@ 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
@@ -190,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3396799621810134094
+      hash: -629410189197339585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -204,5 +190,7 @@ 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

data/lib/tkellem/celluloid_tools.rb

@@ -1,131 +0,0 @@
-require 'openssl'
-require 'celluloid/io'
-
-module Tkellem
-module CelluloidTools
-
-# Generates a new SSL context with a new cert and key
-# Great for easily getting up and running, but not necessarily a good idea for
-# production use
-def self.generate_ssl_ctx
-  key = OpenSSL::PKey::RSA.new(2048)
-
-  dn = OpenSSL::X509::Name.parse("/CN=tkellem-auto")
-  cert = OpenSSL::X509::Certificate.new
-  cert.version = 2
-  cert.serial = 1
-  cert.subject = dn
-  cert.issuer = dn
-  cert.public_key = key.public_key
-  cert.not_before = Time.now
-  cert.not_after = Time.now + 94670777 # 3 years
-  cert.sign(key, OpenSSL::Digest::SHA1.new)
-
-  ctx = OpenSSL::SSL::SSLContext.new
-  ctx.key = key
-  ctx.cert = cert
-
-  ctx
-end
-
-class BackoffSupervisor < ::Celluloid::SupervisionGroup
-  attr_reader :registry
-
-  def restart_actor(actor, reason)
-    member = @members.find do |member|
-      member.actor == actor
-    end
-    raise "a group member went missing. This shouldn't be!" unless member
-
-    if reason
-    end
-
-    member.restart(reason)
-  end
-end
-
-class Listener < Struct.new(:server, :callback)
-  include Celluloid::IO
-
-  def self.start(*args, &callback)
-    listener = self.new(*args)
-    listener.callback = callback
-    listener.async.run
-    listener
-  end
-
-  def run
-    loop { handle_connection(server.accept) }
-  end
-
-  def handle_connection(socket)
-    callback.(socket)
-  end
-
-  finalizer :close
-
-  def close
-    server.try(:close) unless server.try(:closed?)
-  end
-end
-
-class TCPListener < Listener
-  def initialize(host, port)
-    self.server = TCPServer.new(host, port)
-  end
-end
-
-class SSLListener < Listener
-  def initialize(host, port)
-    self.server = SSLServer.new(TCPServer.new(host, port), CelluloidTools.generate_ssl_ctx)
-  end
-end
-
-class UnixListener < Listener
-  def initialize(socket_path)
-    self.server = UNIXServer.new(socket_path)
-  end
-end
-
-module LineReader
-  def self.included(k)
-    k.send :finalizer, :close_connection
-  end
-
-  def readline
-    @delimiter ||= "\r\n"
-    @readline_buffer ||= ''
-    loop do
-      if idx = @readline_buffer.index(@delimiter)
-        postidx = idx + @delimiter.size
-        line = @readline_buffer[0, postidx]
-        @readline_buffer = @readline_buffer[postidx..-1]
-        return line
-      else
-        @socket.readpartial(4096, @readline_buffer)
-      end
-    end
-  end
-
-  def close_connection
-    @socket.close if @socket && !@socket.closed?
-  end
-
-  def run
-    loop do
-      line = readline.force_encoding(Encoding::UTF_8)
-      receive_line(line)
-    end
-  rescue EOFError, IOError, OpenSSL::SSL::SSLError
-    unbind
-  end
-
-  def receive_line(line)
-  end
-
-  def unbind
-  end
-end
-
-end
-end