Pulse 1.2.8 → 1.3.0

data/library/pulse/client.rb

@@ -9,28 +9,25 @@ module Pulse
     attr_accessor :scripts
 
     def initialize options
-      @scripts       = []
-      @channels      = {}
-      @settings      = Settings.new options
-      @callbacks     = {}
-      @connection    = Connection.new self, @settings
-      @conversations = {}
+      @conversations, @callbacks, @channels, @scripts = {}, {}, {}, []
 
-      load_scripts
+      @settings   = Settings.new options
+      @connection = Connection.new self, @settings
 
-      trap 2 do
-        unload_scripts
-        transmit :QUIT, "I was interrupted" 
-      end
+      load_scripts
+      trap 2, &method(:quit)
     end
 
     def connect
-      @connection.establish
+      if not @connection.established?
+        @connection.establish
+      else
+        raise ConnectionError, 'Connection has already been established'
+      end
     end
 
     def got_command command
       name = :"got_#{command.name.downcase}"
-      puts "<< #{command}"
 
       if respond_to? name
         __send__ name, command
@@ -38,18 +35,11 @@ module Pulse
     end
 
     def connection_established connection
-      puts "Connection has been established."
-
       transmit :NICK, @settings.nickname
       transmit :USER, @settings.username, ?*, ?*, @settings.realname
     end
 
     def connection_terminated connection
-      puts "The connection was terminated."
-    end
-
-    def say recipient, line
-      transmit :PRIVMSG, recipient.to_s, line
     end
 
     def load_scripts
@@ -64,25 +54,30 @@ module Pulse
       end.clear
     end
 
-    def each_user name
+    def instances_of name
       @channels.values.select { |c| c.user? name }.each do |channel|
         yield channel.user name
       end
     end
 
-    def send_file path, recipient
-      Thread.new path, recipient do
-        DCC.new(path).listen do |addr|
-          # FIXME: find the right local ip address and convert it to an integer
-          transmit :PRIVMSG, recipient, "\x01DCC SEND #{File.basename path} 1489377357 #{addr[1]} #{File.size path}\x01"
-        end
-      end
-    end
-
     def transmit name, *args
       @connection.transmit name, *args
     end
 
+    def say recipient, line
+      transmit :PRIVMSG, recipient.to_s, line
+    end
+
+    def join channel
+      transmit :JOIN, channel.to_s
+    end
+
+    def quit signal
+      unload_scripts
+
+      transmit :QUIT, "Received kill signal (#{signal})"
+    end
+
   private
 
     def emit name, *args
@@ -90,12 +85,9 @@ module Pulse
         callback.call *args
       end if @callbacks[name]
 
-
       @scripts.each do |script|
         begin
-          if script.respond_to? name
-            script.__send__ name, *args
-          end
+          script.__send__ name, *args if script.respond_to? name
         rescue => exception
           puts "Script error: #{exception.message} on line #{exception.line + 1} in #{script.path}"
         end

data/library/pulse/connection.rb

@@ -23,12 +23,22 @@ module Pulse
       @delegate.connection_terminated self
     end
 
-    def close
-      @socket.close
+    def transmit name, *arguments
+      if established?
+        Command.new(name, arguments).tap { |this| @queue << this }
+      else
+        raise ConnectionError, 'Connection has not been established'
+      end
     end
 
-    def transmit name, *arguments
-      Command.new(name, arguments).tap { |this| @queue << this }
+    def established?; not @socket.nil? and not @socket.closed? end
+
+    def close
+      if established?
+        @socket.close
+      else
+        raise ConnectionError, 'Connection is already closed'
+      end
     end
   end
 end

data/library/pulse/handling.rb

@@ -20,7 +20,6 @@ module Pulse
         else
           @channels[command[2]] ||= Channel.new(command[2], self, users)
         end
-        p users, command[3]
       end
 
       # The IRCd is checking whether or not we're still alive
@@ -56,11 +55,7 @@ module Pulse
           (@conversations[command.sender.nickname] ||= Conversation.new user, self).tap do |conversation|
             user.channel = conversation
 
-            if message =~ /^\x01DCC (.*?)\x01$/
-              emit :dcc, user, conversation, $1.split
-            else
-              emit :conversation, user, conversation, message
-            end
+            emit :conversation, user, conversation, message
           end
         end
       end
@@ -73,7 +68,7 @@ module Pulse
           user.channel = channel
           user.synchronize command.sender
           channel.users << user
-          emit :user_joined, user, channel
+          emit :user_entered, user, channel
         end
       end
 

data/library/pulse/queue.rb

@@ -2,7 +2,6 @@
 
 module Pulse
   class Queue
-
     SleepDuration = 2
     Timelapse = 4
     Amount = 3
@@ -29,8 +28,6 @@ module Pulse
           end
 
           @socket.write "#{command}\n"
-
-          puts ">> #{command}"
         else
           Thread.stop
         end

data/library/pulse/script/cache.rb

@@ -15,16 +15,13 @@ module Pulse
           YAML.dump @containers, file
         end
 
