spunk 0.0.3 → 0.1.0

data/lib/spunk.rb

@@ -6,5 +6,5 @@ require 'spunk/helpers'
 require 'spunk/origin'
 require 'spunk/bot'
 
-SPUNK_VERSION = '0.0.1'
+SPUNK_VERSION = '0.1.0'
 

data/lib/spunk/base_parser.rb

@@ -1,9 +1,15 @@
 module Spunk
   module Processor
     class Base
-      def call(bot, origin, command, parameters)
+      def call(hash)
+        bot = hash[:bot]
+        command = hash[:command]
+        parameters = hash[:parameters]
+        origin = hash[:origin]
+        
         if command =~ /^INVITE #{bot.nickname}$/i
-          room = Spunk::Helpers.parse_room(parameters)
+          room = Helpers.parse_room(hash[:parameters])
+          hash[:logger].debug "Recieved invite for room #{room}"
           if room
             bot.join_room(room)
           end

data/lib/spunk/bot.rb

@@ -1,12 +1,15 @@
 require 'socket'
 require 'openssl'
+require 'mutex_m'
+require 'logger'
 
 module Spunk
   class Bot
-    attr_accessor :nickname, :server, :joined_rooms, :ssl, :server, :rooms, :token
+    attr_accessor :nickname, :server, :joined_rooms, :ssl, :server, :rooms, :token, :logger
     attr_reader :processors, :request_processors, :response_processors, :hostname
 
     def initialize(options = {})
+      #self.extend Mutex_m
       options.each do |option, value|
         instance_variable_set("@#{option}", value)
       end
@@ -21,9 +24,22 @@ module Spunk
       add_request_processor(Spunk::Processor::Ping.new)
       add_request_processor(Spunk::Processor::Base.new)
       @rooms = options[:rooms] ||= []
+      if options[:logger].class == String
+        @logger = Logger.new(options[:logger])
+        @logger.level = Logger::INFO
+      elsif options[:logger].nil?
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::INFO
+      elsif options[:logger].class == Hash
+        @logger = Logger.new(options[:logger][:file])
+        @logger.level = options[:logger][:level] ||= Logger::INFO
+      elsif options[:logger].class == Logger
+        @logger = options[:logger]
+      end
     end
 
     def start
+      @logger.info "Starting Bot"
       loop do
         @buffer ||= ""
         if @ssl
@@ -75,10 +91,11 @@ module Spunk
       origin = if !prefix.nil? && prefix != ""
         Origin.new(prefix)
       end
-
+      hash = Helpers.hashify(self, origin, command, parameters, @logger)
+      @logger.debug "Processing request: origin=#{hash[:origin]} :: command=#{hash[:command]} :: parameters=#{hash[:parameters]}"
       (@request_processors + @processors).each do |processor|
         begin
-          processor.call(self, origin, command, parameters)
+          processor.call(hash)
         rescue => e
           puts e.class.name + ": " + e.message
           puts e.backtrace.join("\n")
@@ -89,7 +106,8 @@ module Spunk
     def process_response(origin, command, parameters)
       (@response_processors + @processors).each do |processor|
         begin
-          processor.call(self, origin, command, parameters)
+          hash = Helpers.hashify(self, origin, command, parameters, @logger)
+          processor.call(hash)
         rescue => e
           puts e.class.name + ": " + e.message
           puts e.backtrace.join("\n")
@@ -115,8 +133,10 @@ module Spunk
     end
 
     def connect
+      @logger.info "Starting connection to #{@server[:hostname]}:#{@server[:port]}"
       @socket = TCPSocket.new(@server[:hostname], @server[:port])
       if @ssl == true
+        @logger.debug "Detected SSL connection"
         @ssl_context = OpenSSL::SSL::SSLContext.new()
         @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
         @socket = OpenSSL::SSL::SSLSocket.new(@socket, @ssl_context)
@@ -132,7 +152,9 @@ module Spunk
     end
 
     def authenticate
+      @logger.debug "Starting authentication section"
       unless @token.nil?
+        @logger.debug "Token detected.. sending token"
         send_message "PASS #{@token}"
       end
       send_message "NICK #{@nickname}"
@@ -140,16 +162,19 @@ module Spunk
     end
 
     def join_room(room, password = nil)
+      @logger.debug "Joining room #{room}"
       @joined_rooms << room
       @joined_rooms.uniq!
       send_message("JOIN #{room}" + (password ? " #{password}" : ""))
     end
 
     def say(to, message)
+      @logger.debug "saying message: PRIVMSG #{to} :#{message}"
       send_message "PRIVMSG #{to} :#{message}"
     end
 
     def send_message(message)
+      @logger.debug "Sending message: #{message}"
       command, parameters = message.strip.split(/\:/, 2)
       process_response(origin, command.to_s.strip, parameters)
     end

data/lib/spunk/helpers.rb

@@ -1,12 +1,15 @@
 module Spunk
   module Helpers
    def Helpers.parse_room(command)
+     if command.nil?
+       return nil
+     end
      command.match(/(\#\S+\b)/i)
      return $1
    end
    
-   def Helpers.hashify(bot, origin, command, msg)
-     hash = {:bot=>bot, :origin=>origin, :command => command, :msg => msg, :room => nil}
+   def Helpers.hashify(bot, origin, command, parameters, logger)
+     hash = {:bot=>bot, :origin=>origin, :command => command, :msg => parameters, :parameters=>parameters, :room => nil, :logger=>logger}
      hash[:room] = Helpers.parse_room(command)
      return hash
    end

data/lib/spunk/origin.rb

@@ -9,6 +9,10 @@ module Spunk
     def nickname
       @prefix.to_s.split(/!/, 2)[0]
     end
+    
+    def username
+      @prefix.to_s.split(/!/, 2)[1].split("@").first
+    end
 
     def to_s
       case

data/lib/spunk/ping_parser.rb

@@ -1,9 +1,9 @@
 module Spunk
   module Processor
     class Ping
-      def call(bot, origin, command, parameters)
-        if command =~ /^PING$/
-          bot.send_message("PONG :#{parameters}")
+      def call(hash)
+        if hash[:command] =~ /^PING$/
+          hash[:bot].send_message("PONG :#{hash[:parameters]}")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spunk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors: