hector 1.0.2 → 1.0.3

data/bin/hector-daemon

@@ -3,12 +3,21 @@
 require "hector/boot"
 Hector.start
 
-if fork
-  exec "tail -n 0 -f #{Hector.root.join("log/hector.log")}"
+def stop
+  EventMachine.stop_event_loop
+  Hector.logger.info "Hector stopped"
+end
+
+%w(INT QUIT TERM).each do |signal|
+  Signal.trap(signal) { stop }
+end
+
+run_method = if EventMachine.respond_to?(:synchrony)
+  :synchrony
 else
-  sleep 0.01
-  EventMachine.run do
-    Hector.start_server
-  end
-  Process.wait
+  :run
+end
+
+EventMachine.send(run_method) do
+  Hector.start_server
 end

data/bin/hector-identity

@@ -17,7 +17,9 @@ command = nil unless username
 
 case command
 when "authenticate"
-  exit Hector::Identity.adapter.authenticate(username, password || read_password) ? 0 : -1
+  Hector::Identity.adapter.authenticate(username, password || read_password) do |authenticated|
+    exit authenticated ? 0 : -1
+  end
 
 when "remember"
   Hector::Identity.adapter.remember(username, password || read_password)

data/lib/hector/channel.rb

@@ -28,6 +28,7 @@ module Hector
       end
 
       def normalize(name)
+        name.force_encoding("UTF-8") if name.respond_to?(:force_encoding)
         if name =~ /^#[\p{L}\p{M}\p{N}\p{So}\p{Co}\w][\p{L}\p{M}\p{N}\p{So}\p{Co}\p{Pd}\p{Pc}\w-]{0,15}$/u
           name.downcase
         else

data/lib/hector/commands/invite.rb

@@ -0,0 +1,24 @@
+module Hector
+  module Commands
+    module Invite
+      def on_invite
+        touch_presence
+        nickname = request.args.first
+        if session = Session.find(nickname)
+          channel = Channel.find(request.args[1])
+          if channels.include?(channel)
+            if !session.channels.include?(channel)
+              session.deliver(:invite, self, :source => source, :text => request.text)
+            else
+              respond_with("443", nickname, channel.name, "is already on channel", :source => Hector.server_name)
+            end
+          else
+            respond_with("442", request.args[1], "You're not on that channel", :source => Hector.server_name)
+          end
+        else
+          raise NoSuchNickOrChannel, nickname
+        end        
+      end
+    end
+  end
+end

data/lib/hector/concerns/authentication.rb

@@ -19,6 +19,7 @@ module Hector
 
       protected
         def authenticate
+          start_timeout
           set_identity
           set_session
         end
@@ -27,6 +28,7 @@ module Hector
           if @username && @password && !@identity
             Identity.authenticate(@username, @password) do |identity|
               if @identity = identity
+                cancel_timeout
                 set_session
               else
                 error InvalidPassword
@@ -36,10 +38,20 @@ module Hector
         end
 
         def set_session
-          if @identity && @nickname
+          if @identity && @nickname && !@session
             @session = UserSession.create(@nickname, self, @identity, @realname)
           end
         end
+        
+        def start_timeout
+          @timer ||= EventMachine::Timer.new(30) do
+            close_connection(true)
+          end
+        end
+        
+        def cancel_timeout
+          @timer.cancel if @timer
+        end
     end
   end
 end

data/lib/hector/server.rb

@@ -1,14 +1,17 @@
 module Hector
   class << self
-    attr_accessor :server_name
+    attr_accessor :server_name, :address, :port, :ssl_port
 
-    def start_server(address = "0.0.0.0", port = 6767, ssl_port = 6868)
-      EventMachine.start_server(address, port, Connection)
-      EventMachine.start_server(address, ssl_port, SSLConnection)
-      logger.info("Hector running on #{address}:#{port}")
-      logger.info("Secure Hector running on #{address}:#{ssl_port}")
+    def start_server
+      EventMachine.start_server(@address, @port, Connection)
+      EventMachine.start_server(@address, @ssl_port, SSLConnection)
+      logger.info("Hector running on #{@address}:#{@port}")
+      logger.info("Secure Hector running on #{@address}:#{@ssl_port}")
     end
   end
 
   self.server_name = "hector.irc"
+  self.address = "0.0.0.0"
+  self.port = 6767
+  self.ssl_port = 6868
 end

data/lib/hector/session.rb

@@ -18,6 +18,7 @@ module Hector
     include Commands::Who
     include Commands::Whois
     include Commands::Away
+    include Commands::Invite
 
     attr_reader :nickname, :request, :response, :away_message
 
@@ -59,7 +60,8 @@ module Hector
       end
 
       def normalize(nickname)
-        if nickname =~ /^[\p{L}\p{M}\p{N}\p{So}\p{Co}\w][\p{L}\p{M}\p{N}\p{So}\p{Co}\p{P}\w-]{0,15}$/u
+        nickname.force_encoding("UTF-8") if nickname.respond_to?(:force_encoding)
+        if nickname =~ /^[\p{L}\p{M}\p{N}\p{So}\p{Co}\w][\p{L}\p{M}\p{N}\p{So}\p{Co}\p{P}\w\|\-]{0,15}$/u
           nickname.downcase
         else
           raise ErroneousNickname, nickname

data/lib/hector.rb

@@ -11,6 +11,7 @@ require "hector/concerns/keep_alive"
 require "hector/concerns/presence"
 
 require "hector/commands/away"
+require "hector/commands/invite"
 require "hector/commands/join"
 require "hector/commands/mode"
 require "hector/commands/names"

metadata

@@ -1,56 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hector
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.3
   prerelease: 
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Sam Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-05 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70326738713840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70326738713840
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70326738713280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.9
   type: :development
-  version_requirements: *id002
-description: A private group chat server for people you trust. Implements a limited subset of the IRC protocol.
-email: 
+  prerelease: false
+  version_requirements: *70326738713280
+description: A private group chat server for people you trust. Implements a limited
+  subset of the IRC protocol.
+email:
 - sstephenson@gmail.com
-executables: 
+executables:
 - hector
 - hector-daemon
 - hector-identity
 - hector-setup
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/hector/boot.rb
 - lib/hector/channel.rb
 - lib/hector/commands/away.rb
+- lib/hector/commands/invite.rb
 - lib/hector/commands/join.rb
 - lib/hector/commands/mode.rb
 - lib/hector/commands/names.rb
@@ -87,33 +85,28 @@ files:
 - bin/hector-daemon
 - bin/hector-identity
 - bin/hector-setup
-has_rdoc: true
 homepage: http://github.com/sstephenson/hector
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Private group chat server
 test_files: []
-