-        puts "Dumping cache for script #{@script.inspect} to #{path} …"
+        puts "Dumping cache for script #{@script.name} to #{path} …"
       end
 
       def load
-        if yaml = YAML.load_file(path)
-          @containers = yaml
-
-          puts "Imported cache from #{path} …"
+        if data = YAML.load_file(path)
+          puts "Imported cache from #{path} …" if @containers = data
         end
-
       rescue
         puts "The cache is corrupted. Removing."
         File.unlink path

data/library/pulse/script.rb

@@ -2,29 +2,31 @@
 
 module Pulse
   class Script < Module
-
     attr_accessor :name, :author, :version, :path
 
     def initialize path, client
-      @path, @client = path, client
-      @loaded = false
+      @path, @client, @loaded = path, client, false
 
-      evaluate_script
       cache.load if has_cache?
-      __send__ :loaded if respond_to? :loaded
+      emit :loaded if evaluate_script
     end
 
-    def Script name, version = [1, 0, 0], author = nil, &block
+    def Script name, version = [1,0,0], author = nil, &block
       @name, @version, @author = name, version, author
+
       instance_eval &block
     end
 
+    def cache_for name; script = @client.scripts.find { |script| script.name == name } ? script.cache : nil end
+
+    def emit method, *args; __send__ method, *args if respond_to? method end
+    def script name; @client.scripts.find { |script| script.name == name } end
+    def cache; @cache ||= Cache.new self end
+
+    def has_cache?; File.exists? "#{File.expand_path File.dirname $0}/cache/#@name.yml" end
     def loaded?; @loaded == true end
 
-    def unload!
-      cache.save if @cache
-      __send__ :unloaded if respond_to? :unloaded
-    end
+    def unload!; cache.save if @cache; emit :unloaded end
 
     def to_yaml opts = {}; @name.to_yaml opts end
 
@@ -32,19 +34,6 @@ module Pulse
       %{#<#{self.class.name} @name=#{@name.inspect} @version=#{@version.inspect} @author=#{@author.inspect}}
     end
 
-    def cache_for name
-      script = @client.scripts.find { |script| script.name == name }
-      script ? script.cache : nil
-    end
-
-    def script name; @client.scripts.find { |script| script.name == name } end
-
-    def has_cache?
-      File.exists? "#{File.expand_path File.dirname $0}/cache/#@name.yml"
-    end
-
-    def cache; @cache ||= Cache.new self end
-
   private
 
     def evaluate_script
@@ -52,6 +41,5 @@ module Pulse
     rescue
       puts "Parse error: #{$!.message}"
     end
-
   end
 end

data/library/pulse.rb

@@ -2,33 +2,21 @@
 
 require 'yaml'
 require 'socket'
-require 'pulse/dcc'
-require 'pulse/user'
-require 'pulse/queue'
-require 'pulse/client'
-require 'pulse/script'
-require 'pulse/channel'
-require 'pulse/command'
-require 'pulse/settings'
-require 'pulse/connection'
-require 'pulse/enhancements'
-require 'pulse/conversation'
-require 'pulse/script/cache'
 
 Thread.abort_on_exception = true
 
+Dir.glob("#{File.dirname __FILE__}/pulse/**/*.rb").each &method(:require)
+
 module Pulse
-  class << Version = [1,2]
+  class ConnectionError < StandardError; end
+
+  class << Version = [1,3]
     def to_s; join ?. end
   end
 
-  class << self
-    def connect options, &block
-      puts "=> Pulse #{Version}"
-
-      Client.new(options).tap do |client|
-        client.instance_eval &block
-      end.connect
-    end
+  def self.connect options, &block
+    Client.new(options).tap do |client|
+      client.instance_eval &block
+    end.connect
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 8
-  version: 1.2.8
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Mikkel Kroman
@@ -14,7 +14,7 @@ autorequire:
 bindir: executables
 cert_chain: []
 
-date: 2010-12-11 00:00:00 +01:00
+date: 2010-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -38,7 +38,6 @@ files:
 - library/pulse/user.rb
 - library/pulse/conversation.rb
 - library/pulse/channel.rb
-- library/pulse/dcc.rb
 - library/pulse/enhancements.rb
 - library/pulse.rb
 has_rdoc: true

data/library/pulse/dcc.rb

@@ -1,38 +0,0 @@
-# encoding: utf-8
-
-require 'timeout'
-
-module Pulse
-  class DCC
-    Duration = 150
-
-    def initialize path, position = 0
-      @path, @position = path, 0
-    end
-
-    def listen
-      client = nil
-
-      TCPServer.open '0.0.0.0', 0 do |server|
-        yield server.addr if block_given?
-
-        begin
-          timeout(Duration) { client = server.accept }
-        rescue Timeout::Error
-          server.close
-        end
-
-        each_chunk { |chunk| client.write chunk } if client
-        client.close if client
-      end
-    end
-
-    def each_chunk
-      File.open @path, ?r do |file|
-        file.readpartial @position if @position > 0
-        yield file.readpartial 1024 until file.eof?
-      end
-    end
-
-  end
-end